data_migrate 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2867f4c1b8e7a37696ea3c640e83babb573e8996
-  data.tar.gz: 1e67d3ce5fd3517d60a8687afcf9df3c151de4b7
+  metadata.gz: 1a61a9b037890457c24cc8cea7276360ae1fd56c
+  data.tar.gz: f5f4fd95f631b962accb8c1709967ada6a771d22
 SHA512:
-  metadata.gz: 1c5548f92419a80bd209316e505a6bc08342bc17942296bd68c5e7a248a8c3ef689b7b440d48c09caf36e633db145068fcbd17b5f1ca840eeef3a68daff075b8
-  data.tar.gz: d4341fa69a92b91308975b9b8ebc18709f39576891fd4e32a2e04caf809eb9197fc0b7be558d08898016a0489429f97cc2a98a0b2adf70098a3d8f97051d621b
+  metadata.gz: 71d3e595a3ecc3e49b9509b6ae6250394c89514900d35b992480a609527d0a7413940c3ba06b274f74f5968d53a6b77bcf362c839e27c8f60d1352ff92c346a5
+  data.tar.gz: b98a1f2a4ab114da88312dbfb56ef1710ecdc3aebf61c2f68d10240daa95eadafad8aa688611d3011aa32682134082635b2d78437bf6db091e5ececd72670c88

data/.gitignore

@@ -1,2 +1,3 @@
+
 /.rvmrc
 *.gem

data/Changelog.md

@@ -0,0 +1,7 @@
+Changelog
+=========
+
+## 2.1.0
+
+User `Rails.application.config.paths["db/migrate"]` instead of hard coded
+path to db migrations

data/lib/data_migrate/data_migrator.rb

@@ -39,6 +39,27 @@ module DataMigrate
       def migrations_path
         'db/data'
       end
+
+      def assure_data_schema_table
+        config = ActiveRecord::Base.configurations[Rails.env || 'development'] || ENV["DATABASE_URL"]
+        ActiveRecord::Base.establish_connection(config)
+        sm_table = DataMigrate::DataMigrator.schema_migrations_table_name
+
+        unless ActiveRecord::Base.connection.table_exists?(sm_table)
+          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}"
+
+          ActiveRecord::Base.connection.add_index sm_table, :version,
+            :unique => true,
+            :name => index_name
+        end
+      end
+
     end
   end
 end

data/lib/data_migrate/version.rb

@@ -1,3 +1,3 @@
 module DataMigrate
-  VERSION = "2.0.1"
+  VERSION = "2.1.0"
 end

data/tasks/databases.rake

@@ -49,7 +49,11 @@ namespace :db do
           DataMigrate::DataMigrator.run(migration[:direction], "db/data/", migration[:version])
         else
           ActiveRecord::Migration.write("== %s %s" % ['Schema', "=" * 69])
-          ActiveRecord::Migrator.run(migration[:direction], "db/migrate/", migration[:version])
+          ActiveRecord::Migrator.run(
+            migration[:direction],
+            Rails.application.config.paths["db/migrate"],
+            migration[:version]
+          )
         end
       end
 
@@ -312,11 +316,17 @@ def pending_migrations
 end
 
 def pending_data_migrations
-  sort_migrations DataMigrate::DataMigrator.new(:up, 'db/data').pending_migrations.map{|m| { :version => m.version, :kind => :data }}
+  data_migrations = DataMigrate::DataMigrator.migrations('db/data')
+  sort_migrations DataMigrate::DataMigrator.new(:up, data_migrations ).
+    pending_migrations.map{|m| { :version => m.version, :kind => :data }}
 end
 
 def pending_schema_migrations
-  sort_migrations ActiveRecord::Migrator.new(:up, 'db/migrate').pending_migrations.map{|m| { :version => m.version, :kind => :schema }}
+  all_migrations = ActiveRecord::Migrator.migrations(Rails.application.config.paths["db/migrate"])
+  sort_migrations(
+    ActiveRecord::Migrator.new(:up, all_migrations).
+    pending_migrations.
+    map{|m| { :version => m.version, :kind => :schema }})
 end
 
 def sort_migrations set_1, set_2=nil
@@ -353,14 +363,5 @@ def past_migrations sort=nil
 end
 
 def assure_data_schema_table
-  config = ActiveRecord::Base.configurations[Rails.env || 'development'] || ENV["DATABASE_URL"]
-  ActiveRecord::Base.establish_connection(config)
-  sm_table = DataMigrate::DataMigrator.schema_migrations_table_name
-
-  unless ActiveRecord::Base.connection.table_exists?(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.add_index sm_table, :version, :unique => true, :name => "#{ActiveRecord::Base.table_name_prefix}unique_data_migrations#{ActiveRecord::Base.table_name_suffix}"
-  end
+  DataMigrate::DataMigrator.assure_data_schema_table
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: data_migrate
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Andrew J Vargo
@@ -9,20 +9,20 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-07 00:00:00.000000000 Z
+date: 2016-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '4.0'
 description: Rake tasks to migrate data alongside schema changes.
@@ -33,7 +33,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
+- Changelog.md
 - Gemfile
 - LICENSE
 - README.md
@@ -61,17 +62,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: data_migrate
-rubygems_version: 2.4.8
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: Rake tasks to migrate data alongside schema changes.