rails-worktree 0.1.0 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8888a53c51f48da7d20802a75aa290fedafb9a4facb449276ac98f03a35a2ca
-  data.tar.gz: a6609cd5f4d380f0c62acb8a7bae58079e9c995c032ef04efb2b815386edc612
+  metadata.gz: 456c428610bf82c3e0e1ce8f720d22a70659384b87980c48ae7afa8484c1e5d3
+  data.tar.gz: d723f2b9631b97304507b63155c9a9b1a7c5b729c8d97e471d55d40032ca2a19
 SHA512:
-  metadata.gz: 28b6e35bbe05918a9ae07a794ce883e4c791e20f71d3fb1956b46a1b4c410ed7ee3f5c5382e914fcc2c90a5f78b25428b8a2a03a00a29c4b1191dce5df8d2706
-  data.tar.gz: d64ef8946b28c67a3f34e6602eed6903a8a2bb27492f576167453e2269ede2235e351ce985153495cb780e4469206da6a12d4274acf74a39b66fd81296e2d2e5
+  metadata.gz: 1704fd1870220d15467ad2d3f7de1791eca318265982344cd61519d2202e3198cfc1346305d75e44b6d32e82e5b8b17f188e09ef4a198734f577c00325b356ff
+  data.tar.gz: 603b6dc0fed0d99407bed88ef1c3b266fdd8cd9b8fa77b90e774506e41ad8de4f14fe28ebc102007a8c9d4c133f874327da637ffb2a635e7d3b62a6d453794ed

data/README.md

@@ -1,174 +1,85 @@
 # Rails Worktree
 
-A Ruby gem for managing git worktrees in Rails projects with isolated databases and configurations.
+Git worktree management for Rails projects with isolated databases and configurations.
 
 ## Features
 
 - Create git worktrees with automatic branch creation
-- Isolated database per worktree (separate database name)
-- Automatic configuration file copying (.env, database.yml, etc.)
+- Isolated databases per worktree (separate development and test databases)
+- Automatic configuration file copying
 - Copy node_modules from main worktree
 - Easy cleanup with database dropping and directory removal
-- Works across any Rails project (no hardcoded paths)
 
 ## Installation
 
-### In your Rails project Gemfile
+Add to your `Gemfile`:
 
 ```ruby
-# Add to Gemfile (development group)
 group :development do
   gem "rails-worktree"
 end
 ```
 
-Then run:
-
-```bash
-bundle install
-```
-
-The gem will automatically install a binstub to `bin/worktree` when Rails loads in development mode.
-
-### Manual binstub installation
-
-If needed, you can manually install or reinstall the binstub:
+Run `bundle install`. A binstub will be automatically created at `bin/worktree`.
 
+Manual binstub installation (if needed):
 ```bash
 bundle exec rake worktree:install
 ```
 
-To uninstall:
-
-```bash
-bundle exec rake worktree:uninstall
-```
-
-### Global installation (optional)
-
-If you want to use `worktree` command globally:
-
-```bash
-gem install rails-worktree
-```
-
 ## Usage
 
-### Create a new worktree
+### Create a worktree
 
 ```bash
-bin/worktree feature-branch
-# Creates worktree from current branch
-
-bin/worktree feature-branch main
-# Creates worktree from main branch
+bin/worktree feature-branch         # From current branch
+bin/worktree feature-branch main    # From specific branch
 ```
 
-This will:
-1. Create a new git worktree in `../feature-branch`
-2. Create a new branch called `feature-branch`
-3. Copy configuration files from main worktree
-4. Set up a separate database (e.g., `myapp_feature-branch`)
-5. Copy node_modules
-6. Run migrations and seed the database
+This creates a new worktree with:
+- Separate databases: `myapp_feature-branch_development` and `myapp_feature-branch_test`
+- Copied configuration files (`.env`, `database.yml`, `Procfile.dev`, credentials)
+- Copied `node_modules`
+- Migrated and seeded databases
 
 ### Close a worktree
 
 ```bash
-# From main repository:
-bin/worktree --close feature-branch
-
-# From within the worktree:
-bin/worktree --close
+bin/worktree --close feature-branch  # From main repo
+bin/worktree --close                 # From within worktree
 ```
 
-This will:
-1. Drop the worktree's database
-2. Remove the worktree directory
-3. Delete the branch
-4. Clean up git worktree references
+Drops both databases, removes the directory, deletes the branch, and cleans up git references.
 
-### Manual initialization (advanced)
+## Database Configuration
 
-If you need to manually initialize a worktree:
+The gem uses environment variables for database names:
 
-```bash
-cd ../feature-branch
-worktree --init feature-branch
-```
+- `DATABASE_NAME_DEVELOPMENT` - Development database name
+- `DATABASE_NAME_TEST` - Test database name
 
-## How it works
+Your `config/database.yml` should look like:
 
-### Database isolation
+```yaml
+development:
+  <<: *default
+  database: <%= ENV.fetch("DATABASE_NAME_DEVELOPMENT", "myapp_development") %>
+test:
+  <<: *default
+  database: <%= ENV.fetch("DATABASE_NAME_TEST", "myapp_test") %>
+```
 
 The gem automatically:
-- Detects your main database name from `config/database.yml`
-- Creates a new database with pattern: `{app_name}_{worktree_name}`
-- Updates the worktree's `.env` to set `DATABASE_NAME`
-- Modifies `database.yml` to use the `DATABASE_NAME` environment variable
-
-### Configuration files
-
-The following files are copied from the main worktree:
-- `.env`
-- `config/database.yml`
-- `Procfile.dev`
-- `config/credentials/development.key`
-
-### Node modules
-
-If `node_modules` exists in the main worktree, it will be copied to the new worktree.
+1. Sets these variables in the worktree's `.env` file
+2. Updates the worktree's `database.yml` to use them
+3. Creates both development and test databases with unique names
 
 ## Requirements
 
 - Ruby >= 2.6.0
-- Git with worktree support
 - Rails project with standard structure
-
-## Project structure
-
-This gem works with Rails projects that follow the standard structure:
-
-```
-your-project/
-├── config/
-│   ├── database.yml
-│   └── credentials/
-│       └── development.key
-├── .env
-├── Procfile.dev
-└── bin/
-    ├── rails
-    └── dev
-```
-
-## Development
-
-To work on the gem:
-
-```bash
-# Clone or create the gem
-cd worktree
-
-# Make changes to lib/worktree/**
-
-# Test locally
-gem build worktree.gemspec
-gem install ./worktree-0.1.0.gem
-
-# Test in a Rails project
-cd /path/to/rails/project
-worktree test-branch
-```
+- PostgreSQL (or modify for your database)
 
 ## License
 
 MIT
-
-## Contributing
-
-1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request

data/exe/worktree

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 
-require "worktree"
+require "rails-worktree"
 
-Worktree::CLI.run(ARGV)
+RailsWorktree::CLI.run(ARGV)

data/lib/rails-worktree.rb

@@ -7,6 +7,6 @@ require_relative "worktree/commands/close"
 # Load Railtie only if Rails is available
 require_relative "worktree/railtie" if defined?(Rails::Railtie)
 
-module Worktree
+module RailsWorktree
   class Error < StandardError; end
 end

data/lib/worktree/cli.rb

@@ -1,4 +1,4 @@
-module Worktree
+module RailsWorktree
   class CLI
     def self.run(args)
       new(args).run

data/lib/worktree/commands/close.rb

@@ -1,6 +1,6 @@
 require "fileutils"
 
-module Worktree
+module RailsWorktree
   module Commands
     class Close
       def initialize(args)
@@ -13,7 +13,8 @@ module Worktree
         detect_worktree_name unless @worktree_name
 
         @db_prefix = get_db_prefix
-        @database_name = "#{@db_prefix}_#{@worktree_name}"
+        @dev_database_name = "#{@db_prefix}_#{@worktree_name}_development"
+        @test_database_name = "#{@db_prefix}_#{@worktree_name}_test"
 
         detect_paths
 
@@ -21,14 +22,14 @@ module Worktree
         puts "Main worktree: #{@main_worktree}"
         puts ""
 
-        drop_database
+        drop_databases
         remove_worktree
         prune_worktrees
         delete_branch
 
         puts ""
         puts "✓ Worktree '#{@worktree_name}' closed successfully!"
-        puts "  Database #{@database_name} dropped"
+        puts "  Databases dropped: #{@dev_database_name}, #{@test_database_name}"
         puts "  Worktree removed from #{@worktree_path}"
         puts "  Branch #{@worktree_name} deleted"
       end
@@ -73,16 +74,27 @@ module Worktree
         end
       end
 
-      def drop_database
-        puts "Dropping database #{@database_name}..."
+      def drop_databases
+        puts "Dropping databases..."
 
         Dir.chdir(@worktree_dir) do
           env_file = ".env"
-          if File.exist?(env_file) && File.read(env_file).match?(/^DATABASE_NAME=#{@database_name}/)
+          env_content = File.exist?(env_file) ? File.read(env_file) : ""
+
+          # Drop development database
+          if env_content.match?(/^DATABASE_NAME_DEVELOPMENT=#{@dev_database_name}/)
             system("RAILS_ENV=development bin/rails db:drop 2>/dev/null") ||
-              puts("Warning: Could not drop database #{@database_name}")
+              puts("Warning: Could not drop development database #{@dev_database_name}")
+          else
+            puts "Warning: DATABASE_NAME_DEVELOPMENT not set in .env, skipping development database drop"
+          end
+
+          # Drop test database
+          if env_content.match?(/^DATABASE_NAME_TEST=#{@test_database_name}/)
+            system("RAILS_ENV=test bin/rails db:drop 2>/dev/null") ||
+              puts("Warning: Could not drop test database #{@test_database_name}")
           else
-            puts "Warning: DATABASE_NAME not set to #{@database_name} in .env, skipping database drop"
+            puts "Warning: DATABASE_NAME_TEST not set in .env, skipping test database drop"
           end
         end
       end

data/lib/worktree/commands/create.rb

@@ -1,4 +1,4 @@
-module Worktree
+module RailsWorktree
   module Commands
     class Create
       def initialize(args)
@@ -14,6 +14,7 @@ module Worktree
 
         @base_branch ||= current_branch
         worktree_path = "../#{@worktree_name}"
+        absolute_path = File.expand_path(worktree_path)
 
         puts "Creating worktree '#{@worktree_name}' from branch '#{@base_branch}' at #{worktree_path}..."
 
@@ -30,6 +31,10 @@ module Worktree
         Dir.chdir(worktree_path) do
           Init.new([@worktree_name]).run
         end
+
+        puts ""
+        puts "To switch to the new worktree:"
+        puts "  cd #{absolute_path}"
       end
 
       private

data/lib/worktree/commands/init.rb

@@ -1,6 +1,6 @@
 require "fileutils"
 
-module Worktree
+module RailsWorktree
   module Commands
     class Init
       def initialize(args)
@@ -16,21 +16,24 @@ module Worktree
 
         @main_worktree = get_main_worktree
         @db_prefix = get_db_prefix
-        @database_name = "#{@db_prefix}_#{@worktree_name}"
+        @dev_database_name = "#{@db_prefix}_#{@worktree_name}_development"
+        @test_database_name = "#{@db_prefix}_#{@worktree_name}_test"
 
         puts "Initializing worktree '#{@worktree_name}'..."
         puts "Main worktree: #{@main_worktree}"
-        puts "Database: #{@database_name}"
+        puts "Development database: #{@dev_database_name}"
+        puts "Test database: #{@test_database_name}"
 
         copy_config_files
-        set_database_name
+        set_database_names
         update_database_yml
         copy_node_modules
         setup_database
 
         puts ""
         puts "✓ Worktree initialized successfully!"
-        puts "  Database: #{@database_name}"
+        puts "  Development database: #{@dev_database_name}"
+        puts "  Test database: #{@test_database_name}"
         puts "  Configuration files copied"
         puts ""
         puts "To start the development server: bin/dev"
@@ -44,12 +47,16 @@ module Worktree
       end
 
       def get_db_prefix
+        # Try to get prefix from database.yml first
         database_yml = File.join(@main_worktree, "config/database.yml")
-        return nil unless File.exist?(database_yml)
+        if File.exist?(database_yml)
+          content = File.read(database_yml)
+          match = content.match(/database:\s*(\w+)_development/)
+          return match[1] if match
+        end
 
-        content = File.read(database_yml)
-        match = content.match(/database:\s*(\w+)_development/)
-        match ? match[1] : nil
+        # Fall back to using the Rails app name (directory name of main worktree)
+        File.basename(@main_worktree)
       end
 
       def copy_config_files
@@ -73,32 +80,57 @@ module Worktree
         end
       end
 
-      def set_database_name
-        puts "Setting DATABASE_NAME=#{@database_name} in .env..."
+      def set_database_names
+        puts "Setting database names in .env..."
 
         env_file = ".env"
         return unless File.exist?(env_file)
 
         content = File.read(env_file)
-        if content.match?(/^DATABASE_NAME=/)
-          content.gsub!(/^DATABASE_NAME=.*$/, "DATABASE_NAME=#{@database_name}")
+
+        # Set development database name
+        if content.match?(/^DATABASE_NAME_DEVELOPMENT=/)
+          content.gsub!(/^DATABASE_NAME_DEVELOPMENT=.*$/, "DATABASE_NAME_DEVELOPMENT=#{@dev_database_name}")
         else
-          content += "\nDATABASE_NAME=#{@database_name}\n"
+          content += "\nDATABASE_NAME_DEVELOPMENT=#{@dev_database_name}\n"
+        end
+
+        # Set test database name
+        if content.match?(/^DATABASE_NAME_TEST=/)
+          content.gsub!(/^DATABASE_NAME_TEST=.*$/, "DATABASE_NAME_TEST=#{@test_database_name}")
+        else
+          content += "DATABASE_NAME_TEST=#{@test_database_name}\n"
         end
 
         File.write(env_file, content)
       end
 
       def update_database_yml
-        puts "Updating database.yml to use DATABASE_NAME..."
+        puts "Updating database.yml to use separate database names..."
 
         database_yml = "config/database.yml"
         return unless File.exist?(database_yml)
 
         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\", \"#{@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\") %>"
         )
 
         File.write(database_yml, content)
@@ -116,13 +148,15 @@ module Worktree
       end
 
       def setup_database
-        puts "Creating database #{@database_name}..."
-        system("RAILS_ENV=development bin/rails db:create") || puts("Warning: Could not create 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")
 
         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 "Seeding database..."
+        puts "Seeding development database..."
         system("RAILS_ENV=development bin/rails db:seed") || puts("Warning: Could not seed database")
       end
     end

data/lib/worktree/railtie.rb

@@ -1,6 +1,6 @@
 require "rails/railtie"
 
-module Worktree
+module RailsWorktree
   class Railtie < Rails::Railtie
     railtie_name :worktree
 
@@ -20,9 +20,9 @@ module Worktree
             #!/usr/bin/env ruby
 
             require "bundler/setup"
-            require "worktree"
+            require "rails-worktree"
 
-            Worktree::CLI.run(ARGV)
+            RailsWorktree::CLI.run(ARGV)
           RUBY
 
           FileUtils.chmod("+x", binstub_path)

data/lib/worktree/tasks.rb

@@ -12,9 +12,9 @@ namespace :worktree do
       #!/usr/bin/env ruby
 
       require "bundler/setup"
-      require "worktree"
+      require "rails-worktree"
 
-      Worktree::CLI.run(ARGV)
+      RailsWorktree::CLI.run(ARGV)
     RUBY
 
     File.chmod(0755, binstub_path)

data/lib/worktree/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails-worktree
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.3
 platform: ruby
 authors:
 - Martin Ulleberg
@@ -21,7 +21,6 @@ files:
 - README.md
 - exe/worktree
 - lib/rails-worktree.rb
-- lib/worktree.rb
 - lib/worktree/cli.rb
 - lib/worktree/commands/close.rb
 - lib/worktree/commands/create.rb

data/lib/worktree.rb

@@ -1,12 +0,0 @@
-require_relative "worktree/version"
-require_relative "worktree/cli"
-require_relative "worktree/commands/create"
-require_relative "worktree/commands/init"
-require_relative "worktree/commands/close"
-
-# Load Railtie only if Rails is available
-require_relative "worktree/railtie" if defined?(Rails::Railtie)
-
-module Worktree
-  class Error < StandardError; end
-end