data_migrate 9.0.0 → 10.0.0.rc1

data/spec/data_migrate/tasks/data_migrate_tasks_spec.rb

@@ -3,33 +3,40 @@
 require "spec_helper"
 
 describe DataMigrate::Tasks::DataMigrateTasks do
-  describe :dump do
-    let(:db_config) do
-      {
-        adapter: "sqlite3",
-        database: "spec/db/other_test.db"
-      }
+  let(:connection_db_config) do
+    if Gem::Dependency.new("rails", ">= 6.1").match?("rails", Gem.loaded_specs["rails"].version)
+      ActiveRecord::Base.connection_db_config
+    else
+      ActiveRecord::Base.configurations.configs_for.first
     end
+  end
+
+  before do
+    ActiveRecord::SchemaMigration.create_table
+    DataMigrate::DataSchemaMigration.create_table
+  end
 
+  after do
+    ActiveRecord::Migration.drop_table("data_migrations") rescue nil
+    ActiveRecord::Migration.drop_table("schema_migrations") rescue nil
+  end
+
+  describe :dump do
     before do
-      allow(DataMigrate::DataMigrator).to receive(:db_config) { db_config }
       allow(DataMigrate::DatabaseTasks).to receive(:db_dir).and_return("spec/db")
-    end
-
-    after do
-      ActiveRecord::Migration.drop_table("data_migrations")
+      DataMigrate::Tasks::DataMigrateTasks.migrate
     end
 
     context 'when not given a separate db config' do
-      it 'does not override the default connection' do
-        DataMigrate::Tasks::DataMigrateTasks.migrate
+      it 'does not override the default connection' do  
         expect(ActiveRecord::Base).not_to receive(:establish_connection)
         expect(DataMigrate::SchemaDumper).to receive(:dump)
-        DataMigrate::Tasks::DataMigrateTasks.dump
+
+        DataMigrate::Tasks::DataMigrateTasks.dump(connection_db_config)
       end
     end
 
-    context 'when given ' do
+    context 'when given a separate db config' do
       let(:override_config) do
         {
           'host' => '127.0.0.1',
@@ -39,6 +46,7 @@ describe DataMigrate::Tasks::DataMigrateTasks do
           'password' => nil,
         }
       end
+      let(:paths) { ["spec/db/migrate"] }
 
       before do
         DataMigrate.configure do |config|
@@ -47,40 +55,20 @@ describe DataMigrate::Tasks::DataMigrateTasks do
       end
 
       it 'overrides the default connection' do
-        DataMigrate::Tasks::DataMigrateTasks.migrate
         expect(ActiveRecord::Base).to receive(:establish_connection).with(override_config)
-        DataMigrate::Tasks::DataMigrateTasks.dump
+
+        DataMigrate::Tasks::DataMigrateTasks.dump(connection_db_config)
       end
     end
   end
 
   describe :migrate do
-    let(:db_config) do
-      {
-        adapter: "sqlite3",
-        database: "spec/db/test.db"
-      }
-    end
-
-    before do
-      allow(DataMigrate::DataMigrator).to receive(:db_config) { db_config }
-      ActiveRecord::Base.establish_connection(db_config)
-    end
-
-    after do
-      ActiveRecord::Migration.drop_table("data_migrations")
+    it "first run should run the first pending migration" do
+      expect { DataMigrate::Tasks::DataMigrateTasks.migrate }.to output(/20091231235959 SomeName: migrating/).to_stdout
     end
 
-    it do
-       expect {
-        DataMigrate::Tasks::DataMigrateTasks.migrate
-       }.to output(/20091231235959 SomeName: migrating/).to_stdout
-    end
-
-    it do
-      expect {
-        DataMigrate::Tasks::DataMigrateTasks.migrate
-      }.to output(/20171231235959 SuperUpdate: migrating/).to_stdout
+    it "second run should run the second pending migration" do
+      expect { DataMigrate::Tasks::DataMigrateTasks.migrate }.to output(/20171231235959 SuperUpdate: migrating/).to_stdout
     end
   end
 
@@ -111,52 +99,30 @@ describe DataMigrate::Tasks::DataMigrateTasks do
       it "should abort with given message and print names and versions of pending migrations" do
         expect { subject }
           .to raise_error(SystemExit, message)
-          .and output("You have 2 pending migrations:\n     1 A\n     2 B\n").to_stdout
+          .and output(match(/You have #{migrations.count} pending migrations:/)
+          .and match(Regexp.new(migrations.map { |m| m.slice(:version, :name)
+          .values.join("\\W+") }.join("\\W+")))).to_stdout
       end
     end
   end
 
-  describe :status do
-    let(:db_config) do
-      {
-        adapter: "sqlite3",
-        database: "spec/db/test.db"
-      }
-    end
-
+  describe ".status" do
     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
+      allow(Rails).to receive(:root) { "." }
+      allow(Rails).to receive(:application) { OpenStruct.new(config: OpenStruct.new(paths: { "db/migrate" => ["spec/db/migrate"] })) }
 
       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
+        DataMigrate::Tasks::DataMigrateTasks.status(connection_db_config)
       }.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
+        DataMigrate::Tasks::DataMigrateTasks.status_with_schema(connection_db_config)
       }.to output(match(/up      data   20091231235959  Some name/)
         .and match(/down    schema  20131111111111  Late migration/)).to_stdout
     end

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

@@ -1,4 +1,4 @@
-class SomeName < ActiveRecord::Migration[5.2]
+class SomeName < ActiveRecord::Migration[6.0]
   def up
     puts "Doing data migration"
   end

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

@@ -1,4 +1,4 @@
-class SuperUpdate < ActiveRecord::Migration[5.2]
+class SuperUpdate < ActiveRecord::Migration[6.0]
   def up
     puts "Doing SuperUpdate"
   end

data/spec/spec_helper.rb

@@ -20,14 +20,8 @@ RSpec.configure do |config|
     if example.metadata[:no_override]
     else
       @prev_data_migrations_path = DataMigrate.config.data_migrations_path
-      if Rails::VERSION::MAJOR == 5
-        DataMigrate.configure do |config|
-          config.data_migrations_path = "spec/db/data"
-        end
-      else
-        DataMigrate.configure do |config|
-          config.data_migrations_path = "spec/db/6.0"
-        end
+      DataMigrate.configure do |config|
+        config.data_migrations_path = "spec/db/data"
       end
     end
   end

data/tasks/databases.rake

@@ -1,10 +1,15 @@
+# frozen_string_literal: true
+
 require 'data_migrate/tasks/data_migrate_tasks'
 
 namespace :db do
   namespace :migrate do
     desc "Migrate the database data and schema (options: VERSION=x, VERBOSE=false)."
     task :with_data => :environment do
-      DataMigrate::DataMigrator.assure_data_schema_table
+      original_db_config = ActiveRecord::Base.connection_db_config
+      ActiveRecord::Base.configurations.configs_for(env_name: ActiveRecord::Tasks::DatabaseTasks.env).each do |db_config|
+        ActiveRecord::Base.establish_connection(db_config)
+        DataMigrate::DataMigrator.assure_data_schema_table
 
       ActiveRecord::Migration.verbose = ENV["VERBOSE"] ? ENV["VERBOSE"] == "true" : true
       target_version = ENV["VERSION"] ? ENV["VERSION"].to_i : nil
@@ -48,9 +53,12 @@ namespace :db do
       migrations.each do |migration|
         DataMigrate::DatabaseTasks.run_migration(migration, migration[:direction])
       end
+      end
 
       Rake::Task["db:_dump"].invoke
       Rake::Task["data:dump"].invoke
+    ensure
+      ActiveRecord::Base.establish_connection(original_db_config)
     end
 
     namespace :redo do
@@ -114,7 +122,10 @@ namespace :db do
     namespace :status do
       desc "Display status of data and schema migrations"
       task :with_data => :environment do
-        DataMigrate::Tasks::DataMigrateTasks.status_with_schema
+        ActiveRecord::Base.configurations.configs_for(env_name: ActiveRecord::Tasks::DatabaseTasks.env).each do |db_config|
+          ActiveRecord::Base.establish_connection(db_config)
+          DataMigrate::Tasks::DataMigrateTasks.status_with_schema(db_config)
+        end
       end
     end
   end # END OF MIGRATE NAME SPACE
@@ -193,8 +204,14 @@ end
 namespace :data do
   desc 'Migrate data migrations (options: VERSION=x, VERBOSE=false)'
   task :migrate => :environment do
-    DataMigrate::Tasks::DataMigrateTasks.migrate
+    original_db_config = ActiveRecord::Base.connection_db_config
+    ActiveRecord::Base.configurations.configs_for(env_name: ActiveRecord::Tasks::DatabaseTasks.env).each do |db_config|
+      ActiveRecord::Base.establish_connection(db_config)
+      DataMigrate::Tasks::DataMigrateTasks.migrate
+    end
     Rake::Task["data:dump"].invoke
+  ensure
+    ActiveRecord::Base.establish_connection(original_db_config)
   end
 
   namespace :migrate do
@@ -230,7 +247,10 @@ namespace :data do
 
     desc "Display status of data migrations"
     task :status => :environment do
-      DataMigrate::Tasks::DataMigrateTasks.status
+      ActiveRecord::Base.configurations.configs_for(env_name: ActiveRecord::Tasks::DatabaseTasks.env).each do |db_config|
+        ActiveRecord::Base.establish_connection(db_config)
+        DataMigrate::Tasks::DataMigrateTasks.status(db_config)
+      end
     end
   end
 
@@ -269,7 +289,10 @@ namespace :data do
 
   desc "Create a db/data_schema.rb file that stores the current data version"
   task dump: :environment do
-    DataMigrate::Tasks::DataMigrateTasks.dump
+    ActiveRecord::Base.configurations.configs_for(env_name: ActiveRecord::Tasks::DatabaseTasks.env).each do |db_config|
+      ActiveRecord::Base.establish_connection(db_config)
+      DataMigrate::Tasks::DataMigrateTasks.dump(db_config)
+    end
 
     # Allow this task to be called as many times as required. An example
     # is the migrate:redo task, which calls other two internally

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: data_migrate
 version: !ruby/object:Gem::Version
-  version: 9.0.0
+  version: 10.0.0.rc1
 platform: ruby
 authors:
 - Andrew J Vargo
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-02-21 00:00:00.000000000 Z
+date: 2023-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -203,13 +203,11 @@ files:
 - Appraisals
 - Changelog.md
 - Gemfile
-- Gemfile.rails5.2
 - Gemfile.rails6.1
 - LICENSE
 - README.md
 - Rakefile
 - data_migrate.gemspec
-- gemfiles/rails_5.2.gemfile
 - gemfiles/rails_6.0.gemfile
 - gemfiles/rails_6.1.gemfile
 - gemfiles/rails_7.0.gemfile
@@ -217,7 +215,7 @@ files:
 - lib/capistrano/data_migrate/migrate.rb
 - lib/data_migrate.rb
 - lib/data_migrate/config.rb
-- lib/data_migrate/data_migrator_five.rb
+- lib/data_migrate/data_migrator.rb
 - lib/data_migrate/data_schema.rb
 - lib/data_migrate/data_schema_migration.rb
 - lib/data_migrate/database_tasks.rb
@@ -225,9 +223,8 @@ files:
 - lib/data_migrate/migration_context.rb
 - lib/data_migrate/railtie.rb
 - lib/data_migrate/schema_dumper.rb
-- lib/data_migrate/schema_migration_five.rb
-- lib/data_migrate/schema_migration_six.rb
-- lib/data_migrate/status_service_five.rb
+- lib/data_migrate/schema_migration.rb
+- lib/data_migrate/status_service.rb
 - lib/data_migrate/tasks/data_migrate_tasks.rb
 - lib/data_migrate/version.rb
 - lib/generators/data_migrate.rb
@@ -247,11 +244,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/6.0/20091231235959_some_name.rb
-- spec/db/6.0/20171231235959_super_update.rb
-- spec/db/data-6.0/20091231235959_some_name.rb
-- spec/db/data-6.0/20171231235959_super_update.rb
-- spec/db/data-6.0/20181128000207_excluded_file.rb.other_ext
 - spec/db/data/20091231235959_some_name.rb
 - spec/db/data/20171231235959_super_update.rb
 - spec/db/data/20181128000207_excluded_file.rb.other_ext
@@ -259,10 +251,8 @@ 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/5.2/20131111111111_late_migration.rb
-- spec/db/migrate/5.2/20202020202011_db_migration.rb
-- spec/db/migrate/6.0/20131111111111_late_migration.rb
-- spec/db/migrate/6.0/20202020202011_db_migration.rb
+- spec/db/migrate/20131111111111_late_migration.rb
+- spec/db/migrate/20202020202011_db_migration.rb
 - spec/generators/data_migration/data_migration_generator_spec.rb
 - spec/spec_helper.rb
 - tasks/.gitkeep
@@ -282,9 +272,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.3.26
 signing_key: 

data/Gemfile.rails5.2

@@ -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.2'
-end

data/gemfiles/rails_5.2.gemfile

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

data/lib/data_migrate/schema_migration_five.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::MigrationContext.new(migrations_paths).migrations
-      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::MigrationContext.new(migration_paths).run(direction, 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/spec/db/6.0/20091231235959_some_name.rb

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

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

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

data/spec/db/data-6.0/20091231235959_some_name.rb

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

data/spec/db/data-6.0/20171231235959_super_update.rb

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

data/spec/db/data-6.0/20181128000207_excluded_file.rb.other_ext

@@ -1 +0,0 @@
-# This file should be excluded

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

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

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

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