data_migrate 7.0.2 → 8.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d029ae70dba905ed85200561697e4e44b62b654ab216d6b20b809737e35f3fc1
-  data.tar.gz: 39f53a2d2f289d8d55730f9657bbaef454abff395593e354fa31ef11b1a38dd3
+  metadata.gz: 86bd9c5c658d19081e2f3832e2637197c53ba841fb779a0424dae6b6d87c6685
+  data.tar.gz: 8698b30801c19530248088d6521de33c1688f548e7ce8b218ccd75ca4058bffb
 SHA512:
-  metadata.gz: b0e7f347d47d48acab66cb3e700f72321805ee29fbed1bbb7689bfaafb0f7cff6a0add4a62ec847cb0d49dd18b46f9408b3b8d3a2bf56c0fa1c2a75dcabb3277
-  data.tar.gz: 63a062d5266920ecddd9d18a781f9105390f9188cc9ed6cc4930a99821ab2ed972dae7cb2687de9202c0a26fcf29040eb77aae78215e43401d234685116a7981
+  metadata.gz: 4303810721d723a76494aee931ca4026b20590f762d9600f056cafd2e8af3e955067f56c0ecdea271f53aa0c1f82eb1f803078e20dd3483ec2a311a3cb5a2d55
+  data.tar.gz: ebee6c3e420f9d272daf4f428cdd71a24f9453fb1b845aee783b1348a45ce18a6539a6d60ce40885f39c8180035c940c71be7a685988fba1780445a8df1bc287

data/.ruby-version

@@ -1 +1 @@
-2.6.1
+2.7.5

data/.travis.yml

@@ -1,16 +1,14 @@
 language: ruby
 rvm:
-  - 2.6
   - 2.7
+  - 3.0
 script: bundle exec rspec
 gemfile:
-  - gemfiles/rails_5.1.gemfile
   - gemfiles/rails_5.2.gemfile
   - gemfiles/rails_6.0.gemfile
   - gemfiles/rails_6.1.gemfile
-matrix:
+  - gemfiles/rails_7.0.gemfile
+jobs:
   exclude:
-    - rvm: 2.4.4
-      gemfile: gemfiles/rails_6.0.gemfile
-    - rvm: 2.4.4
-      gemfile: gemfiles/rails_6.1.gemfile
+    - rvm: 3.0
+      gemfile: gemfiles/rails_5.2.gemfile

data/Appraisals

@@ -1,11 +1,3 @@
-appraise 'rails-5.0' do
-  gem 'rails', '5.0.7.2'
-end
-
-appraise 'rails-5.1' do
-  gem 'rails', '5.1.7'
-end
-
 appraise 'rails-5.2' do
   gem 'rails', '~> 5.2.3'
 end
@@ -17,3 +9,7 @@ end
 appraise 'rails-6.1' do
   gem 'rails', '~> 6.1.0'
 end
+
+appraise 'rails-7.0' do
+  gem 'rails', '~> 7.0'
+end

data/Changelog.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 8.0.0.rc2
+
+Bug fixes [gdott9](https://github.com/gdott9)
+
+## 8.0.0.rc1
+Add support for Rails 7
+Removed support for Rails versions below 5.2. Now are supported only versions Rails 5.2 and up
+
 ## 7.0.2
 
 Remove magic comment in migration files [y-yagi](https://github.com/y-yagi)

data/Gemfile

@@ -1,11 +1,4 @@
 source "http://rubygems.org"
 
-# Specify your gem's dependencies in data_migrate.gemspec
-%w[
-  activerecord
-  railties
-].each do |rails_gem|
-  gem rails_gem, '~> 6.0.0'
-end
 gem 'sqlite3', "~> 1.4"
 gemspec

data/README.md

@@ -36,7 +36,7 @@ table to track all migrations.
 
 ## Rails Support
 
-Support Rails 5.0 through 6.0
+Support Rails 5.2 through 7.0
 
 ### Important notes for older versions
 

data/gemfiles/{rails_5.1.gemfile → rails_7.0.gemfile}

@@ -2,7 +2,7 @@
 
 source "http://rubygems.org"
 
-gem "rails", "5.1.7"
 gem "sqlite3", "~> 1.4"
+gem "rails", "~> 7.0"
 
 gemspec path: "../"

data/lib/data_migrate/database_tasks.rb

@@ -23,6 +23,20 @@ module DataMigrate
         ENV["DATA_SCHEMA"] || File.join(schema_location, filename)
       end
 
+      def schema_dump_path(db_config, format = ActiveRecord.schema_format)
+        return ENV["DATA_SCHEMA"] if ENV["DATA_SCHEMA"]
+
+        filename = if db_config.primary?
+          schema_file_type(format)
+        else
+          [db_config.name, schema_file_type(format)].join("_")
+        end
+
+        return unless filename
+
+        File.dirname(filename) == schema_location ? filename : File.join(schema_location, filename)
+      end
+
       def schema_location
         db_dir
       end

data/lib/data_migrate/schema_dumper.rb

@@ -8,7 +8,7 @@ module DataMigrate
     private_class_method :new
 
     class << self
-      def dump(connection = ActiveRecord::Base.connection, stream = STDOUT)
+      def dump(connection = ActiveRecord::Base.connection, stream = $stdout)
         new(connection).dump(stream)
         stream
       end

data/lib/data_migrate/status_service_five.rb

@@ -1,7 +1,7 @@
 module DataMigrate
   class StatusService
     class << self
-      def dump(connection = ActiveRecord::Base.connection, stream = STDOUT)
+      def dump(connection = ActiveRecord::Base.connection, stream = $stdout)
         new(connection).dump(stream)
         stream
       end
@@ -32,7 +32,11 @@ module DataMigrate
       end
 
       # output
-      stream.puts "\ndatabase: #{ActiveRecord::Base.connection_config[:database]}\n\n"
+      if ActiveRecord.version >= Gem::Version.new('7.0')
+        stream.puts "\ndatabase: #{ActiveRecord::Base.connection_db_config.configuration_hash[:database]}\n\n"
+      else
+        stream.puts "\ndatabase: #{ActiveRecord::Base.connection_config[:database]}\n\n"
+      end
       stream.puts "#{'Status'.center(8)}  #{'Migration ID'.ljust(14)}  Migration Name"
       stream.puts "-" * 50
       db_list.each do |status, version, name|

data/lib/data_migrate/tasks/data_migrate_tasks.rb

@@ -2,12 +2,17 @@ module DataMigrate
   module Tasks
     module DataMigrateTasks
       extend self
+
+      def schema_migrations_path
+        File.join('db', 'migrate')
+      end
+
       def migrations_paths
         @migrations_paths ||= DataMigrate.config.data_migrations_path
       end
 
       def dump
-        if ActiveRecord::Base.dump_schema_after_migration
+        if dump_schema_after_migration?
           filename = DataMigrate::DatabaseTasks.schema_file
           ActiveRecord::Base.establish_connection(DataMigrate.config.db_configuration) if DataMigrate.config.db_configuration
           File.open(filename, "w:utf-8") do |file|
@@ -17,14 +22,10 @@ module DataMigrate
       end
 
       def migrate
-        DataMigrate::DataMigrator.assure_data_schema_table
         target_version = ENV["VERSION"] ? ENV["VERSION"].to_i : nil
-        if (Rails::VERSION::MAJOR == 5 && Rails::VERSION::MINOR == 2) ||
-          Rails::VERSION::MAJOR == 6
-          DataMigrate::MigrationContext.new(migrations_paths).migrate(target_version)
-        else
-          DataMigrate::DataMigrator.migrate(migrations_paths, ENV["VERSION"] ? ENV["VERSION"].to_i : nil)
-        end
+
+        DataMigrate::DataMigrator.assure_data_schema_table
+        DataMigrate::MigrationContext.new(migrations_paths).migrate(target_version)
       end
 
       def abort_if_pending_migrations(migrations, message)
@@ -36,6 +37,90 @@ module DataMigrate
           abort message
         end
       end
+
+      def dump_schema_after_migration?
+        if ActiveRecord.respond_to?(:dump_schema_after_migration)
+          ActiveRecord.dump_schema_after_migration
+        else
+          ActiveRecord::Base.dump_schema_after_migration
+        end
+      end
+
+      def status
+        config = connect_to_database
+        return unless config
+
+        connection = ActiveRecord::Base.connection
+        puts "\ndatabase: #{config['database']}\n\n"
+        DataMigrate::StatusService.dump(connection)
+      end
+
+      def status_with_schema
+        config = connect_to_database
+        return unless config
+
+        db_list_data = ActiveRecord::Base.connection.select_values(
+          "SELECT version FROM #{DataMigrate::DataSchemaMigration.table_name}"
+        )
+        db_list_schema = ActiveRecord::Base.connection.select_values(
+          "SELECT version FROM #{ActiveRecord::SchemaMigration.schema_migrations_table_name}"
+        )
+        file_list = []
+
+        Dir.foreach(File.join(Rails.root, migrations_paths)) do |file|
+          # only files matching "20091231235959_some_name.rb" pattern
+          if match_data = /(\d{14})_(.+)\.rb/.match(file)
+            status = db_list_data.delete(match_data[1]) ? 'up' : 'down'
+            file_list << [status, match_data[1], match_data[2], 'data']
+          end
+        end
+
+        Dir.foreach(File.join(Rails.root, schema_migrations_path)) do |file|
+          # only files matching "20091231235959_some_name.rb" pattern
+          if match_data = /(\d{14})_(.+)\.rb/.match(file)
+            status = db_list_schema.delete(match_data[1]) ? 'up' : 'down'
+            file_list << [status, match_data[1], match_data[2], 'schema']
+          end
+        end
+
+        file_list.sort!{|a,b| "#{a[1]}_#{a[3] == 'data' ? 1 : 0}" <=> "#{b[1]}_#{b[3] == 'data' ? 1 : 0}" }
+
+        # output
+        puts "\ndatabase: #{config['database']}\n\n"
+        puts "#{"Status".center(8)} #{"Type".center(8)}  #{"Migration ID".ljust(14)} Migration Name"
+        puts "-" * 60
+        file_list.each do |file|
+          puts "#{file[0].center(8)} #{file[3].center(8)} #{file[1].ljust(14)}  #{file[2].humanize}"
+        end
+        db_list_schema.each do |version|
+          puts "#{'up'.center(8)}  #{version.ljust(14)}  *** NO SCHEMA FILE ***"
+        end
+        db_list_data.each do |version|
+          puts "#{'up'.center(8)}  #{version.ljust(14)}  *** NO DATA FILE ***"
+        end
+        puts
+      end
+
+      private
+
+      def connect_to_database
+        config = if ActiveRecord.version < Gem::Version.new('6.1')
+          ActiveRecord::Base.configurations[Rails.env || 'development']
+        else
+          ActiveRecord::Base.configurations.find_db_config(Rails.env || 'development').configuration_hash
+        end
+        ActiveRecord::Base.establish_connection(config)
+
+        unless DataMigrate::DataSchemaMigration.table_exists?
+          puts 'Data migrations table does not exist yet.'
+          config = nil
+        end
+        unless ActiveRecord::SchemaMigration.table_exists?
+          puts 'Schema migrations table does not exist yet.'
+          config = nil
+        end
+        config
+      end
     end
   end
 end

data/lib/data_migrate/version.rb

@@ -1,3 +1,3 @@
 module DataMigrate
-  VERSION = "7.0.2".freeze
+  VERSION = "8.0.0".freeze
 end

data/lib/data_migrate.rb

@@ -1,44 +1,22 @@
 # frozen_string_literal: true
 
-if Rails::VERSION::MAJOR == 6
-  require File.join(File.dirname(__FILE__), "data_migrate", "data_migrator_five")
-elsif Rails::VERSION::MAJOR == 5 && Rails::VERSION::MINOR == 2
-  require File.join(File.dirname(__FILE__), "data_migrate", "data_migrator_five")
-else
-  require File.join(File.dirname(__FILE__), "data_migrate", "data_migrator")
-end
-require File.join(File.dirname(__FILE__), "data_migrate",
-                  "data_schema_migration")
+require File.join(File.dirname(__FILE__), "data_migrate", "data_migrator_five")
+require File.join(File.dirname(__FILE__), "data_migrate", "data_schema_migration")
 require File.join(File.dirname(__FILE__), "data_migrate", "data_schema")
 require File.join(File.dirname(__FILE__), "data_migrate", "database_tasks")
 require File.join(File.dirname(__FILE__), "data_migrate", "schema_dumper")
-if Rails::VERSION::MAJOR == 6
-  require File.join(File.dirname(__FILE__), "data_migrate", "status_service_five")
-  require File.join(File.dirname(__FILE__), "data_migrate", "schema_migration_six")
-elsif Rails::VERSION::MAJOR == 5 &&  Rails::VERSION::MINOR == 2
-  require File.join(File.dirname(__FILE__), "data_migrate", "status_service_five")
-  require File.join(File.dirname(__FILE__), "data_migrate", "schema_migration_five")
-else
-  require File.join(File.dirname(__FILE__), "data_migrate", "status_service")
-  require File.join(File.dirname(__FILE__), "data_migrate", "schema_migration")
-end
-
-if Rails::VERSION::MAJOR == 6
-  require File.join(File.dirname(__FILE__), "data_migrate", "migration_context")
-  # require File.join(File.dirname(__FILE__), "data_migrate", "migration_five")
-elsif Rails::VERSION::MAJOR == 5
-  if Rails::VERSION::MINOR == 2
-    require File.join(File.dirname(__FILE__), "data_migrate", "migration_context")
-  else
-    require File.join(File.dirname(__FILE__), "data_migrate", "migration_five")
-  end
-else
-  require File.join(File.dirname(__FILE__), "data_migrate", "migration")
-end
+require File.join(File.dirname(__FILE__), "data_migrate", "status_service_five")
+require File.join(File.dirname(__FILE__), "data_migrate", "migration_context")
 require File.join(File.dirname(__FILE__), "data_migrate", "railtie")
 require File.join(File.dirname(__FILE__), "data_migrate", "tasks/data_migrate_tasks")
 require File.join(File.dirname(__FILE__), "data_migrate", "legacy_migrator")
 require File.join(File.dirname(__FILE__), "data_migrate", "config")
 
+if Rails::VERSION::MAJOR == 5
+  require File.join(File.dirname(__FILE__), "data_migrate", "schema_migration_five")
+else
+  require File.join(File.dirname(__FILE__), "data_migrate", "schema_migration_six")
+end
+
 module DataMigrate
 end

data/lib/generators/data_migration/data_migration_generator.rb

@@ -27,13 +27,7 @@ module DataMigrate
       end
 
       def migration_base_class_name
-        if ActiveRecord.version >= Gem::Version.new("5.0")
-          "ActiveRecord::Migration[#{ActiveRecord::Migration.current_version}]"
-        elsif ActiveRecord.version >= Gem::Version.new("5.2")
-          "DataMigrate::MigrationContext"
-        else
-          "ActiveRecord::Migration"
-        end
+        "ActiveRecord::Migration[#{ActiveRecord::Migration.current_version}]"
       end
 
       def data_migrations_file_path

data/spec/data_migrate/database_tasks_spec.rb

@@ -5,16 +5,10 @@ require "spec_helper"
 describe DataMigrate::DatabaseTasks do
   let(:subject) { DataMigrate::DatabaseTasks }
   let(:migration_path) {
-    if Rails::VERSION::MAJOR == 6
-      "spec/db/migrate/6.0"
-    elsif Rails::VERSION::MAJOR == 5
-      if Rails::VERSION::MINOR == 2
-        "spec/db/migrate/5.2"
-      else
-        "spec/db/migrate/5.0"
-      end
+    if Rails::VERSION::MAJOR == 5
+      "spec/db/migrate/5.2"
     else
-      "spec/db/migrate/4.2"
+      "spec/db/migrate/6.0"
     end
   }
   let(:data_migrations_path) {
@@ -32,6 +26,7 @@ describe DataMigrate::DatabaseTasks do
     # Rails.application.config.paths["db"].first
     # @see https://github.com/rails/rails/blob/a7d49ef78c36df2d1ca876451f30915ada1079a5/activerecord/lib/active_record/tasks/database_tasks.rb#L54
     allow(subject).to receive(:db_dir).and_return("db")
+    allow(ActiveRecord::Tasks::DatabaseTasks).to receive(:db_dir).and_return("db")
   end
 
   before do

data/spec/data_migrate/migration_context_spec.rb

@@ -2,28 +2,20 @@ require "spec_helper"
 
 describe DataMigrate::DataMigrator do
   let(:context) {
-    if (Rails::VERSION::MAJOR == 6)
-      DataMigrate::MigrationContext.new("spec/db/data-6.0")
-    else
+    if (Rails::VERSION::MAJOR == 5)
       DataMigrate::MigrationContext.new("spec/db/data")
+    else
+      DataMigrate::MigrationContext.new("spec/db/data-6.0")
     end
   }
   let(:schema_context) {
-    if (Rails::VERSION::MAJOR == 6)
-      ActiveRecord::MigrationContext.new("spec/db/migrate/6.0", ActiveRecord::Base.connection.schema_migration)
-    else
+    if (Rails::VERSION::MAJOR == 5)
       ActiveRecord::MigrationContext.new("spec/db/migrate/5.2")
+    else
+      ActiveRecord::MigrationContext.new("spec/db/migrate/6.0", ActiveRecord::Base.connection.schema_migration)
     end
   }
 
-  before do
-    unless (Rails::VERSION::MAJOR == 5 and
-           Rails::VERSION::MINOR == 2) ||
-           Rails::VERSION::MAJOR == 6
-      skip("Tests are only applicable for Rails 5.2")
-    end
-  end
-
   after do
     begin
       ActiveRecord::Migration.drop_table("data_migrations")

data/spec/data_migrate/schema_migration_spec.rb

@@ -4,16 +4,10 @@ require "spec_helper"
 
 describe DataMigrate::SchemaMigration do
   let(:migration_path) {
-    if Rails::VERSION::MAJOR == 6
-      "spec/db/migrate/6.0"
-    elsif Rails::VERSION::MAJOR == 5
-      if Rails::VERSION::MINOR == 2
-        "spec/db/migrate/5.2"
-      else
-        "spec/db/migrate/5.0"
-      end
+    if Rails::VERSION::MAJOR == 5
+      "spec/db/migrate/5.2"
     else
-      "spec/db/migrate/4.2"
+      "spec/db/migrate/6.0"
     end
   }
 
@@ -72,22 +66,27 @@ describe DataMigrate::SchemaMigration do
   if Rails.version > '6'
     describe :migrations_paths do
       context 'when a db_name is configured' do
+        let(:config) { double(:config) }
         let(:paths) { ['spec/db/migrate/6.0', 'spec/db/components/migrate/6.0'] }
-
-        if Rails.version > '6.1'
-          before do
-            allow(ActiveRecord::Base.configurations.configs_for(env_name: 'test', name: 'primary')).to receive(:migrations_paths).and_return(paths)
-            DataMigrate.configure do |config|
-              config.spec_name = 'primary'
-            end
+        let(:config_options) do
+          if Rails.version > '6.1'
+            { env_name: 'test', name: 'primary' }
+          else
+            { env_name: 'test', spec_name: 'primary' }
           end
-        else
-          before do
-            allow(ActiveRecord::Base.configurations.configs_for(env_name: 'test', spec_name: 'primary')).to receive(:migrations_paths).and_return(paths)
-            DataMigrate.configure do |config|
-              config.spec_name = 'primary'
-            end
+        end
+
+        before do
+          DataMigrate.configure do |config|
+            config.spec_name = 'primary'
           end
+
+          allow(ActiveRecord::Base.configurations)
+            .to receive(:configs_for)
+            .with(config_options)
+            .and_return(config)
+
+          allow(config).to receive(:migrations_paths).and_return(paths)
         end
 
         it 'lists schema migration paths' do

data/spec/data_migrate/tasks/data_migrate_tasks_spec.rb

@@ -115,4 +115,50 @@ describe DataMigrate::Tasks::DataMigrateTasks do
       end
     end
   end
+
+  describe :status do
+    let(:db_config) do
+      {
+        adapter: "sqlite3",
+        database: "spec/db/test.db"
+      }
+    end
+
+    before do
+      if Rails::VERSION::MAJOR == 5
+        ActiveRecord::Base.configurations['test'] = db_config
+      else
+        hash_config = ActiveRecord::DatabaseConfigurations::HashConfig.new('test', 'test', db_config)
+        config_obj = ActiveRecord::DatabaseConfigurations.new([hash_config])
+        allow(ActiveRecord::Base).to receive(:configurations).and_return(config_obj)
+      end
+
+      allow(Rails).to receive(:root) { '.' }
+
+      if Rails::VERSION::MAJOR == 5
+        allow(DataMigrate::Tasks::DataMigrateTasks).to receive(:schema_migrations_path) { 'spec/db/migrate/5.2' }
+      else
+        allow(DataMigrate::Tasks::DataMigrateTasks).to receive(:schema_migrations_path) { 'spec/db/migrate/6.0' }
+      end
+
+      DataMigrate::Tasks::DataMigrateTasks.migrate
+    end
+
+    after do
+      ActiveRecord::Migration.drop_table("data_migrations")
+    end
+
+    it "should display data migration status" do
+      expect {
+        DataMigrate::Tasks::DataMigrateTasks.status
+      }.to output(/up     20091231235959  Some name/).to_stdout
+    end
+
+    it "should display schema and data migration status" do
+      expect {
+        DataMigrate::Tasks::DataMigrateTasks.status_with_schema
+      }.to output(match(/up      data   20091231235959  Some name/)
+        .and match(/down    schema  20131111111111  Late migration/)).to_stdout
+    end
+  end
 end

data/spec/generators/data_migration/data_migration_generator_spec.rb

@@ -8,8 +8,12 @@ describe DataMigrate::Generators::DataMigrationGenerator do
   describe :next_migration_number do
     it "next migration" do
       Timecop.freeze("2016-12-03 22:15:26 -0800") do
-        expect(ActiveRecord::Base).to receive(:timestamped_migrations) { true }
-        expect(subject.next_migration_number(1)).to eq("20161204061526")
+        if ActiveRecord.version >= Gem::Version.new('7.0')
+          expect(ActiveRecord).to receive(:timestamped_migrations) { true }
+        else
+          expect(ActiveRecord::Base).to receive(:timestamped_migrations) { true }
+        end
+        expect(subject.next_migration_number(1).to_s).to eq("20161204061526")
       end
     end
   end
@@ -17,11 +21,7 @@ describe DataMigrate::Generators::DataMigrationGenerator do
   describe :migration_base_class_name do
     let(:subject) { DataMigrate::Generators::DataMigrationGenerator.new(['my_migration']) }
     it "returns the correct base class name" do
-      if ActiveRecord.version >= Gem::Version.new('5.0')
-        expect(subject.send(:migration_base_class_name)).to eq("ActiveRecord::Migration[#{ActiveRecord::Migration.current_version}]")
-      else
-        expect(subject.send(:migration_base_class_name)).to eq('ActiveRecord::Migration')
-      end
+      expect(subject.send(:migration_base_class_name)).to eq("ActiveRecord::Migration[#{ActiveRecord::Migration.current_version}]")
     end
   end
 

data/spec/spec_helper.rb

@@ -20,23 +20,13 @@ RSpec.configure do |config|
     if example.metadata[:no_override]
     else
       @prev_data_migrations_path = DataMigrate.config.data_migrations_path
-      if Rails::VERSION::MAJOR == 6
+      if Rails::VERSION::MAJOR == 5
         DataMigrate.configure do |config|
-          config.data_migrations_path = "spec/db/6.0"
-        end
-      elsif Rails::VERSION::MAJOR == 5
-        if Rails::VERSION::MINOR == 2
-          DataMigrate.configure do |config|
-            config.data_migrations_path = "spec/db/data"
-          end
-        else
-          DataMigrate.configure do |config|
-            config.data_migrations_path = "spec/db/5.0"
-          end
+          config.data_migrations_path = "spec/db/data"
         end
       else
         DataMigrate.configure do |config|
-          config.data_migrations_path = "spec/db/5.0"
+          config.data_migrations_path = "spec/db/6.0"
         end
       end
     end

data/tasks/databases.rake

@@ -114,49 +114,7 @@ namespace :db do
     namespace :status do
       desc "Display status of data and schema migrations"
       task :with_data => :environment do
-        config = connect_to_database
-        next unless config
-
-        db_list_data = ActiveRecord::Base.connection.select_values(
-          "SELECT version FROM #{DataMigrate::DataSchemaMigration.table_name}"
-        )
-        db_list_schema = ActiveRecord::Base.connection.select_values(
-          "SELECT version FROM #{ActiveRecord::SchemaMigration.schema_migrations_table_name}"
-        )
-        file_list = []
-
-        Dir.foreach(File.join(Rails.root, data_migrations_path)) do |file|
-          # only files matching "20091231235959_some_name.rb" pattern
-          if match_data = /(\d{14})_(.+)\.rb/.match(file)
-            status = db_list_data.delete(match_data[1]) ? 'up' : 'down'
-            file_list << [status, match_data[1], match_data[2], 'data']
-          end
-        end
-
-        Dir.foreach(File.join(Rails.root, 'db', 'migrate')) do |file|
-          # only files matching "20091231235959_some_name.rb" pattern
-          if match_data = /(\d{14})_(.+)\.rb/.match(file)
-            status = db_list_schema.delete(match_data[1]) ? 'up' : 'down'
-            file_list << [status, match_data[1], match_data[2], 'schema']
-          end
-        end
-
-        file_list.sort!{|a,b| "#{a[1]}_#{a[3] == 'data' ? 1 : 0}" <=> "#{b[1]}_#{b[3] == 'data' ? 1 : 0}" }
-
-        # output
-        puts "\ndatabase: #{config['database']}\n\n"
-        puts "#{"Status".center(8)} #{"Type".center(8)}  #{"Migration ID".ljust(14)} Migration Name"
-        puts "-" * 60
-        file_list.each do |file|
-          puts "#{file[0].center(8)} #{file[3].center(8)} #{file[1].ljust(14)}  #{file[2].humanize}"
-        end
-        db_list_schema.each do |version|
-          puts "#{'up'.center(8)}  #{version.ljust(14)}  *** NO SCHEMA FILE ***"
-        end
-        db_list_data.each do |version|
-          puts "#{'up'.center(8)}  #{version.ljust(14)}  *** NO DATA FILE ***"
-        end
-        puts
+        DataMigrate::Tasks::DataMigrateTasks.status_with_schema
       end
     end
   end # END OF MIGRATE NAME SPACE
@@ -272,11 +230,7 @@ namespace :data do
 
     desc "Display status of data migrations"
     task :status => :environment do
-      config = ActiveRecord::Base.configurations[Rails.env || 'development']
-      ActiveRecord::Base.establish_connection(config)
-      connection = ActiveRecord::Base.connection
-      puts "\ndatabase: #{config['database']}\n\n"
-      DataMigrate::StatusService.dump(connection)
+      DataMigrate::Tasks::DataMigrateTasks.status
     end
   end
 
@@ -358,21 +312,6 @@ def sort_string migration
   "#{migration[:version]}_#{migration[:kind] == :data ? 1 : 0}"
 end
 
-def connect_to_database
-  config = ActiveRecord::Base.configurations[Rails.env || 'development']
-  ActiveRecord::Base.establish_connection(config)
-
-  unless DataMigrate::DataSchemaMigration.table_exists?
-    puts 'Data migrations table does not exist yet.'
-    config = nil
-  end
-  unless ActiveRecord::SchemaMigration.table_exists?
-    puts 'Schema migrations table does not exist yet.'
-    config = nil
-  end
-  config
-end
-
 def past_migrations(sort=nil)
   DataMigrate::DatabaseTasks.past_migrations(sort)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: data_migrate
 version: !ruby/object:Gem::Version
-  version: 7.0.2
+  version: 8.0.0
 platform: ruby
 authors:
 - Andrew J Vargo
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-12 00:00:00.000000000 Z
+date: 2022-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -202,40 +202,30 @@ files:
 - Appraisals
 - Changelog.md
 - Gemfile
-- Gemfile.rails5
-- Gemfile.rails5.1
 - Gemfile.rails5.2
 - Gemfile.rails6.1
 - LICENSE
 - README.md
 - Rakefile
 - data_migrate.gemspec
-- gemfiles/rails_4.1.gemfile
-- gemfiles/rails_4.2.gemfile
-- gemfiles/rails_5.0.gemfile
-- gemfiles/rails_5.1.gemfile
 - gemfiles/rails_5.2.gemfile
 - gemfiles/rails_6.0.gemfile
 - gemfiles/rails_6.1.gemfile
+- gemfiles/rails_7.0.gemfile
 - lib/capistrano/data_migrate.rb
 - lib/capistrano/data_migrate/migrate.rb
 - lib/data_migrate.rb
 - lib/data_migrate/config.rb
-- lib/data_migrate/data_migrator.rb
 - lib/data_migrate/data_migrator_five.rb
 - lib/data_migrate/data_schema.rb
 - lib/data_migrate/data_schema_migration.rb
 - lib/data_migrate/database_tasks.rb
 - lib/data_migrate/legacy_migrator.rb
-- lib/data_migrate/migration.rb
 - lib/data_migrate/migration_context.rb
-- lib/data_migrate/migration_five.rb
 - lib/data_migrate/railtie.rb
 - lib/data_migrate/schema_dumper.rb
-- lib/data_migrate/schema_migration.rb
 - lib/data_migrate/schema_migration_five.rb
 - lib/data_migrate/schema_migration_six.rb
-- lib/data_migrate/status_service.rb
 - lib/data_migrate/status_service_five.rb
 - lib/data_migrate/tasks/data_migrate_tasks.rb
 - lib/data_migrate/version.rb
@@ -256,8 +246,6 @@ files:
 - spec/data_migrate/schema_migration_spec.rb
 - spec/data_migrate/status_service_spec.rb
 - spec/data_migrate/tasks/data_migrate_tasks_spec.rb
-- spec/db/5.0/20091231235959_some_name.rb
-- spec/db/5.0/20171231235959_super_update.rb
 - spec/db/6.0/20091231235959_some_name.rb
 - spec/db/6.0/20171231235959_super_update.rb
 - spec/db/data-6.0/20091231235959_some_name.rb
@@ -270,10 +258,6 @@ files:
 - spec/db/data/partial_schema/test_data_schema.rb
 - spec/db/data/schema/data_schema.rb
 - spec/db/data/schema/test_data_schema.rb
-- spec/db/migrate/4.2/20131111111111_late_migration.rb
-- spec/db/migrate/4.2/20202020202011_db_migration.rb
-- spec/db/migrate/5.0/20131111111111_late_migration.rb
-- spec/db/migrate/5.0/20202020202011_db_migration.rb
 - spec/db/migrate/5.2/20131111111111_late_migration.rb
 - spec/db/migrate/5.2/20202020202011_db_migration.rb
 - spec/db/migrate/6.0/20131111111111_late_migration.rb
@@ -307,7 +291,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.2.32
 signing_key: 
 specification_version: 4
 summary: Rake tasks to migrate data alongside schema changes.

data/Gemfile.rails5

@@ -1,10 +0,0 @@
-source "http://rubygems.org"
-
-# Specify your gem's dependencies in data_migrate.gemspec
-gemspec
-%w[
-  activerecord
-  railties
-].each do |rails_gem|
-  gem rails_gem, '~> 5.0.0'
-end

data/Gemfile.rails5.1

@@ -1,10 +0,0 @@
-source "http://rubygems.org"
-
-# Specify your gem's dependencies in data_migrate.gemspec
-gemspec
-%w[
-  activerecord
-  railties
-].each do |rails_gem|
-  gem rails_gem, '~> 5.1.7'
-end

data/gemfiles/rails_4.1.gemfile

@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "http://rubygems.org"
-
-gem "rails", "4.1.16"
-
-gemspec path: "../"

data/gemfiles/rails_4.2.gemfile

@@ -1,9 +0,0 @@
-# This file was generated by Appraisal
-
-source "http://rubygems.org"
-
-gem "rails", "4.2.11.1"
-gem "nokogiri", "1.6.8.1"
-gem "bundler" , "< 2.0"
-
-gemspec path: "../"

data/gemfiles/rails_5.0.gemfile

@@ -1,8 +0,0 @@
-# This file was generated by Appraisal
-
-source "http://rubygems.org"
-
-gem "rails", "5.0.7.2"
-gem "sqlite3", "~> 1.4"
-
-gemspec path: "../"

data/lib/data_migrate/data_migrator.rb

@@ -1,101 +0,0 @@
-# frozen_string_literal: true
-
-require "active_record"
-
-module DataMigrate
-  class DataMigrator < ActiveRecord::Migrator
-
-    def record_version_state_after_migrating(version)
-      if down?
-        migrated.delete(version)
-        DataMigrate::DataSchemaMigration.where(version: version.to_s).delete_all
-      else
-        migrated << version
-        DataMigrate::DataSchemaMigration.create!(version: version.to_s)
-      end
-    end
-
-    def load_migrated(connection = ActiveRecord::Base.connection)
-      self.class.get_all_versions(connection)
-    end
-
-    class << self
-      alias_method :migrations_status_orig, :migrations_status
-
-      def migrations_status
-        migrations_status_orig([DataMigrate.config.data_migrations_path])
-      end
-
-      def current_version(connection = ActiveRecord::Base.connection)
-        get_all_versions(connection).max || 0
-      end
-
-      def get_all_versions(connection = ActiveRecord::Base.connection)
-        if table_exists?(connection, schema_migrations_table_name)
-          DataMigrate::DataSchemaMigration.all.map { |x| x.version.to_i }.sort
-        else
-          []
-        end
-      end
-
-      def schema_migrations_table_name
-        ActiveRecord::Base.table_name_prefix + "data_migrations" +
-          ActiveRecord::Base.table_name_suffix
-      end
-
-      def migrations_path
-        DataMigrate.config.data_migrations_path
-      end
-
-      ##
-      # Provides the full migrations_path filepath
-      # @return (String)
-      def full_migrations_path
-        File.join(Rails.root, *migrations_path.split(File::SEPARATOR))
-      end
-
-      def assure_data_schema_table
-        ActiveRecord::Base.establish_connection(db_config)
-        sm_table = DataMigrate::DataMigrator.schema_migrations_table_name
-
-        unless table_exists?(ActiveRecord::Base.connection, sm_table)
-          create_table(sm_table)
-        end
-      end
-
-      ##
-      # Compares the given filename with what we expect data migration
-      # filenames to be, eg the "20091231235959_some_name.rb" pattern
-      # @param (String) filename
-      # @return (MatchData)
-      def match(filename)
-        /(\d{14})_(.+)\.rb$/.match(filename)
-      end
-
-      private
-
-      def create_table(sm_table)
-        ActiveRecord::Base.connection.create_table(sm_table, id: false) do |schema_migrations_table|
-          schema_migrations_table.string :version, primary_key: true
-        end
-      end
-
-      def table_exists?(connection, table_name)
-        # Avoid the warning that table_exists? prints in Rails 5.0 due a
-        # change in behavior between Rails 5.0 and Rails 5.1 of this method
-        # with respect to database views.
-        if ActiveRecord.version >= Gem::Version.new("5.0") &&
-           ActiveRecord.version < Gem::Version.new("5.1")
-          connection.data_source_exists?(table_name)
-        else
-          connection.table_exists?(schema_migrations_table_name)
-        end
-      end
-
-      def db_config
-        ActiveRecord::Base.configurations[Rails.env || "development"] ||
-          ENV["DATABASE_URL"]
-      end
-    end
-  end
-end

data/lib/data_migrate/migration.rb

@@ -1,26 +0,0 @@
-module DataMigrate
-  class Migration < ::ActiveRecord::Migration
-
-    class << self
-      def check_pending!(connection = ::ActiveRecord::Base.connection)
-        raise ActiveRecord::PendingMigrationError if DataMigrator::Migrator.needs_migration?(connection)
-      end
-
-      def migrate(direction)
-        new.migrate direction
-      end
-
-      def table_name
-        ActiveRecord::Base.table_name_prefix + "data_migrations" + ActiveRecord::Base.table_name_suffix
-      end
-
-      def primary_key
-        "version"
-      end
-    end
-
-    def initialize(name = self.class.name, version = nil)
-      super(name, version)
-    end
-  end
-end

data/lib/data_migrate/migration_five.rb

@@ -1,26 +0,0 @@
-module DataMigrate
-  class MigrationFive < ::ActiveRecord::Migration[5.0]
-
-    class << self
-      def check_pending!(connection = ::ActiveRecord::Base.connection)
-        raise ActiveRecord::PendingMigrationError if DataMigrator::Migrator.needs_migration?(connection)
-      end
-
-      def migrate(direction)
-        new.migrate direction
-      end
-
-      def table_name
-        ActiveRecord::Base.table_name_prefix + 'data_migrations' + ActiveRecord::Base.table_name_suffix
-      end
-
-      def primary_key
-        "version"
-      end
-    end
-
-    def initialize(name = self.class.name, version = nil)
-      super(name, version)
-    end
-  end
-end

data/lib/data_migrate/schema_migration.rb

@@ -1,31 +0,0 @@
-module DataMigrate
-  # Helper class to getting access to db schema
-  # to allow data/schema combiation tasks
-  class SchemaMigration
-    def self.pending_schema_migrations
-      all_migrations = DataMigrate::DataMigrator.migrations(migrations_paths)
-      sort_migrations(
-        ActiveRecord::Migrator.new(:up, all_migrations).
-        pending_migrations.
-        map {|m| { version: m.version, name: m.name, kind: :schema }}
-      )
-    end
-
-    def self.run(direction, migration_paths, version)
-      ActiveRecord::Migrator.run(direction, migration_paths, version)
-    end
-
-    def self.sort_migrations(set1, set2 = nil)
-      migrations = set1 + (set2 || [])
-      migrations.sort {|a, b|  sort_string(a) <=> sort_string(b)}
-    end
-
-    def self.migrations_paths
-      Rails.application.config.paths["db/migrate"].to_a
-    end
-
-    def self.sort_string(migration)
-      "#{migration[:version]}_#{migration[:kind] == :data ? 1 : 0}"
-    end
-  end
-end

data/lib/data_migrate/status_service.rb

@@ -1,65 +0,0 @@
-module DataMigrate
-  class StatusService
-    class << self
-      def dump(connection = ActiveRecord::Base.connection, stream = STDOUT)
-        new(connection).dump(stream)
-        stream
-      end
-    end
-
-    def initialize(connection)
-      @connection = connection
-    end
-
-    def root_folder
-      Rails.root
-    end
-
-    def dump(stream)
-      unless @connection.table_exists?(table_name)
-        stream.puts "Data migrations table does not exist yet."
-        return
-      end
-      sql = "SELECT version FROM #{DataMigrate::DataMigrator.schema_migrations_table_name}"
-      db_list = ActiveRecord::Base.connection.select_values(sql)
-      output(stream, db_list)
-    end
-
-    private
-
-    def table_name
-      DataMigrate::DataMigrator.schema_migrations_table_name
-    end
-
-    def output(stream, db_list)
-      stream.puts "#{"Status".center(8)}  #{"Migration ID".ljust(14)}  Migration Name"
-      stream.puts "-" * 50
-      list =  migration_files(db_list) + migration_list(db_list)
-      list.sort! {|line1, line2| line1[1] <=> line2[1]}
-      list.each do |file|
-        stream.puts "#{file[0].center(8)}  #{file[1].ljust(14)}  #{file[2]}"
-      end
-      stream.puts
-    end
-
-    def migration_list(db_list)
-      list = []
-      db_list.each do |version|
-        list << ["up", version, "********** NO FILE *************"]
-      end
-      list
-    end
-
-    def migration_files(db_list)
-      file_list = []
-      Dir.foreach(File.join(root_folder, DataMigrate.config.data_migrations_path)) do |file|
-        # only files matching "20091231235959_some_name.rb" pattern
-        if match_data = DataMigrate::DataMigrator.match(file)
-          status = db_list.delete(match_data[1]) ? "up" : "down"
-          file_list << [status, match_data[1], match_data[2].humanize]
-        end
-      end
-      file_list
-    end
-  end
-end

data/spec/db/5.0/20091231235959_some_name.rb

@@ -1,9 +0,0 @@
-class SomeName < ActiveRecord::Migration[5.0]
-  def up
-    puts "Doing data migration"
-  end
-
-  def down
-    raise ActiveRecord::IrreversibleMigration
-  end
-end

data/spec/db/5.0/20171231235959_super_update.rb

@@ -1,9 +0,0 @@
-class SuperUpdate < ActiveRecord::Migration[5.0]
-  def up
-    puts "Doing data migration"
-  end
-
-  def down
-    raise ActiveRecord::IrreversibleMigration
-  end
-end

data/spec/db/migrate/4.2/20131111111111_late_migration.rb

@@ -1,9 +0,0 @@
-class LateMigration < ActiveRecord::Migration
-  def up
-    puts "Doing schema LateMigration"
-  end
-
-  def down
-    puts "Undoing LateMigration"
-  end
-end

data/spec/db/migrate/4.2/20202020202011_db_migration.rb

@@ -1,9 +0,0 @@
-class DbMigration < ActiveRecord::Migration
-  def up
-    puts "Doing schema migration"
-  end
-
-  def down
-    puts "Undoing DbMigration"
-  end
-end

data/spec/db/migrate/5.0/20131111111111_late_migration.rb

@@ -1,9 +0,0 @@
-class LateMigration < ActiveRecord::Migration[5.0]
-  def up
-    puts "Doing schema LateMigration"
-  end
-
-  def down
-    puts "Undoing LateMigration"
-  end
-end

data/spec/db/migrate/5.0/20202020202011_db_migration.rb

@@ -1,9 +0,0 @@
-class DbMigration < ActiveRecord::Migration[5.0]
-  def up
-    puts "Doing schema migration"
-  end
-
-  def down
-    puts "Undoing DbMigration"
-  end
-end