data_migrate 5.3.2 → 6.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 737ac14150dfe99227e19eff42fbe27ad4ed670abf64352497de7d795bb63ffe
-  data.tar.gz: 44d29c907e88b2fa0cfb2686b9d5a61ac52be77b2d80d528840f3fa7be150a95
+  metadata.gz: 3f4da014e11358e7723df55f6406cbf37ce2e493ecc88c9c0491a22ec336958c
+  data.tar.gz: d3f2c34344cf70447c900085a725803128bbb38ca7ef2cce66c7fd309b990056
 SHA512:
-  metadata.gz: 01436d19ffc4671f27bdbdade83539d8c4a2e2b9ff3a632740beb8851cdeea43c1d39edc6288be41d6d695f268c70706f09a016412438a92c44cc1e86495f2bd
-  data.tar.gz: d51939c5695ff458db14bb5df3f9a276e3a8d576fcb3372573fa4babbd2bdef29df63e2e51942c52b663f3c76fdeffb3d92769ae042cf0ecf50777cceade98bd
+  metadata.gz: b6cbbc544a5454293c4867e3b576c432138cad92bafb21c72b0ce34ac3adfd78fcbbe70bf6317518625463e0e661096b0f28d2912ddc00268fe159b54c638bd2
+  data.tar.gz: d4695470310defaf03f7a69525c279b4d7c78da59d7046f04b5f7708c8843a0be14dfc8682312cb9c47e8b2f6d75878d03042bdfd2fcb7e167ac35e125dafb89

data/.rbenv-gemsets

@@ -0,0 +1,2 @@
+data-migrate
+-global

data/.ruby-version

@@ -0,0 +1 @@
+2.6.1

data/.travis.yml

@@ -1,12 +1,15 @@
 language: ruby
 rvm:
-  - 2.2.9
-  - 2.3.7
   - 2.4.4
-  - 2.5.1
+  - 2.5.5
+  - 2.6.2
 script: bundle exec rspec
 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
+matrix:
+  exclude:
+    - rvm: 2.4.4
+      gemfile: gemfiles/rails_6.0.gemfile

data/Appraisals

@@ -1,17 +1,15 @@
-appraise 'rails-4.2' do
-  gem 'rails', '4.2.8'
-  # Nokogiri 1.7+ requires Ruby 2.1+
-  gem 'nokogiri', '1.6.8.1'
-end
-
 appraise 'rails-5.0' do
-  gem 'rails', '5.0.3'
+  gem 'rails', '5.0.7.2'
 end
 
 appraise 'rails-5.1' do
-  gem 'rails', '5.1'
+  gem 'rails', '5.1.7'
 end
 
 appraise 'rails-5.2' do
-  gem 'rails', '~> 5.2.0'
+  gem 'rails', '~> 5.2.3'
+end
+
+appraise 'rails-6.0' do
+  gem 'rails', '~> 6.0.0.beta3'
 end

data/Changelog.md

@@ -1,16 +1,44 @@
-Changelog
-=========
+# Changelog
+
+## 6.0.5
+
+Fixing `needs_migration?` method for Rails 5.2 and up [EnomaDebby](https://github.com/EnomaDebby)
+
+## 6.0.4.beta
+
+Fix rolling back schema migrations failing for Rails 5.2 and above
+
+## 6.0.3.beta
+
+Compatiblity with Rails 6 RC2 [y-yagi](https://github.com/y-yagi)
+
+## 6.0.1.beta
+
+Fix migrations being generated in wrong folder
+
+## 6.0.0
+
+Support for Rails 6
+No longer supporting Rails 4.2
+
+## 5.3.3
+
+Ruby 2.2 and 2.3 are no longer actively validated with tests since they are both EOL
 
 ## 5.3.2
+
 Fix capistrano migration tasks to only skip migrations if there are no changes in the db/data and db/migrate folders
 
 ## 5.3.1
+
 Change database task to use data_migrations_path_configuration
 
 ## 5.3.0
-Add support to configure data migration path 
+
+Add support to configure data migration path
 
 ## 5.1.0
+
 Fixes to `db:schema:load:with_data` + `db:structure:load:with_data` definition, thanks to [craineum](https://github.com/craineum)
 
 ## 5.0.0
@@ -37,11 +65,15 @@ Deprecated support for rails 4.0
 Improvements to timestamped migrations, thanks to [Pierre-Michard](https://github.com/Pierre-Michard)
 
 ## 3.4.0
+
 `rake data:migrate:status` to return result in chronological order
+
 ## 3.3.1
+
 Regression fix, thanks to [subakva](https://github.com/subakva)
 
 ## 3.3.0
+
 The concept of schema:dump to data migrations, thanks to
 [tobyndockerill](https://github.com/tobyndockerill)
 
@@ -50,8 +82,8 @@ The concept of schema:dump to data migrations, thanks to
 data_migrate table into rails schema dump, thanks to
 [jturkel](https://github.com/jturkel)
 
-
 ## 3.2.0
+
 - Add support for Rails 5.1
 - No longer testing EOL rubies
 

data/Gemfile

@@ -1,4 +1,6 @@
 source "http://rubygems.org"
 
 # Specify your gem's dependencies in data_migrate.gemspec
+gem 'rails', path: "~/ws/rails"
+gem 'sqlite3', "~> 1.4"
 gemspec

data/Gemfile.rails5.1

@@ -2,4 +2,4 @@ source "http://rubygems.org"
 
 # Specify your gem's dependencies in data_migrate.gemspec
 gemspec
-gem 'rails', '~> 5.1'
+gem 'rails', '~> 5.1.7'

data/README.md

@@ -1,12 +1,10 @@
-Data Migrate
-====
+# Data Migrate
 
 - [![Version](http://img.shields.io/gem/v/data_migrate.svg?style=flat-square)](https://rubygems.org/gems/data_migrate)
 - [![License](http://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square)](http://opensource.org/licenses/MIT)
 - [![Travis](https://img.shields.io/travis/ilyakatz/data-migrate.svg)](https://travis-ci.org/ilyakatz/data-migrate)
 - [![Reviewed by Hound](https://img.shields.io/badge/Reviewed_by-Hound-8E64B0.svg)](https://houndci.com)
 
-
 Run data migrations alongside schema migrations.
 
 Data migrations are stored in `db/data`. They act like schema
@@ -19,13 +17,13 @@ is the place to do it.
 # Why should I use this?
 
 Its seems when a project hits a certain size, I get to manipulate data
-outside the application itself.  Changing defaults, new validations,
+outside the application itself. Changing defaults, new validations,
 one-to-one to one-to-many... I found it a pain and dodgy to have to
 step up migrations one by one, run a ruby script of some sort, then
-resume migrations.  It tanks a lot of the automation of deploy.
+resume migrations. It tanks a lot of the automation of deploy.
 
 If you don't use the one off scripts, you could do it as a regular
-migration.  It'd be much better to keep concerns separate. The benefit
+migration. It'd be much better to keep concerns separate. The benefit
 of having them separate has to do with your data model.
 
 For instance, lets take an absurd example, to illustrate: You have
@@ -34,28 +32,29 @@ After some use, you decide you are going to be a trend setter,
 and want only one comment per post, and just the text.
 
 Given that you:
+
 - write a migration to add a comment column to `Post`
 - write a migration to move the contents of the first comments to the `Post`
 - drop the `column_id` column from `Post`
 - drop the `Comment` model
 - fix all your tests
 
-You've just got bit.  When you `rake setup:development`, the mess gets
+You've just got bit. When you `rake setup:development`, the mess gets
 mad at you after it creates your database, and starts cranking through
-migrations.  It gets to the part where you iterate over the comments
-and it blows up.  You don't have a `Comment` model anymore for it to
-even try and get 'all' from.  You think you are smarter, and wrap the
+migrations. It gets to the part where you iterate over the comments
+and it blows up. You don't have a `Comment` model anymore for it to
+even try and get 'all' from. You think you are smarter, and wrap the
 ActiveRecord call in a conditional based on the environment.
 
 That's fine until you get that QA gal, and she wants her own thing.
 Then the UI people get tired of waiting for the full stack to load on page
 refreshes, so you have to edit past migrations...
 
-With Data Migrate, you have the control.  You can generate your
+With Data Migrate, you have the control. You can generate your
 migrations as schema or data as you would as your work flow. For
 setting tasks that don't require any intermediate AR activity, like
-dev and test, you stick with `db:migrate`.  For production and QA, you
-change their scripts to `db:migrate:with_data`.  Of course you want to
+dev and test, you stick with `db:migrate`. For production and QA, you
+change their scripts to `db:migrate:with_data`. Of course you want to
 test your migration, so you have the choice of `db:migrate:with_data` or
 `data:migrate` to just capture that data change.
 
@@ -70,7 +69,7 @@ table to track all the goodness.
 
 ## Rails Support
 
-Support Rails 4.2 through 5.2
+Support Rails 5.0 through 6.0
 
 ### Important notes for older versions
 
@@ -93,6 +92,7 @@ If you've installed previous to v1.1.0, you'll want to delete the
 `create_data_migrations_table` migration.
 
 ## Installation
+
 Add the gem to your project
 
     # Gemfile
@@ -104,7 +104,6 @@ So you know, when you use one of the provide rake tasks, a table
 called `data_migrations` will be created in your database. This
 is to mirror the way the standard `db` rake tasks work.
 
-
 ## Usage
 
 ### Generating Migrations
@@ -138,15 +137,15 @@ You can generate a data migration as you would a schema migration:
 
 Tasks work as they would with the 'vanilla' db version. The 'with_data' addition to the 'db' tasks will run the task in the context of both the data and schema migrations. That is, rake db:rollback:with_data will check to see if it was a schema or data migration invoked last, and do that. Tasks invoked in that space also have an additional line of output, indicating if the action is performed on data or schema.
 
-With 'up' and 'down', you can specify the option 'BOTH', which defaults to false. Using true, will migrate both the data and schema (in the desired direction) if they both match the version provided.  Again, going up, schema is given precedence. Down its data.
+With 'up' and 'down', you can specify the option 'BOTH', which defaults to false. Using true, will migrate both the data and schema (in the desired direction) if they both match the version provided. Again, going up, schema is given precedence. Down its data.
 
 `rake db:migrate:status:with_data` provides and additional column to indicate which type of migration.
+
 ### Configuration
 
 `data_migrate` respects `ActiveRecord::Base.dump_schema_after_migration`. If it is set to `false`, data schema file will not be generated
 
-
-By default, data migrations are added to the `db/data/` path. 
+By default, data migrations are added to the `db/data/` path.
 You can override this setting in `config/initializers/data_migrate.rb`
 
 ```ruby
@@ -176,13 +175,14 @@ Run tests for a specific version of Rails
 
 ```
 bundle exec appraisal install
-bundle exec appraisal rails-4.2 rspec
 bundle exec appraisal rails-5.0 rspec
+bundle exec appraisal rails-5.2 rspec
 ```
 
 ## Thanks
+
 [Andrew J Vargo](http://github.com/ajvargo) Andrew was the original creator and maintainer of this project!
 
 [Jeremy Durham](http://jeremydurham.com/) for fleshing out the idea with me, and providing guidance.
 
-You!  Yes, you. Thanks for checking it out.
+You! Yes, you. Thanks for checking it out.

data/data_migrate.gemspec

@@ -15,14 +15,14 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "data_migrate"
 
-  s.add_dependency('rails', '>= 4.2')
+  s.add_dependency('rails', '>= 5.0')
   s.add_development_dependency "appraisal"
   s.add_development_dependency "rake"
   s.add_development_dependency "rspec"
   s.add_development_dependency "rspec-core"
   s.add_development_dependency "pry"
   s.add_development_dependency "rb-readline"
-  s.add_development_dependency "sqlite3"
+  s.add_development_dependency "sqlite3", "~> 1.3.6"
   s.add_development_dependency "timecop"
   s.add_development_dependency "rubocop"
   s.add_development_dependency "overcommit"

data/gemfiles/rails_4.2.gemfile

@@ -2,7 +2,8 @@
 
 source "http://rubygems.org"
 
-gem "rails", "4.2.8"
+gem "rails", "4.2.11.1"
 gem "nokogiri", "1.6.8.1"
+gem "bundler" , "< 2.0"
 
 gemspec path: "../"

data/gemfiles/rails_5.0.gemfile

@@ -2,6 +2,6 @@
 
 source "http://rubygems.org"
 
-gem "rails", "5.0.3"
+gem "rails", "5.0.7.2"
 
 gemspec path: "../"

data/gemfiles/rails_5.1.gemfile

@@ -2,6 +2,6 @@
 
 source "http://rubygems.org"
 
-gem "rails", "5.1"
+gem "rails", "5.1.7"
 
 gemspec path: "../"

data/gemfiles/rails_5.2.gemfile

@@ -2,6 +2,6 @@
 
 source "http://rubygems.org"
 
-gem "rails", "~> 5.2.0"
+gem "rails", "~> 5.2.3"
 
 gemspec path: "../"

data/gemfiles/rails_6.0.gemfile

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

data/lib/data_migrate.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
-if Rails::VERSION::MAJOR == 5 && Rails::VERSION::MINOR == 2
+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")
@@ -10,15 +12,22 @@ require File.join(File.dirname(__FILE__), "data_migrate",
 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 == 5 &&  Rails::VERSION::MINOR == 2
+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 == 5
-  if  Rails::VERSION::MINOR == 2
+
+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")

data/lib/data_migrate/data_migrator.rb

@@ -20,6 +20,12 @@ module DataMigrate
     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

data/lib/data_migrate/data_migrator_five.rb

@@ -5,7 +5,9 @@ require "data_migrate/config"
 
 module DataMigrate
   class DataMigrator < ActiveRecord::Migrator
-    self.migrations_paths = [DataMigrate.config.data_migrations_path]
+    def self.migrations_paths
+      [DataMigrate.config.data_migrations_path]
+    end
 
     def self.assure_data_schema_table
       ActiveRecord::Base.establish_connection(db_config)
@@ -43,6 +45,9 @@ module DataMigrate
         /(\d{14})_(.+)\.rb/.match(filename)
       end
 
+      def needs_migration?
+        DataMigrate::DatabaseTasks.pending_migrations.count.positive?
+      end
       ##
       # Provides the full migrations_path filepath
       # @return (String)
@@ -54,9 +59,10 @@ module DataMigrate
         DataMigrate::MigrationContext.new(migrations_paths).migrations_status
       end
 
-      #TODO: this was added to be backward compatible, need to re-evaluate
+      # TODO: this was added to be backward compatible, need to re-evaluate
       def migrations(_migrations_paths)
-        DataMigrate::MigrationContext.new(migrations_paths).migrations
+        #DataMigrate::MigrationContext.new(migrations_paths).migrations
+        DataMigrate::MigrationContext.new(_migrations_paths).migrations
       end
 
       #TODO: this was added to be backward compatible, need to re-evaluate

data/lib/data_migrate/schema_migration_five.rb

@@ -3,7 +3,7 @@ module DataMigrate
   # to allow data/schema combiation tasks
   class SchemaMigration
     def self.pending_schema_migrations
-      all_migrations = ActiveRecord::MigrationContext.new(migrations_paths).migrations
+      all_migrations = DataMigrate::MigrationContext.new(migrations_paths).migrations
       sort_migrations(
         ActiveRecord::Migrator.new(:up, all_migrations).
         pending_migrations.

data/lib/data_migrate/schema_migration_six.rb

@@ -0,0 +1,31 @@
+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, ActiveRecord::Base.connection.schema_migration).
+        pending_migrations.
+        map {|m| { version: m.version, kind: :schema }}
+      )
+    end
+
+    def self.run(direction, migration_paths, version)
+      ActiveRecord::MigrationContext.new(migration_paths, ActiveRecord::Base.connection.schema_migration).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/lib/data_migrate/tasks/data_migrate_tasks.rb

@@ -9,7 +9,8 @@ module DataMigrate
       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
+        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)

data/lib/data_migrate/version.rb

@@ -1,3 +1,3 @@
 module DataMigrate
-  VERSION = "5.3.2".freeze
+  VERSION = "6.0.5".freeze
 end

data/lib/generators/data_migration/data_migration_generator.rb

@@ -14,7 +14,7 @@ module DataMigrate
 
       def create_data_migration
         set_local_assigns!
-        migration_template "data_migration.rb", "#{data_migrations_path}#{file_name}.rb"
+        migration_template "data_migration.rb", data_migrations_file_path
       end
 
       protected
@@ -36,6 +36,10 @@ module DataMigrate
         end
       end
 
+      def data_migrations_file_path
+        File.join(data_migrations_path, "#{file_name}.rb")
+      end
+
       def data_migrations_path
         DataMigrate.config.data_migrations_path
       end

data/spec/data_migrate/config_spec.rb

@@ -2,12 +2,13 @@ require "spec_helper"
 
 describe DataMigrate::Config do
 
-  it "sets default data_migrations_path path" do
+  it "sets default data_migrations_path path", :no_override do
     expect(DataMigrate.config.data_migrations_path).to eq "db/data/"
   end
 
   describe "data migration path configured" do
     before do
+      @before = DataMigrate.config.data_migrations_path
       DataMigrate.configure do |config|
         config.data_migrations_path = "db/awesome/"
       end
@@ -15,7 +16,7 @@ describe DataMigrate::Config do
 
     after do
       DataMigrate.configure do |config|
-        config.data_migrations_path = "db/data/"
+        config.data_migrations_path = @before
       end
     end
 

data/spec/data_migrate/data_migrator_spec.rb

@@ -9,6 +9,11 @@ describe DataMigrate::DataMigrator do
     }
   end
 
+  before do
+    allow(DataMigrate::DataMigrator).to receive(:db_config) { db_config }
+    ActiveRecord::Base.establish_connection(db_config)
+  end
+
   describe :load_migrated do
     before do
       allow(subject).to receive(:db_config) { db_config }.at_least(:once)
@@ -56,6 +61,22 @@ describe DataMigrate::DataMigrator do
     end
   end
 
+  describe "#migrations_status" do
+    before do
+      allow(subject).to receive(:db_config) { db_config }.at_least(:once)
+      ActiveRecord::Base.establish_connection(db_config)
+      ::ActiveRecord::SchemaMigration.create_table
+      DataMigrate::DataSchemaMigration.create_table
+    end
+
+    it "returns all migrations statuses" do
+      status = subject.migrations_status
+      expect(status.length).to eq 2
+      expect(status.first).to eq ["down", "20091231235959", "Some name"]
+      expect(status.second).to eq ["down", "20171231235959", "Super update"]
+    end
+  end
+
   describe :match do
     context "when the file does not match" do
       it "returns nil" do

data/spec/data_migrate/database_tasks_spec.rb

@@ -5,7 +5,9 @@ require "spec_helper"
 describe DataMigrate::DatabaseTasks do
   let(:subject) { DataMigrate::DatabaseTasks }
   let(:migration_path) {
-    if Rails::VERSION::MAJOR == 5
+    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
@@ -16,15 +18,7 @@ describe DataMigrate::DatabaseTasks do
     end
   }
   let(:data_migrations_path) {
-    if Rails::VERSION::MAJOR == 5
-      if Rails::VERSION::MINOR == 2
-        "spec/db/data"
-      else
-        "spec/db/5.0"
-      end
-    else
-      "spec/db/4.2"
-    end
+    DataMigrate.config.data_migrations_path
   }
   let(:db_config) do
     {

data/spec/data_migrate/migration_context_spec.rb

@@ -2,15 +2,24 @@ require "spec_helper"
 
 describe DataMigrate::DataMigrator do
   let(:context) {
-    DataMigrate::MigrationContext.new("spec/db/data")
+    if (Rails::VERSION::MAJOR == 6)
+      DataMigrate::MigrationContext.new("spec/db/data-6.0")
+    else
+      DataMigrate::MigrationContext.new("spec/db/data")
+    end
   }
   let(:schema_context) {
-    ActiveRecord::MigrationContext.new("spec/db/migrate/5.2")
+    if (Rails::VERSION::MAJOR == 6)
+      ActiveRecord::MigrationContext.new("spec/db/migrate/6.0", ActiveRecord::Base.connection.schema_migration)
+    else
+      ActiveRecord::MigrationContext.new("spec/db/migrate/5.2")
+    end
   }
 
   before do
-    unless Rails::VERSION::MAJOR == 5 and
-           Rails::VERSION::MINOR == 2
+    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

data/spec/data_migrate/schema_migration_spec.rb

@@ -4,7 +4,9 @@ require "spec_helper"
 
 describe DataMigrate::SchemaMigration do
   let(:migration_path) {
-    if Rails::VERSION::MAJOR == 5
+    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

data/spec/data_migrate/status_service_spec.rb

@@ -46,7 +46,7 @@ describe DataMigrate::StatusService do
         VALUES #{fixture_file_timestamps.map { |t| "(#{t})" }.join(', ')}
       SQL
 
-      allow_any_instance_of(service).to receive(:root_folder) { "spec" }
+      allow_any_instance_of(service).to receive(:root_folder) { "./" }
     end
 
     after do

data/spec/data_migrate/tasks/data_migrate_tasks_spec.rb

@@ -11,21 +11,6 @@ describe DataMigrate::Tasks::DataMigrateTasks do
   end
 
   before do
-    if Rails::VERSION::MAJOR == 5
-      if Rails::VERSION::MINOR == 2
-        allow(DataMigrate::Tasks::DataMigrateTasks).to receive(:migrations_paths) {
-          "spec/db/data"
-        }
-      else
-        allow(DataMigrate::Tasks::DataMigrateTasks).to receive(:migrations_paths) {
-          "spec/db/5.0"
-        }
-      end
-    else
-      allow(DataMigrate::Tasks::DataMigrateTasks).to receive(:migrations_paths) {
-        "spec/db/4.2"
-      }
-    end
     allow(DataMigrate::DataMigrator).to receive(:db_config) { db_config }
     ActiveRecord::Base.establish_connection(db_config)
   end
@@ -36,9 +21,9 @@ describe DataMigrate::Tasks::DataMigrateTasks do
 
   describe :migrate do
     it do
-      expect {
+       expect {
         DataMigrate::Tasks::DataMigrateTasks.migrate
-      }.to output(/20091231235959 SomeName: migrating/).to_stdout
+       }.to output(/20091231235959 SomeName: migrating/).to_stdout
     end
 
     it do

data/spec/db/{4.2 → 6.0}/20091231235959_some_name.rb

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

data/spec/db/{4.2 → 6.0}/20171231235959_super_update.rb

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

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

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

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

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

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

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

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

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

data/spec/generators/data_migration/data_migration_generator_spec.rb

@@ -24,4 +24,37 @@ describe DataMigrate::Generators::DataMigrationGenerator do
       end
     end
   end
+
+  describe :create_data_migration do
+    let(:subject) { DataMigrate::Generators::DataMigrationGenerator.new(['my_migration']) }
+    let(:data_migrations_file_path) { 'abc/my_migration.rb' }
+
+    context 'when custom data migrations path has a trailing slash' do
+      before do
+        DataMigrate.config.data_migrations_path = 'abc/'
+      end
+
+      it 'returns correct file path' do
+        expect(subject).to receive(:migration_template).with(
+          'data_migration.rb', data_migrations_file_path
+        )
+
+        subject.create_data_migration
+      end
+    end
+
+    context 'when custom data migrations path does not have a trailing slash' do
+      before do
+        DataMigrate.config.data_migrations_path = 'abc'
+      end
+
+      it 'returns correct file path' do
+        expect(subject).to receive(:migration_template).with(
+          'data_migration.rb', data_migrations_file_path
+        )
+
+        subject.create_data_migration
+      end
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -1,15 +1,37 @@
 require 'rspec'
 require 'rails'
+require 'sqlite3'
 require 'data_migrate'
 require 'pry'
 require 'timecop'
 
-if Rails::VERSION::MAJOR == 5 &&  Rails::VERSION::MINOR == 2
-  DataMigrate::DataMigrator.migrations_paths = ["spec/db/data"]
-end
-
 RSpec.configure do |config|
   config.mock_with :rspec do |mocks|
     mocks.verify_partial_doubles = true
   end
+
+  config.before(:each) do |example|
+    if example.metadata[:no_override]
+    else
+      if Rails::VERSION::MAJOR == 6
+        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
+        end
+      else
+        DataMigrate.configure do |config|
+          config.data_migrations_path = "spec/db/5.0"
+        end
+      end
+    end
+  end
 end

data/tasks/databases.rake

@@ -194,7 +194,7 @@ namespace :db do
           DataMigrate::DataMigrator.run(:down, data_migrations_path, past_migration[:version])
         elsif past_migration[:kind] == :schema
           ActiveRecord::Migration.write("== %s %s" % ['Schema', "=" * 69])
-          ActiveRecord::Migrator.run(:down, "db/migrate/", past_migration[:version])
+          DataMigrate::SchemaMigration.run(:down, "db/migrate/", past_migration[:version])
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: data_migrate
 version: !ruby/object:Gem::Version
-  version: 5.3.2
+  version: 6.0.5
 platform: ruby
 authors:
 - Andrew J Vargo
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-01 00:00:00.000000000 Z
+date: 2019-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -114,16 +114,16 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.6
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -178,9 +178,11 @@ files:
 - ".gitignore"
 - ".hound.yml"
 - ".overcommit.yml"
+- ".rbenv-gemsets"
 - ".rspec"
 - ".rubocop.yml"
 - ".ruby-style.yml"
+- ".ruby-version"
 - ".travis.yml"
 - Appraisals
 - Changelog.md
@@ -197,6 +199,7 @@ files:
 - gemfiles/rails_5.0.gemfile
 - gemfiles/rails_5.1.gemfile
 - gemfiles/rails_5.2.gemfile
+- gemfiles/rails_6.0.gemfile
 - lib/capistrano/data_migrate.rb
 - lib/capistrano/data_migrate/migrate.rb
 - lib/data_migrate.rb
@@ -214,6 +217,7 @@ files:
 - 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
@@ -235,10 +239,13 @@ 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/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/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
@@ -248,6 +255,8 @@ files:
 - 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
+- spec/db/migrate/6.0/20202020202011_db_migration.rb
 - spec/generators/data_migration/data_migration_generator_spec.rb
 - spec/spec_helper.rb
 - tasks/.gitkeep
@@ -277,8 +286,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: data_migrate
-rubygems_version: 2.7.8
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Rake tasks to migrate data alongside schema changes.
@@ -295,10 +303,13 @@ test_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/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/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
@@ -308,5 +319,7 @@ test_files:
 - 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
+- spec/db/migrate/6.0/20202020202011_db_migration.rb
 - spec/generators/data_migration/data_migration_generator_spec.rb
 - spec/spec_helper.rb