data_migrate 6.8.0 → 7.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f0dd24ff404906327e5bc24b17a503f0f3b83216822d6b30ea23c36f003ac91
-  data.tar.gz: 53b774e131bc3f0fc4267b4cc1b46df6f9cefed04064f6d32fae6adf17193539
+  metadata.gz: d029ae70dba905ed85200561697e4e44b62b654ab216d6b20b809737e35f3fc1
+  data.tar.gz: 39f53a2d2f289d8d55730f9657bbaef454abff395593e354fa31ef11b1a38dd3
 SHA512:
-  metadata.gz: 96d703eb0eb1af977f911200287a7b47c4defc186e346ebeff842c2d79d098c9bf2bb7c99b618b140a1b72a8e9f67ad047ef022eaff7b5e55f9ad54c1beb3662
-  data.tar.gz: 0c313639ecf58bc5573cdeab9bc3ae2d2c8aa2f443aacf95f03f0951ab708e79247d05bc647c28ae293ee7f9b5eb246bb8e18fd7e5fc5a5c24d700da84524c1b
+  metadata.gz: b0e7f347d47d48acab66cb3e700f72321805ee29fbed1bbb7689bfaafb0f7cff6a0add4a62ec847cb0d49dd18b46f9408b3b8d3a2bf56c0fa1c2a75dcabb3277
+  data.tar.gz: 63a062d5266920ecddd9d18a781f9105390f9188cc9ed6cc4930a99821ab2ed972dae7cb2687de9202c0a26fcf29040eb77aae78215e43401d234685116a7981

data/.travis.yml

@@ -1,8 +1,7 @@
 language: ruby
 rvm:
-  - 2.4.4
-  - 2.5.5
-  - 2.6.2
+  - 2.6
+  - 2.7
 script: bundle exec rspec
 gemfile:
   - gemfiles/rails_5.1.gemfile

data/Changelog.md

@@ -1,9 +1,16 @@
 # Changelog
 
+## 7.0.2
+
+Remove magic comment in migration files [y-yagi](https://github.com/y-yagi)
+User frozen string [jonnay](https://github.com/jonnay)
+## 7.0.1
+Use SchemaMigration.migrations_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
+## 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)

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

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

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/lib/data_migrate/schema_dumper.rb

@@ -17,10 +17,6 @@ module DataMigrate
     def dump(stream)
       define_params = @version ? "version: #{@version}" : ""
 
-      if stream.respond_to?(:external_encoding) && stream.external_encoding
-        stream.puts "# encoding: #{stream.external_encoding.name}"
-      end
-
       stream.puts "DataMigrate::Data.define(#{define_params})"
 
       stream

data/lib/data_migrate/version.rb

@@ -1,3 +1,3 @@
 module DataMigrate
-  VERSION = "6.8.0".freeze
+  VERSION = "7.0.2".freeze
 end

data/lib/generators/data_migration/templates/data_migration.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class <%= migration_class_name %> < <%= migration_base_class_name %>
   def up
   end

data/spec/db/data/partial_schema/data_schema.rb

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

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

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

data/spec/db/data/schema/data_schema.rb

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

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

@@ -1,2 +1 @@
-# 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.8.0
+  version: 7.0.2
 platform: ruby
 authors:
 - Andrew J Vargo
@@ -10,10 +10,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-18 00:00:00.000000000 Z
+date: 2021-07-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:
     - - ">="