Merge pull request #20 from zendesk/pschambacher/rails5.2.again

Compatibility with Rails 5.2.0

Author: pschambacher

Gemfile.lock

@@ -2,26 +2,27 @@ PATH
   remote: .
   specs:
     migration_tools (1.4.0)
-      activerecord (>= 3.2.6, < 5.2)
+      activerecord (>= 3.2.6, < 6.0)
 
 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)
+    activemodel (5.2.0)
+      activesupport (= 5.2.0)
+    activerecord (5.2.0)
+      activemodel (= 5.2.0)
+      activesupport (= 5.2.0)
+      arel (>= 9.0)
+    activesupport (5.2.0)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    arel (8.0.0)
+    arel (9.0.0)
     bump (0.5.3)
     concurrent-ruby (1.0.5)
-    i18n (0.8.1)
+    i18n (1.0.1)
+      concurrent-ruby (~> 1.0)
     iconv (1.0.4)
     metaclass (0.0.4)
     minitest (5.8.3)
@@ -32,7 +33,7 @@ GEM
     rake (10.4.2)
     sqlite3 (1.3.11)
     thread_safe (0.3.6)
-    tzinfo (1.2.3)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
     wwtd (1.3.0)
 
@@ -51,4 +52,4 @@ DEPENDENCIES
   wwtd
 
 BUNDLED WITH
-   1.14.6
+   1.16.2

gemfiles/rails3.2.gemfile.lock

@@ -2,7 +2,7 @@ PATH
   remote: ..
   specs:
     migration_tools (1.4.0)
-      activerecord (>= 3.2.6, < 5.2)
+      activerecord (>= 3.2.6, < 6.0)
 
 GEM
   remote: https://rubygems.org/
@@ -51,4 +51,4 @@ DEPENDENCIES
   wwtd
 
 BUNDLED WITH
-   1.16.0
+   1.16.2

gemfiles/rails4.2.gemfile.lock

@@ -2,7 +2,7 @@ PATH
   remote: ..
   specs:
     migration_tools (1.4.0)
-      activerecord (>= 3.2.6, < 5.2)
+      activerecord (>= 3.2.6, < 6.0)
 
 GEM
   remote: https://rubygems.org/
@@ -55,4 +55,4 @@ DEPENDENCIES
   wwtd
 
 BUNDLED WITH
-   1.16.0
+   1.16.2

gemfiles/rails5.0.gemfile.lock

@@ -2,7 +2,7 @@ PATH
   remote: ..
   specs:
     migration_tools (1.4.0)
-      activerecord (>= 3.2.6, < 5.2)
+      activerecord (>= 3.2.6, < 6.0)
 
 GEM
   remote: https://rubygems.org/
@@ -50,4 +50,4 @@ DEPENDENCIES
   wwtd
 
 BUNDLED WITH
-   1.16.0
+   1.16.2

gemfiles/rails5.1.gemfile.lock

@@ -2,7 +2,7 @@ PATH
   remote: ..
   specs:
     migration_tools (1.4.0)
-      activerecord (>= 3.2.6, < 5.2)
+      activerecord (>= 3.2.6, < 6.0)
 
 GEM
   remote: https://rubygems.org/
@@ -50,4 +50,4 @@ DEPENDENCIES
   wwtd
 
 BUNDLED WITH
-   1.16.0
+   1.16.2

gemfiles/rails5.2.gemfile

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

gemfiles/rails5.2.gemfile.lock

@@ -2,45 +2,45 @@ PATH
   remote: ..
   specs:
     migration_tools (1.4.0)
-      activerecord (>= 3.2.6, < 5.2)
+      activerecord (>= 3.2.6, < 6.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (5.2.0.beta2)
-      activesupport (= 5.2.0.beta2)
-    activerecord (5.2.0.beta2)
-      activemodel (= 5.2.0.beta2)
-      activesupport (= 5.2.0.beta2)
+    activemodel (5.2.0)
+      activesupport (= 5.2.0)
+    activerecord (5.2.0)
+      activemodel (= 5.2.0)
+      activesupport (= 5.2.0)
       arel (>= 9.0)
-    activesupport (5.2.0.beta2)
+    activesupport (5.2.0)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     arel (9.0.0)
-    bump (0.5.4)
+    bump (0.6.1)
     concurrent-ruby (1.0.5)
-    i18n (0.9.1)
+    i18n (1.0.1)
       concurrent-ruby (~> 1.0)
     metaclass (0.0.4)
-    minitest (5.10.3)
+    minitest (5.11.3)
     minitest-rg (5.2.0)
       minitest (~> 5.0)
-    mocha (1.3.0)
+    mocha (1.5.0)
       metaclass (~> 0.0.1)
-    rake (12.3.0)
+    rake (12.3.1)
     sqlite3 (1.3.13)
     thread_safe (0.3.6)
-    tzinfo (1.2.4)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
     wwtd (1.3.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (~> 5.2.0.beta2)
+  activerecord (~> 5.2.0)
   bump
   migration_tools!
   minitest
@@ -51,4 +51,4 @@ DEPENDENCIES
   wwtd
 
 BUNDLED WITH
-   1.16.0
+   1.16.2

lib/migration_tools/tasks.rb

@@ -29,7 +29,12 @@ def migrations_paths
 
     def migrator(target_version = nil)
       if ActiveRecord::VERSION::MAJOR > 3
-        ActiveRecord::Migrator.new(:up, ActiveRecord::Migrator.migrations(migrations_paths), target_version)
+        migrations = if defined?(::ActiveRecord::MigrationContext)
+          ActiveRecord::MigrationContext.new(migrations_paths).migrations
+        else
+          ActiveRecord::Migrator.migrations(migrations_paths)
+        end
+        ActiveRecord::Migrator.new(:up, migrations, target_version)
       else
         ActiveRecord::Migrator.new(:up, migrations_paths, target_version)
       end

migration_tools.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new "migration_tools", "1.4.0" 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.2'
+  s.add_runtime_dependency "activerecord", '>= 3.2.6', '< 6.0'
 
   s.add_development_dependency "rake"
   s.add_development_dependency "bump"