data_migrate 5.1.0 → 6.0.4.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 374e93835d9a65e56af9ce534dd650c286a3dbcf
-  data.tar.gz: 48a7b7a1b7870b28f4cc34bff8468cc797649c8d
+SHA256:
+  metadata.gz: 04d7f1a511de2b5d2fa39aeb5bbeeb2786e916c92ad3cc1b6252e5f3fc2ed5d2
+  data.tar.gz: 9a7d2d4f9fef7fbd193d63844058cab15716387d595f52acd52d552a20f73a1d
 SHA512:
-  metadata.gz: 3b53c608118790f93587e29221f7d5aad40fcbe782f081f314d3955228f6ad45f2fbe90b565221aeb90fb38fe6642883f850b31ae7ec8d925b7b34c7a07cc2b7
-  data.tar.gz: 1500d7f084fcdc4b8f0a442925a695c90b495a148da5ba6021add79d432c8826c6bc2b965bc178595796d92fe8d990f931860f02e0fadcc68674546e366bf2bf
+  metadata.gz: abf2884ae3a915dd7a1ee357df76b4844d164e8e861404781b686fcdca9cedef37b8c82a401d42d56b1eb91033927fd23aaa7834699dc5e1e1fa4a40b408ac63
+  data.tar.gz: 36508cb78ecc4146671582e8db6ddd056e088d1b942b6aba7f78427e2ac453e749bdd18341b93b058ce580331e03ec18363d05bc2497fa7fa4e906cb0bba9183

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,7 +1,39 @@
-Changelog
-=========
+# Changelog
+
+## 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
 
 ## 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
@@ -28,11 +60,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)
 
@@ -41,8 +77,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,10 +1,9 @@
-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.
 
@@ -18,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
@@ -33,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.
 
@@ -69,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
 
@@ -92,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
@@ -103,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
@@ -137,13 +137,24 @@ 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.
+You can override this setting in `config/initializers/data_migrate.rb`
+
+```ruby
+DataMigrate.configure do |config|
+  config.data_migrations_path = "db/awesomepath/"
+end
+
+```
+
 ## Capistrano Support
 
 The gem comes with a capistrano task that can be used instead of `capistrano/rails/migrations`.
@@ -164,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/capistrano/data_migrate/migrate.rb

@@ -7,10 +7,9 @@ namespace :deploy do
       conditionally_migrate = fetch(:conditionally_migrate)
       info '[deploy:migrate] Checking changes in db/migrate or db/data' if conditionally_migrate
 
-      if conditionally_migrate && (
-          test("diff -q #{release_path}/db/migrate #{current_path}/db/migrate") ||
-          test("diff -q #{release_path}/db/data #{current_path}/db/data")
-        )
+      if conditionally_migrate &&
+         test("diff -q #{release_path}/db/migrate #{current_path}/db/migrate") &&
+         test("diff -q #{release_path}/db/data #{current_path}/db/data")
         info '[deploy:migrate] Skip `deploy:migrate` (nothing changed in db/migrate or db/data)'
       else
         info '[deploy:migrate] Run `rake db:migrate:with_data`'

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")
@@ -29,12 +38,7 @@ end
 require File.join(File.dirname(__FILE__), "data_migrate", "railtie")
 require File.join(File.dirname(__FILE__), "data_migrate", "tasks/data_migrate_tasks")
 require File.join(File.dirname(__FILE__), "data_migrate", "legacy_migrator")
+require File.join(File.dirname(__FILE__), "data_migrate", "config")
 
 module DataMigrate
-  include ActiveSupport::Configurable
-  class << self
-    def configure
-      yield config
-    end
-  end
 end

data/lib/data_migrate/config.rb

@@ -0,0 +1,21 @@
+module DataMigrate
+  include ActiveSupport::Configurable
+  class << self
+
+    def configure
+      yield config
+    end
+
+    def config
+      @config ||= Config.new
+    end
+  end
+
+  class Config
+    attr_accessor :data_migrations_path
+
+    def initialize
+      @data_migrations_path = "db/data/"
+    end
+  end
+end

data/lib/data_migrate/data_migrator.rb

@@ -3,16 +3,15 @@
 require "active_record"
 
 module DataMigrate
-
   class DataMigrator < ActiveRecord::Migrator
 
     def record_version_state_after_migrating(version)
       if down?
         migrated.delete(version)
-        DataMigrate::DataSchemaMigration.where(:version => version.to_s).delete_all
+        DataMigrate::DataSchemaMigration.where(version: version.to_s).delete_all
       else
         migrated << version
-        DataMigrate::DataSchemaMigration.create!(:version => version.to_s)
+        DataMigrate::DataSchemaMigration.create!(version: version.to_s)
       end
     end
 
@@ -21,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
@@ -39,7 +44,7 @@ module DataMigrate
       end
 
       def migrations_path
-        "db/data"
+        DataMigrate.config.data_migrations_path
       end
 
       ##
@@ -64,23 +69,24 @@ module DataMigrate
       # @param (String) filename
       # @return (MatchData)
       def match(filename)
-        /(\d{14})_(.+)\.rb/.match(filename)
+        /(\d{14})_(.+)\.rb$/.match(filename)
       end
 
       private
 
       def create_table(sm_table)
-        ActiveRecord::Base.connection.create_table(sm_table, :id => false) do |schema_migrations_table|
-            schema_migrations_table.column :version, :string, :null => false
-          end
+        ActiveRecord::Base.connection.create_table(sm_table, id: false) do |schema_migrations_table|
+          schema_migrations_table.column :version, :string, null: false
+        end
+
+        suffix = ActiveRecord::Base.table_name_suffix
+        prefix = ActiveRecord::Base.table_name_prefix
+        index_name = "#{prefix}unique_data_migrations#{suffix}"
 
-          suffix = ActiveRecord::Base.table_name_suffix
-          prefix = ActiveRecord::Base.table_name_prefix
-          index_name = "#{prefix}unique_data_migrations#{suffix}"
+        options = {unique: true, name: index_name}
+        options[:length] = 191 if ActiveRecord::Base.connection_config[:adapter] == "mysql2"
 
-          ActiveRecord::Base.connection.add_index sm_table, :version,
-            :unique => true,
-            :name => index_name
+        ActiveRecord::Base.connection.add_index sm_table, :version, options
       end
 
       def table_exists?(connection, table_name)