data_migrate 11.0.0.rc3 → 11.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48ee408a432e7b193a5244355a42c8b9850d3712fa03650150ba75d764d4f9cb
-  data.tar.gz: 9f2e3e3b896598afe9e560f063fc74816346fb6032f90008f0caa8d50380f753
+  metadata.gz: 93b03e47ca0a194f18a72fdb0cc47a54de82688858aa6660827ef7f68644ef8d
+  data.tar.gz: 4aa2328b5e432edb4b445fa46efe0f2871e5eb47acee15a02c2a19bc4505404b
 SHA512:
-  metadata.gz: 4b209a7dc5fd808b0aa4b7ced806d82f7d4d971b68c79e9df3b71f3500dd25906417a91a73b1ee31d67b2ce49cf7cbe2d84d8c887ceef7ac958d294f0d50a1cd
-  data.tar.gz: 739b8946e4a1318c0063345c2e84f3a1e6bd336547c8d763dfa5588a6f4a1b2b704298c23026f8b21e6670a350edc39a910ad9cdb43af00ee729f5be2d1ee720
+  metadata.gz: 975645eca490e58faa6895abd76888876f2fa5d90487272d95441c6f887d75799db561c1a5773b53dd3f0d4fe9ffe3487beb964eab138766243cde3162dd0284
+  data.tar.gz: d6aa8d28e0225ab194440f51b5c66787a363e4021c5291215ba406f7c410dd13ae898cdc3a19bb43908c20de6c0801c7bc3a51dcc78b8df7ccf69178d55568eb

data/.github/workflows/build.yml

@@ -9,7 +9,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ "ubuntu-20.04" ]
+        os: [ "ubuntu-24.04" ]
         ruby:
           - '3.1'
           - '3.2'
@@ -19,13 +19,17 @@ jobs:
           - gemfiles/rails_7.0.gemfile
           - gemfiles/rails_7.1.gemfile
           - gemfiles/rails_7.2.gemfile
+          - gemfiles/rails_8.0.gemfile
+        exclude:
+          - ruby: '3.1'
+            gemfile: 'gemfiles/rails_8.0.gemfile'
     runs-on: ubuntu-latest
     env:
       BUNDLE_GEMFILE: ${{ matrix.gemfile }}
       RAILS_ENV: test
     steps:
       - name: Checkout code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:

data/Appraisals

@@ -7,10 +7,13 @@ appraise 'rails-7.0' do
 end
 
 appraise 'rails-7.1' do
-  gem 'rails', '7.1.0'
+  gem 'rails', '~> 7.1.0'
 end
 
-
 appraise 'rails-7.2' do
-  gem 'rails', '7.2.0.beta1'
+  gem 'rails', '~> 7.2.0'
+end
+
+appraise 'rails-8.0' do
+  gem 'rails', '8.0.0.beta1'
 end

data/Changelog.md

@@ -1,5 +1,16 @@
 # Changelog
 
+# 11.1.0
+- Allow multiple data migration paths https://github.com/ilyakatz/data-migrate/pull/331
+- Fix db:prepare:with_data task on [Rails 7.2](https://github.com/ilyakatz/data-migrate/pull/339)
+- Fix ConnectionPool deprecation warnings on [Rails 7.2](https://github.com/ilyakatz/data-migrate/pull/341)
+- Add Rails 8.0 to testing grounds https://github.com/ilyakatz/data-migrate/pull/341
+- [Bump webrick from 1.8.1 to 1.8.2](https://github.com/ilyakatz/data-migrate/pull/345)
+
+# 11.0.0
+- [Update rexml to 3.3.6](https://github.com/ilyakatz/data-migrate/pull/329)
+- Fixes a bug which ignored migrations on [Rails 7.1 and higher](https://github.com/ilyakatz/data-migrate/pull/326)
+
 # 11.0.0rc
 - Remove Ruby 3.0 from build matrix
 - Support Rails 7.2.0 https://github.com/ilyakatz/data-migrate/pull/312

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    data_migrate (11.0.0.rc3)
+    data_migrate (11.1.0)
       activerecord (>= 6.1)
       railties (>= 6.1)
 
@@ -124,7 +124,7 @@ GEM
     regexp_parser (2.9.0)
     reline (0.4.3)
       io-console (~> 0.5)
-    rexml (3.3.3)
+    rexml (3.3.6)
       strscan
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
@@ -165,7 +165,7 @@ GEM
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.5.0)
-    webrick (1.8.1)
+    webrick (1.8.2)
     zeitwerk (2.6.13)
 
 PLATFORMS

data/README.md

@@ -38,6 +38,11 @@ table to track all migrations.
 
 Support Rails 6.1 through 7.2
 
+For **Rails 6.0** support, please use gem version `9.1.x`:
+
+```ruby
+gem 'data_migrate', '~> 9.1.0'
+```
 
 #### v1
 
@@ -86,6 +91,7 @@ You can generate a data migration as you would a schema migration:
     rake db:migrate:status:with_data               # Display status of data and schema migrations
     rake db:migrate:up:with_data                   # Runs the "up" for a given migration VERSION
     rake db:migrate:with_data                      # Migrate the database data and schema (options: VERSION=x, VERBOSE=false)
+    rake db:prepare:with_data                      # Runs setup if database does not exist, or runs data and schema migrations if it does
     rake db:rollback:with_data                     # Rolls the schema back to the previous version (specify steps w/ STEP=n)
     rake db:schema:load:with_data                  # Load both schema.rb and data_schema.rb file into the database
     rake db:structure:load:with_data               # Load both structure.sql and data_schema.rb file into the database

data/gemfiles/rails_6.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    data_migrate (11.0.0.rc3)
+    data_migrate (11.1.0)
       activerecord (>= 6.1)
       railties (>= 6.1)
 

data/gemfiles/rails_7.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    data_migrate (11.0.0.rc3)
+    data_migrate (11.1.0)
       activerecord (>= 6.1)
       railties (>= 6.1)
 

data/gemfiles/rails_7.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    data_migrate (11.0.0.rc3)
+    data_migrate (11.1.0)
       activerecord (>= 6.1)
       railties (>= 6.1)
 
@@ -121,6 +121,7 @@ GEM
     marcel (1.0.4)
     method_source (1.0.0)
     mini_mime (1.1.5)
+    mini_portile2 (2.8.7)
     minitest (5.25.1)
     mutex_m (0.2.0)
     net-imap (0.4.14)
@@ -133,6 +134,9 @@ GEM
     net-smtp (0.5.0)
       net-protocol
     nio4r (2.7.3)
+    nokogiri (1.16.7)
+      mini_portile2 (~> 2.8.2)
+      racc (~> 1.4)
     nokogiri (1.16.7-aarch64-linux)
       racc (~> 1.4)
     nokogiri (1.16.7-arm64-darwin)
@@ -228,6 +232,8 @@ GEM
     rubocop-ast (1.29.0)
       parser (>= 3.2.1.0)
     ruby-progressbar (1.13.0)
+    sqlite3 (1.7.2)
+      mini_portile2 (~> 2.8.0)
     sqlite3 (1.7.2-aarch64-linux)
     sqlite3 (1.7.2-arm64-darwin)
     sqlite3 (1.7.2-x86_64-darwin)
@@ -249,6 +255,7 @@ PLATFORMS
   aarch64-linux
   arm64-darwin-22
   arm64-darwin-23
+  ruby
   x86_64-darwin-22
   x86_64-linux
 

data/gemfiles/rails_7.2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    data_migrate (11.0.0.rc3)
+    data_migrate (11.1.0)
       activerecord (>= 6.1)
       railties (>= 6.1)
 
@@ -118,6 +118,7 @@ GEM
     marcel (1.0.4)
     method_source (1.1.0)
     mini_mime (1.1.5)
+    mini_portile2 (2.8.7)
     minitest (5.25.1)
     net-imap (0.4.14)
       date
@@ -129,6 +130,9 @@ GEM
     net-smtp (0.5.0)
       net-protocol
     nio4r (2.7.3)
+    nokogiri (1.16.7)
+      mini_portile2 (~> 2.8.2)
+      racc (~> 1.4)
     nokogiri (1.16.7-aarch64-linux)
       racc (~> 1.4)
     nokogiri (1.16.7-arm64-darwin)
@@ -248,6 +252,7 @@ GEM
 PLATFORMS
   aarch64-linux
   arm64-darwin-23
+  ruby
   x86_64-darwin-22
   x86_64-linux
 

data/gemfiles/rails_8.0.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "rails", "8.0.0.beta1"
+
+gemspec path: "../"

data/gemfiles/rails_8.0.gemfile.lock

@@ -0,0 +1,268 @@
+PATH
+  remote: ..
+  specs:
+    data_migrate (11.1.0)
+      activerecord (>= 6.1)
+      railties (>= 6.1)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    actioncable (8.0.0.beta1)
+      actionpack (= 8.0.0.beta1)
+      activesupport (= 8.0.0.beta1)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+      zeitwerk (~> 2.6)
+    actionmailbox (8.0.0.beta1)
+      actionpack (= 8.0.0.beta1)
+      activejob (= 8.0.0.beta1)
+      activerecord (= 8.0.0.beta1)
+      activestorage (= 8.0.0.beta1)
+      activesupport (= 8.0.0.beta1)
+      mail (>= 2.8.0)
+    actionmailer (8.0.0.beta1)
+      actionpack (= 8.0.0.beta1)
+      actionview (= 8.0.0.beta1)
+      activejob (= 8.0.0.beta1)
+      activesupport (= 8.0.0.beta1)
+      mail (>= 2.8.0)
+      rails-dom-testing (~> 2.2)
+    actionpack (8.0.0.beta1)
+      actionview (= 8.0.0.beta1)
+      activesupport (= 8.0.0.beta1)
+      nokogiri (>= 1.8.5)
+      rack (>= 2.2.4)
+      rack-session (>= 1.0.1)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+      useragent (~> 0.16)
+    actiontext (8.0.0.beta1)
+      actionpack (= 8.0.0.beta1)
+      activerecord (= 8.0.0.beta1)
+      activestorage (= 8.0.0.beta1)
+      activesupport (= 8.0.0.beta1)
+      globalid (>= 0.6.0)
+      nokogiri (>= 1.8.5)
+    actionview (8.0.0.beta1)
+      activesupport (= 8.0.0.beta1)
+      builder (~> 3.1)
+      erubi (~> 1.11)
+      rails-dom-testing (~> 2.2)
+      rails-html-sanitizer (~> 1.6)
+    activejob (8.0.0.beta1)
+      activesupport (= 8.0.0.beta1)
+      globalid (>= 0.3.6)
+    activemodel (8.0.0.beta1)
+      activesupport (= 8.0.0.beta1)
+    activerecord (8.0.0.beta1)
+      activemodel (= 8.0.0.beta1)
+      activesupport (= 8.0.0.beta1)
+      timeout (>= 0.4.0)
+    activestorage (8.0.0.beta1)
+      actionpack (= 8.0.0.beta1)
+      activejob (= 8.0.0.beta1)
+      activerecord (= 8.0.0.beta1)
+      activesupport (= 8.0.0.beta1)
+      marcel (~> 1.0)
+    activesupport (8.0.0.beta1)
+      base64
+      benchmark (>= 0.3)
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.3.1)
+      connection_pool (>= 2.2.5)
+      drb
+      i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
+      minitest (>= 5.1)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
+      uri (>= 0.13.1)
+    appraisal (2.5.0)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    ast (2.4.2)
+    base64 (0.2.0)
+    benchmark (0.3.0)
+    bigdecimal (3.1.8)
+    builder (3.3.0)
+    childprocess (5.1.0)
+      logger (~> 1.5)
+    coderay (1.1.3)
+    concurrent-ruby (1.3.4)
+    connection_pool (2.4.1)
+    crass (1.0.6)
+    date (3.3.4)
+    diff-lcs (1.5.1)
+    drb (2.2.1)
+    erubi (1.13.0)
+    globalid (1.2.1)
+      activesupport (>= 6.1)
+    i18n (1.14.6)
+      concurrent-ruby (~> 1.0)
+    iniparse (1.5.0)
+    io-console (0.7.2)
+    irb (1.14.1)
+      rdoc (>= 4.0.0)
+      reline (>= 0.4.2)
+    json (2.7.2)
+    language_server-protocol (3.17.0.3)
+    logger (1.6.1)
+    loofah (2.22.0)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.12.0)
+    mail (2.8.1)
+      mini_mime (>= 0.1.1)
+      net-imap
+      net-pop
+      net-smtp
+    marcel (1.0.4)
+    method_source (1.1.0)
+    mini_mime (1.1.5)
+    mini_portile2 (2.8.7)
+    minitest (5.25.1)
+    net-imap (0.4.16)
+      date
+      net-protocol
+    net-pop (0.1.2)
+      net-protocol
+    net-protocol (0.2.2)
+      timeout
+    net-smtp (0.5.0)
+      net-protocol
+    nio4r (2.7.3)
+    nokogiri (1.16.7)
+      mini_portile2 (~> 2.8.2)
+      racc (~> 1.4)
+    nokogiri (1.16.7-arm64-darwin)
+      racc (~> 1.4)
+    overcommit (0.64.0)
+      childprocess (>= 0.6.3, < 6)
+      iniparse (~> 1.4)
+      rexml (~> 3.2)
+    parallel (1.26.3)
+    parser (3.3.5.0)
+      ast (~> 2.4.1)
+      racc
+    pry (0.14.2)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    psych (5.1.2)
+      stringio
+    racc (1.8.1)
+    rack (3.1.7)
+    rack-session (2.0.0)
+      rack (>= 3.0.0)
+    rack-test (2.1.0)
+      rack (>= 1.3)
+    rackup (2.1.0)
+      rack (>= 3)
+      webrick (~> 1.8)
+    rails (8.0.0.beta1)
+      actioncable (= 8.0.0.beta1)
+      actionmailbox (= 8.0.0.beta1)
+      actionmailer (= 8.0.0.beta1)
+      actionpack (= 8.0.0.beta1)
+      actiontext (= 8.0.0.beta1)
+      actionview (= 8.0.0.beta1)
+      activejob (= 8.0.0.beta1)
+      activemodel (= 8.0.0.beta1)
+      activerecord (= 8.0.0.beta1)
+      activestorage (= 8.0.0.beta1)
+      activesupport (= 8.0.0.beta1)
+      bundler (>= 1.15.0)
+      railties (= 8.0.0.beta1)
+    rails-dom-testing (2.2.0)
+      activesupport (>= 5.0.0)
+      minitest
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.6.0)
+      loofah (~> 2.21)
+      nokogiri (~> 1.14)
+    railties (8.0.0.beta1)
+      actionpack (= 8.0.0.beta1)
+      activesupport (= 8.0.0.beta1)
+      irb (~> 1.13)
+      rackup (>= 1.0.0)
+      rake (>= 12.2)
+      thor (~> 1.0, >= 1.2.2)
+      zeitwerk (~> 2.6)
+    rainbow (3.1.1)
+    rake (13.2.1)
+    rb-readline (0.5.5)
+    rdoc (6.7.0)
+      psych (>= 4.0.0)
+    regexp_parser (2.9.2)
+    reline (0.5.10)
+      io-console (~> 0.5)
+    rexml (3.3.7)
+    rspec (3.13.0)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.1)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.3)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.1)
+    rubocop (1.66.1)
+      json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
+      parallel (~> 1.10)
+      parser (>= 3.3.0.2)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 2.4, < 3.0)
+      rubocop-ast (>= 1.32.2, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 2.4.0, < 3.0)
+    rubocop-ast (1.32.3)
+      parser (>= 3.3.1.0)
+    ruby-progressbar (1.13.0)
+    securerandom (0.3.1)
+    sqlite3 (2.1.0)
+      mini_portile2 (~> 2.8.0)
+    sqlite3 (2.1.0-arm64-darwin)
+    stringio (3.1.1)
+    thor (1.3.2)
+    timecop (0.9.10)
+    timeout (0.4.1)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.6.0)
+    uri (0.13.1)
+    useragent (0.16.10)
+    webrick (1.8.2)
+    websocket-driver (0.7.6)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.5)
+    zeitwerk (2.6.18)
+
+PLATFORMS
+  aarch64-linux
+  arm64-darwin-23
+  ruby
+  x86_64-darwin-22
+  x86_64-linux
+
+DEPENDENCIES
+  appraisal
+  data_migrate!
+  overcommit
+  pry
+  rails (= 8.0.0.beta1)
+  rake
+  rb-readline
+  rspec
+  rspec-core
+  rubocop
+  sqlite3
+  timecop
+
+BUNDLED WITH
+   2.4.17

data/lib/data_migrate/data_migrator.rb

@@ -12,7 +12,7 @@ module DataMigrate
 
     class << self
       def migrations_paths
-        [DataMigrate.config.data_migrations_path]
+        Array.wrap(DataMigrate.config.data_migrations_path)
       end
 
       def create_data_schema_table

data/lib/data_migrate/data_schema.rb

@@ -29,13 +29,13 @@ module DataMigrate
     end
 
     def versions
-      @versions ||= begin
-        versions = []
-        Dir.foreach(DataMigrate::DataMigrator.full_migrations_path) do |file|
-          match_data = DataMigrate::DataMigrator.match(file)
-          versions << match_data[1].to_i if match_data
+      @versions ||= Set.new.tap do |versions|
+        DataMigrate::DataMigrator.migrations_paths.each do |path|
+          Dir.foreach(path) do |file|
+            match_data = DataMigrate::DataMigrator.match(file)
+            versions << match_data[1].to_i if match_data
+          end
         end
-        versions
       end
     end
 

data/lib/data_migrate/database_tasks.rb

@@ -10,21 +10,21 @@ module DataMigrate
     extend self
 
     # These method are only introduced in Rails 7.1
-    unless respond_to?(:with_temporary_connection_for_each)
-      def with_temporary_connection_for_each(env: ActiveRecord::Tasks::DatabaseTasks.env, name: nil, &block) # :nodoc:
+    unless respond_to?(:with_temporary_pool_for_each)
+      def with_temporary_pool_for_each(env: ActiveRecord::Tasks::DatabaseTasks.env, name: nil, &block) # :nodoc:
         if name
           db_config = ActiveRecord::Base.configurations.configs_for(env_name: env, name: name)
-          with_temporary_connection(db_config, &block)
+           with_temporary_pool(db_config, &block)
         else
           ActiveRecord::Base.configurations.configs_for(env_name: env, name: name).each do |db_config|
-            with_temporary_connection(db_config, &block)
+             with_temporary_pool(db_config, &block)
           end
         end
       end
 
-      def with_temporary_connection(db_config) # :nodoc:
+      def with_temporary_connection(db_config, &block) # :nodoc:
         with_temporary_pool(db_config) do |pool|
-          yield pool.connection
+          pool.with_connection(&block)
         end
       end
 
@@ -49,8 +49,8 @@ module DataMigrate
     def db_configs_with_versions
       db_configs_with_versions = Hash.new { |h, k| h[k] = [] }
 
-      with_temporary_connection_for_each do |conn|
-        db_config = conn.pool.db_config
+      with_temporary_pool_for_each do |pool|
+        db_config = pool.db_config
         if db_config.primary?
           versions_to_run = DataMigrate::DatabaseTasks.pending_data_migrations.map { |m| m[:version] }
           target_version = ActiveRecord::Tasks::DatabaseTasks.target_version
@@ -214,19 +214,13 @@ module DataMigrate
       seed = false
 
       each_current_configuration(env) do |db_config|
-        next unless db_config.primary?
+        next unless primary?(db_config)
 
-        with_temporary_pool(db_config) do
-          begin
-            database_initialized = migration_connection.schema_migration.table_exists?
-          rescue ActiveRecord::NoDatabaseError
+        with_temporary_pool(db_config) do |pool|
+          unless database_exists?(pool.connection)
             create(db_config)
-            retry
-          end
-
-          unless database_initialized
             if File.exist?(schema_dump_path(db_config))
-              load_schema(db_config, ActiveRecord.schema_format, nil)
+              load_schema(db_config, schema_format, nil)
               load_schema_current(
                 :ruby,
                 ENV["DATA_SCHEMA"]
@@ -237,7 +231,7 @@ module DataMigrate
           end
 
           migrate_with_data
-          if ActiveRecord.dump_schema_after_migration
+          if dump_schema_after_migration?
             dump_schema(db_config)
             DataMigrate::Tasks::DataMigrateTasks.dump
           end
@@ -246,5 +240,41 @@ module DataMigrate
 
       load_seed if seed
     end
+
+    private
+
+    def database_exists?(connection)
+      if connection.respond_to?(:database_exists?)  # Rails 7.1+
+        connection.database_exists?
+      else
+        connection.table_exists?(ActiveRecord::SchemaMigration.table_name)
+      end
+    rescue ActiveRecord::NoDatabaseError
+      false
+    end
+
+    def primary?(db_config)
+      if db_config.respond_to?(:primary?)  # Rails 7.0+
+        db_config.primary?
+      else
+        db_config.name == "primary"
+      end
+    end
+
+    def dump_schema_after_migration?
+      if ActiveRecord.respond_to?(:dump_schema_after_migration)
+        ActiveRecord.dump_schema_after_migration
+      else
+        ActiveRecord::Base.dump_schema_after_migration
+      end
+    end
+
+    def schema_format
+      if ActiveRecord.respond_to?(:schema_format)
+        ActiveRecord.schema_format
+      else
+        ActiveRecord::Base.schema_format
+      end
+    end
   end
 end

data/lib/data_migrate/tasks/data_migrate_tasks.rb

@@ -6,7 +6,7 @@ module DataMigrate
       extend self
 
       def migrations_paths
-        @migrations_paths ||= DataMigrate.config.data_migrations_path
+        @migrations_paths ||= Array.wrap(DataMigrate.config.data_migrations_path)
       end
 
       def dump
@@ -55,11 +55,13 @@ module DataMigrate
         db_list_schema = DataMigrate::RailsHelper.schema_migration_versions
         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']
+        migrations_paths.each do |path|
+          Dir.foreach(File.join(Rails.root, 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
         end
 

data/lib/data_migrate/version.rb

@@ -1,3 +1,3 @@
 module DataMigrate
-  VERSION = "11.0.0.rc3".freeze
+  VERSION = "11.1.0".freeze
 end

data/lib/generators/data_migration/data_migration_generator.rb

@@ -38,8 +38,9 @@ module DataMigrate
         File.join(data_migrations_path, "#{file_name}.rb")
       end
 
+      # Use the first path in the data_migrations_path as the target directory
       def data_migrations_path
-        DataMigrate.config.data_migrations_path
+        Array.wrap(DataMigrate.config.data_migrations_path).first
       end
     end
   end

data/spec/data_migrate/data_migrator_spec.rb

@@ -51,9 +51,10 @@ describe DataMigrate::DataMigrator do
   describe "#migrations_status" do
     it "returns all migrations statuses" do
       status = described_class.migrations_status
-      expect(status.length).to eq 2
+      expect(status.length).to eq 3
       expect(status.first).to eq ["down", "20091231235959", "Some name"]
       expect(status.second).to eq ["down", "20171231235959", "Super update"]
+      expect(status.third).to eq ["down", "20241231235959", "Data two update"]
     end
   end
 

data/spec/data_migrate/database_tasks_spec.rb

@@ -5,9 +5,7 @@ require "spec_helper"
 describe DataMigrate::DatabaseTasks do
   let(:subject) { DataMigrate::DatabaseTasks }
   let(:migration_path) { "spec/db/migrate" }
-  let(:data_migrations_path) {
-    DataMigrate.config.data_migrations_path
-  }
+  let(:data_migrations_path) { DataMigrate.config.data_migrations_path }
 
   before do
     # In a normal Rails installation, db_dir would defer to
@@ -18,11 +16,13 @@ describe DataMigrate::DatabaseTasks do
   end
 
   before do
-    allow(DataMigrate::Tasks::DataMigrateTasks).to receive(:migrations_paths) {
+    allow(DataMigrate::Tasks::DataMigrateTasks).to receive(:migrations_paths) do
       data_migrations_path
-    }
-    ActiveRecord::Base.establish_connection({ adapter: "sqlite3", database: "spec/db/test.db" })
-    hash_config = ActiveRecord::DatabaseConfigurations::HashConfig.new('test', 'test', { adapter: "sqlite3", database: "spec/db/test.db" })
+    end
+    ActiveRecord::Base.establish_connection(adapter: "sqlite3", database: "spec/db/test.db")
+    hash_config = ActiveRecord::DatabaseConfigurations::HashConfig.new(
+      'test', 'test', adapter: "sqlite3", database: "spec/db/test.db"
+    )
     config_obj = ActiveRecord::DatabaseConfigurations.new([hash_config])
     allow(ActiveRecord::Base).to receive(:configurations).and_return(config_obj)
   end
@@ -36,12 +36,10 @@ describe DataMigrate::DatabaseTasks do
     before do
       DataMigrate::RailsHelper.schema_migration.create_table
 
-      allow(DataMigrate::SchemaMigration).to receive(:migrations_paths) {
-        migration_path
-      }
-      allow(DataMigrate::DatabaseTasks).to receive(:data_migrations_path) {
+      allow(DataMigrate::SchemaMigration).to receive(:migrations_paths) { migration_path }
+      allow(DataMigrate::DatabaseTasks).to receive(:data_migrations_path) do
         data_migrations_path
-      }.at_least(:once)
+      end.at_least(:once)
     end
 
     describe :past_migrations do
@@ -79,11 +77,14 @@ describe DataMigrate::DatabaseTasks do
     if DataMigrate::RailsHelper.rails_version_equal_to_or_higher_than_7_0
       describe :schema_dump_path do
         before do
-          allow(ActiveRecord::Base).to receive(:configurations).and_return(ActiveRecord::DatabaseConfigurations.new([db_config]))
+          allow(ActiveRecord::Base).to receive(:configurations)
+            .and_return(ActiveRecord::DatabaseConfigurations.new([db_config]))
         end
 
         context "for primary database" do
-          let(:db_config) { ActiveRecord::DatabaseConfigurations::HashConfig.new("development", "primary", {} ) }
+          let(:db_config) do
+            ActiveRecord::DatabaseConfigurations::HashConfig.new("development", "primary", {})
+          end
 
           context "for :ruby db format" do
             it 'returns the data schema path' do
@@ -101,5 +102,113 @@ describe DataMigrate::DatabaseTasks do
         end
       end
     end
+
+    describe :prepare_all_with_data do
+      let(:db_config) do
+        ActiveRecord::DatabaseConfigurations::HashConfig.new(
+          'test',
+          'primary',
+          adapter: "sqlite3",
+          database: "spec/db/test.db"
+        )
+      end
+
+      let(:pool) { double("ConnectionPool") }
+      let(:connection) { double("Connection") }
+
+      before do
+        allow(subject).to receive(:each_current_configuration).and_yield(db_config)
+        allow(subject).to receive(:with_temporary_pool).with(db_config).and_yield(pool)
+        allow(pool).to receive(:connection).and_return(connection)
+        allow(subject).to receive(:schema_dump_path).and_return("db/data_schema.rb")
+        allow(File).to receive(:exist?).and_return(true)
+        allow(subject).to receive(:load_schema)
+        allow(subject).to receive(:load_schema_current)
+        allow(subject).to receive(:migrate_with_data)
+        allow(subject).to receive(:dump_schema)
+        allow(DataMigrate::Tasks::DataMigrateTasks).to receive(:dump)
+        allow(subject).to receive(:load_seed)
+
+        configurations = ActiveRecord::DatabaseConfigurations.new([db_config])
+        allow(ActiveRecord::Base).to receive(:configurations).and_return(configurations)
+      end
+
+      context "when the database does not exist" do
+        before do
+          allow(subject).to receive(:database_exists?).with(connection).and_return(false)
+          allow_any_instance_of(ActiveRecord::Tasks::DatabaseTasks).to receive(:create)
+            .and_return(true)
+        end
+
+        it "creates the database" do
+          expect_any_instance_of(ActiveRecord::Tasks::DatabaseTasks).to receive(:create)
+            .with(db_config)
+          subject.prepare_all_with_data
+        end
+
+        it "loads the schema" do
+          expect(subject).to receive(:load_schema).with(
+            db_config,
+            subject.send(:schema_format),
+            nil
+          )
+          subject.prepare_all_with_data
+        end
+
+        it "loads the current data schema" do
+          expect(subject).to receive(:load_schema_current).with(:ruby, ENV["DATA_SCHEMA"])
+          subject.prepare_all_with_data
+        end
+
+        it "runs migrations with data" do
+          expect(subject).to receive(:migrate_with_data)
+          subject.prepare_all_with_data
+        end
+
+        it "dumps the schema after migration" do
+          expect(subject).to receive(:dump_schema).with(db_config)
+          expect(DataMigrate::Tasks::DataMigrateTasks).to receive(:dump)
+          subject.prepare_all_with_data
+        end
+
+        it "loads seed data" do
+          expect(subject).to receive(:load_seed)
+          subject.prepare_all_with_data
+        end
+      end
+
+      context "when the database exists" do
+        before do
+          allow(subject).to receive(:database_exists?).with(connection).and_return(true)
+        end
+
+        it "does not create the database" do
+          expect(ActiveRecord::Tasks::DatabaseTasks).not_to receive(:create)
+          subject.prepare_all_with_data
+        end
+
+        it "does not load the schema" do
+          expect(subject).not_to receive(:load_schema)
+          expect(subject).not_to receive(:load_schema_current)
+          subject.prepare_all_with_data
+        end
+
+        it "runs migrations with data" do
+          expect(subject).to receive(:migrate_with_data)
+          subject.prepare_all_with_data
+        end
+
+        it "dumps the schema after migration" do
+          expect(subject).to receive(:dump_schema).with(db_config)
+          expect(DataMigrate::Tasks::DataMigrateTasks).to receive(:dump)
+          subject.prepare_all_with_data
+        end
+
+        it "does not load seed data" do
+          expect(subject).not_to receive(:load_seed)
+          subject.prepare_all_with_data
+        end
+      end
+    end
   end
 end

data/spec/db/data_two/20241231235959_data_two_update.rb

@@ -0,0 +1,9 @@
+class DataTwoUpdate < ActiveRecord::Migration[6.1]
+  def up
+    puts "Doing DataTwoUpdate"
+  end
+
+  def down
+    puts "Undoing DataTwoUpdate"
+  end
+end

data/spec/spec_helper.rb

@@ -21,7 +21,7 @@ RSpec.configure do |config|
     else
       @prev_data_migrations_path = DataMigrate.config.data_migrations_path
       DataMigrate.configure do |config|
-        config.data_migrations_path = "spec/db/data"
+        config.data_migrations_path = ["spec/db/data", "spec/db/data_two"]
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: data_migrate
 version: !ruby/object:Gem::Version
-  version: 11.0.0.rc3
+  version: 11.1.0
 platform: ruby
 authors:
 - Andrew J Vargo
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-08-20 00:00:00.000000000 Z
+date: 2024-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -214,6 +214,8 @@ files:
 - gemfiles/rails_7.1.gemfile.lock
 - gemfiles/rails_7.2.gemfile
 - gemfiles/rails_7.2.gemfile.lock
+- gemfiles/rails_8.0.gemfile
+- gemfiles/rails_8.0.gemfile.lock
 - lib/capistrano/data_migrate.rb
 - lib/capistrano/data_migrate/migrate.rb
 - lib/data_migrate.rb
@@ -230,7 +232,6 @@ files:
 - lib/data_migrate/schema_migration.rb
 - lib/data_migrate/status_service.rb
 - lib/data_migrate/tasks/data_migrate_tasks.rb
-- lib/data_migrate/test.rb
 - lib/data_migrate/version.rb
 - lib/generators/data_migrate.rb
 - lib/generators/data_migration/data_migration_generator.rb
@@ -255,6 +256,7 @@ files:
 - spec/db/data/partial_schema/test_data_schema.rb
 - spec/db/data/schema/data_schema.rb
 - spec/db/data/schema/test_data_schema.rb
+- spec/db/data_two/20241231235959_data_two_update.rb
 - spec/db/migrate/20131111111111_late_migration.rb
 - spec/db/migrate/20202020202011_db_migration.rb
 - spec/generators/data_migration/data_migration_generator_spec.rb
@@ -276,9 +278,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.4.19
 signing_key: 

data/lib/data_migrate/test.rb

@@ -1,14 +0,0 @@
-module Base
-  extend self
-
-  def foo
-    puts "Base#foo called"
-  end
-end
-
-module Child
-  extend Base
-  extend self
-
-  puts "foo: #{respond_to?(:foo)}"
-end