rails-worktree 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad88ee441877f765a65b7be1ef147d22508444ef5b7ce17f04596433b390d394
-  data.tar.gz: c8906a0ede3919a35027cffd738e3dbb14766ea277a643cadbc30679c5a1d369
+  metadata.gz: 8e7212fc3b6e29ec0889e74aa816833e5709c61ffe580138d793eb7e32774b9e
+  data.tar.gz: 40ffa81276288089b12c97655fda37718fc34ca3414ff475acb961afc073fd9c
 SHA512:
-  metadata.gz: 3ae6d372db674ff7960b38e0f238ef95bf9d57240b6b73cd7757714b03778b3b9ab25ae24337616fdd6d9fce735ae07cb013094d70d023d07ad3604b74a1a2fb
-  data.tar.gz: 2162aa087bf170e7fdaa03e8f02998fc4a6880ee48abfda700f5460abe2403e3bda46577bc08ca17f9f534aefa9e8ecbe50d5a90ed8ad8307728fdab20082fd5
+  metadata.gz: b0c3ecb5d1e2ba749a205172ba8eb5cfe1fc85fcdf96daa7e55194b92f647fb21497c59e980cab8505854a9c4d034211513b5232a2319e53d4ba12b3f7f44ac2
+  data.tar.gz: 9d215b260bd60c01c3494d840f022b95ead4f86010632118f8290b738ab021a1c40f9588e550e60aa9a6aa05c2c991e57f7c3e16b99355f2541a0268c70ae49a

data/lib/worktree/commands/close.rb

@@ -22,6 +22,9 @@ module RailsWorktree
         puts "Main worktree: #{@main_worktree}"
         puts ""
 
+        # Move to main worktree early so we're not inside the directory we're about to delete
+        Dir.chdir(@main_worktree) unless @in_main_repo
+
         drop_databases
         remove_node_modules
         remove_worktree
@@ -34,6 +37,11 @@ module RailsWorktree
         puts "  node_modules removed"
         puts "  Worktree removed from #{@worktree_path}"
         puts "  Branch #{@worktree_name} deleted"
+
+        unless @in_main_repo
+          puts ""
+          puts "Run: cd #{@main_worktree}"
+        end
       end
 
       private
@@ -80,24 +88,19 @@ 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(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}")
+        if system("dropdb", "--if-exists", @dev_database_name)
+          puts "Dropped database '#{@dev_database_name}'"
+        else
+          puts "Warning: Could not drop development database #{@dev_database_name}"
+        end
 
-          # Drop test database
-          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}")
+        if system("dropdb", "--if-exists", @test_database_name)
+          puts "Dropped database '#{@test_database_name}'"
+        else
+          puts "Warning: Could not drop test database #{@test_database_name}"
         end
       end
 
@@ -116,9 +119,6 @@ module RailsWorktree
       def remove_worktree
         puts "Removing worktree..."
 
-        # Change back to main repo if needed
-        Dir.chdir(@main_worktree) unless @in_main_repo
-
         if system("git worktree remove #{@worktree_path} --force 2>/dev/null")
           puts "Worktree removed successfully via git"
         else

data/lib/worktree/commands/init.rb

@@ -112,25 +112,13 @@ module RailsWorktree
 
         content = File.read(database_yml)
 
-        # Update development database
-        content.gsub!(
-          /database:\s*<%= ENV\.fetch\("DATABASE_NAME",\s*"#{@db_prefix}_development"\s*%>/,
-          "database: <%= ENV.fetch(\"DATABASE_NAME_DEVELOPMENT\", \"#{@db_prefix}_development\") %>"
-        )
-        content.gsub!(
-          /database:\s*#{@db_prefix}_development/,
-          "database: <%= ENV.fetch(\"DATABASE_NAME_DEVELOPMENT\", \"#{@db_prefix}_development\") %>"
-        )
-
-        # Update test database
-        content.gsub!(
-          /database:\s*<%= ENV\.fetch\("DATABASE_NAME",\s*"#{@db_prefix}_test"\s*%>/,
-          "database: <%= ENV.fetch(\"DATABASE_NAME_TEST\", \"#{@db_prefix}_test\") %>"
-        )
-        content.gsub!(
-          /database:\s*#{@db_prefix}_test/,
-          "database: <%= ENV.fetch(\"DATABASE_NAME_TEST\", \"#{@db_prefix}_test\") %>"
-        )
+        # Replace original database names with worktree-specific ones wherever they appear
+        # This handles hardcoded names, ERB defaults, env var defaults, etc.
+        original_dev = "#{@db_prefix}_development"
+        original_test = "#{@db_prefix}_test"
+
+        content.gsub!(original_dev, @dev_database_name)
+        content.gsub!(original_test, @test_database_name)
 
         File.write(database_yml, content)
       end

data/lib/worktree/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails-worktree
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Martin Ulleberg