preparing release 2.5.0.pre2

History.txt

 == 2.5.0
 
-* Fixed that schema kept prepending additional newlines
-* Updates to make annotate smarter about when to touch a model 
+* Works better with Rails 3
+* Bugfix: schema kept prepending additional newlines
+* Updates to make annotate smarter about when to touch a model
 * Recognize column+type, and don't change a file unless the column+type combination of the new schema are different than that of the old (i.e., don't regenerate if columns happen to be in a different order. That's just how life is sometimes)
 * Grab old specification even if it has \r\n as line endings rather than pure \ns
 * Various warning and specification fixes
 * Fix "no such file to load -- annotate/annotate_models (MissingSourceFile)" error (require statements in tasks now use full path to lib files)
-* warn about macros, to mitigate when we're included during a production run, not just a rakefile run -- possibly at the expense of too much noise 
+* warn about macros, to mitigate when we're included during a production run, not just a rakefile run -- possibly at the expense of too much noise
 * Adding rake as a runtime dependency
-* If the schema is already in the model file, it will be replaced into the same location.  If it didn't previously exist, it'll be placed according to the "position", as before. 
+* If the schema is already in the model file, it will be replaced into the same location.  If it didn't previously exist, it'll be placed according to the "position", as before.
 * Allow task loading from Rakefile for gems (plugin installation already auto-detects).
-* Add skip_on_db_migrate option as well for people that don't want it 
-* Fix options parsing to convert strings to proper booleans. Change annotate to use opt
- ions hash instead of ENV. 
+* Add skip_on_db_migrate option as well for people that don't want it
+* Fix options parsing to convert strings to proper booleans
 * Add support for Fabrication fabricators
 * Leave magic encoding comment intact
 * Fix issue #14 - RuntimeError: Already memoized
@@ -57,6 +57,10 @@
   no replacement. It will be removed on or after 2011-10-01.`
 * Fix handling of files with no trailing newline when putting annotations at
   the end of the file.
+* Now works on tables with no primary key.
+* Add --format=markdown option
+* "Table name" annotation (if table name is different from model name)
+* "Human name" annotation (enabling translation to non-English locales)
 
 == 2.4.2 2009-11-21
 

README.rdoc

@@ -107,14 +107,16 @@ anywhere in the file:
         -r, --routes                     Annotate routes.rb with the output of 'rake routes'
         -v, --version                    Show the current version of this gem
         -m, --show-migration             Include the migration version number in the annotation
-        -i, --show-indexes               List the indexes for the table in the annotation
-        -s, --simple-indexes             Include information about indexes inline with the relevant column
+        -i, --show-indexes               List the table's database indexes in the annotation
+        -s, --simple-indexes             Concat the column's related indexes in the annotation
             --model-dir dir              Annotate model files stored in dir rather than app/models
-            --ignore-model-subdirs       Ignore sub-directories of the models directory.
+            --ignore-model-subdirects    Ignore subdirectories of the models directory
+            --sort                       Sort columns alphabetically, rather than in creation order
         -R, --require path               Additional files to require before loading models
-        -e [tests,fixtures]              Skip annotation of fixtures/factories/test files
-            --exclude
-            --sort                        Sort by alphabetical order rather than column creation order
+        -e, --exclude [tests,fixtures]   Do not annotate fixtures, test files, or both
+        -f [bare|rdoc|markdown],         Render Schema Infomation as plain/RDoc/Markdown
+            --format
+            --force                      Force new annotations even if there are no changes.
 
 
 == SORTING
@@ -170,5 +172,12 @@ With help from:
 - Nathan Brazil - http://github.com/bitaxis
 - Ian Duggan http://github.com/ijcd
 - Jon Frisby http://github.com/mrjoy
+- Tsutomu Kuroda
+- Kevin Moore
+- Philip Hallstrom
+- Brent Greeff
+- Paul Alexander
+- Dmitry Lihachev
+- qichunren
 
 and many others that I may have missed to add.

lib/annotate/version.rb

 module Annotate
   def self.version
-    "2.5.0.pre1"
+    "2.5.0.pre2"
   end
 end