rails-data-migrations 1.0.6 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 3a6b25e007eef003d75b2953380781470b2a7bd3
-  data.tar.gz: 153dc99e165bac154d41f9787be7438703d7af42
+SHA256:
+  metadata.gz: ecadfdf1ff6e4b9a293770e5f333f7c297cb6821a946a89d698e829a68f5ed5b
+  data.tar.gz: 665d7d252f71febca0da708f838808b1e165a8f94b7e8fa4f8bd6dcc891339b5
 SHA512:
-  metadata.gz: ccc415203e5b66c467a6d4635905e57d9b673426ba59cfd4dae1545fdf8753e096e77f49693b52fdd7ceb4d0a271871b8fc56d4e740d0f031df945fa73a36cc9
-  data.tar.gz: f82dd38e3df83a050b3d85e550593371bdce3ee8e46385ede74f7361d5724ba9a7e5f861ba162e86022d6594183dc008da01d4e37ff17fc42a6a3071bf0a7622
+  metadata.gz: 1663219b32be0c3803b827d25a2e5ebb8359324ccd78ba65c7b5eea0e8b0119bd95ee854205767b3aa6beb2ab939dc9202f1811c3dce757a94a23043a2c37913
+  data.tar.gz: 7fcac514b7b565bfcd936d975877188a7fc8c9a52baa74ec64c56ce918cf5376bb3a4f632c835027c95d3c1cb05514c15311ee8ddd34b858cdf9402421584b84

data/.travis.yml

@@ -3,4 +3,5 @@ language: ruby
 rvm:
   - 2.3.4
   - 2.4.1
-script: appraisal install && appraisal rake && rubocop --fail-level R
+  - 2.5.0
+script: bundle exec appraisal install && bundle exec appraisal rake && rubocop --fail-level R

data/Appraisals

@@ -21,3 +21,7 @@ end
 appraise 'rails-5.1' do
   gem 'rails', '~> 5.1.0'
 end
+
+appraise 'rails-5.2' do
+  gem 'rails', '~> 5.2.0'
+end

data/lib/rails_data_migrations/migrator.rb

@@ -26,6 +26,10 @@ module RailsDataMigrations
         end
       end
 
+      def current_version
+        get_all_versions.max || 0
+      end
+
       def schema_migrations_table_name
         LogEntry.table_name
       end
@@ -33,6 +37,35 @@ module RailsDataMigrations
       def migrations_path
         'db/data_migrations'
       end
+
+      def rails_5_2?
+        Rails::VERSION::MAJOR > 5 || (Rails::VERSION::MAJOR == 5 && Rails::VERSION::MINOR >= 2)
+      end
+
+      def list_migrations
+        if rails_5_2?
+          ::ActiveRecord::MigrationContext.new(migrations_path).migrations
+        else
+          migrations(migrations_path)
+        end
+      end
+
+      def list_pending_migrations
+        if rails_5_2?
+          already_migrated = get_all_versions
+          list_migrations.reject { |m| already_migrated.include?(m.version) }
+        else
+          open(migrations_path).pending_migrations
+        end
+      end
+
+      def run_migration(direction, migrations_path, version)
+        if rails_5_2?
+          new(direction, list_migrations, version).run
+        else
+          run(direction, migrations_path, version)
+        end
+      end
     end
   end
-end
+end

data/lib/rails_data_migrations/version.rb

@@ -1,3 +1,3 @@
 module RailsDataMigrations
-  VERSION = '1.0.6'.freeze
+  VERSION = '1.1.0'.freeze
 end

data/lib/tasks/data_migrations.rake

@@ -1,13 +1,13 @@
 require 'rake'
 
 namespace :data do
-  def migrations_path
-    RailsDataMigrations::Migrator.migrations_path
-  end
-
   def apply_single_migration(direction, version)
     raise 'VERSION is required' unless version
-    RailsDataMigrations::Migrator.run(direction, migrations_path, version.to_i)
+    RailsDataMigrations::Migrator.run_migration(
+      direction,
+      RailsDataMigrations::Migrator.migrations_path,
+      version.to_i
+    )
   end
 
   task init_migration: :environment do
@@ -16,21 +16,15 @@ namespace :data do
 
   desc 'Apply pending data migrations'
   task migrate: :init_migration do
-    source_versions = RailsDataMigrations::Migrator.migrations(migrations_path).collect(&:version)
-    applied_versions = RailsDataMigrations::Migrator.get_all_versions
-
-    (source_versions - applied_versions).sort.each do |version|
-      apply_single_migration(:up, version)
+    RailsDataMigrations::Migrator.list_pending_migrations.sort_by(&:version).each do |m|
+      apply_single_migration(:up, m.version)
     end
   end
 
   desc 'Mark all pending data migrations complete'
   task reset: :init_migration do
-    source_versions = RailsDataMigrations::Migrator.migrations(migrations_path).collect(&:version)
-    applied_versions = RailsDataMigrations::Migrator.get_all_versions
-
-    (source_versions - applied_versions).sort.each do |version|
-      RailsDataMigrations::LogEntry.create!(version: version.to_s)
+    RailsDataMigrations::Migrator.list_pending_migrations.each do |m|
+      RailsDataMigrations::LogEntry.create!(version: m.version.to_s)
     end
   end
 
@@ -61,8 +55,7 @@ namespace :data do
     task pending: :init_migration do
       puts "#{format('% 16s', 'Migration ID')}  Migration Name"
       puts '--------------------------------------------------'
-      migrator = RailsDataMigrations::Migrator
-      migrator.open(migrator.migrations_path).pending_migrations.each do |m|
+      RailsDataMigrations::Migrator.list_pending_migrations.each do |m|
         puts "#{format('% 16i', m.version)}  #{m.name.to_s.titleize}"
       end
     end

data/rails-data-migrations.gemspec

@@ -20,10 +20,10 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'rails', '>= 4.0.0'
 
+  spec.add_development_dependency 'appraisal', '~> 2.1'
   spec.add_development_dependency 'bundler', '~> 1.13'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '3.5.0'
+  spec.add_development_dependency 'rubocop', '0.52.1'
   spec.add_development_dependency 'sqlite3', '~> 1.3'
-  spec.add_development_dependency 'appraisal', '~> 2.1'
-  spec.add_development_dependency 'rubocop'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-data-migrations
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.1.0
 platform: ruby
 authors:
 - Sergey Glukhov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-27 00:00:00.000000000 Z
+date: 2018-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.0.0
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -67,47 +81,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.5.0
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 0.52.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: 0.52.1
 - !ruby/object:Gem::Dependency
-  name: appraisal
+  name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
 description: 
 email:
 - sergey.glukhov@gmail.com
@@ -154,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Run your data migration tasks in a db:migrate-like manner