Merge pull request #18 from zendesk/pschambacher/rails5.1

Compatibility with Rails 5.1

Author: pschambacher

.travis.yml

@@ -12,6 +12,7 @@ gemfile:
   - gemfiles/rails3.2.gemfile
   - gemfiles/rails4.2.gemfile
   - gemfiles/rails5.0.gemfile
+  - gemfiles/rails5.1.gemfile
 matrix:
   exclude:
     - rvm: 2.4.1

Gemfile.lock

@@ -2,30 +2,27 @@ PATH
   remote: .
   specs:
     migration_tools (1.3.1)
-      activerecord (>= 3.2.6, < 5.1)
+      activerecord (>= 3.2.6, < 5.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (4.2.5)
-      activesupport (= 4.2.5)
-      builder (~> 3.1)
-    activerecord (4.2.5)
-      activemodel (= 4.2.5)
-      activesupport (= 4.2.5)
-      arel (~> 6.0)
-    activesupport (4.2.5)
+    activemodel (5.1.0)
+      activesupport (= 5.1.0)
+    activerecord (5.1.0)
+      activemodel (= 5.1.0)
+      activesupport (= 5.1.0)
+      arel (~> 8.0)
+    activesupport (5.1.0)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (~> 0.7)
-      json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    arel (6.0.3)
-    builder (3.2.2)
+    arel (8.0.0)
     bump (0.5.3)
-    i18n (0.7.0)
+    concurrent-ruby (1.0.5)
+    i18n (0.8.1)
     iconv (1.0.4)
-    json (1.8.3)
     metaclass (0.0.4)
     minitest (5.8.3)
     minitest-rg (5.2.0)
@@ -34,8 +31,8 @@ GEM
       metaclass (~> 0.0.1)
     rake (10.4.2)
     sqlite3 (1.3.11)
-    thread_safe (0.3.5)
-    tzinfo (1.2.2)
+    thread_safe (0.3.6)
+    tzinfo (1.2.3)
       thread_safe (~> 0.1)
     wwtd (1.3.0)
 
@@ -54,4 +51,4 @@ DEPENDENCIES
   wwtd
 
 BUNDLED WITH
-   1.11.2
+   1.14.6

gemfiles/rails3.2.gemfile.lock

@@ -2,7 +2,7 @@ PATH
   remote: ..
   specs:
     migration_tools (1.3.1)
-      activerecord (>= 3.2.6, < 5.1)
+      activerecord (>= 3.2.6, < 5.2)
 
 GEM
   remote: https://rubygems.org/

gemfiles/rails4.2.gemfile.lock

@@ -2,7 +2,7 @@ PATH
   remote: ..
   specs:
     migration_tools (1.3.1)
-      activerecord (>= 3.2.6, < 5.1)
+      activerecord (>= 3.2.6, < 5.2)
 
 GEM
   remote: https://rubygems.org/

gemfiles/rails5.0.gemfile.lock

@@ -2,7 +2,7 @@ PATH
   remote: ..
   specs:
     migration_tools (1.3.1)
-      activerecord (>= 3.2.6, < 5.1)
+      activerecord (>= 3.2.6, < 5.2)
 
 GEM
   remote: https://rubygems.org/

gemfiles/rails5.1.gemfile

@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gem "activerecord", "~> 5.1.0"
+
+gemspec path: "../"

gemfiles/rails5.1.gemfile.lock

@@ -0,0 +1,53 @@
+PATH
+  remote: ..
+  specs:
+    migration_tools (1.3.1)
+      activerecord (>= 3.2.6, < 5.2)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (5.1.0)
+      activesupport (= 5.1.0)
+    activerecord (5.1.0)
+      activemodel (= 5.1.0)
+      activesupport (= 5.1.0)
+      arel (~> 8.0)
+    activesupport (5.1.0)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    arel (8.0.0)
+    bump (0.5.3)
+    concurrent-ruby (1.0.5)
+    i18n (0.8.1)
+    metaclass (0.0.4)
+    minitest (5.10.1)
+    minitest-rg (5.2.0)
+      minitest (~> 5.0)
+    mocha (1.2.1)
+      metaclass (~> 0.0.1)
+    rake (12.0.0)
+    sqlite3 (1.3.13)
+    thread_safe (0.3.6)
+    tzinfo (1.2.3)
+      thread_safe (~> 0.1)
+    wwtd (1.3.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (~> 5.1.0)
+  bump
+  migration_tools!
+  minitest
+  minitest-rg
+  mocha
+  rake
+  sqlite3
+  wwtd
+
+BUNDLED WITH
+   1.14.6

lib/migration_tools.rb

@@ -8,7 +8,7 @@
 
 module MigrationTools
   def self.forced?
-    !!@forced
+    defined?(@forced) && !!@forced
   end
 
   def self.forced!

lib/migration_tools/tasks.rb

@@ -10,7 +10,7 @@ def initialize
     end
 
     def group
-      return @group if @group
+      return @group if defined?(@group) && @group
 
       @group = ENV['GROUP'].to_s
       raise "Invalid group \"#{@group}\"" if !@group.empty? && !MIGRATION_GROUPS.member?(@group)
@@ -36,7 +36,7 @@ def migrator(target_version = nil)
     end
 
     def pending_migrations
-      return @pending_migrations if @pending_migrations
+      return @pending_migrations if defined?(@pending_migrations) && @pending_migrations
       @pending_migrations = migrator.pending_migrations
       @pending_migrations = @pending_migrations.select { |proxy| group.empty? || proxy.migration_group == group }
 

migration_tools.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new "migration_tools", "1.3.1" do |s|
   s.files = `git ls-files lib`.split("\n")
   s.license = "Apache License Version 2.0"
 
-  s.add_runtime_dependency "activerecord", '>= 3.2.6', '< 5.1'
+  s.add_runtime_dependency "activerecord", '>= 3.2.6', '< 5.2'
 
   s.add_development_dependency "rake"
   s.add_development_dependency "bump"