rails-worktree 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c771eeca1a0ebd25d16f5b998d7c85664b29dce630232228188177c48ef406a
-  data.tar.gz: ab045a8fb0f2a5c2af5bcaacfb35237cdd3ce49c404a539f5a51cc944e7f8f82
+  metadata.gz: ad88ee441877f765a65b7be1ef147d22508444ef5b7ce17f04596433b390d394
+  data.tar.gz: c8906a0ede3919a35027cffd738e3dbb14766ea277a643cadbc30679c5a1d369
 SHA512:
-  metadata.gz: 1f7974fdd4e268a473d0f7d72957e832cee8b8a40606521cbcb6ebcb4410b9faabf02a103ff632fbe5a4d86b515573a215dd7abcaf7621fae7729c9f157b2e7c
-  data.tar.gz: fb7284245d332144b3e0d4eead26e63b811459fb8afc096604f6cde6e053588261ab9a29e32e0390c079de3ab79cf5c4134a528ab37d8500bd4cdf154d38e91e
+  metadata.gz: 3ae6d372db674ff7960b38e0f238ef95bf9d57240b6b73cd7757714b03778b3b9ab25ae24337616fdd6d9fce735ae07cb013094d70d023d07ad3604b74a1a2fb
+  data.tar.gz: 2162aa087bf170e7fdaa03e8f02998fc4a6880ee48abfda700f5460abe2403e3bda46577bc08ca17f9f534aefa9e8ecbe50d5a90ed8ad8307728fdab20082fd5

data/lib/worktree/commands/close.rb

@@ -80,16 +80,23 @@ module RailsWorktree
         end
       end
 
+      def database_env
+        {
+          "DATABASE_NAME_DEVELOPMENT" => @dev_database_name,
+          "DATABASE_NAME_TEST" => @test_database_name
+        }
+      end
+
       def drop_databases
         puts "Dropping databases..."
 
         Dir.chdir(@worktree_dir) do
           # Drop development database
-          system("RAILS_ENV=development bin/rails db:drop 2>/dev/null") ||
+          system(database_env.merge("RAILS_ENV" => "development", "DISABLE_DATABASE_ENVIRONMENT_CHECK" => "1"), "bin/rails", "db:drop") ||
             puts("Warning: Could not drop development database #{@dev_database_name}")
 
           # Drop test database
-          system("RAILS_ENV=test bin/rails db:drop 2>/dev/null") ||
+          system(database_env.merge("RAILS_ENV" => "test", "DISABLE_DATABASE_ENVIRONMENT_CHECK" => "1"), "bin/rails", "db:drop") ||
             puts("Warning: Could not drop test database #{@test_database_name}")
         end
       end

data/lib/worktree/commands/init.rb

@@ -146,20 +146,32 @@ module RailsWorktree
         end
       end
 
+      def database_env
+        {
+          "DATABASE_NAME_DEVELOPMENT" => @dev_database_name,
+          "DATABASE_NAME_TEST" => @test_database_name
+        }
+      end
+
       def setup_database
-        puts "Creating databases..."
-        system("RAILS_ENV=development bin/rails db:create") || puts("Warning: Could not create development database")
-        system("RAILS_ENV=test bin/rails db:create") || puts("Warning: Could not create test database")
+        if File.executable?("bin/setup")
+          puts "Running bin/setup..."
+          system(database_env, "bin/setup") || puts("Warning: bin/setup failed")
+        else
+          puts "Creating databases..."
+          system(database_env.merge("RAILS_ENV" => "development"), "bin/rails", "db:create") || puts("Warning: Could not create development database")
+          system(database_env.merge("RAILS_ENV" => "test"), "bin/rails", "db:create") || puts("Warning: Could not create test database")
 
-        puts "Running migrations..."
-        system("RAILS_ENV=development bin/rails db:migrate") || puts("Warning: Could not run migrations")
-        system("RAILS_ENV=test bin/rails db:migrate") || puts("Warning: Could not run test migrations")
+          puts "Running migrations..."
+          system(database_env.merge("RAILS_ENV" => "development"), "bin/rails", "db:migrate") || puts("Warning: Could not run migrations")
+          system(database_env.merge("RAILS_ENV" => "test"), "bin/rails", "db:migrate") || puts("Warning: Could not run test migrations")
 
-        unless @skip_seeds
-          puts "Seeding development database..."
-          system("RAILS_ENV=development bin/rails db:seed > /dev/null 2>&1") || puts("Warning: Could not seed database")
-        else
-          puts "Skipping database seeding..."
+          unless @skip_seeds
+            puts "Seeding development database..."
+            system(database_env.merge("RAILS_ENV" => "development"), "bin/rails", "db:seed") || puts("Warning: Could not seed database")
+          else
+            puts "Skipping database seeding..."
+          end
         end
       end
     end

data/lib/worktree/version.rb

@@ -1,3 +1,3 @@
 module RailsWorktree
-  VERSION = "0.1.0"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails-worktree
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Martin Ulleberg
@@ -48,7 +48,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Git worktree management for Rails projects
 test_files: []