migration_tools 1.3.1 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 12b49932fe409545d164d7cb198256b2486b298b
-  data.tar.gz: 143860d5ed493dea62e247e17fa55f0e79c7f0b5
+SHA256:
+  metadata.gz: 0c732ea88e26c0621508842c77ee2d539a2042c7b9b993587465d8e35db9cfab
+  data.tar.gz: b28ba6fa5efc44b25dba8460bb4e020ac3a83694cb937c813d528211601d426b
 SHA512:
-  metadata.gz: 5383e68f3208176a38473a901b5cac684d322be1a48adc60415df1d35de2ba491851627e9909d1f702f58869791fe1b3636fa16ba065c421f26f974166a2b1c4
-  data.tar.gz: 6025f1aff003f04b7f1d48c267d02ea62ef2c6bb1117c47c249a8df88f0e5a4d3a716076f7832a68785a8f25542089994508074ac01654b479b095a1300e9e0b
+  metadata.gz: 882f4ad3d1fb93fe07243ca9d77cc8efa6c1f030977ca8a29924d6d28ab395d3a1c891f082a53e2b48bd8e763fde08d2f3c032ff28acaf0fa2e8a3d59e98aa71
+  data.tar.gz: 56de39fc69b9b9b33f9fc26495ac0e3f6596f0e166e4479d445237b3c5a4b2410777479933965ed8f3d3e032d8479b232ed7df2fe9ae78b9929deb2047711ab6

data/lib/migration_tools/tasks.rb

@@ -10,7 +10,7 @@ module MigrationTools
     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)
@@ -28,15 +28,28 @@ module MigrationTools
     end
 
     def migrator(target_version = nil)
-      if ActiveRecord::VERSION::MAJOR > 3
-        ActiveRecord::Migrator.new(:up, ActiveRecord::Migrator.migrations(migrations_paths), target_version)
+      if ActiveRecord::VERSION::MAJOR >= 6
+        migrate_up(ActiveRecord::MigrationContext.new(
+          migrations_paths,
+          ActiveRecord::SchemaMigration
+        ).migrations, target_version)
+      elsif ActiveRecord::VERSION::MAJOR == 5 && ActiveRecord::VERSION::MINOR == 2
+        migrate_up(ActiveRecord::MigrationContext.new(migrations_paths).migrations, target_version)
       else
-        ActiveRecord::Migrator.new(:up, migrations_paths, target_version)
+        migrate_up(ActiveRecord::Migrator.migrations(migrations_paths), target_version)
+      end
+    end
+
+    def migrate_up(migrations, target_version)
+      if ActiveRecord::VERSION::MAJOR  >= 6
+        ActiveRecord::Migrator.new(:up, migrations, ActiveRecord::SchemaMigration, target_version)
+      else
+        ActiveRecord::Migrator.new(:up, migrations, target_version)
       end
     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 }
 

data/lib/migration_tools.rb

@@ -8,7 +8,7 @@ require 'migration_tools/tasks'
 
 module MigrationTools
   def self.forced?
-    !!@forced
+    defined?(@forced) && !!@forced
   end
 
   def self.forced!

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: migration_tools
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.7.0
 platform: ruby
 authors:
 - Morten Primdahl
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-26 00:00:00.000000000 Z
+date: 2021-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.6
+        version: 4.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.6
+        version: 4.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -114,20 +114,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: wwtd
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Rake tasks for Rails that add groups to migrations
 email: morten@zendesk.com
 executables: []
@@ -139,7 +125,7 @@ files:
 - lib/migration_tools/tasks.rb
 homepage: https://github.com/zendesk/migration_tools
 licenses:
-- Apache License Version 2.0
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -156,8 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.0
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Encourage migrations that do not require downtime