data_migrate 8.0.0.rc1 → 8.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af0b932d1ca71e8bd2218c66a901c7f4075722fc716d4acf2ba20356cec069a7
-  data.tar.gz: cd0193ea16bac2ef7f21df588ff0c673e9e7706b99a55ae82452d0843c47b5d7
+  metadata.gz: '09b6187a1a958297e53be31177698552df42454a2e075fcaf392add7fb9f9085'
+  data.tar.gz: 71af0e938b31d223f04399e771ff1dbbba8cac52b5560ce0305da7935e1c03a0
 SHA512:
-  metadata.gz: 20ddb8b51aa8f5fa817490baf8d016e594d15ed5a5f896fb26205fb629a2de29a5f9630a4992603d695219a8bf7d2b559c70968a6f6df6b0ec2529a9d388b6dd
-  data.tar.gz: 5f879b36def5b29a024d01144663887a03cf296f2a09a3b65962ffbdb1851fdd2c383f379ec548607fd1df414fc71b47283694ae86d53c251692fdce0380c76c
+  metadata.gz: dd9810087eaef6a8fb537401908d945007436b946759284fdfdd5836d9d7632518452039ec1432aab23743b54bd58401fa2e44572af34a87c47e924f7612c71f
+  data.tar.gz: 5b0aa4e76fc0641c3d609f4f434d91905c48a2a281952c9ebc0817aa71cea757bc5c68823351f83b1a2776e11c87085320bbb7a884cb75f29304f0235eab7453

data/Changelog.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 8.0.0.rc2
+
+Bug fixes [gdott9](https://github.com/gdott9)
+
 ## 8.0.0.rc1
 Add support for Rails 7
 Removed support for Rails versions below 5.2. Now are supported only versions Rails 5.2 and up

data/README.md

@@ -36,7 +36,7 @@ table to track all migrations.
 
 ## Rails Support
 
-Support Rails 5.0 through 6.0
+Support Rails 5.2 through 7.0
 
 ### Important notes for older versions
 

data/lib/data_migrate/schema_dumper.rb

@@ -8,7 +8,7 @@ module DataMigrate
     private_class_method :new
 
     class << self
-      def dump(connection = ActiveRecord::Base.connection, stream = STDOUT)
+      def dump(connection = ActiveRecord::Base.connection, stream = $stdout)
         new(connection).dump(stream)
         stream
       end

data/lib/data_migrate/status_service_five.rb

@@ -1,7 +1,7 @@
 module DataMigrate
   class StatusService
     class << self
-      def dump(connection = ActiveRecord::Base.connection, stream = STDOUT)
+      def dump(connection = ActiveRecord::Base.connection, stream = $stdout)
         new(connection).dump(stream)
         stream
       end

data/lib/data_migrate/tasks/data_migrate_tasks.rb

@@ -2,6 +2,11 @@ module DataMigrate
   module Tasks
     module DataMigrateTasks
       extend self
+
+      def schema_migrations_path
+        File.join('db', 'migrate')
+      end
+
       def migrations_paths
         @migrations_paths ||= DataMigrate.config.data_migrations_path
       end
@@ -40,6 +45,82 @@ module DataMigrate
           ActiveRecord::Base.dump_schema_after_migration
         end
       end
+
+      def status
+        config = connect_to_database
+        return unless config
+
+        connection = ActiveRecord::Base.connection
+        puts "\ndatabase: #{config['database']}\n\n"
+        DataMigrate::StatusService.dump(connection)
+      end
+
+      def status_with_schema
+        config = connect_to_database
+        return unless config
+
+        db_list_data = ActiveRecord::Base.connection.select_values(
+          "SELECT version FROM #{DataMigrate::DataSchemaMigration.table_name}"
+        )
+        db_list_schema = ActiveRecord::Base.connection.select_values(
+          "SELECT version FROM #{ActiveRecord::SchemaMigration.schema_migrations_table_name}"
+        )
+        file_list = []
+
+        Dir.foreach(File.join(Rails.root, migrations_paths)) 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'
+            file_list << [status, match_data[1], match_data[2], 'data']
+          end
+        end
+
+        Dir.foreach(File.join(Rails.root, schema_migrations_path)) do |file|
+          # only files matching "20091231235959_some_name.rb" pattern
+          if match_data = /(\d{14})_(.+)\.rb/.match(file)
+            status = db_list_schema.delete(match_data[1]) ? 'up' : 'down'
+            file_list << [status, match_data[1], match_data[2], 'schema']
+          end
+        end
+
+        file_list.sort!{|a,b| "#{a[1]}_#{a[3] == 'data' ? 1 : 0}" <=> "#{b[1]}_#{b[3] == 'data' ? 1 : 0}" }
+
+        # output
+        puts "\ndatabase: #{config['database']}\n\n"
+        puts "#{"Status".center(8)} #{"Type".center(8)}  #{"Migration ID".ljust(14)} Migration Name"
+        puts "-" * 60
+        file_list.each do |file|
+          puts "#{file[0].center(8)} #{file[3].center(8)} #{file[1].ljust(14)}  #{file[2].humanize}"
+        end
+        db_list_schema.each do |version|
+          puts "#{'up'.center(8)}  #{version.ljust(14)}  *** NO SCHEMA FILE ***"
+        end
+        db_list_data.each do |version|
+          puts "#{'up'.center(8)}  #{version.ljust(14)}  *** NO DATA FILE ***"
+        end
+        puts
+      end
+
+      private
+
+      def connect_to_database
+        config = if ActiveRecord.version < Gem::Version.new('6.1')
+          ActiveRecord::Base.configurations[Rails.env || 'development']
+        else
+          ActiveRecord::Base.configurations.find_db_config(Rails.env || 'development').configuration_hash
+        end
+        ActiveRecord::Base.establish_connection(config)
+
+        unless DataMigrate::DataSchemaMigration.table_exists?
+          puts 'Data migrations table does not exist yet.'
+          config = nil
+        end
+        unless ActiveRecord::SchemaMigration.table_exists?
+          puts 'Schema migrations table does not exist yet.'
+          config = nil
+        end
+        config
+      end
     end
   end
 end

data/lib/data_migrate/version.rb

@@ -1,3 +1,3 @@
 module DataMigrate
-  VERSION = "8.0.0.rc1".freeze
+  VERSION = "8.0.0.rc2".freeze
 end

data/spec/data_migrate/tasks/data_migrate_tasks_spec.rb

@@ -115,4 +115,50 @@ describe DataMigrate::Tasks::DataMigrateTasks do
       end
     end
   end
+
+  describe :status do
+    let(:db_config) do
+      {
+        adapter: "sqlite3",
+        database: "spec/db/test.db"
+      }
+    end
+
+    before do
+      if Rails::VERSION::MAJOR == 5
+        ActiveRecord::Base.configurations['test'] = db_config
+      else
+        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)
+      end
+
+      allow(Rails).to receive(:root) { '.' }
+
+      if Rails::VERSION::MAJOR == 5
+        allow(DataMigrate::Tasks::DataMigrateTasks).to receive(:schema_migrations_path) { 'spec/db/migrate/5.2' }
+      else
+        allow(DataMigrate::Tasks::DataMigrateTasks).to receive(:schema_migrations_path) { 'spec/db/migrate/6.0' }
+      end
+
+      DataMigrate::Tasks::DataMigrateTasks.migrate
+    end
+
+    after do
+      ActiveRecord::Migration.drop_table("data_migrations")
+    end
+
+    it "should display data migration status" do
+      expect {
+        DataMigrate::Tasks::DataMigrateTasks.status
+      }.to output(/up     20091231235959  Some name/).to_stdout
+    end
+
+    it "should display schema and data migration status" do
+      expect {
+        DataMigrate::Tasks::DataMigrateTasks.status_with_schema
+      }.to output(match(/up      data   20091231235959  Some name/)
+        .and match(/down    schema  20131111111111  Late migration/)).to_stdout
+    end
+  end
 end

data/tasks/databases.rake

@@ -114,49 +114,7 @@ namespace :db do
     namespace :status do
       desc "Display status of data and schema migrations"
       task :with_data => :environment do
-        config = connect_to_database
-        next unless config
-
-        db_list_data = ActiveRecord::Base.connection.select_values(
-          "SELECT version FROM #{DataMigrate::DataSchemaMigration.table_name}"
-        )
-        db_list_schema = ActiveRecord::Base.connection.select_values(
-          "SELECT version FROM #{ActiveRecord::SchemaMigration.schema_migrations_table_name}"
-        )
-        file_list = []
-
-        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'
-            file_list << [status, match_data[1], match_data[2], 'data']
-          end
-        end
-
-        Dir.foreach(File.join(Rails.root, 'db', 'migrate')) do |file|
-          # only files matching "20091231235959_some_name.rb" pattern
-          if match_data = /(\d{14})_(.+)\.rb/.match(file)
-            status = db_list_schema.delete(match_data[1]) ? 'up' : 'down'
-            file_list << [status, match_data[1], match_data[2], 'schema']
-          end
-        end
-
-        file_list.sort!{|a,b| "#{a[1]}_#{a[3] == 'data' ? 1 : 0}" <=> "#{b[1]}_#{b[3] == 'data' ? 1 : 0}" }
-
-        # output
-        puts "\ndatabase: #{config['database']}\n\n"
-        puts "#{"Status".center(8)} #{"Type".center(8)}  #{"Migration ID".ljust(14)} Migration Name"
-        puts "-" * 60
-        file_list.each do |file|
-          puts "#{file[0].center(8)} #{file[3].center(8)} #{file[1].ljust(14)}  #{file[2].humanize}"
-        end
-        db_list_schema.each do |version|
-          puts "#{'up'.center(8)}  #{version.ljust(14)}  *** NO SCHEMA FILE ***"
-        end
-        db_list_data.each do |version|
-          puts "#{'up'.center(8)}  #{version.ljust(14)}  *** NO DATA FILE ***"
-        end
-        puts
+        DataMigrate::Tasks::DataMigrateTasks.status_with_schema
       end
     end
   end # END OF MIGRATE NAME SPACE
@@ -272,11 +230,7 @@ namespace :data do
 
     desc "Display status of data migrations"
     task :status => :environment do
-      config = ActiveRecord::Base.configurations[Rails.env || 'development']
-      ActiveRecord::Base.establish_connection(config)
-      connection = ActiveRecord::Base.connection
-      puts "\ndatabase: #{config['database']}\n\n"
-      DataMigrate::StatusService.dump(connection)
+      DataMigrate::Tasks::DataMigrateTasks.status
     end
   end
 
@@ -358,21 +312,6 @@ def sort_string migration
   "#{migration[:version]}_#{migration[:kind] == :data ? 1 : 0}"
 end
 
-def connect_to_database
-  config = ActiveRecord::Base.configurations[Rails.env || 'development']
-  ActiveRecord::Base.establish_connection(config)
-
-  unless DataMigrate::DataSchemaMigration.table_exists?
-    puts 'Data migrations table does not exist yet.'
-    config = nil
-  end
-  unless ActiveRecord::SchemaMigration.table_exists?
-    puts 'Schema migrations table does not exist yet.'
-    config = nil
-  end
-  config
-end
-
 def past_migrations(sort=nil)
   DataMigrate::DatabaseTasks.past_migrations(sort)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: data_migrate
 version: !ruby/object:Gem::Version
-  version: 8.0.0.rc1
+  version: 8.0.0.rc2
 platform: ruby
 authors:
 - Andrew J Vargo
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-18 00:00:00.000000000 Z
+date: 2022-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord