data_migrate 6.6.0 → 7.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5b08f7465fcf3fba0054816fa8b07b07216ba3831114b0a8d477e24caa7ba98
-  data.tar.gz: 556f3785c1b198cc36daac457809b95fe79754276b2ad4f1056ab1f7dfbd748d
+  metadata.gz: eb3b56bd9d4670d332c63569b1744e1bb98af5f2f492ba3df0d4b80a5bdb7f7d
+  data.tar.gz: '08fe1b1769bf9c021aa2896e733d98100034d934e6a27492f6e455ad3f7475dd'
 SHA512:
-  metadata.gz: 3df442c3c71eb087476c1c66a0ad1b0d74672b98a6ada2fb9349874f28a3bb3321ba3bc856278f63756d778e9ea7568771788d6e94a255f6f92a0d673f9782a8
-  data.tar.gz: f56faf7e4dd10ef8a1c9e0698190ee5a6cdf2217e1bbdc1a153bc64b3b43e32d3d0065b81fe2e15f9811fe6a5ba3ee40f722d0009da1e00586f7be97349210cc
+  metadata.gz: 1d84302907054176f07464c0c4ec0f2340d43e90305477fb0da6dac29a597287628f26882590168c4bd8e2d376deacbde53d27e8e5458a6dbe0970f275462886
+  data.tar.gz: 055f2fe4fea33cc47d64976bd5c5f630099e0be193a7b01f01f76f4e272de20bdc43b5e6ba2de2888a1a60643ad4947af03dfa71190cb5b1812550eab9a95e1b

data/.gitignore

@@ -8,3 +8,4 @@ spec/db/data_schema.rb
 .vscode/
 .DS_Store
 .idea/
+vendor/

data/.travis.yml

@@ -8,7 +8,10 @@ gemfile:
   - gemfiles/rails_5.1.gemfile
   - gemfiles/rails_5.2.gemfile
   - gemfiles/rails_6.0.gemfile
+  - gemfiles/rails_6.1.gemfile
 matrix:
   exclude:
     - rvm: 2.4.4
       gemfile: gemfiles/rails_6.0.gemfile
+    - rvm: 2.4.4
+      gemfile: gemfiles/rails_6.1.gemfile

data/Appraisals

@@ -13,3 +13,7 @@ end
 appraise 'rails-6.0' do
   gem 'rails', '~> 6.0.0'
 end
+
+appraise 'rails-6.1' do
+  gem 'rails', '~> 6.1.0'
+end

data/Changelog.md

@@ -1,5 +1,20 @@
 # Changelog
+## 7.0.1
+Use SchemaMigrations.migration_paths in main rake task [lewhit](https://github.com/lewhit)
 
+## 6.8.0
+
+Specify database name for migrations_paths [lewhit](https://github.com/lewhit)
+## 6.7.0
+
+Add configuration for which database name is to be used for database migrations [lewhit](https://github.com/lewhit)
+Add tests for Rails 6.1 [lewhit](https://github.com/lewhit)
+Migrations files should end only in .rb [kroehre](https://github.com/kroehre)
+
+## 6.6.2
+## 6.6.1
+
+configs_for deprecation notice [borama](https://github.com/borama)
 ## 6.6.0
 
 Allow data dump connection to be configured [lewhit](https://github.com/lewhit)

data/Gemfile

@@ -1,6 +1,11 @@
 source "http://rubygems.org"
 
 # Specify your gem's dependencies in data_migrate.gemspec
-gem 'rails', '~> 6.0.0'
+%w[
+  activerecord
+  railties
+].each do |rails_gem|
+  gem rails_gem, '~> 6.0.0'
+end
 gem 'sqlite3', "~> 1.4"
 gemspec

data/Gemfile.rails5

@@ -2,4 +2,9 @@ source "http://rubygems.org"
 
 # Specify your gem's dependencies in data_migrate.gemspec
 gemspec
-gem 'rails', '~> 5.0.0'
+%w[
+  activerecord
+  railties
+].each do |rails_gem|
+  gem rails_gem, '~> 5.0.0'
+end

data/Gemfile.rails5.1

@@ -2,4 +2,9 @@ source "http://rubygems.org"
 
 # Specify your gem's dependencies in data_migrate.gemspec
 gemspec
-gem 'rails', '~> 5.1.7'
+%w[
+  activerecord
+  railties
+].each do |rails_gem|
+  gem rails_gem, '~> 5.1.7'
+end

data/Gemfile.rails5.2

@@ -2,4 +2,9 @@ source "http://rubygems.org"
 
 # Specify your gem's dependencies in data_migrate.gemspec
 gemspec
-gem 'rails', '~> 5.2'
+%w[
+  activerecord
+  railties
+].each do |rails_gem|
+  gem rails_gem, '~> 5.2'
+end

data/Gemfile.rails6.1

@@ -0,0 +1,11 @@
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in data_migrate.gemspec
+%w[
+  activerecord
+  railties
+].each do |rails_gem|
+  gem rails_gem, '~> 6.1.0'
+end
+gem 'sqlite3', "~> 1.4"
+gemspec

data/README.md

@@ -121,7 +121,7 @@ You can override this setting in `config/initializers/data_migrate.rb`
 
 ```ruby
 DataMigrate.configure do |config|
-  config.data_migrations_path = "db/awesomepath/"
+  config.data_migrations_path = 'db/awesomepath/'
   config.db_configuration = {
     'host' => '127.0.0.1',
     'database' => 'awesome_database',
@@ -129,6 +129,7 @@ DataMigrate.configure do |config|
     'username' => 'root',
     'password' => nil,
   }
+  config.spec_name = 'primary'
 end
 
 ```

data/data_migrate.gemspec

@@ -15,7 +15,13 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "data_migrate"
 
-  s.add_dependency('rails', '>= 5.0')
+  %w[
+    activerecord
+    railties
+  ].each do |rails_gem|
+    s.add_dependency(rails_gem, '>= 5.0')
+  end
+
   s.add_development_dependency "appraisal"
   s.add_development_dependency "rake"
   s.add_development_dependency "rspec"

data/gemfiles/rails_5.0.gemfile

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

data/gemfiles/rails_6.1.gemfile

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

data/lib/data_migrate/config.rb

@@ -12,11 +12,12 @@ module DataMigrate
   end
 
   class Config
-    attr_accessor :data_migrations_path, :db_configuration
+    attr_accessor :data_migrations_path, :db_configuration, :spec_name
 
     def initialize
       @data_migrations_path = "db/data/"
       @db_configuration = nil
+      @spec_name = nil
     end
   end
 end

data/lib/data_migrate/data_migrator_five.rb

@@ -42,7 +42,7 @@ module DataMigrate
       # @param (String) filename
       # @return (MatchData)
       def match(filename)
-        /(\d{14})_(.+)\.rb/.match(filename)
+        /(\d{14})_(.+)\.rb$/.match(filename)
       end
 
       def needs_migration?
@@ -75,8 +75,13 @@ module DataMigrate
       end
 
       def db_config
-        ActiveRecord::Base.configurations[Rails.env || "development"] ||
-          ENV["DATABASE_URL"]
+        env = Rails.env || "development"
+        ar_config = if (Rails::VERSION::MAJOR == 6 && Rails::VERSION::MINOR >= 1) || Rails::VERSION::MAJOR > 6
+                      ActiveRecord::Base.configurations.configs_for(env_name: env).first
+                    else
+                      ActiveRecord::Base.configurations[env]
+                    end
+        ar_config || ENV["DATABASE_URL"]
       end
     end
 

data/lib/data_migrate/schema_migration_six.rb

@@ -21,7 +21,14 @@ module DataMigrate
     end
 
     def self.migrations_paths
-      Rails.application.config.paths["db/migrate"].to_a
+      spec_name = DataMigrate.config.spec_name
+      if spec_name && Rails.version > '6.1'
+        ActiveRecord::Base.configurations.configs_for(env_name: Rails.env, name: spec_name).migrations_paths
+      elsif spec_name
+        ActiveRecord::Base.configurations.configs_for(env_name: Rails.env, spec_name: spec_name).migrations_paths
+      else
+        Rails.application.config.paths["db/migrate"].to_a
+      end
     end
 
     def self.sort_string(migration)

data/lib/data_migrate/version.rb

@@ -1,3 +1,3 @@
 module DataMigrate
-  VERSION = "6.6.0".freeze
+  VERSION = "7.0.1".freeze
 end

data/spec/data_migrate/data_migrator_spec.rb

@@ -82,6 +82,12 @@ describe DataMigrate::DataMigrator do
       end
     end
 
+    context "when the file doesn't end in .rb" do
+      it "returns nil" do
+        expect(subject.match("20091231235959_some_name.rb.un~")).to be_nil
+      end
+    end
+
     context "when the file matches" do
       it "returns a valid MatchData object" do
         match_data = subject.match("20091231235959_some_name.rb")

data/spec/data_migrate/database_tasks_spec.rb

@@ -39,8 +39,14 @@ describe DataMigrate::DatabaseTasks do
       data_migrations_path
     }
     allow(DataMigrate::DataMigrator).to receive(:db_config) { db_config }
-    ActiveRecord::Base.configurations[:test] =db_config
     ActiveRecord::Base.establish_connection(db_config)
+    if Rails.version >= '6.1'
+      hash_config = ActiveRecord::DatabaseConfigurations::HashConfig.new('test', 'test', db_config)
+      config_obj = ActiveRecord::DatabaseConfigurations.new([hash_config])
+      allow(ActiveRecord::Base).to receive(:configurations).and_return(config_obj)
+    else
+      ActiveRecord::Base.configurations[:test] = db_config
+    end
   end
 
   describe :schema_file do
@@ -59,7 +65,6 @@ describe DataMigrate::DatabaseTasks do
     end
 
     before do
-      # ActiveRecord::Base.establish_connection(db_config)
       ActiveRecord::SchemaMigration.create_table
 
       allow(DataMigrate::SchemaMigration).to receive(:migrations_paths) {

data/spec/data_migrate/schema_migration_spec.rb

@@ -68,4 +68,33 @@ describe DataMigrate::SchemaMigration do
       expect(versions.count).to eq(0)
     end
   end
+
+  if Rails.version > '6'
+    describe :migrations_paths do
+      context 'when a db_name is configured' do
+        let(:paths) { ['spec/db/migrate/6.0', 'spec/db/components/migrate/6.0'] }
+
+        if Rails.version > '6.1'
+          before do
+            allow(ActiveRecord::Base.configurations.configs_for(env_name: 'test', name: 'primary')).to receive(:migrations_paths).and_return(paths)
+            DataMigrate.configure do |config|
+              config.spec_name = 'primary'
+            end
+          end
+        else
+          before do
+            allow(ActiveRecord::Base.configurations.configs_for(env_name: 'test', spec_name: 'primary')).to receive(:migrations_paths).and_return(paths)
+            DataMigrate.configure do |config|
+              config.spec_name = 'primary'
+            end
+          end
+        end
+
+        it 'lists schema migration paths' do
+          expect(subject.migrations_paths.size).to eq(2)
+          expect(subject.migrations_paths).to eq(paths)
+        end
+      end
+    end
+  end
 end

data/spec/db/data/partial_schema/test_data_schema.rb

@@ -0,0 +1,2 @@
+# encoding: UTF-8
+DataMigrate::Data.define(version: 20091231235959)

data/spec/db/data/schema/test_data_schema.rb

@@ -0,0 +1,2 @@
+# encoding: UTF-8
+DataMigrate::Data.define(version: 20171231235959)

data/tasks/databases.rake

@@ -46,17 +46,7 @@ namespace :db do
       end
 
       migrations.each do |migration|
-        if migration[:kind] == :data
-          ActiveRecord::Migration.write("== %s %s" % ['Data', "=" * 71])
-          DataMigrate::DataMigrator.run(migration[:direction], data_migrations_path, migration[:version])
-        else
-          ActiveRecord::Migration.write("== %s %s" % ['Schema', "=" * 69])
-          DataMigrate::SchemaMigration.run(
-            migration[:direction],
-            Rails.application.config.paths["db/migrate"],
-            migration[:version]
-          )
-        end
+        run_migration(migration, migration[:direction])
       end
 
       Rake::Task["db:_dump"].invoke
@@ -91,13 +81,7 @@ namespace :db do
         end
 
         migrations.each do |migration|
-          if migration[:kind] == :data
-            ActiveRecord::Migration.write("== %s %s" % ['Data', "=" * 71])
-            DataMigrate::DataMigrator.run(:up, data_migrations_path, migration[:version])
-          else
-            ActiveRecord::Migration.write("== %s %s" % ['Schema', "=" * 69])
-            DataMigrate::SchemaMigration.run(:up, "db/migrate/", migration[:version])
-          end
+          run_migration(migration, :up)
         end
 
         Rake::Task["db:_dump"].invoke
@@ -119,13 +103,7 @@ namespace :db do
         end
 
         migrations.each do |migration|
-          if migration[:kind] == :data
-            ActiveRecord::Migration.write("== %s %s" % ['Data', "=" * 71])
-            DataMigrate::DataMigrator.run(:down, data_migrations_path, migration[:version])
-          else
-            ActiveRecord::Migration.write("== %s %s" % ['Schema', "=" * 69])
-            DataMigrate::SchemaMigration.run(:down, "db/migrate/", migration[:version])
-          end
+          run_migration(migration, :down)
         end
 
         Rake::Task["db:_dump"].invoke
@@ -189,13 +167,7 @@ namespace :db do
       step = ENV['STEP'] ? ENV['STEP'].to_i : 1
       assure_data_schema_table
       past_migrations[0..(step - 1)].each do | past_migration |
-        if past_migration[:kind] == :data
-          ActiveRecord::Migration.write("== %s %s" % ['Data', "=" * 71])
-          DataMigrate::DataMigrator.run(:down, data_migrations_path, past_migration[:version])
-        elsif past_migration[:kind] == :schema
-          ActiveRecord::Migration.write("== %s %s" % ['Schema', "=" * 69])
-          DataMigrate::SchemaMigration.run(:down, "db/migrate/", past_migration[:version])
-        end
+        run_migration(past_migration, :down)
       end
 
       Rake::Task["db:_dump"].invoke
@@ -412,3 +384,17 @@ 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: 6.6.0
+  version: 7.0.1
 platform: ruby
 authors:
 - Andrew J Vargo
@@ -10,10 +10,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-15 00:00:00.000000000 Z
+date: 2021-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -191,15 +205,18 @@ files:
 - Gemfile.rails5
 - Gemfile.rails5.1
 - Gemfile.rails5.2
+- Gemfile.rails6.1
 - 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
 - gemfiles/rails_6.0.gemfile
+- gemfiles/rails_6.1.gemfile
 - lib/capistrano/data_migrate.rb
 - lib/capistrano/data_migrate/migrate.rb
 - lib/data_migrate.rb
@@ -250,7 +267,9 @@ files:
 - spec/db/data/20171231235959_super_update.rb
 - spec/db/data/20181128000207_excluded_file.rb.other_ext
 - spec/db/data/partial_schema/data_schema.rb
+- 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/4.2/20131111111111_late_migration.rb
 - spec/db/migrate/4.2/20202020202011_db_migration.rb
 - spec/db/migrate/5.0/20131111111111_late_migration.rb
@@ -288,7 +307,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.15
 signing_key: 
 specification_version: 4
 summary: Rake tasks to migrate data alongside schema changes.