data_migrate 5.2.0 → 5.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aae65effdc868c62166684eabdeb9ab2799aa4804b6172fe4ff541b1193fba54
-  data.tar.gz: 3c50deaf50da13456a9e078ae0df07d269335b312863c88b0807f58bb3fdcffa
+  metadata.gz: 9462f36e74230a90ba6e6d8eecc2372bd2b95645728e2791ff58fe46a0603a67
+  data.tar.gz: b8f720b2a4f81de75c4ab7a45bcb6f95a472e17569e6d06297cdc9b3bbf1407d
 SHA512:
-  metadata.gz: 650d0315aa2cbb3549fdd1104bf2f471a141519aee4b51589a988b027e496a4ea8659b160e651a5f8b9a88cd7fe6a41822e0de65b96e3e01591bdef4cac3e3c7
-  data.tar.gz: 21f4a447c422b8470a4968a48b6e9e56fdcf798bff9f92ef2dcf1a84283d6c790f73dd1d54c0992e15cec11ca4ac10b0ec429a7fe68d5f28fb70e2a7d4119d17
+  metadata.gz: 481d64df974f86ad1c81f8ab064afd16ccd9596b924de2ea09f8060bc85f4cf39cf4501af54e45d473d00c71ab8a272173e4a898a421d2cef0f8993b64bdfe5f
+  data.tar.gz: 27e18b67499e98a64cced4c95ad5c145f9d0b4213be841966c8c38f90dbd2d9e2fcac55b70afa02ceb2917c54851cae40e8e34df32782fffb4ca3e93b2da989d

data/README.md

@@ -4,6 +4,7 @@ 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.
@@ -144,6 +145,17 @@ With 'up' and 'down', you can specify the option 'BOTH', which defaults to false
 
 `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`.

data/lib/data_migrate.rb

@@ -29,12 +29,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

@@ -38,7 +38,7 @@ module DataMigrate
       end
 
       def migrations_path
-        "db/data"
+        DataMigrate.config.data_migrations_path
       end
 
       ##
@@ -63,7 +63,7 @@ module DataMigrate
       # @param (String) filename
       # @return (MatchData)
       def match(filename)
-        /(\d{14})_(.+)\.rb/.match(filename)
+        /(\d{14})_(.+)\.rb$/.match(filename)
       end
 
       private

data/lib/data_migrate/status_service.rb

@@ -52,7 +52,7 @@ module DataMigrate
 
     def migration_files(db_list)
       file_list = []
-      Dir.foreach(File.join(root_folder, "db", "data")) do |file|
+      Dir.foreach(File.join(root_folder, DataMigrate.config.data_migrations_path)) do |file|
         # only files matching "20091231235959_some_name.rb" pattern
         if match_data = DataMigrate::DataMigrator.match(file)
           status = db_list.delete(match_data[1]) ? "up" : "down"

data/lib/data_migrate/tasks/data_migrate_tasks.rb

@@ -3,11 +3,7 @@ module DataMigrate
     module DataMigrateTasks
       extend self
       def migrations_paths
-        @migrations_paths ||= begin
-          if Rails.application && Rails.application.paths["data/migrate"]
-            Rails.application.paths["data/migrate"].to_a
-          end
-        end
+        @migrations_paths ||= DataMigrate.config.data_migrations_path
       end
 
       def migrate
@@ -16,8 +12,7 @@ module DataMigrate
         if Rails::VERSION::MAJOR == 5 && Rails::VERSION::MINOR == 2
           DataMigrate::MigrationContext.new(migrations_paths).migrate(target_version)
         else
-          paths = migrations_paths || "db/data/"
-          DataMigrate::DataMigrator.migrate(paths, ENV["VERSION"] ? ENV["VERSION"].to_i : nil)
+          DataMigrate::DataMigrator.migrate(migrations_paths, ENV["VERSION"] ? ENV["VERSION"].to_i : nil)
         end
       end
     end

data/lib/data_migrate/version.rb

@@ -1,3 +1,3 @@
 module DataMigrate
-  VERSION = "5.2.0".freeze
+  VERSION = "5.3.0".freeze
 end

data/lib/generators/data_migration/data_migration_generator.rb

@@ -2,6 +2,7 @@ require "generators/data_migrate"
 require "rails/generators"
 require "rails/generators/active_record/migration"
 require "rails/generators/migration"
+require "data_migrate/config"
 
 module DataMigrate
   module Generators
@@ -13,7 +14,7 @@ module DataMigrate
 
       def create_data_migration
         set_local_assigns!
-        migration_template "data_migration.rb", "db/data/#{file_name}.rb"
+        migration_template "data_migration.rb", "#{data_migrations_path}#{file_name}.rb"
       end
 
       protected
@@ -34,6 +35,10 @@ module DataMigrate
           "ActiveRecord::Migration"
         end
       end
+
+      def data_migrations_path
+        DataMigrate.config.data_migrations_path
+      end
     end
   end
 end

data/spec/data_migrate/config_spec.rb

@@ -0,0 +1,26 @@
+require "spec_helper"
+
+describe DataMigrate::Config do
+
+  it "sets default data_migrations_path path" do
+    expect(DataMigrate.config.data_migrations_path).to eq "db/data/"
+  end
+
+  describe "data migration path configured" do
+    before do
+      DataMigrate.configure do |config|
+        config.data_migrations_path = "db/awesome/"
+      end
+    end
+
+    after do
+      DataMigrate.configure do |config|
+        config.data_migrations_path = "db/data/"
+      end
+    end
+
+    it do
+      expect(DataMigrate.config.data_migrations_path).to eq "db/awesome/"
+    end
+  end
+end

data/spec/data_migrate/status_service_spec.rb

@@ -62,6 +62,15 @@ describe DataMigrate::StatusService do
       expect(stream.read).to include expected
     end
 
+    it "excludes files without .rb extension" do
+      stream = StringIO.new
+      service.dump(ActiveRecord::Base.connection, stream)
+      stream.rewind
+
+      expected = "20181128000207  Excluded file"
+      expect(stream.read).to_not include expected
+    end
+
     it "shows missing file migration" do
       stream = StringIO.new
       service.dump(ActiveRecord::Base.connection, stream)

data/spec/db/data/20181128000207_excluded_file.rb.other_ext

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

data/tasks/databases.rake

@@ -48,7 +48,7 @@ namespace :db do
       migrations.each do |migration|
         if migration[:kind] == :data
           ActiveRecord::Migration.write("== %s %s" % ['Data', "=" * 71])
-          DataMigrate::DataMigrator.run(migration[:direction], "db/data/", migration[:version])
+          DataMigrate::DataMigrator.run(migration[:direction], data_migrations_path, migration[:version])
         else
           ActiveRecord::Migration.write("== %s %s" % ['Schema', "=" * 69])
           DataMigrate::SchemaMigration.run(
@@ -93,7 +93,7 @@ namespace :db do
         migrations.each do |migration|
           if migration[:kind] == :data
             ActiveRecord::Migration.write("== %s %s" % ['Data', "=" * 71])
-            DataMigrate::DataMigrator.run(:up, "db/data/", migration[:version])
+            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])
@@ -121,7 +121,7 @@ namespace :db do
         migrations.each do |migration|
           if migration[:kind] == :data
             ActiveRecord::Migration.write("== %s %s" % ['Data', "=" * 71])
-            DataMigrate::DataMigrator.run(:down, "db/data/", migration[:version])
+            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])
@@ -147,7 +147,7 @@ namespace :db do
         )
         file_list = []
 
-        Dir.foreach(File.join(Rails.root, 'db', 'data')) do |file|
+        Dir.foreach(File.join(Rails.root, data_migrations_path)) do |file|
           # only files matching "20091231235959_some_name.rb" pattern
           if match_data = /(\d{14})_(.+)\.rb/.match(file)
             status = db_list_data.delete(match_data[1]) ? 'up' : 'down'
@@ -191,7 +191,7 @@ namespace :db do
       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, "db/data/", past_migration[:version])
+          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])
@@ -277,7 +277,7 @@ namespace :data do
       assure_data_schema_table
       version = ENV["VERSION"] ? ENV["VERSION"].to_i : nil
       raise "VERSION is required" unless version
-      DataMigrate::DataMigrator.run(:up, "db/data/", version)
+      DataMigrate::DataMigrator.run(:up, data_migrations_path, version)
       Rake::Task["data:dump"].invoke
     end
 
@@ -286,7 +286,7 @@ namespace :data do
       version = ENV["VERSION"] ? ENV["VERSION"].to_i : nil
       raise "VERSION is required" unless version
       assure_data_schema_table
-      DataMigrate::DataMigrator.run(:down, "db/data/", version)
+      DataMigrate::DataMigrator.run(:down, data_migrations_path, version)
       Rake::Task["data:dump"].invoke
     end
 
@@ -304,7 +304,7 @@ namespace :data do
   task :rollback => :environment do
     assure_data_schema_table
     step = ENV['STEP'] ? ENV['STEP'].to_i : 1
-    DataMigrate::DataMigrator.rollback('db/data/', step)
+    DataMigrate::DataMigrator.rollback(data_migrations_path, step)
     Rake::Task["data:dump"].invoke
   end
 
@@ -316,7 +316,7 @@ namespace :data do
     # DataMigrate::DataMigrator.forward('db/data/', step)
     migrations = pending_data_migrations.reverse.pop(step).reverse
     migrations.each do | pending_migration |
-      DataMigrate::DataMigrator.run(:up, "db/data/", pending_migration[:version])
+      DataMigrate::DataMigrator.run(:up, data_migrations_path, pending_migration[:version])
     end
     Rake::Task["data:dump"].invoke
   end
@@ -389,3 +389,7 @@ end
 def assure_data_schema_table
   DataMigrate::DataMigrator.assure_data_schema_table
 end
+
+def data_migrations_path
+  DataMigrate.config.data_migrations_path
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: data_migrate
 version: !ruby/object:Gem::Version
-  version: 5.2.0
+  version: 5.3.0
 platform: ruby
 authors:
 - Andrew J Vargo
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-03 00:00:00.000000000 Z
+date: 2018-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -200,6 +200,7 @@ files:
 - lib/capistrano/data_migrate.rb
 - lib/capistrano/data_migrate/migrate.rb
 - lib/data_migrate.rb
+- lib/data_migrate/config.rb
 - lib/data_migrate/data_migrator.rb
 - lib/data_migrate/data_migrator_five.rb
 - lib/data_migrate/data_schema.rb
@@ -222,6 +223,7 @@ files:
 - lib/generators/data_migration/templates/data_migration.rb
 - lib/generators/data_migration/templates/migration.rb
 - screenshot.png
+- spec/data_migrate/config_spec.rb
 - spec/data_migrate/data_migrator_spec.rb
 - spec/data_migrate/data_schema_migration_spec.rb
 - spec/data_migrate/data_spec.rb
@@ -239,6 +241,7 @@ files:
 - spec/db/5.0/20171231235959_super_update.rb
 - spec/db/data/20091231235959_some_name.rb
 - spec/db/data/20171231235959_super_update.rb
+- spec/db/data/20181128000207_excluded_file.rb.other_ext
 - 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
@@ -280,6 +283,7 @@ signing_key:
 specification_version: 4
 summary: Rake tasks to migrate data alongside schema changes.
 test_files:
+- spec/data_migrate/config_spec.rb
 - spec/data_migrate/data_migrator_spec.rb
 - spec/data_migrate/data_schema_migration_spec.rb
 - spec/data_migrate/data_spec.rb
@@ -297,6 +301,7 @@ test_files:
 - spec/db/5.0/20171231235959_super_update.rb
 - spec/db/data/20091231235959_some_name.rb
 - spec/db/data/20171231235959_super_update.rb
+- spec/db/data/20181128000207_excluded_file.rb.other_ext
 - 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