bard-rake 0.20.0 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 31ff0200f42734631cff25875af6998072c84f11ddeaecfc6b1200966690f185
-  data.tar.gz: a3c65ba5837e92853b669245b5ef8164cb3c154d6fca3ce9d1c77c151879e147
+  metadata.gz: ed2973e1bd9430f0585ea99cba34d561a17c44b982b8f03f05f7df41e51cd315
+  data.tar.gz: d4d8e2501839c24b43ba81c1c4fa7050f144078fa234cb5178914ee08c25d65d
 SHA512:
-  metadata.gz: d225869ec23fbbf45258cb3ba635054683e8275cca6f193b24dad2a70cc0772bb3ba393d3fc82e0442606e2d54644818fa87e0e29479410573797d5a91f88d00
-  data.tar.gz: 01be76580d0d8d55bb8473165798a02251a91d09a296c24c0603127c203650e6fa2a55b0d214471ea9899b487a1e89b93a57734ed2992f1f6ac079bc7986b4b9
+  metadata.gz: 3e68e3814804327257584c57b482510077646a9418bae083bab304156ad786940a79d1c5ab71047f7fc9caec7e0f109309b7bd0f60afb8d4953a72fdd376c240
+  data.tar.gz: ec92167bbf8a5541547a5726b77cc34e551eef1e2914017f390224fa800093d7428c8d8d09624133209b9294bd0066e8c8e8340daa6db21301d66ff4f965ecd5

data/lib/bard/rake/bootstrap.rb

@@ -6,8 +6,10 @@ end
 desc "Bootstrap project"
 task :bootstrap do
   system "cp config/database.sample.yml config/database.yml" unless File.exist?('config/database.yml') or !File.exist?('config/database.sample.yml')
-  invoke_task_if_exists "db:create:all"
-  invoke_task_if_exists "db:migrate:all"
+  invoke_task_if_exists "db:create"
+  invoke_task_if_exists "db:migrate"
+  invoke_task_if_exists "rake parallel:create"
+  invoke_task_if_exists "rake parallel:migrate"
   if %w(staging production).include?(ENV["RAILS_ENV"])
     invoke_task_if_exists "assets:precompile"
   end

data/lib/bard/rake/db_multiple_environment_sanity.rb

@@ -2,52 +2,53 @@ if defined?(ActiveRecord)
   namespace :db do
     namespace :create do
       task :all => :load_config do
-        run_in_all_environments do |config, env|
-          if env == "test" && Rake::Task.task_defined?("parallel:create")
-            Rake::Task["parallel:create"].invoke
-          else
-            ActiveRecord::Tasks::DatabaseTasks.create config
-          end
-        end
+        invoke_with_parallel "create"
       end
     end
 
     namespace :drop do
       task :all => :load_config do
-        run_in_all_environments do |config, env|
-          if env == "test" && Rake::Task.task_defined?("parallel:drop")
-            Rake::Task["parallel:drop"].invoke
-          else
-            ActiveRecord::Tasks::DatabaseTasks.drop config
-          end
-        end
+        invoke_with_parallel "drop"
       end
     end
 
     namespace :migrate do
       task :all => :load_config do
-        run_in_all_environments do |config, env|
-          if env == "test" && Rake::Task.task_defined?("parallel:migrate")
-            Rake::Task["parallel:migrate"].invoke
-          else
-            ActiveRecord::Tasks::DatabaseTasks.migrate
-          end
-        end
+        invoke_with_parallel "migrate"
       end
     end
 
     namespace :rollback do
       task :all => :load_config do
+        invoke_with_parallel "rollback" do # 6.1, 7.0 vanilla doesn't follow the pattern of the other three
+          ActiveRecord::Base.connection.migration_context.rollback(1)
+        end
+      end
+    end
+
+    def invoke_with_parallel task
+      if Rails.version >= "7.1"
+        Rake::Task["db:#{task}"].invoke
+        if %w[development test].include?(Rails.env) && Rake::Task.task_defined?("parallel:#{task}")
+          Rake::Task["parallel:#{task}"].invoke
+        end
+
+      else # Rails 6.1, 7.0
         run_in_all_environments do |config, env|
-          if env == "test" && Rake::Task.task_defined?("parallel:rollback")
-            Rake::Task["parallel:rollback"].invoke
+          if env == "test" && Rake::Task.task_defined?("parallel:#{task}")
+            Rake::Task["parallel:#{task}"].invoke
           else
-            ActiveRecord::Base.connection.migration_context.rollback(1)
+            if block_given?
+              yield
+            else
+              ActiveRecord::Tasks::DatabaseTasks.send task.to_sym, config
+            end
           end
         end
       end
     end
 
+
     def run_in_all_environments &block
       invoke_task_if_exists :rails_env
 
@@ -76,18 +77,6 @@ if defined?(ActiveRecord)
 
       Rake::Task["db:_dump"].invoke
     end
-
-    def test_environment?
-      rails_env == "test"
-    end
-
-    def rails_env
-      if defined?(Rails)
-        Rails.env
-      else
-        ENV["RAILS_ENV"]
-      end
-    end
   end
 end
 

data/lib/bard/rake/version.rb

@@ -1,6 +1,6 @@
 module Bard
   module Rake
-    VERSION = "0.20.0"
+    VERSION = "0.21.0"
   end
 end
 

data/plans

@@ -0,0 +1,5 @@
+|          | current  | current+test(if dev) | all        |
+| create   |          | create               | create:all |
+| migrate  | migrate  | B/R::migrate:all     |            |
+| rollback | rollback | B/R::rollback:all    |            |
+| drop     |          | drop                 | drop:all   |

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bard-rake
 version: !ruby/object:Gem::Version
-  version: 0.20.0
+  version: 0.21.0
 platform: ruby
 authors:
 - Micah Geisel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-08 00:00:00.000000000 Z
+date: 2024-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -109,6 +109,7 @@ files:
 - lib/bard/rake/version.rb
 - lib/generators/bard/utf8mb4_migration/templates/migration.rb.tt
 - lib/generators/bard/utf8mb4_migration/utf8mb4_migration_generator.rb
+- plans
 homepage: http://github.com/botandrose/bard-rake
 licenses:
 - MIT
@@ -128,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.5.4
 signing_key: 
 specification_version: 4
 summary: Rake tasks for all bard projects.