Merge pull request #46 from zendesk/bquorning/drop-oldies

Drop support for old Ruby and Rails versions
zendesk · Nov 29, 2023 · 02b9a49 · 02b9a49
2 parents a7c99fc + 6d743a2
commit 02b9a49
Show file tree

Hide file tree

Showing 18 changed files with 14 additions and 269 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -17,12 +17,6 @@ jobs:
           - rails6.1
           - rails7.0
           - rails7.1
-        include:
-          - {ruby-version: '2.6', gemfile: rails4.2}
-          - {ruby-version: '2.6', gemfile: rails5.0}
-          - {ruby-version: '2.6', gemfile: rails5.1}
-          - {ruby-version: '2.6', gemfile: rails5.2}
-          - {ruby-version: '2.7', gemfile: rails5.2}
     env:
       BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
     steps:

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -2,7 +2,7 @@ PATH
   remote: .
   specs:
     migration_tools (1.9.0)
-      activerecord (>= 4.2.0, < 7.2)
+      activerecord (>= 6.0.0, < 7.2)
 
 GEM
   remote: https://rubygems.org/

diff --git a/gemfiles/rails4.2.gemfile b/gemfiles/rails4.2.gemfile
diff --git a/gemfiles/rails4.2.gemfile.lock b/gemfiles/rails4.2.gemfile.lock
diff --git a/gemfiles/rails5.0.gemfile b/gemfiles/rails5.0.gemfile
diff --git a/gemfiles/rails5.0.gemfile.lock b/gemfiles/rails5.0.gemfile.lock
diff --git a/gemfiles/rails5.1.gemfile b/gemfiles/rails5.1.gemfile
diff --git a/gemfiles/rails5.1.gemfile.lock b/gemfiles/rails5.1.gemfile.lock
diff --git a/gemfiles/rails5.2.gemfile b/gemfiles/rails5.2.gemfile
diff --git a/gemfiles/rails5.2.gemfile.lock b/gemfiles/rails5.2.gemfile.lock
diff --git a/gemfiles/rails6.0.gemfile.lock b/gemfiles/rails6.0.gemfile.lock
@@ -2,7 +2,7 @@ PATH
   remote: ..
   specs:
     migration_tools (1.9.0)
-      activerecord (>= 4.2.0, < 7.2)
+      activerecord (>= 6.0.0, < 7.2)
 
 GEM
   remote: https://rubygems.org/

diff --git a/gemfiles/rails6.1.gemfile.lock b/gemfiles/rails6.1.gemfile.lock
@@ -2,7 +2,7 @@ PATH
   remote: ..
   specs:
     migration_tools (1.9.0)
-      activerecord (>= 4.2.0, < 7.2)
+      activerecord (>= 6.0.0, < 7.2)
 
 GEM
   remote: https://rubygems.org/

diff --git a/gemfiles/rails7.0.gemfile.lock b/gemfiles/rails7.0.gemfile.lock
@@ -2,7 +2,7 @@ PATH
   remote: ..
   specs:
     migration_tools (1.9.0)
-      activerecord (>= 4.2.0, < 7.2)
+      activerecord (>= 6.0.0, < 7.2)
 
 GEM
   remote: https://rubygems.org/

diff --git a/gemfiles/rails7.1.gemfile.lock b/gemfiles/rails7.1.gemfile.lock
@@ -2,7 +2,7 @@ PATH
   remote: ..
   specs:
     migration_tools (1.9.0)
-      activerecord (>= 4.2.0, < 7.2)
+      activerecord (>= 6.0.0, < 7.2)
 
 GEM
   remote: https://rubygems.org/

diff --git a/lib/migration_tools/tasks.rb b/lib/migration_tools/tasks.rb
@@ -33,15 +33,11 @@ def migrator(target_version = nil)
           migrations_paths,
           ActiveRecord::Base.connection.schema_migration
         ).migrations, target_version)
-      elsif ActiveRecord::VERSION::MAJOR >= 6
+      else
         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
-        migrate_up(ActiveRecord::Migrator.migrations(migrations_paths), target_version)
       end
     end
 
@@ -52,10 +48,8 @@ def migrate_up(migrations, target_version)
           ActiveRecord::Base.connection.internal_metadata,
           target_version
         )
-      elsif ActiveRecord::VERSION::MAJOR >= 6
-        ActiveRecord::Migrator.new(:up, migrations, ActiveRecord::SchemaMigration, target_version)
       else
-        ActiveRecord::Migrator.new(:up, migrations, target_version)
+        ActiveRecord::Migrator.new(:up, migrations, ActiveRecord::SchemaMigration, target_version)
       end
     end
 

diff --git a/migration_tools.gemspec b/migration_tools.gemspec
@@ -7,9 +7,9 @@ Gem::Specification.new "migration_tools", "1.9.0" do |s|
   s.files = `git ls-files lib`.split("\n")
   s.license = "Apache-2.0"
 
-  s.required_ruby_version = '>= 2.6.0'
+  s.required_ruby_version = '>= 2.7.0'
 
-  s.add_runtime_dependency "activerecord", '>= 4.2.0', '< 7.2'
+  s.add_runtime_dependency "activerecord", '>= 6.0.0', '< 7.2'
 
   s.add_development_dependency "rake"
   s.add_development_dependency "bump"

diff --git a/test/helper.rb b/test/helper.rb
@@ -6,12 +6,8 @@
 require 'active_support/all'
 require 'migration_tools'
 
-MIGRATION_CLASS = if ActiveRecord::Migration.respond_to?(:[])
-  rails_version = "#{ActiveRecord::VERSION::MAJOR}.#{ActiveRecord::VERSION::MINOR}".to_f
-  ActiveRecord::Migration[rails_version]
-else
-  ActiveRecord::Migration
-end
+rails_version = "#{ActiveRecord::VERSION::MAJOR}.#{ActiveRecord::VERSION::MINOR}".to_f
+MIGRATION_CLASS = ActiveRecord::Migration[rails_version]
 
 dir = File.expand_path('../migrations', __FILE__)
 ActiveRecord::Migrator.migrations_paths.replace([dir])

diff --git a/test/test_migration_tools.rb b/test/test_migration_tools.rb
@@ -128,10 +128,9 @@ def migration_proxy(m)
     end
   end
 
-  if ActiveRecord.gem_version >= Gem::Version.new("5.0")
-    require 'active_support/testing/stream'
-    include ActiveSupport::Testing::Stream
-  end
+  require 'active_support/testing/stream'
+  include ActiveSupport::Testing::Stream
+
   it "abort_if_pending_migrations_with_group_with_migrations" do
     assert_raises(SystemExit, "did not abort") do
       silence_stream($stdout) do