Skip to content

Commit 3e89448

Browse files
committed
preparing release 2.5.0.pre2
1 parent 62d31ea commit 3e89448

File tree

3 files changed

+27
-14
lines changed

3 files changed

+27
-14
lines changed

History.txt

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
== 2.5.0
22

3-
* Fixed that schema kept prepending additional newlines
4-
* Updates to make annotate smarter about when to touch a model
3+
* Works better with Rails 3
4+
* Bugfix: schema kept prepending additional newlines
5+
* Updates to make annotate smarter about when to touch a model
56
* 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)
67
* Grab old specification even if it has \r\n as line endings rather than pure \ns
78
* Various warning and specification fixes
89
* Fix "no such file to load -- annotate/annotate_models (MissingSourceFile)" error (require statements in tasks now use full path to lib files)
9-
* 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
10+
* 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
1011
* Adding rake as a runtime dependency
11-
* 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.
12+
* 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.
1213
* Allow task loading from Rakefile for gems (plugin installation already auto-detects).
13-
* Add skip_on_db_migrate option as well for people that don't want it
14-
* Fix options parsing to convert strings to proper booleans. Change annotate to use opt
15-
ions hash instead of ENV.
14+
* Add skip_on_db_migrate option as well for people that don't want it
15+
* Fix options parsing to convert strings to proper booleans
1616
* Add support for Fabrication fabricators
1717
* Leave magic encoding comment intact
1818
* Fix issue #14 - RuntimeError: Already memoized
@@ -57,6 +57,10 @@
5757
no replacement. It will be removed on or after 2011-10-01.`
5858
* Fix handling of files with no trailing newline when putting annotations at
5959
the end of the file.
60+
* Now works on tables with no primary key.
61+
* Add --format=markdown option
62+
* "Table name" annotation (if table name is different from model name)
63+
* "Human name" annotation (enabling translation to non-English locales)
6064

6165
== 2.4.2 2009-11-21
6266

README.rdoc

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -107,14 +107,16 @@ anywhere in the file:
107107
-r, --routes Annotate routes.rb with the output of 'rake routes'
108108
-v, --version Show the current version of this gem
109109
-m, --show-migration Include the migration version number in the annotation
110-
-i, --show-indexes List the indexes for the table in the annotation
111-
-s, --simple-indexes Include information about indexes inline with the relevant column
110+
-i, --show-indexes List the table's database indexes in the annotation
111+
-s, --simple-indexes Concat the column's related indexes in the annotation
112112
--model-dir dir Annotate model files stored in dir rather than app/models
113-
--ignore-model-subdirs Ignore sub-directories of the models directory.
113+
--ignore-model-subdirects Ignore subdirectories of the models directory
114+
--sort Sort columns alphabetically, rather than in creation order
114115
-R, --require path Additional files to require before loading models
115-
-e [tests,fixtures] Skip annotation of fixtures/factories/test files
116-
--exclude
117-
--sort Sort by alphabetical order rather than column creation order
116+
-e, --exclude [tests,fixtures] Do not annotate fixtures, test files, or both
117+
-f [bare|rdoc|markdown], Render Schema Infomation as plain/RDoc/Markdown
118+
--format
119+
--force Force new annotations even if there are no changes.
118120

119121

120122
== SORTING
@@ -170,5 +172,12 @@ With help from:
170172
- Nathan Brazil - http://github.com/bitaxis
171173
- Ian Duggan http://github.com/ijcd
172174
- Jon Frisby http://github.com/mrjoy
175+
- Tsutomu Kuroda
176+
- Kevin Moore
177+
- Philip Hallstrom
178+
- Brent Greeff
179+
- Paul Alexander
180+
- Dmitry Lihachev
181+
- qichunren
173182

174183
and many others that I may have missed to add.

lib/annotate/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module Annotate
22
def self.version
3-
"2.5.0.pre1"
3+
"2.5.0.pre2"
44
end
55
end

0 commit comments

Comments
 (0)