rails-worktrees 0.1.1 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c6da0f27411c99c20b5ab3496a4ac0672ba6a3833e429b33b53b5884d3a3c76
-  data.tar.gz: cb144472bad91868165d8a37de3ba12f0675255aabc2fa3df0d9e8d6c3d736ff
+  metadata.gz: 971ba5f8f872a37a91d2e8c1755bf838db8bf67a767dbfba1b105b727440d9b7
+  data.tar.gz: dd0441f61442afffc29b7ab5f70968abd0c35c59e2731247cc55ddeae6e18265
 SHA512:
-  metadata.gz: 7d959fde216a23fa191dca31294ff776b0091e3f230db9191a87890e8736217c3182b773e2950b18cbc151c20f833b238b7f3a07e618a5a4aa997bad5191760e
-  data.tar.gz: 7abecada6524724a90bd993b3975ce8b20a05e5123c0a9e2f6a2e8bc3d5435d04590a2ba3df83561ec41004d03d83627d48659866290b78b5ce4ed3bebbabfb1
+  metadata.gz: 1e77b1961db51bcaca110efe1b8c9c6c96e848b523f30e158cc55c94550023fb85289b124ec859abd6957542ae0fcc4e20a63f793985b87ea5a03e2302b9748a
+  data.tar.gz: 5955435a25990d85b834e9c22d3c37d9621cab21a69dac6c6b9e038e763bc8346a8f6a23886f37098285cd6f055496417f85b34f8351e9f5b4d3e6115b429753

data/.release-please-manifest.json

@@ -1 +1 @@
-{".":"0.1.1"}
+{".":"0.2.1"}

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## [0.2.1](https://github.com/asjer/rails-worktrees/compare/v0.2.0...v0.2.1) (2026-03-30)
+
+
+### Bug Fixes
+
+* **puma:** add missing `DEV_PORT` support to config/puma.rb ([3fd71a0](https://github.com/asjer/rails-worktrees/commit/3fd71a04d79732bed4cf626951abe06ddbc01153))
+
+## [0.2.0](https://github.com/asjer/rails-worktrees/compare/v0.1.1...v0.2.0) (2026-03-30)
+
+
+### Features
+
+* add `--yolo` mode to install common follow-ups without manual edits ([1ec82ec](https://github.com/asjer/rails-worktrees/commit/1ec82ec83726b5ca9cbaee39697c607fdb825f26))
+
 ## [0.1.1](https://github.com/asjer/rails-worktrees/compare/v0.1.0...v0.1.1) (2026-03-30)
 
 

data/README.md

@@ -13,6 +13,8 @@
 ```bash
 bundle add rails-worktrees
 bin/rails generate worktrees:install
+# or, to apply the common Procfile.dev + Puma + mise follow-ups automatically:
+bin/rails generate worktrees:install --yolo
 ```
 
 The installer adds:
@@ -22,6 +24,12 @@ The installer adds:
 - `Procfile.dev.worktree.example` — a copy-paste helper for `${DEV_PORT:-3000}` in `Procfile.dev`
 - a safe update to `config/database.yml` for common development/test database names
 
+With `--yolo`, the installer also:
+
+- replaces the existing `web:` entry in `Procfile.dev` with the DEV_PORT-aware command when `Procfile.dev` already exists
+- updates `config/puma.rb` to use `port ENV['DEV_PORT'] || ENV.fetch('PORT', 3000)` when it still uses a supported default `PORT` binding
+- updates `mise.toml` or `.mise.toml` to load `.env` from `[env]` when either file already exists
+
 ## Usage
 
 ```bash
@@ -115,12 +123,20 @@ When `bin/wt` creates a worktree it writes a worktree-local `.env` with:
 
 Existing `.env` values are never overwritten.
 
-The gem does **not** edit your `Procfile.dev` or add dotenv. The installer generates `Procfile.dev.worktree.example` with a ready-to-copy line:
+By default, the installer does **not** edit your `Procfile.dev`, `config/puma.rb`, or `mise` config. It generates `Procfile.dev.worktree.example` with a ready-to-copy line:
 
 ```text
 web: env RUBY_DEBUG_OPEN=true bin/rails server -b 0.0.0.0 -p ${DEV_PORT:-3000}
 ```
 
+If you run `bin/rails generate worktrees:install --yolo`, the installer applies the three common follow-ups for you when the files already exist:
+
+- replace the existing `web:` entry in `Procfile.dev`
+- update `config/puma.rb` to `port ENV['DEV_PORT'] || ENV.fetch('PORT', 3000)` when it still uses a supported default `PORT` binding
+- add `_.file = ".env"` to the `[env]` section of `mise.toml` or `.mise.toml`
+
+On a regular install, the follow-up message also suggests the same `config/puma.rb` edit when Puma still uses the default `PORT` binding.
+
 Use a project-local env loader like `mise` with `_.file = ".env"` to keep values scoped per-worktree.
 
 ## Development
@@ -141,8 +157,8 @@ This smoke test:
 
 - creates a temporary Rails app from a compatible Rails version
 - installs `rails-worktrees` from the current checkout path
-- runs `bin/rails generate worktrees:install`
-- verifies `bin/wt`, the generated initializer, the Procfile example, `config/database.yml` patching, and worktree `.env` bootstrapping
+- runs `bin/rails generate worktrees:install --yolo`
+- verifies `bin/wt`, the generated initializer, the Procfile example, yolo updates to `Procfile.dev`, `config/puma.rb`, and `mise.toml`, `config/database.yml` patching, and worktree `.env` bootstrapping
 - creates a temporary bare `origin` and confirms `bin/wt smoke-branch` creates a real worktree
 
 By default, the script cleans up all temp directories after the run. Set `KEEP_SMOKE_TEST_ARTIFACTS=1` to keep them around for debugging, or set `RAILS_WORKTREES_SMOKE_RAILS_VERSION` to try a different compatible Rails version.

data/lib/generators/rails/worktrees/mise_follow_up.rb

@@ -11,7 +11,8 @@ module Rails
           [
             '',
             '      Tip:',
-            '        Detected mise.toml. To auto-load the worktree-local .env when you enter a worktree,',
+            "        Detected #{File.basename(mise_toml_path)}. To auto-load the worktree-local .env when",
+            '        you enter a worktree,',
             '        consider adding:',
             '          [env]',
             '          _.file = ".env"'
@@ -19,15 +20,24 @@ module Rails
         end
 
         def suggest_mise_env_file?
-          File.file?(mise_toml_path) && !mise_env_file_configured?
+          mise_toml_path && !mise_env_file_configured?
         end
 
         def mise_env_file_configured?
-          File.read(mise_toml_path).match?(/^\s*_.file\s*=\s*["']\.env["']\s*$/)
+          return false unless mise_toml_path
+
+          File.read(mise_toml_path).match?(/^\s*_.file\s*=\s*["']\.env["']\s*(?:#.*)?\s*$/)
         end
 
         def mise_toml_path
-          File.join(destination_root, 'mise.toml')
+          @mise_toml_path ||= mise_toml_paths.find { |path| File.file?(path) }
+        end
+
+        def mise_toml_paths
+          [
+            File.join(destination_root, 'mise.toml'),
+            File.join(destination_root, '.mise.toml')
+          ]
         end
       end
     end

data/lib/generators/rails/worktrees/puma_follow_up.rb

@@ -0,0 +1,45 @@
+module Rails
+  module Worktrees
+    module Generators
+      # Detects config/puma.rb setups that should prefer the worktree-local DEV_PORT.
+      module PumaFollowUp
+        private
+
+        def puma_follow_up_notes_text
+          return '' unless suggest_puma_dev_port_update?
+
+          [
+            '',
+            '      Tip:',
+            '        Detected config/puma.rb. To bind Puma to the worktree-local DEV_PORT,',
+            '        consider changing the port line to:',
+            "          #{::Rails::Worktrees::PumaConfigUpdater::STANDARD_PORT_LINE}"
+          ].join("\n")
+        end
+
+        def suggest_puma_dev_port_update?
+          existing_puma_config_path && puma_update_result.status == :updated
+        end
+
+        def puma_update_result
+          return missing_puma_update_result unless existing_puma_config_path
+
+          ::Rails::Worktrees::PumaConfigUpdater.new(content: File.read(existing_puma_config_path)).call
+        end
+
+        def missing_puma_update_result
+          ::Rails::Worktrees::PumaConfigUpdater::Result.new(nil, false, :skip, [])
+        end
+
+        def puma_config_path
+          File.join(destination_root, 'config/puma.rb')
+        end
+
+        def existing_puma_config_path
+          path = puma_config_path
+          File.file?(path) ? path : nil
+        end
+      end
+    end
+  end
+end

data/lib/generators/worktrees/install/install_generator.rb

@@ -2,19 +2,27 @@ require 'open3'
 require 'rails/generators'
 
 require_relative '../../rails/worktrees/mise_follow_up'
+require_relative '../../rails/worktrees/puma_follow_up'
 require_relative '../../../rails/worktrees/database_config_updater'
+require_relative '../../../rails/worktrees/procfile_updater'
+require_relative '../../../rails/worktrees/mise_toml_updater'
+require_relative '../../../rails/worktrees/puma_config_updater'
 
 module Worktrees
   module Generators
     # Installs the wt wrapper, configuration, and safe database.yml updates.
+    # rubocop:disable Metrics/ClassLength
     class InstallGenerator < ::Rails::Generators::Base
       include ::Rails::Worktrees::Generators::MiseFollowUp
+      include ::Rails::Worktrees::Generators::PumaFollowUp
 
       namespace 'worktrees:install'
       desc 'Installs bin/wt, a Rails::Worktrees initializer, and updates config/database.yml when safe.'
       source_root File.expand_path('../../rails/worktrees/templates', __dir__)
       class_option :conductor, type: :boolean, default: false,
                                desc: 'Configure the installer for ~/Sites/conductor/workspaces'
+      class_option :yolo, type: :boolean, default: false,
+                          desc: 'Apply common Procfile.dev, config/puma.rb, and mise .env follow-up edits when safe'
 
       FOLLOW_UP_TEMPLATE = <<~TEXT.freeze
           ============================================
@@ -46,6 +54,14 @@ module Worktrees
         template('Procfile.dev.worktree.example.tt', 'Procfile.dev.worktree.example')
       end
 
+      def apply_yolo_follow_ups
+        return unless options[:yolo]
+
+        update_procfile
+        update_puma_config
+        update_mise_toml
+      end
+
       def update_database_configuration
         unless File.exist?(database_config_path)
           say_status(:skip, 'config/database.yml not found', :yellow)
@@ -76,6 +92,21 @@ module Worktrees
         File.join(destination_root, 'config/database.yml')
       end
 
+      def procfile_path
+        File.join(destination_root, 'Procfile.dev')
+      end
+
+      def puma_config_path
+        File.join(destination_root, 'config/puma.rb')
+      end
+
+      def mise_toml_paths
+        [
+          File.join(destination_root, 'mise.toml'),
+          File.join(destination_root, '.mise.toml')
+        ]
+      end
+
       def database_update_result
         result = ::Rails::Worktrees::DatabaseConfigUpdater.new(
           content: File.read(database_config_path)
@@ -90,6 +121,10 @@ module Worktrees
         "\n#{format(FOLLOW_UP_TEMPLATE, installed: installed_items_text, notes: follow_up_notes_text)}"
       end
 
+      def follow_up_notes_text
+        [super, puma_follow_up_notes_text].join
+      end
+
       def installed_items_text
         items = [
           '      • bin/wt',
@@ -117,6 +152,63 @@ module Worktrees
         result.messages.each { |message| say(message) }
       end
 
+      def update_procfile
+        unless File.exist?(procfile_path)
+          say_status(:skip, 'Procfile.dev not found', :yellow)
+          say('Skipped Procfile.dev yolo update because the file does not exist yet.')
+          return
+        end
+
+        result = ::Rails::Worktrees::ProcfileUpdater.new(content: File.read(procfile_path)).call
+        File.write(procfile_path, result.content) if result.changed?
+        announce_updater_result('Procfile.dev', result)
+      end
+
+      def update_puma_config
+        unless File.exist?(puma_config_path)
+          say_status(:skip, 'config/puma.rb not found', :yellow)
+          say('Skipped config/puma.rb yolo update because the file does not exist yet.')
+          return
+        end
+
+        result = ::Rails::Worktrees::PumaConfigUpdater.new(content: File.read(puma_config_path)).call
+        File.write(puma_config_path, result.content) if result.changed?
+        announce_updater_result('config/puma.rb', result)
+      end
+
+      def update_mise_toml
+        path = first_mise_toml_path
+        return announce_missing_mise_toml unless path
+
+        result = ::Rails::Worktrees::MiseTomlUpdater.new(
+          content: File.read(path),
+          file_name: File.basename(path)
+        ).call
+
+        File.write(path, result.content) if result.changed?
+        announce_updater_result(File.basename(path), result)
+      end
+
+      def announce_updater_result(path, result)
+        status, color = case result.status
+                        when :updated then %i[update green]
+                        when :identical then %i[identical blue]
+                        else %i[skip yellow]
+                        end
+
+        say_status(status, path, color)
+        result.messages.each { |message| say(message) }
+      end
+
+      def first_mise_toml_path
+        mise_toml_paths.find { |candidate| File.file?(candidate) }
+      end
+
+      def announce_missing_mise_toml
+        say_status(:skip, 'mise.toml/.mise.toml not found', :yellow)
+        say('Skipped mise yolo update because no supported mise config file was found.')
+      end
+
       def git_repo?
         _stdout_str, _stderr_str, status = Open3.capture3(
           'git', 'rev-parse', '--is-inside-work-tree', chdir: destination_root
@@ -130,5 +222,6 @@ module Worktrees
         "File.expand_path('~/Sites/conductor/workspaces')"
       end
     end
+    # rubocop:enable Metrics/ClassLength
   end
 end

data/lib/rails/worktrees/mise_toml_updater.rb

@@ -0,0 +1,82 @@
+module Rails
+  module Worktrees
+    # Safely updates mise config to load the worktree-local .env.
+    class MiseTomlUpdater
+      Result = Struct.new(:content, :changed, :status, :messages) do
+        def changed?
+          changed
+        end
+      end
+
+      ENV_SECTION_PATTERN = /\A\s*\[env\]\s*(?:#.*)?\z/
+      ENV_FILE_PATTERN = /\A\s*_.file\s*=\s*["']\.env["']\s*(?:#.*)?\z/
+      SECTION_PATTERN = /\A\s*\[[^\]]+\]\s*(?:#.*)?\z/
+      ENV_FILE_ENTRY = '_.file = ".env"'.freeze
+
+      def initialize(content:, file_name:)
+        @content = content
+        @file_name = file_name
+      end
+
+      def call
+        lines = @content.lines(chomp: true)
+        return update_existing_env_section(lines) if env_section_present?(lines)
+
+        append_env_section(lines)
+      end
+
+      private
+
+      def update_existing_env_section(lines)
+        env_section_start, env_section_end = env_section_bounds(lines)
+        return identical_result if env_file_configured?(lines, env_section_start, env_section_end)
+
+        updated_lines = lines.dup
+        updated_lines.insert(env_section_end, ENV_FILE_ENTRY)
+        updated_result(rebuild_content(updated_lines, trailing_newline: @content.end_with?("\n")))
+      end
+
+      def append_env_section(lines)
+        updated_lines = lines.dup
+        updated_lines << '' if updated_lines.any? && !updated_lines.last.empty?
+        updated_lines << '[env]'
+        updated_lines << ENV_FILE_ENTRY
+
+        updated_result(rebuild_content(updated_lines, trailing_newline: true))
+      end
+
+      def updated_result(content)
+        Result.new(content, true, :updated, ["Configured #{@file_name} to load .env from [env]."])
+      end
+
+      def identical_result
+        Result.new(@content, false, :identical, ["#{@file_name} already loads .env from [env]."])
+      end
+
+      def env_section_bounds(lines)
+        start_index = lines.find_index { |line| line.match?(ENV_SECTION_PATTERN) }
+        return [nil, nil] unless start_index
+
+        end_index = ((start_index + 1)...lines.length).find do |index|
+          lines[index].match?(SECTION_PATTERN)
+        end || lines.length
+        [start_index, end_index]
+      end
+
+      def env_section_present?(lines)
+        env_section_bounds(lines).first
+      end
+
+      def env_file_configured?(lines, start_index, end_index)
+        lines[(start_index + 1)...end_index].any? { |line| line.match?(ENV_FILE_PATTERN) }
+      end
+
+      def rebuild_content(lines, trailing_newline:)
+        content = lines.join("\n")
+        return content if content.empty? || !trailing_newline
+
+        "#{content}\n"
+      end
+    end
+  end
+end

data/lib/rails/worktrees/procfile_updater.rb

@@ -0,0 +1,69 @@
+module Rails
+  module Worktrees
+    # Safely updates Procfile.dev to use the worktree-local DEV_PORT.
+    class ProcfileUpdater
+      Result = Struct.new(:content, :changed, :status, :messages) do
+        def changed?
+          changed
+        end
+      end
+
+      STANDARD_WEB_ENTRY = 'web: env RUBY_DEBUG_OPEN=true bin/rails server -b 0.0.0.0 -p ${DEV_PORT:-3000}'.freeze
+      WEB_ENTRY_PATTERN = /\Aweb:\s*.*\z/
+
+      def initialize(content:)
+        @content = content
+      end
+
+      def call
+        lines = @content.lines(chomp: true)
+        web_entry_indexes = web_entry_indexes(lines)
+        return skip_result if web_entry_indexes.empty?
+
+        updated_content = rebuild_content(
+          replace_web_entries(lines, web_entry_indexes),
+          trailing_newline: @content.end_with?("\n")
+        )
+
+        build_result(updated_content)
+      end
+
+      private
+
+      def updated_result(content)
+        Result.new(content, true, :updated, ['Updated Procfile.dev web entry to use DEV_PORT.'])
+      end
+
+      def identical_result(content)
+        Result.new(content, false, :identical, ['Procfile.dev already uses the DEV_PORT-aware web entry.'])
+      end
+
+      def skip_result
+        Result.new(@content, false, :skip, ['No web: entry found in Procfile.dev; update it manually if needed.'])
+      end
+
+      def web_entry_indexes(lines)
+        lines.each_index.select { |index| lines[index].match?(WEB_ENTRY_PATTERN) }
+      end
+
+      def replace_web_entries(lines, web_entry_indexes)
+        lines.dup.tap do |updated_lines|
+          web_entry_indexes.each { |index| updated_lines[index] = STANDARD_WEB_ENTRY }
+        end
+      end
+
+      def build_result(content)
+        return identical_result(content) if content == @content
+
+        updated_result(content)
+      end
+
+      def rebuild_content(lines, trailing_newline:)
+        content = lines.join("\n")
+        return content if content.empty? || !trailing_newline
+
+        "#{content}\n"
+      end
+    end
+  end
+end

data/lib/rails/worktrees/puma_config_updater.rb

@@ -0,0 +1,91 @@
+module Rails
+  module Worktrees
+    # Safely updates config/puma.rb to bind Puma to the worktree-local DEV_PORT.
+    class PumaConfigUpdater
+      Result = Struct.new(:content, :changed, :status, :messages) do
+        def changed?
+          changed
+        end
+      end
+
+      STANDARD_PORT_LINE = "port ENV['DEV_PORT'] || ENV.fetch('PORT', 3000)".freeze
+      CURRENT_PORT_PATTERN = /\A\s*port\s+ENV\.fetch\(["']PORT["'],\s*3000\)\s*(?:#.*)?\z/
+      LEGACY_PORT_PATTERN = /\A\s*port\s+ENV\.fetch\(["']PORT["']\)\s*\{\s*3000\s*\}\s*(?:#.*)?\z/
+      PORT_LINE_PATTERN = /\A\s*port\s+/
+      DEV_PORT_ACCESS_PATTERN = /ENV\[(["'])DEV_PORT\1\]/
+      DEV_PORT_FETCH_PATTERN = /ENV\.fetch\((["'])DEV_PORT\1(?:\s*,|\s*\))/
+
+      def initialize(content:)
+        @content = content
+      end
+
+      def call
+        lines = @content.lines(chomp: true)
+        return identical_result(@content) if dev_port_configured?(lines)
+
+        port_line_indexes = supported_port_line_indexes(lines)
+        return skip_result if port_line_indexes.empty?
+
+        updated_content = rebuild_content(
+          replace_port_lines(lines, port_line_indexes),
+          trailing_newline: @content.end_with?("\n")
+        )
+
+        updated_result(updated_content)
+      end
+
+      private
+
+      def updated_result(content)
+        Result.new(content, true, :updated, ['Updated config/puma.rb to prefer DEV_PORT before PORT.'])
+      end
+
+      def identical_result(content)
+        Result.new(content, false, :identical, ['config/puma.rb already uses DEV_PORT-aware port binding.'])
+      end
+
+      def skip_result
+        Result.new(
+          @content,
+          false,
+          :skip,
+          ['No supported Puma port binding found in config/puma.rb; update it manually if needed.']
+        )
+      end
+
+      def dev_port_configured?(lines)
+        lines.any? do |line|
+          line.match?(PORT_LINE_PATTERN) &&
+            (line.match?(DEV_PORT_ACCESS_PATTERN) || line.match?(DEV_PORT_FETCH_PATTERN))
+        end
+      end
+
+      def supported_port_line_indexes(lines)
+        lines.each_index.select { |index| supported_port_line?(lines[index]) }
+      end
+
+      def supported_port_line?(line)
+        line.match?(CURRENT_PORT_PATTERN) || line.match?(LEGACY_PORT_PATTERN)
+      end
+
+      def replace_port_lines(lines, port_line_indexes)
+        lines.dup.tap do |updated_lines|
+          port_line_indexes.each do |index|
+            original_line = lines[index]
+            indent = original_line[/\A\s*/]
+            trailing_comment = original_line[/(\s*#.*)\z/, 1].to_s
+
+            updated_lines[index] = "#{indent}#{STANDARD_PORT_LINE}#{trailing_comment}"
+          end
+        end
+      end
+
+      def rebuild_content(lines, trailing_newline:)
+        content = lines.join("\n")
+        return content if content.empty? || !trailing_newline
+
+        "#{content}\n"
+      end
+    end
+  end
+end

data/lib/rails/worktrees/version.rb

@@ -1,5 +1,5 @@
 module Rails
   module Worktrees
-    VERSION = '0.1.1'.freeze
+    VERSION = '0.2.1'.freeze
   end
 end

data/lib/rails/worktrees.rb

@@ -6,6 +6,9 @@ require_relative 'worktrees/env_bootstrapper'
 require_relative 'worktrees/command'
 require_relative 'worktrees/cli'
 require_relative 'worktrees/database_config_updater'
+require_relative 'worktrees/procfile_updater'
+require_relative 'worktrees/mise_toml_updater'
+require_relative 'worktrees/puma_config_updater'
 
 module Rails
   # Rails-specific git worktree helpers and installer support.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails-worktrees
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.1
 platform: ruby
 authors:
 - Asjer Querido
@@ -46,6 +46,7 @@ files:
 - exe/wt
 - lefthook.yml
 - lib/generators/rails/worktrees/mise_follow_up.rb
+- lib/generators/rails/worktrees/puma_follow_up.rb
 - lib/generators/rails/worktrees/templates/Procfile.dev.worktree.example.tt
 - lib/generators/rails/worktrees/templates/bin/wt
 - lib/generators/rails/worktrees/templates/rails_worktrees.rb.tt
@@ -61,7 +62,10 @@ files:
 - lib/rails/worktrees/configuration.rb
 - lib/rails/worktrees/database_config_updater.rb
 - lib/rails/worktrees/env_bootstrapper.rb
+- lib/rails/worktrees/mise_toml_updater.rb
 - lib/rails/worktrees/names/cities.txt
+- lib/rails/worktrees/procfile_updater.rb
+- lib/rails/worktrees/puma_config_updater.rb
 - lib/rails/worktrees/railtie.rb
 - lib/rails/worktrees/version.rb
 - mise.toml