data_migrate 3.0.1 → 4.0.0

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

@@ -0,0 +1,9 @@
+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

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

data/spec/generators/data_migration/data_migration_generator_spec.rb

@@ -0,0 +1,27 @@
+require 'spec_helper'
+require 'rails/generators'
+require 'rails/generators/migration'
+require 'generators/data_migration/data_migration_generator'
+
+describe DataMigrate::Generators::DataMigrationGenerator do
+  let(:subject) { DataMigrate::Generators::DataMigrationGenerator }
+  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")
+      end
+    end
+  end
+
+  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
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,9 @@
+require 'rspec'
+require 'rails'
+require 'data_migrate'
+require 'pry'
+require 'timecop'
+
+if Rails::VERSION::MAJOR == 5 &&  Rails::VERSION::MINOR == 2
+  DataMigrate::DataMigrator.migrations_paths = ["spec/db/data"]
+end

data/tasks/databases.rake

@@ -1,3 +1,5 @@
+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)."
@@ -49,7 +51,7 @@ namespace :db do
           DataMigrate::DataMigrator.run(migration[:direction], "db/data/", migration[:version])
         else
           ActiveRecord::Migration.write("== %s %s" % ['Schema', "=" * 69])
-          ActiveRecord::Migrator.run(
+          DataMigrate::SchemaMigration.run(
             migration[:direction],
             Rails.application.config.paths["db/migrate"],
             migration[:version]
@@ -57,7 +59,8 @@ namespace :db do
         end
       end
 
-      Rake::Task["db:schema:dump"].invoke if ActiveRecord::Base.schema_format == :ruby
+      Rake::Task["db:_dump"].invoke
+      Rake::Task["data:dump"].invoke
     end
 
     namespace :redo do
@@ -93,9 +96,12 @@ namespace :db do
             DataMigrate::DataMigrator.run(:up, "db/data/", migration[:version])
           else
             ActiveRecord::Migration.write("== %s %s" % ['Schema', "=" * 69])
-            ActiveRecord::Migrator.run(:up, "db/migrate/", migration[:version])
+            DataMigrate::SchemaMigration.run(:up, "db/migrate/", migration[:version])
           end
         end
+
+        Rake::Task["db:_dump"].invoke
+        Rake::Task["data:dump"].invoke
       end
     end
 
@@ -118,9 +124,12 @@ namespace :db do
             DataMigrate::DataMigrator.run(:down, "db/data/", migration[:version])
           else
             ActiveRecord::Migration.write("== %s %s" % ['Schema', "=" * 69])
-            ActiveRecord::Migrator.run(:down, "db/migrate/", migration[:version])
+            DataMigrate::SchemaMigration.run(:down, "db/migrate/", migration[:version])
           end
         end
+
+        Rake::Task["db:_dump"].invoke
+        Rake::Task["data:dump"].invoke
       end
     end
 
@@ -130,8 +139,12 @@ namespace :db do
         config = connect_to_database
         next unless config
 
-        db_list_data = ActiveRecord::Base.connection.select_values("SELECT version FROM #{DataMigrate::DataMigrator.schema_migrations_table_name}")
-        db_list_schema = ActiveRecord::Base.connection.select_values("SELECT version FROM #{ActiveRecord::Migrator.schema_migrations_table_name}")
+        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, 'db', 'data')) do |file|
@@ -184,6 +197,9 @@ namespace :db do
           ActiveRecord::Migrator.run(:down, "db/migrate/", past_migration[:version])
         end
       end
+
+      Rake::Task["db:_dump"].invoke
+      Rake::Task["data:dump"].invoke
     end
   end
 
@@ -191,19 +207,10 @@ namespace :db do
     desc 'Pushes the schema to the next version (specify steps w/ STEP=n).'
     task :with_data => :environment do
       assure_data_schema_table
-      # TODO: No worky for .forward
       step = ENV['STEP'] ? ENV['STEP'].to_i : 1
-      # DataMigrate::DataMigrator.forward('db/data/', step)
-      migrations = pending_migrations.reverse.pop(step).reverse
-      migrations.each do | pending_migration |
-        if pending_migration[:kind] == :data
-          ActiveRecord::Migration.write("== %s %s" % ['Data', "=" * 71])
-          DataMigrate::DataMigrator.run(:up, "db/data/", pending_migration[:version])
-        elsif pending_migration[:kind] == :schema
-          ActiveRecord::Migration.write("== %s %s" % ['Schema', "=" * 69])
-          ActiveRecord::Migrator.run(:up, "db/migrate/", pending_migration[:version])
-        end
-      end
+      DataMigrate::DatabaseTasks.forward(step)
+      Rake::Task["db:_dump"].invoke
+      Rake::Task["data:dump"].invoke
     end
   end
 
@@ -215,14 +222,24 @@ namespace :db do
       puts "Current Data version: #{DataMigrate::DataMigrator.current_version}"
     end
   end
+
+  namespace :schema do
+    namespace :load do
+      desc "Load both schema.rb and data_schema.rb file into the database"
+      task with_data: :environment do
+        Rake::Task["db:schema:load"].invoke
+
+        DataMigrate::DatabaseTasks.load_schema_current(:ruby, ENV["SCHEMA"])
+      end
+    end
+  end
 end
 
 namespace :data do
   desc 'Migrate data migrations (options: VERSION=x, VERBOSE=false)'
   task :migrate => :environment do
-    assure_data_schema_table
-    #ActiveRecord::Migration.verbose = ENV["VERBOSE"] ? ENV["VERBOSE"] == "true" : true
-    DataMigrate::DataMigrator.migrate("db/data/", ENV["VERSION"] ? ENV["VERSION"].to_i : nil)
+    DataMigrate::Tasks::DataMigrateTasks.migrate
+    Rake::Task["data:dump"].invoke
   end
 
   namespace :migrate do
@@ -244,6 +261,7 @@ namespace :data do
       version = ENV["VERSION"] ? ENV["VERSION"].to_i : nil
       raise "VERSION is required" unless version
       DataMigrate::DataMigrator.run(:up, "db/data/", version)
+      Rake::Task["data:dump"].invoke
     end
 
     desc 'Runs the "down" for a given migration VERSION.'
@@ -252,36 +270,16 @@ namespace :data do
       raise "VERSION is required" unless version
       assure_data_schema_table
       DataMigrate::DataMigrator.run(:down, "db/data/", version)
+      Rake::Task["data:dump"].invoke
     end
 
     desc "Display status of data migrations"
     task :status => :environment do
       config = ActiveRecord::Base.configurations[Rails.env || 'development']
       ActiveRecord::Base.establish_connection(config)
-      unless ActiveRecord::Base.connection.table_exists?(DataMigrate::DataMigrator.schema_migrations_table_name)
-        puts 'Data migrations table does not exist yet.'
-        next  # means "return" for rake task
-      end
-      db_list = ActiveRecord::Base.connection.select_values("SELECT version FROM #{DataMigrate::DataMigrator.schema_migrations_table_name}")
-      file_list = []
-      Dir.foreach(File.join(Rails.root, 'db', 'data')) do |file|
-        # only files matching "20091231235959_some_name.rb" pattern
-        if match_data = /(\d{14})_(.+)\.rb/.match(file)
-          status = db_list.delete(match_data[1]) ? 'up' : 'down'
-          file_list << [status, match_data[1], match_data[2]]
-        end
-      end
-      # output
+      connection = ActiveRecord::Base.connection
       puts "\ndatabase: #{config['database']}\n\n"
-      puts "#{"Status".center(8)}  #{"Migration ID".ljust(14)}  Migration Name"
-      puts "-" * 50
-      file_list.each do |file|
-        puts "#{file[0].center(8)}  #{file[1].ljust(14)}  #{file[2].humanize}"
-      end
-      db_list.each do |version|
-        puts "#{'up'.center(8)}  #{version.ljust(14)}  *** NO FILE ***"
-      end
-      puts
+      DataMigrate::StatusService.dump(connection)
     end
   end
 
@@ -290,6 +288,7 @@ namespace :data do
     assure_data_schema_table
     step = ENV['STEP'] ? ENV['STEP'].to_i : 1
     DataMigrate::DataMigrator.rollback('db/data/', step)
+    Rake::Task["data:dump"].invoke
   end
 
   desc 'Pushes the schema to the next version (specify steps w/ STEP=n).'
@@ -302,6 +301,7 @@ namespace :data do
     migrations.each do | pending_migration |
       DataMigrate::DataMigrator.run(:up, "db/data/", pending_migration[:version])
     end
+    Rake::Task["data:dump"].invoke
   end
 
   desc "Retrieves the current schema version number for data migrations"
@@ -309,24 +309,36 @@ namespace :data do
     assure_data_schema_table
     puts "Current data version: #{DataMigrate::DataMigrator.current_version}"
   end
+
+  desc "Create a db/data_schema.rb file that stores the current data version"
+  task dump: :environment do
+    if ActiveRecord::Base.dump_schema_after_migration
+      filename = DataMigrate::DatabaseTasks.data_schema_file
+      File.open(filename, "w:utf-8") do |file|
+        DataMigrate::SchemaDumper.dump(ActiveRecord::Base.connection, file)
+      end
+    end
+
+    # Allow this task to be called as many times as required. An example
+    # is the migrate:redo task, which calls other two internally
+    # that depend on this one.
+    Rake::Task["data:dump"].reenable
+  end
 end
 
 def pending_migrations
-  sort_migrations pending_data_migrations, pending_schema_migrations
+  DataMigrate::DatabaseTasks.sort_migrations(
+    DataMigrate::DatabaseTasks.pending_schema_migrations,
+    DataMigrate::DatabaseTasks.pending_data_migrations
+  )
 end
 
 def pending_data_migrations
-  data_migrations = DataMigrate::DataMigrator.migrations('db/data')
-  sort_migrations DataMigrate::DataMigrator.new(:up, data_migrations ).
-    pending_migrations.map{|m| { :version => m.version, :kind => :data }}
+  DataMigrate::DatabaseTasks.pending_data_migrations
 end
 
 def pending_schema_migrations
-  all_migrations = ActiveRecord::Migrator.migrations(Rails.application.config.paths["db/migrate"])
-  sort_migrations(
-    ActiveRecord::Migrator.new(:up, all_migrations).
-    pending_migrations.
-    map{|m| { :version => m.version, :kind => :schema }})
+  DataMigrate::DatabaseTasks.pending_schema_migrations
 end
 
 def sort_migrations set_1, set_2=nil
@@ -342,24 +354,19 @@ def connect_to_database
   config = ActiveRecord::Base.configurations[Rails.env || 'development']
   ActiveRecord::Base.establish_connection(config)
 
-  unless ActiveRecord::Base.connection.table_exists?(DataMigrate::DataMigrator.schema_migrations_table_name)
+  unless DataMigrate::DataSchemaMigration.table_exists?
     puts 'Data migrations table does not exist yet.'
     config = nil
   end
-  unless ActiveRecord::Base.connection.table_exists?(ActiveRecord::Migrator.schema_migrations_table_name)
+  unless ActiveRecord::SchemaMigration.table_exists?
     puts 'Schema migrations table does not exist yet.'
     config = nil
   end
   config
 end
 
-def past_migrations sort=nil
-  sort = sort.downcase if sort
-  db_list_data = ActiveRecord::Base.connection.select_values("SELECT version FROM #{DataMigrate::DataMigrator.schema_migrations_table_name}").sort
-  db_list_schema = ActiveRecord::Base.connection.select_values("SELECT version FROM #{ActiveRecord::Migrator.schema_migrations_table_name}").sort
-  migrations = db_list_data.map{|d| {:version => d.to_i, :kind => :data }} + db_list_schema.map{|d| {:version => d.to_i, :kind => :schema }}
-
-  sort == 'asc' ? sort_migrations(migrations) : sort_migrations(migrations).reverse
+def past_migrations(sort=nil)
+  DataMigrate::DatabaseTasks.past_migrations(sort)
 end
 
 def assure_data_schema_table

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: data_migrate
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 4.0.0
 platform: ruby
 authors:
 - Andrew J Vargo
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-15 00:00:00.000000000 Z
+date: 2018-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -17,14 +17,154 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '4.2'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  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'
+- !ruby/object:Gem::Dependency
+  name: rake
+  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'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  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'
+- !ruby/object:Gem::Dependency
+  name: rspec-core
+  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'
+- !ruby/object:Gem::Dependency
+  name: pry
+  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'
+- !ruby/object:Gem::Dependency
+  name: rb-readline
+  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'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  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'
+- !ruby/object:Gem::Dependency
+  name: timecop
+  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'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  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'
+- !ruby/object:Gem::Dependency
+  name: overcommit
+  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 to migrate data alongside schema changes.
 email:
 - ajvargo@computer.org
@@ -34,24 +174,75 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".hound.yml"
+- ".overcommit.yml"
+- ".rspec"
+- ".rubocop.yml"
+- ".ruby-style.yml"
+- ".travis.yml"
+- Appraisals
 - Changelog.md
 - Gemfile
+- Gemfile.rails5
+- Gemfile.rails5.1
+- Gemfile.rails5.2
 - 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
 - lib/capistrano/data_migrate.rb
 - lib/capistrano/data_migrate/migrate.rb
 - lib/data_migrate.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/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/status_service.rb
+- lib/data_migrate/status_service_five.rb
+- lib/data_migrate/tasks/data_migrate_tasks.rb
 - lib/data_migrate/version.rb
 - lib/generators/data_migrate.rb
 - lib/generators/data_migration/data_migration_generator.rb
 - lib/generators/data_migration/templates/data_migration.rb
 - lib/generators/data_migration/templates/migration.rb
+- screenshot.png
+- spec/data_migrate/data_migrator_spec.rb
+- spec/data_migrate/data_schema_migration_spec.rb
+- spec/data_migrate/data_spec.rb
+- spec/data_migrate/database_tasks_spec.rb
+- spec/data_migrate/migration.rb
+- spec/data_migrate/migration_context_spec.rb
+- spec/data_migrate/schema_dumper_spec.rb
+- 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/4.2/20091231235959_some_name.rb
+- spec/db/4.2/20171231235959_super_update.rb
+- spec/db/5.0/20091231235959_some_name.rb
+- spec/db/5.0/20171231235959_super_update.rb
+- spec/db/data/20091231235959_some_name.rb
+- spec/db/data/20171231235959_super_update.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/generators/data_migration/data_migration_generator_spec.rb
+- spec/spec_helper.rb
 - tasks/.gitkeep
 - tasks/databases.rake
 homepage: https://github.com/ilyakatz/data-migrate
@@ -77,8 +268,32 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: data_migrate
-rubygems_version: 2.2.3
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Rake tasks to migrate data alongside schema changes.
-test_files: []
+test_files:
+- spec/data_migrate/data_migrator_spec.rb
+- spec/data_migrate/data_schema_migration_spec.rb
+- spec/data_migrate/data_spec.rb
+- spec/data_migrate/database_tasks_spec.rb
+- spec/data_migrate/migration.rb
+- spec/data_migrate/migration_context_spec.rb
+- spec/data_migrate/schema_dumper_spec.rb
+- 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/4.2/20091231235959_some_name.rb
+- spec/db/4.2/20171231235959_super_update.rb
+- spec/db/5.0/20091231235959_some_name.rb
+- spec/db/5.0/20171231235959_super_update.rb
+- spec/db/data/20091231235959_some_name.rb
+- spec/db/data/20171231235959_super_update.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/generators/data_migration/data_migration_generator_spec.rb
+- spec/spec_helper.rb