Skip to content

A
annotate
Commit 52ffefcb by cuong.tran
Options

Merge branch 'release/v2.6.8'

parents d5d55e8b 53a1f06d
Showing with 76 additions and 58 deletions
CHANGELOG.rdoc
== 2.6.8
* Nothing annotated unless options[:model_dir] is specified, #234
== 2.6.7 == 2.6.7
* Nothing annotated unless options[:model_dir] is specified, #234 * Nothing annotated unless options[:model_dir] is specified, #234
......
RELEASE.rdoc 0 → 100644
== Prerequisite
- Install "git-flow" (brew install git-flow)
- Install "bump" gem (gem install bump)
== Perform a release
- git flow release start <release>
- Update the CHANGELOG.rdoc file
- bump current
- bump patch
- rm -rf dist
- rake spec
- rake gem
- git flow release finish <release>
- rake gem:publish
annotate.gemspec
...@@ -7,6 +7,7 @@ Gem::Specification.new do |s| ...@@ -7,6 +7,7 @@ Gem::Specification.new do |s|
s.name = "annotate" s.name = "annotate"
s.version = Annotate.version s.version = Annotate.version
s.required_ruby_version = '>= 1.9.3'
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
s.authors = ["Alex Chaffee", "Cuong Tran", "Marcos Piccinini", "Turadg Aleahmad", "Jon Frisby"] s.authors = ["Alex Chaffee", "Cuong Tran", "Marcos Piccinini", "Turadg Aleahmad", "Jon Frisby"]
s.description = "Annotates Rails/ActiveRecord Models, routes, fixtures, and others based on the database schema." s.description = "Annotates Rails/ActiveRecord Models, routes, fixtures, and others based on the database schema."
...@@ -25,14 +26,14 @@ Gem::Specification.new do |s| ...@@ -25,14 +26,14 @@ Gem::Specification.new do |s|
s.specification_version = 4 s.specification_version = 4
if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
s.add_runtime_dependency(%q<rake>, ["~> 10.4.2", ">= 10.4.2"]) s.add_runtime_dependency(%q<rake>, ["~> 10.4"])
s.add_runtime_dependency(%q<activerecord>, [">= 2.3.0"]) s.add_runtime_dependency(%q<activerecord>, [">= 3.2", "<= 4.3"])
else else
s.add_dependency(%q<rake>, [">= 0.8.7"]) s.add_dependency(%q<rake>, ["~> 10.4"])
s.add_dependency(%q<activerecord>, [">= 2.3.0"]) s.add_dependency(%q<activerecord>, [">= 3.2", "<= 4.3"])
end end
else else
s.add_dependency(%q<rake>, [">= 0.8.7"]) s.add_dependency(%q<rake>, [">= 0.8.7"])
s.add_dependency(%q<activerecord>, [">= 2.3.0"]) s.add_dependency(%q<activerecord>, [">= 3.2", "<= 4.3"])
end end
end end
lib/annotate.rb
...@@ -71,7 +71,7 @@ module Annotate ...@@ -71,7 +71,7 @@ module Annotate
options[key] = (!ENV[key.to_s].blank?) ? ENV[key.to_s].split(',') : [] options[key] = (!ENV[key.to_s].blank?) ? ENV[key.to_s].split(',') : []
end end
if(!options[:model_dir]) if(options[:model_dir].empty?)
options[:model_dir] = ['app/models'] options[:model_dir] = ['app/models']
end end
......
lib/annotate/version.rb
module Annotate module Annotate
def self.version def self.version
'2.6.7' '2.6.8'
end end
end end
spec/integration/rails_4.1.1/Gemfile.lock
PATH PATH
remote: ../../.. remote: ../../..
specs: specs:
annotate (2.6.5) annotate (2.6.6)
activerecord (>= 2.3.0) activerecord (>= 3.2, <= 4.3)
rake (>= 0.8.7) rake (~> 10.4)
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
...@@ -42,27 +42,27 @@ GEM ...@@ -42,27 +42,27 @@ GEM
coffee-script (2.3.0) coffee-script (2.3.0)
coffee-script-source coffee-script-source
execjs execjs
coffee-script-source (1.7.1) coffee-script-source (1.9.1)
erubis (2.7.0) erubis (2.7.0)
execjs (2.2.1) execjs (2.4.0)
hike (1.2.3) hike (1.2.3)
i18n (0.6.11) i18n (0.7.0)
jbuilder (2.1.3) jbuilder (2.2.11)
activesupport (>= 3.0.0, < 5) activesupport (>= 3.0.0, < 5)
multi_json (~> 1.2) multi_json (~> 1.2)
jquery-rails (3.1.1) jquery-rails (3.1.2)
railties (>= 3.0, < 5.0) railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0) thor (>= 0.14, < 2.0)
json (1.8.1) json (1.8.2)
mail (2.5.4) mail (2.5.4)
mime-types (~> 1.16) mime-types (~> 1.16)
treetop (~> 1.4.8) treetop (~> 1.4.8)
mime-types (1.25.1) mime-types (1.25.1)
minitest (5.4.0) minitest (5.5.1)
multi_json (1.10.1) multi_json (1.11.0)
polyglot (0.3.5) polyglot (0.3.5)
rack (1.5.2) rack (1.5.2)
rack-test (0.6.2) rack-test (0.6.3)
rack (>= 1.0) rack (>= 1.0)
rails (4.1.1) rails (4.1.1)
actionmailer (= 4.1.1) actionmailer (= 4.1.1)
...@@ -81,40 +81,39 @@ GEM ...@@ -81,40 +81,39 @@ GEM
activesupport (= 4.1.1) activesupport (= 4.1.1)
rake (>= 0.8.7) rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0) thor (>= 0.18.1, < 2.0)
rake (10.3.2) rake (10.4.2)
rdoc (4.1.1) rdoc (4.2.0)
json (~> 1.4) json (~> 1.4)
sass (3.2.19) sass (3.2.19)
sass-rails (4.0.3) sass-rails (4.0.5)
railties (>= 4.0.0, < 5.0) railties (>= 4.0.0, < 5.0)
sass (~> 3.2.0) sass (~> 3.2.2)
sprockets (~> 2.8, <= 2.11.0) sprockets (~> 2.8, < 3.0)
sprockets-rails (~> 2.0) sprockets-rails (~> 2.0)
sdoc (0.4.0) sdoc (0.4.1)
json (~> 1.8) json (~> 1.7, >= 1.7.7)
rdoc (~> 4.0, < 5.0) rdoc (~> 4.0)
spring (1.1.3) spring (1.3.3)
sprockets (2.11.0) sprockets (2.12.3)
hike (~> 1.2) hike (~> 1.2)
multi_json (~> 1.0) multi_json (~> 1.0)
rack (~> 1.0) rack (~> 1.0)
tilt (~> 1.1, != 1.3.0) tilt (~> 1.1, != 1.3.0)
sprockets-rails (2.1.3) sprockets-rails (2.2.4)
actionpack (>= 3.0) actionpack (>= 3.0)
activesupport (>= 3.0) activesupport (>= 3.0)
sprockets (~> 2.8) sprockets (>= 2.8, < 4.0)
sqlite3 (1.3.9) sqlite3 (1.3.10)
thor (0.19.1) thor (0.19.1)
thread_safe (0.3.4) thread_safe (0.3.4)
tilt (1.4.1) tilt (1.4.1)
treetop (1.4.15) treetop (1.4.15)
polyglot polyglot (>= 0.3.1)
polyglot (>= 0.3.1) turbolinks (2.5.3)
turbolinks (2.2.2)
coffee-rails coffee-rails
tzinfo (1.2.1) tzinfo (1.2.2)
thread_safe (~> 0.1) thread_safe (~> 0.1)
uglifier (2.5.3) uglifier (2.7.1)
execjs (>= 0.3.0) execjs (>= 0.3.0)
json (>= 1.8.0) json (>= 1.8.0)
......
spec/integration/rails_4.2.0/Gemfile.lock
PATH PATH
remote: ../../.. remote: ../../..
specs: specs:
annotate (2.6.5) annotate (2.6.6)
activerecord (>= 2.3.0) activerecord (>= 3.2, <= 4.3)
rake (>= 0.8.7) rake (~> 10.4)
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
...@@ -51,33 +51,33 @@ GEM ...@@ -51,33 +51,33 @@ GEM
coffee-script (2.3.0) coffee-script (2.3.0)
coffee-script-source coffee-script-source
execjs execjs
coffee-script-source (1.8.0) coffee-script-source (1.9.1)
erubis (2.7.0) erubis (2.7.0)
execjs (2.2.2) execjs (2.4.0)
globalid (0.3.0) globalid (0.3.3)
activesupport (>= 4.1.0) activesupport (>= 4.1.0)
hike (1.2.3) hike (1.2.3)
i18n (0.7.0) i18n (0.7.0)
jbuilder (2.2.6) jbuilder (2.2.11)
activesupport (>= 3.0.0, < 5) activesupport (>= 3.0.0, < 5)
multi_json (~> 1.2) multi_json (~> 1.2)
jquery-rails (4.0.2) jquery-rails (4.0.3)
rails-dom-testing (~> 1.0) rails-dom-testing (~> 1.0)
railties (>= 4.2.0) railties (>= 4.2.0)
thor (>= 0.14, < 2.0) thor (>= 0.14, < 2.0)
json (1.8.1) json (1.8.2)
loofah (2.0.1) loofah (2.0.1)
nokogiri (>= 1.5.9) nokogiri (>= 1.5.9)
mail (2.6.3) mail (2.6.3)
mime-types (>= 1.16, < 3) mime-types (>= 1.16, < 3)
mime-types (2.4.3) mime-types (2.4.3)
mini_portile (0.6.1) mini_portile (0.6.2)
minitest (5.5.0) minitest (5.5.1)
multi_json (1.10.1) multi_json (1.11.0)
nokogiri (1.6.5) nokogiri (1.6.6.2)
mini_portile (~> 0.6.0) mini_portile (~> 0.6.0)
rack (1.6.0) rack (1.6.0)
rack-test (0.6.2) rack-test (0.6.3)
rack (>= 1.0) rack (>= 1.0)
rails (4.2.0) rails (4.2.0)
actionmailer (= 4.2.0) actionmailer (= 4.2.0)
...@@ -108,8 +108,8 @@ GEM ...@@ -108,8 +108,8 @@ GEM
rake (10.4.2) rake (10.4.2)
rdoc (4.2.0) rdoc (4.2.0)
json (~> 1.4) json (~> 1.4)
sass (3.4.9) sass (3.4.13)
sass-rails (5.0.0) sass-rails (5.0.1)
railties (>= 4.0.0, < 5.0) railties (>= 4.0.0, < 5.0)
sass (~> 3.1) sass (~> 3.1)
sprockets (>= 2.8, < 4.0) sprockets (>= 2.8, < 4.0)
...@@ -118,13 +118,13 @@ GEM ...@@ -118,13 +118,13 @@ GEM
sdoc (0.4.1) sdoc (0.4.1)
json (~> 1.7, >= 1.7.7) json (~> 1.7, >= 1.7.7)
rdoc (~> 4.0) rdoc (~> 4.0)
spring (1.2.0) spring (1.3.3)
sprockets (2.12.3) sprockets (2.12.3)
hike (~> 1.2) hike (~> 1.2)
multi_json (~> 1.0) multi_json (~> 1.0)
rack (~> 1.0) rack (~> 1.0)
tilt (~> 1.1, != 1.3.0) tilt (~> 1.1, != 1.3.0)
sprockets-rails (2.2.2) sprockets-rails (2.2.4)
actionpack (>= 3.0) actionpack (>= 3.0)
activesupport (>= 3.0) activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0) sprockets (>= 2.8, < 4.0)
...@@ -136,7 +136,7 @@ GEM ...@@ -136,7 +136,7 @@ GEM
coffee-rails coffee-rails
tzinfo (1.2.2) tzinfo (1.2.2)
thread_safe (~> 0.1) thread_safe (~> 0.1)
uglifier (2.6.0) uglifier (2.7.1)
execjs (>= 0.3.0) execjs (>= 0.3.0)
json (>= 1.8.0) json (>= 1.8.0)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment