Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Bump version and update readme.

  • Loading branch information...
commit 112ebfa20af4a02da822c0dac232a014a27a7682 1 parent a6f5497
@MrJoy MrJoy authored
View
14 CHANGELOG.rdoc
@@ -1,4 +1,4 @@
-== 2.5.0
+== 2.6.0.beta1
* It's now possible to use Annotate in standalone ActiveRecord (non-Rails)
projects again.
@@ -28,12 +28,21 @@
* Expose all `position_*` variables as CLI params.
* Make `ENV ['position']` work as a default for all the `ENV ['position_*']`
variables.
+* Make rake tasks more resilient to unusual circumstances / code loading
+ behavior.
+* Resolve annotate vs. annotate_models ambiguity once and for all by settling
+ on `annotate_models` _and_ `annotate_routes`. This avoids a name collision
+ with RMagick while not needlessly overloading the term.
* Fixed that 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)
+* Change annotate to use options hash instead of ENV.
+
+== 2.5.0
+
* Works better with Rails 3
* Bugfix: schema kept prepending additional newlines
* Updates to make annotate smarter about when to touch a model
@@ -51,8 +60,7 @@
* 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 options hash instead of ENV.
+* 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
View
3  README.rdoc
@@ -1,5 +1,8 @@
== Annotate (aka AnnotateModels)
+IMPORTANT: If you're upgrading from a previous version, including 2.5.0,
+re-run the generator task!
+
Add a comment summarizing the current schema to the top or bottom of each of
your...
View
52 annotate.gemspec
@@ -1,28 +1,38 @@
-here = File.dirname __FILE__
-require "#{here}/lib/annotate"
+# This file is auto-generated!
+# DO NOT EDIT THIS FILE DIRECTLY!
+# Instead, edit the Rakefile and run 'rake gems:gemspec'.# -*- encoding: utf-8 -*-
Gem::Specification.new do |s|
- s.name = %q{annotate}
- s.version = Annotate.version
- s.description = %q{Annotates Rails/ActiveRecord Models, routes, fixtures, and others based on the database schema.}
- s.summary = %q{Annotates Rails Models, routes, fixtures, and others based on the database schema.}
- s.authors = ["Cuong Tran", "Alex Chaffee", "Marcos Piccinini", "Turadg Aleahmad"]
- s.email = ["alex@stinky.com", "ctran@pragmaquest.com", "x@nofxx.com", "turadg@aleahmad.net"]
+ s.name = "annotate"
+ s.version = "2.6.0.beta1"
- s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+ s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
+ s.authors = ["Cuong Tran", "Alex Chaffee", "Marcos Piccinini", "Turadg Aleahmad", "Jon Frisby"]
+ s.date = "2012-08-27"
+ s.description = "Annotates Rails/ActiveRecord Models, routes, fixtures, and others based on the database schema."
+ s.email = ["alex@stinky.com", "ctran@pragmaquest.com", "x@nofxx.com", "turadg@aleahmad.net", "jon@cloudability.com"]
+ s.executables = ["annotate", "annotate_models", "annotate_routes"]
s.extra_rdoc_files = ["README.rdoc", "CHANGELOG.rdoc", "TODO.rdoc"]
-
- s.files = %w( README.rdoc CHANGELOG.rdoc TODO.rdoc )
- s.files += Dir.glob("lib/**/*")
- s.files += Dir.glob("tasks/**/*")
- s.files += ["bin/annotate"] # todo: annotate_models
-
- s.homepage = %q{http://github.com/ctran/annotate_models}
- s.rdoc_options = ["--charset=UTF-8"]
+ s.files = ["CHANGELOG.rdoc", "README.rdoc", "TODO.rdoc", "VERSION", "annotate.gemspec", "bin/annotate", "bin/annotate_models", "bin/annotate_routes", "lib/annotate.rb", "lib/annotate/active_record_patch.rb", "lib/annotate/annotate_models.rb", "lib/annotate/annotate_routes.rb", "lib/annotate/tasks.rb", "lib/annotate/version.rb", "lib/generators/annotate/USAGE", "lib/generators/annotate/install_generator.rb", "lib/generators/annotate/templates/auto_annotate_models.rake", "lib/tasks/annotate_routes.rake", "lib/tasks/migrate.rake"]
+ s.homepage = "http://github.com/ctran/annotate_models"
+ s.licenses = ["Ruby"]
s.require_paths = ["lib"]
- s.rubyforge_project = %q{annotate}
+ s.rubyforge_project = "annotate"
+ s.rubygems_version = "1.8.24"
+ s.summary = "Annotates Rails Models, routes, fixtures, and others based on the database schema."
- s.add_runtime_dependency 'rake'
- s.add_runtime_dependency 'activerecord'
-end
+ if s.respond_to? :specification_version then
+ s.specification_version = 3
+ if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+ s.add_runtime_dependency(%q<rake>, [">= 0.8.7"])
+ s.add_runtime_dependency(%q<activerecord>, [">= 2.3.0"])
+ else
+ s.add_dependency(%q<rake>, [">= 0.8.7"])
+ s.add_dependency(%q<activerecord>, [">= 2.3.0"])
+ end
+ else
+ s.add_dependency(%q<rake>, [">= 0.8.7"])
+ s.add_dependency(%q<activerecord>, [">= 2.3.0"])
+ end
+end
View
2  lib/annotate/version.rb
@@ -1,5 +1,5 @@
module Annotate
def self.version
- "2.5.0"
+ '2.6.0.beta1'
end
end
Please sign in to comment.
Something went wrong with that request. Please try again.