Merge branch 'release/v2.6.8'

ctran · Mar 12, 2015 · 52ffefc · 52ffefc
2 parents d5d55e8 + 53a1f06
commit 52ffefc
Show file tree

Hide file tree

Showing 9 changed files with 76 additions and 58 deletions.
diff --git a/CHANGELOG.rdoc b/CHANGELOG.rdoc
@@ -1,3 +1,6 @@
+== 2.6.8
+* Nothing annotated unless options[:model_dir] is specified, #234
+
 == 2.6.7
 * Nothing annotated unless options[:model_dir] is specified, #234
 

diff --git a/RELEASE.rdoc b/RELEASE.rdoc
@@ -0,0 +1,17 @@
+== 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
diff --git a/annotate.gemspec b/annotate.gemspec
@@ -7,6 +7,7 @@ Gem::Specification.new do |s|
   s.name = "annotate"
   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.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."
@@ -25,14 +26,14 @@ Gem::Specification.new do |s|
     s.specification_version = 4
 
     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<activerecord>, [">= 2.3.0"])
+      s.add_runtime_dependency(%q<rake>, ["~> 10.4"])
+      s.add_runtime_dependency(%q<activerecord>, [">= 3.2", "<= 4.3"])
     else
-      s.add_dependency(%q<rake>, [">= 0.8.7"])
-      s.add_dependency(%q<activerecord>, [">= 2.3.0"])
+      s.add_dependency(%q<rake>, ["~> 10.4"])
+      s.add_dependency(%q<activerecord>, [">= 3.2", "<= 4.3"])
     end
   else
     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
diff --git a/lib/annotate.rb b/lib/annotate.rb
@@ -71,7 +71,7 @@ def self.setup_options(options = {})
       options[key] = (!ENV[key.to_s].blank?) ? ENV[key.to_s].split(',') : []
     end
 
-    if(!options[:model_dir])
+    if(options[:model_dir].empty?)
       options[:model_dir] = ['app/models']
     end
 

diff --git a/lib/annotate/version.rb b/lib/annotate/version.rb
@@ -1,5 +1,5 @@
 module Annotate
   def self.version
-    '2.6.7'
+    '2.6.8'
   end
 end
diff --git a/spec/integration/rails_4.1.1/.ruby-version b/spec/integration/rails_4.1.1/.ruby-version
diff --git a/spec/integration/rails_4.1.1/Gemfile.lock b/spec/integration/rails_4.1.1/Gemfile.lock
@@ -1,9 +1,9 @@
 PATH
   remote: ../../..
   specs:
-    annotate (2.6.5)
-      activerecord (>= 2.3.0)
-      rake (>= 0.8.7)
+    annotate (2.6.6)
+      activerecord (>= 3.2, <= 4.3)
+      rake (~> 10.4)
 
 GEM
   remote: https://rubygems.org/
@@ -42,27 +42,27 @@ GEM
     coffee-script (2.3.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.7.1)
+    coffee-script-source (1.9.1)
     erubis (2.7.0)
-    execjs (2.2.1)
+    execjs (2.4.0)
     hike (1.2.3)
-    i18n (0.6.11)
-    jbuilder (2.1.3)
+    i18n (0.7.0)
+    jbuilder (2.2.11)
       activesupport (>= 3.0.0, < 5)
       multi_json (~> 1.2)
-    jquery-rails (3.1.1)
+    jquery-rails (3.1.2)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-    json (1.8.1)
+    json (1.8.2)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.25.1)
-    minitest (5.4.0)
-    multi_json (1.10.1)
+    minitest (5.5.1)
+    multi_json (1.11.0)
     polyglot (0.3.5)
     rack (1.5.2)
-    rack-test (0.6.2)
+    rack-test (0.6.3)
       rack (>= 1.0)
     rails (4.1.1)
       actionmailer (= 4.1.1)
@@ -81,40 +81,39 @@ GEM
       activesupport (= 4.1.1)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.3.2)
-    rdoc (4.1.1)
+    rake (10.4.2)
+    rdoc (4.2.0)
       json (~> 1.4)
     sass (3.2.19)
-    sass-rails (4.0.3)
+    sass-rails (4.0.5)
       railties (>= 4.0.0, < 5.0)
-      sass (~> 3.2.0)
-      sprockets (~> 2.8, <= 2.11.0)
+      sass (~> 3.2.2)
+      sprockets (~> 2.8, < 3.0)
       sprockets-rails (~> 2.0)
-    sdoc (0.4.0)
-      json (~> 1.8)
-      rdoc (~> 4.0, < 5.0)
-    spring (1.1.3)
-    sprockets (2.11.0)
+    sdoc (0.4.1)
+      json (~> 1.7, >= 1.7.7)
+      rdoc (~> 4.0)
+    spring (1.3.3)
+    sprockets (2.12.3)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.1.3)
+    sprockets-rails (2.2.4)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
-      sprockets (~> 2.8)
-    sqlite3 (1.3.9)
+      sprockets (>= 2.8, < 4.0)
+    sqlite3 (1.3.10)
     thor (0.19.1)
     thread_safe (0.3.4)
     tilt (1.4.1)
     treetop (1.4.15)
-      polyglot
-      polyglot (>= 0.3.1)
-    turbolinks (2.2.2)
+      polyglot (>= 0.3.1)      
+    turbolinks (2.5.3)
       coffee-rails
-    tzinfo (1.2.1)
+    tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    uglifier (2.5.3)
+    uglifier (2.7.1)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
 

diff --git a/spec/integration/rails_4.2.0/.ruby-version b/spec/integration/rails_4.2.0/.ruby-version
diff --git a/spec/integration/rails_4.2.0/Gemfile.lock b/spec/integration/rails_4.2.0/Gemfile.lock
@@ -1,9 +1,9 @@
 PATH
   remote: ../../..
   specs:
-    annotate (2.6.5)
-      activerecord (>= 2.3.0)
-      rake (>= 0.8.7)
+    annotate (2.6.6)
+      activerecord (>= 3.2, <= 4.3)
+      rake (~> 10.4)
 
 GEM
   remote: https://rubygems.org/
@@ -51,33 +51,33 @@ GEM
     coffee-script (2.3.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.8.0)
+    coffee-script-source (1.9.1)
     erubis (2.7.0)
-    execjs (2.2.2)
-    globalid (0.3.0)
+    execjs (2.4.0)
+    globalid (0.3.3)
       activesupport (>= 4.1.0)
     hike (1.2.3)
     i18n (0.7.0)
-    jbuilder (2.2.6)
+    jbuilder (2.2.11)
       activesupport (>= 3.0.0, < 5)
       multi_json (~> 1.2)
-    jquery-rails (4.0.2)
+    jquery-rails (4.0.3)
       rails-dom-testing (~> 1.0)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    json (1.8.1)
+    json (1.8.2)
     loofah (2.0.1)
       nokogiri (>= 1.5.9)
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
     mime-types (2.4.3)
-    mini_portile (0.6.1)
-    minitest (5.5.0)
-    multi_json (1.10.1)
-    nokogiri (1.6.5)
+    mini_portile (0.6.2)
+    minitest (5.5.1)
+    multi_json (1.11.0)
+    nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
     rack (1.6.0)
-    rack-test (0.6.2)
+    rack-test (0.6.3)
       rack (>= 1.0)
     rails (4.2.0)
       actionmailer (= 4.2.0)
@@ -108,8 +108,8 @@ GEM
     rake (10.4.2)
     rdoc (4.2.0)
       json (~> 1.4)
-    sass (3.4.9)
-    sass-rails (5.0.0)
+    sass (3.4.13)
+    sass-rails (5.0.1)
       railties (>= 4.0.0, < 5.0)
       sass (~> 3.1)
       sprockets (>= 2.8, < 4.0)
@@ -118,13 +118,13 @@ GEM
     sdoc (0.4.1)
       json (~> 1.7, >= 1.7.7)
       rdoc (~> 4.0)
-    spring (1.2.0)
+    spring (1.3.3)
     sprockets (2.12.3)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.2.2)
+    sprockets-rails (2.2.4)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
@@ -136,7 +136,7 @@ GEM
       coffee-rails
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    uglifier (2.6.0)
+    uglifier (2.7.1)
       execjs (>= 0.3.0)
       json (>= 1.8.0)