data_migrate 8.2.0 → 9.1.1

data/tasks/databases.rake

@@ -1,32 +1,34 @@
+# 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
-      assure_data_schema_table
+      DataMigrate::DataMigrator.create_data_schema_table
 
       ActiveRecord::Migration.verbose = ENV["VERBOSE"] ? ENV["VERBOSE"] == "true" : true
       target_version = ENV["VERSION"] ? ENV["VERSION"].to_i : nil
       migrations = []
 
       if target_version.nil?
-        migrations = pending_migrations.map{ |m| m.merge(:direction =>:up) }
+        migrations = DataMigrate::DatabaseTasks.pending_migrations.map{ |m| m.merge(:direction =>:up) }
       else
         current_schema_version = ActiveRecord::Migrator.current_version
         schema_migrations = if target_version > current_schema_version
-                              pending_schema_migrations.keep_if{ |m| m[:version] <= target_version }.map{ |m| m.merge(:direction =>:up) }
+                              DataMigrate::DatabaseTasks.pending_schema_migrations.keep_if{ |m| m[:version] <= target_version }.map{ |m| m.merge(:direction =>:up) }
                             elsif target_version < current_schema_version
-                              past_migrations.keep_if{ |m| m[:version] > target_version }.map{ |m| m.merge(:direction =>:down) }
+                              DataMigrate::DatabaseTasks.past_migrations.keep_if{ |m| m[:version] > target_version }.map{ |m| m.merge(:direction =>:down) }
                             else # ==
                               []
                             end
 
-        current_data_version = ActiveRecord::Migrator.current_version
+        current_data_version = DataMigrate::DataMigrator.current_version
         data_migrations = if target_version > current_data_version
-                            pending_data_migrations.keep_if{ |m| m[:version] <= target_version }.map{ |m| m.merge(:direction =>:up) }
+                            DataMigrate::DatabaseTasks.pending_data_migrations.keep_if{ |m| m[:version] <= target_version }.map{ |m| m.merge(:direction =>:up) }
                           elsif target_version < current_data_version
-                            past_migrations.keep_if{ |m| m[:version] > target_version }.map{ |m| m.merge(:direction =>:down) }
+                            DataMigrate::DatabaseTasks.past_migrations.keep_if{ |m| m[:version] > target_version }.map{ |m| m.merge(:direction =>:down) }
                           else # ==
                             []
                           end
@@ -35,9 +37,9 @@ namespace :db do
                      elsif data_migrations.empty?
                        schema_migrations
                      elsif target_version > current_data_version && target_version > current_schema_version
-                       sort_migrations data_migrations, schema_migrations
+                       DataMigrate::DatabaseTasks.sort_migrations data_migrations, schema_migrations
                      elsif target_version < current_data_version && target_version < current_schema_version
-                       sort_migrations(data_migrations, schema_migrations).reverse
+                       DataMigrate::DatabaseTasks.sort_migrations(data_migrations, schema_migrations).reverse
                      elsif target_version > current_data_version && target_version < current_schema_version
                        schema_migrations + data_migrations
                      elsif target_version < current_data_version && target_version > current_schema_version
@@ -46,7 +48,7 @@ namespace :db do
       end
 
       migrations.each do |migration|
-        run_migration(migration, migration[:direction])
+        DataMigrate::DatabaseTasks.run_migration(migration, migration[:direction])
       end
 
       Rake::Task["db:_dump"].invoke
@@ -56,7 +58,7 @@ namespace :db do
     namespace :redo do
       desc 'Rollbacks the database one migration and re migrate up (options: STEP=x, VERSION=x).'
       task :with_data => :environment do
-      assure_data_schema_table
+        DataMigrate::DataMigrator.create_data_schema_table
         if ENV["VERSION"]
           Rake::Task["db:migrate:down:with_data"].invoke
           Rake::Task["db:migrate:up:with_data"].invoke
@@ -72,16 +74,16 @@ namespace :db do
       task :with_data => :environment do
         version = ENV["VERSION"] ? ENV["VERSION"].to_i : nil
         raise "VERSION is required" unless version
-        assure_data_schema_table
+        DataMigrate::DataMigrator.create_data_schema_table
         run_both = ENV["BOTH"] == "true"
-        migrations = pending_migrations.keep_if{|m| m[:version] == version}
+        migrations = DataMigrate::DatabaseTasks.pending_migrations.keep_if{|m| m[:version] == version}
 
         unless run_both || migrations.size < 2
           migrations = migrations.slice(0,1)
         end
 
         migrations.each do |migration|
-          run_migration(migration, :up)
+          DataMigrate::DatabaseTasks.run_migration(migration, :up)
         end
 
         Rake::Task["db:_dump"].invoke
@@ -94,16 +96,16 @@ namespace :db do
       task :with_data => :environment do
         version = ENV["VERSION"] ? ENV["VERSION"].to_i : nil
         raise "VERSION is required" unless version
-        assure_data_schema_table
+        DataMigrate::DataMigrator.create_data_schema_table
         run_both = ENV["BOTH"] == "true"
-        migrations = past_migrations.keep_if{|m| m[:version] == version}
+        migrations = DataMigrate::DatabaseTasks.past_migrations.keep_if{|m| m[:version] == version}
 
         unless run_both || migrations.size < 2
           migrations = migrations.slice(0,1)
         end
 
         migrations.each do |migration|
-          run_migration(migration, :down)
+          DataMigrate::DatabaseTasks.run_migration(migration, :down)
         end
 
         Rake::Task["db:_dump"].invoke
@@ -123,9 +125,9 @@ namespace :db do
     desc 'Rolls the schema back to the previous version (specify steps w/ STEP=n).'
     task :with_data => :environment do
       step = ENV['STEP'] ? ENV['STEP'].to_i : 1
-      assure_data_schema_table
-      past_migrations[0..(step - 1)].each do | past_migration |
-        run_migration(past_migration, :down)
+      DataMigrate::DataMigrator.create_data_schema_table
+      DataMigrate::DatabaseTasks.past_migrations[0..(step - 1)].each do | past_migration |
+        DataMigrate::DatabaseTasks.run_migration(past_migration, :down)
       end
 
       Rake::Task["db:_dump"].invoke
@@ -136,7 +138,7 @@ namespace :db do
   namespace :forward do
     desc 'Pushes the schema to the next version (specify steps w/ STEP=n).'
     task :with_data => :environment do
-      assure_data_schema_table
+      DataMigrate::DataMigrator.create_data_schema_table
       step = ENV['STEP'] ? ENV['STEP'].to_i : 1
       DataMigrate::DatabaseTasks.forward(step)
       Rake::Task["db:_dump"].invoke
@@ -147,7 +149,7 @@ namespace :db do
   namespace :version do
     desc "Retrieves the current schema version numbers for data and schema migrations"
     task :with_data => :environment do
-      assure_data_schema_table
+      DataMigrate::DataMigrator.create_data_schema_table
       puts "Current Schema version: #{ActiveRecord::Migrator.current_version}"
       puts "Current Data version: #{DataMigrate::DataMigrator.current_version}"
     end
@@ -157,7 +159,7 @@ namespace :db do
     desc "Raises an error if there are pending migrations or data migrations"
     task with_data: :environment do
       message = %{Run `rake db:migrate:with_data` to update your database then try again.}
-      DataMigrate::Tasks::DataMigrateTasks.abort_if_pending_migrations(pending_migrations, message)
+      DataMigrate::Tasks::DataMigrateTasks.abort_if_pending_migrations(DataMigrate::DatabaseTasks.pending_migrations, message)
     end
   end
 
@@ -200,7 +202,7 @@ namespace :data do
   namespace :migrate do
     desc  'Rollbacks the database one migration and re migrate up (options: STEP=x, VERSION=x).'
     task :redo => :environment do
-      assure_data_schema_table
+      DataMigrate::DataMigrator.create_data_schema_table
       if ENV["VERSION"]
         Rake::Task["data:migrate:down"].invoke
         Rake::Task["data:migrate:up"].invoke
@@ -212,10 +214,10 @@ namespace :data do
 
     desc 'Runs the "up" for a given migration VERSION.'
     task :up => :environment do
-      assure_data_schema_table
+      DataMigrate::DataMigrator.create_data_schema_table
       version = ENV["VERSION"] ? ENV["VERSION"].to_i : nil
       raise "VERSION is required" unless version
-      DataMigrate::DataMigrator.run(:up, data_migrations_path, version)
+      DataMigrate::DataMigrator.run(:up, DataMigrate::DatabaseTasks.data_migrations_path, version)
       Rake::Task["data:dump"].invoke
     end
 
@@ -223,8 +225,8 @@ namespace :data do
     task :down => :environment do
       version = ENV["VERSION"] ? ENV["VERSION"].to_i : nil
       raise "VERSION is required" unless version
-      assure_data_schema_table
-      DataMigrate::DataMigrator.run(:down, data_migrations_path, version)
+      DataMigrate::DataMigrator.create_data_schema_table
+      DataMigrate::DataMigrator.run(:down, DataMigrate::DatabaseTasks.data_migrations_path, version)
       Rake::Task["data:dump"].invoke
     end
 
@@ -236,35 +238,35 @@ namespace :data do
 
   desc 'Rolls the schema back to the previous version (specify steps w/ STEP=n).'
   task :rollback => :environment do
-    assure_data_schema_table
+    DataMigrate::DataMigrator.create_data_schema_table
     step = ENV['STEP'] ? ENV['STEP'].to_i : 1
-    DataMigrate::DataMigrator.rollback(data_migrations_path, step)
+    DataMigrate::DataMigrator.rollback(DataMigrate::DatabaseTasks.data_migrations_path, step)
     Rake::Task["data:dump"].invoke
   end
 
   desc 'Pushes the schema to the next version (specify steps w/ STEP=n).'
   task :forward => :environment do
-    assure_data_schema_table
+    DataMigrate::DataMigrator.create_data_schema_table
     step = ENV['STEP'] ? ENV['STEP'].to_i : 1
     # TODO: No worky for .forward
     # DataMigrate::DataMigrator.forward('db/data/', step)
-    migrations = pending_data_migrations.reverse.pop(step).reverse
+    migrations = DataMigrate::DatabaseTasks.pending_data_migrations.reverse.pop(step).reverse
     migrations.each do | pending_migration |
-      DataMigrate::DataMigrator.run(:up, data_migrations_path, pending_migration[:version])
+      DataMigrate::DataMigrator.run(:up, DataMigrate::DatabaseTasks.data_migrations_path, pending_migration[:version])
     end
     Rake::Task["data:dump"].invoke
   end
 
   desc "Retrieves the current schema version number for data migrations"
   task :version => :environment do
-    assure_data_schema_table
+    DataMigrate::DataMigrator.create_data_schema_table
     puts "Current data version: #{DataMigrate::DataMigrator.current_version}"
   end
 
   desc "Raises an error if there are pending data migrations"
   task abort_if_pending_migrations: :environment do
     message = %{Run `rake data:migrate` to update your database then try again.}
-    DataMigrate::Tasks::DataMigrateTasks.abort_if_pending_migrations(pending_data_migrations, message)
+    DataMigrate::Tasks::DataMigrateTasks.abort_if_pending_migrations(DataMigrate::DatabaseTasks.pending_data_migrations, message)
   end
 
   desc "Create a db/data_schema.rb file that stores the current data version"
@@ -287,53 +289,3 @@ namespace :data do
     end
   end
 end
-
-def pending_migrations
-  DataMigrate::DatabaseTasks.sort_migrations(
-    DataMigrate::DatabaseTasks.pending_schema_migrations,
-    DataMigrate::DatabaseTasks.pending_data_migrations
-  )
-end
-
-def pending_data_migrations
-  DataMigrate::DatabaseTasks.pending_data_migrations
-end
-
-def pending_schema_migrations
-  DataMigrate::DatabaseTasks.pending_schema_migrations
-end
-
-def sort_migrations set_1, set_2=nil
-  migrations = set_1 + (set_2 || [])
-  migrations.sort{|a,b|  sort_string(a) <=> sort_string(b)}
-end
-
-def sort_string migration
-  "#{migration[:version]}_#{migration[:kind] == :data ? 1 : 0}"
-end
-
-def past_migrations(sort=nil)
-  DataMigrate::DatabaseTasks.past_migrations(sort)
-end
-
-def assure_data_schema_table
-  DataMigrate::DataMigrator.assure_data_schema_table
-end
-
-def data_migrations_path
-  DataMigrate.config.data_migrations_path
-end
-
-def run_migration(migration, direction)
-  if migration[:kind] == :data
-    ActiveRecord::Migration.write("== %s %s" % ['Data', "=" * 71])
-    DataMigrate::DataMigrator.run(direction, data_migrations_path, migration[:version])
-  else
-    ActiveRecord::Migration.write("== %s %s" % ['Schema', "=" * 69])
-    DataMigrate::SchemaMigration.run(
-      direction,
-      DataMigrate::SchemaMigration.migrations_paths,
-      migration[:version]
-    )
-  end
-end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: data_migrate
 version: !ruby/object:Gem::Version
-  version: 8.2.0
+  version: 9.1.1
 platform: ruby
 authors:
 - Andrew J Vargo
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-24 00:00:00.000000000 Z
+date: 2023-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -18,28 +18,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -189,6 +189,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/build.yml"
 - ".github/workflows/gempush.yml"
 - ".gitignore"
 - ".hound.yml"
@@ -197,18 +198,14 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".ruby-style.yml"
-- ".ruby-version"
-- ".travis.yml"
 - 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
@@ -216,7 +213,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
@@ -224,9 +221,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
@@ -246,11 +242,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
@@ -258,10 +249,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
@@ -270,13 +259,7 @@ homepage: https://github.com/ilyakatz/data-migrate
 licenses:
 - MIT
 metadata: {}
-post_install_message: |
-  ********************************************************************************
-  data-migrate: IMPORTANT: Breaking change introduced for migrations from v2.
-
-  Failure to run the migration can have serious consequences.
-  See Readme for more info.
-  ********************************************************************************
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -291,7 +274,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.10
 signing_key: 
 specification_version: 4
 summary: Rake tasks to migrate data alongside schema changes.

data/.ruby-version

@@ -1 +0,0 @@
-2.7.5

data/.travis.yml

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

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