rails-worktrees 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e86a789b2e56f07d95a626b67c9fafbf01862e9c8496043107914b4446e13702
-  data.tar.gz: 9f0dce854a6c7a20dfedb00dd181f7ecc5699ae6cf86ff61d24d60bce80be11e
+  metadata.gz: 36b6c2a6e2e481803b035ba28c575c1619ba5fb1d158f0e4c6e4180d69aeafee
+  data.tar.gz: 9265e0459e03d34cbc4962b181bdd62836ddb4433c392d8aac43b65f445992a1
 SHA512:
-  metadata.gz: 16513989c4364e4cf37d4eb0cf1fbde3fc95d8aa246223b5e9cca20da0035266d8f33e81a115d83b95b359ff93292796ba88889f06495c9d8b39fde11eb8d5b4
-  data.tar.gz: 1bcdfe219ef78dadeeaf7a8de8cc71662de4e0066b6bebf9941aa59d86c9349a38e3caf0671693dc321b54b672618e7b9b772994efb48511628f77718345aceb
+  metadata.gz: 7cfecdcffdaeb1e229332c1a8a20ed80f2600886a58deb4f2f9b186c70957f2b70224a950e1c9109b3d9d234db3c18fe7789074ba1109e58d6e1da35236e2923
+  data.tar.gz: 977ebc76e219d9e31d05595852ab830355c6ca30f2617d2ead869b4d5ccce18b0bbc0360dd4e533aff6ffab53c7eee7c20480ec2f380881c69d5387e859526b0

data/.release-please-manifest.json

@@ -1 +1 @@
-{".":"0.7.0"}
+{".":"0.7.1"}

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [0.7.1](https://github.com/asjer/rails-worktrees/compare/v0.7.0...v0.7.1) (2026-07-06)
+
+
+### Bug Fixes
+
+* **wt:** bootstrap mise before bundler ([24720a1](https://github.com/asjer/rails-worktrees/commit/24720a1cf51ce55676277c478f3b86bbb98e72eb))
+
 ## [0.7.0](https://github.com/asjer/rails-worktrees/compare/v0.6.0...v0.7.0) (2026-04-05)
 
 

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

@@ -3,6 +3,8 @@ module Rails
     module Generators
       # Detects common mise.toml setups and suggests loading the worktree-local .env.
       module MiseFollowUp
+        FILE_ENCODING = 'UTF-8'.freeze
+
         private
 
         def follow_up_notes_text
@@ -26,7 +28,7 @@ module Rails
         def mise_env_file_configured?
           return false unless mise_toml_path
 
-          File.read(mise_toml_path).match?(/^\s*_.file\s*=\s*["']\.env["']\s*(?:#.*)?\s*$/)
+          File.read(mise_toml_path, encoding: FILE_ENCODING).match?(/^\s*_.file\s*=\s*["']\.env["']\s*(?:#.*)?\s*$/)
         end
 
         def mise_toml_path

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

@@ -3,6 +3,8 @@ module Rails
     module Generators
       # Detects config/puma.rb setups that should prefer the worktree-local DEV_PORT.
       module PumaFollowUp
+        FILE_ENCODING = 'UTF-8'.freeze
+
         private
 
         def puma_follow_up_notes_text
@@ -24,7 +26,9 @@ module Rails
         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
+          ::Rails::Worktrees::PumaConfigUpdater.new(
+            content: File.read(existing_puma_config_path, encoding: FILE_ENCODING)
+          ).call
         end
 
         def missing_puma_update_result

data/lib/generators/rails/worktrees/templates/bin/wt

@@ -1,5 +1,65 @@
-#!/usr/bin/env ruby
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
+#!/usr/bin/env bash
+set -e
 
-require 'bundler/setup'
-load Gem.bin_path('rails-worktrees', 'wt')
+wt_prepend_path() {
+  case ":${PATH:-}:" in
+    *":$1:"*) ;;
+    *) PATH="$1${PATH:+:$PATH}" ;;
+  esac
+}
+
+wt_prepend_path "/usr/local/bin"
+wt_prepend_path "/opt/homebrew/bin"
+if [ -n "${HOME:-}" ]; then
+  wt_prepend_path "$HOME/.local/bin"
+fi
+export PATH
+
+wt_locale_needs_utf8() {
+  case "${1:-}" in
+    ""|C|POSIX) return 0 ;;
+    *) return 1 ;;
+  esac
+}
+
+wt_utf8_locale() {
+  if command -v locale >/dev/null 2>&1 && locale -a 2>/dev/null | grep -Eiq '^(C|c)[_.-]UTF-?8$'; then
+    printf '%s' 'C.UTF-8'
+  else
+    printf '%s' 'en_US.UTF-8'
+  fi
+}
+
+if wt_locale_needs_utf8 "${LANG:-}" || { [ -n "${LC_ALL:-}" ] && wt_locale_needs_utf8 "${LC_ALL:-}"; }; then
+  WT_UTF8_LOCALE="${LANG:-}"
+  if wt_locale_needs_utf8 "$WT_UTF8_LOCALE"; then
+    WT_UTF8_LOCALE="$(wt_utf8_locale)"
+  fi
+
+  if wt_locale_needs_utf8 "${LANG:-}"; then
+    export LANG="$WT_UTF8_LOCALE"
+  fi
+  if [ -n "${LC_ALL:-}" ] && wt_locale_needs_utf8 "${LC_ALL:-}"; then
+    export LC_ALL="$WT_UTF8_LOCALE"
+  fi
+fi
+
+WT_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd -P)"
+WT_SCRIPT_PATH="$WT_SCRIPT_DIR/$(basename "${BASH_SOURCE[0]}")"
+WT_APP_ROOT="$(cd "$WT_SCRIPT_DIR/.." && pwd -P)"
+WT_MISE_CONFIG=""
+
+if [ -f "$WT_APP_ROOT/mise.toml" ]; then
+  WT_MISE_CONFIG="$WT_APP_ROOT/mise.toml"
+elif [ -f "$WT_APP_ROOT/.mise.toml" ]; then
+  WT_MISE_CONFIG="$WT_APP_ROOT/.mise.toml"
+fi
+
+if [ -n "$WT_MISE_CONFIG" ] && [ -z "${RAILS_WORKTREES_BOOTSTRAPPED:-}" ] && command -v mise >/dev/null 2>&1; then
+  mise trust "$WT_MISE_CONFIG" >/dev/null || true
+  export RAILS_WORKTREES_BOOTSTRAPPED=1
+  exec mise exec -- "$WT_SCRIPT_PATH" "$@"
+fi
+
+export BUNDLE_GEMFILE="${BUNDLE_GEMFILE:-$WT_APP_ROOT/Gemfile}"
+exec ruby -rbundler/setup -e 'load Gem.bin_path("rails-worktrees", "wt")' -- "$@"

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

@@ -36,6 +36,8 @@ module Worktrees
                      'follow-up edits when safe; also generate bin/ob'
                    ].join(' ')
 
+      FILE_ENCODING = 'UTF-8'.freeze
+
       FOLLOW_UP_TEMPLATE = <<~TEXT.freeze
           ============================================
             rails-worktrees installed successfully! 🚂
@@ -130,7 +132,7 @@ module Worktrees
 
       def database_update_result
         result = ::Rails::Worktrees::DatabaseConfigUpdater.new(
-          content: File.read(database_config_path)
+          content: File.read(database_config_path, encoding: FILE_ENCODING)
         ).call
 
         File.write(database_config_path, result.content) if result.changed?
@@ -181,7 +183,9 @@ module Worktrees
           return
         end
 
-        result = ::Rails::Worktrees::ProcfileUpdater.new(content: File.read(procfile_path)).call
+        result = ::Rails::Worktrees::ProcfileUpdater.new(
+          content: File.read(procfile_path, encoding: FILE_ENCODING)
+        ).call
         File.write(procfile_path, result.content) if result.changed?
         announce_updater_result('Procfile.dev', result)
       end
@@ -193,7 +197,9 @@ module Worktrees
           return
         end
 
-        result = ::Rails::Worktrees::PumaConfigUpdater.new(content: File.read(puma_config_path)).call
+        result = ::Rails::Worktrees::PumaConfigUpdater.new(
+          content: File.read(puma_config_path, encoding: FILE_ENCODING)
+        ).call
         File.write(puma_config_path, result.content) if result.changed?
         announce_updater_result('config/puma.rb', result)
       end
@@ -203,7 +209,7 @@ module Worktrees
         return announce_missing_mise_toml unless path
 
         result = ::Rails::Worktrees::MiseTomlUpdater.new(
-          content: File.read(path),
+          content: File.read(path, encoding: FILE_ENCODING),
           file_name: File.basename(path)
         ).call
 
@@ -249,13 +255,19 @@ module Worktrees
 
       def git_repo?
         _stdout_str, _stderr_str, status = Open3.capture3(
-          'git', 'rev-parse', '--is-inside-work-tree', chdir: destination_root
+          git_process_env, 'git', 'rev-parse', '--is-inside-work-tree',
+          chdir: destination_root,
+          unsetenv_others: true
         )
         status.success?
       rescue Errno::ENOENT
         false
       end
 
+      def git_process_env
+        ENV.to_h.slice('HOME', 'PATH')
+      end
+
       def conductor_workspace_root
         "File.expand_path('~/Sites/conductor/workspaces')"
       end

data/lib/rails/worktrees/browser_command.rb

@@ -8,6 +8,7 @@ module Rails
     class BrowserCommand
       APP_ROOT_ENV_KEY = 'RAILS_WORKTREES_APP_ROOT'.freeze
       ENV_FILE_NAME = '.env'.freeze
+      FILE_ENCODING = 'UTF-8'.freeze
 
       def initialize(argv:, io:, env:, cwd:, host_os: RbConfig::CONFIG['host_os'])
         @argv = argv.dup
@@ -127,7 +128,7 @@ module Rails
       def dev_port_from_env_file
         return unless File.file?(env_path)
 
-        lines = File.readlines(env_path, chomp: true)
+        lines = File.readlines(env_path, chomp: true, encoding: FILE_ENCODING)
         env_value(lines, 'DEV_PORT')
       rescue StandardError => e
         raise Error, "Could not read #{env_path}: #{e.message}"

data/lib/rails/worktrees/command/git_operations.rb

@@ -7,6 +7,26 @@ module Rails
       # Shell-level git helpers, branch/worktree queries, and worktree creation.
       # rubocop:disable Metrics/ModuleLength
       module GitOperations
+        GIT_REPOSITORY_ENV_KEYS = %w[
+          GIT_ALTERNATE_OBJECT_DIRECTORIES
+          GIT_COMMON_DIR
+          GIT_CONFIG
+          GIT_CONFIG_COUNT
+          GIT_CONFIG_PARAMETERS
+          GIT_DIR
+          GIT_GRAFT_FILE
+          GIT_IMPLICIT_WORK_TREE
+          GIT_INDEX_FILE
+          GIT_NAMESPACE
+          GIT_NO_REPLACE_OBJECTS
+          GIT_OBJECT_DIRECTORY
+          GIT_PREFIX
+          GIT_QUARANTINE_PATH
+          GIT_REPLACE_REF_BASE
+          GIT_SHALLOW_FILE
+          GIT_WORK_TREE
+        ].freeze
+
         private
 
         def require_git_repo
@@ -162,24 +182,42 @@ module Rails
         end
 
         def git!(*)
-          stdout_str, stderr_str, status = Open3.capture3(@env.to_h, 'git', *, chdir: @cwd)
+          stdout_str, stderr_str, status = Open3.capture3(
+            git_process_env, 'git', *, chdir: @cwd, unsetenv_others: true
+          )
+          stdout_str = command_output(stdout_str)
+          stderr_str = command_output(stderr_str)
           return stdout_str if status.success?
 
           raise Error, combined_output(stdout_str, stderr_str)
         end
 
         def git_capture(*, allow_failure: false)
-          stdout_str, stderr_str, status = Open3.capture3(@env.to_h, 'git', *, chdir: @cwd)
+          stdout_str, stderr_str, status = Open3.capture3(
+            git_process_env, 'git', *, chdir: @cwd, unsetenv_others: true
+          )
+          stdout_str = command_output(stdout_str)
+          stderr_str = command_output(stderr_str)
           return stdout_str if status.success? || allow_failure
 
           raise Error, combined_output(stdout_str, stderr_str)
         end
 
         def git_success?(*)
-          _stdout_str, _stderr_str, status = Open3.capture3(@env.to_h, 'git', *, chdir: @cwd)
+          _stdout_str, _stderr_str, status = Open3.capture3(
+            git_process_env, 'git', *, chdir: @cwd, unsetenv_others: true
+          )
           status.success?
         end
 
+        def git_process_env
+          @env.to_h.except(*GIT_REPOSITORY_ENV_KEYS)
+        end
+
+        def command_output(output)
+          output.to_s.dup.force_encoding(Encoding::UTF_8).scrub
+        end
+
         def combined_output(stdout_str, stderr_str)
           output = [stdout_str, stderr_str].map(&:strip).reject(&:empty?).join("\n")
           return output unless output.empty?

data/lib/rails/worktrees/command/name_picking.rb

@@ -4,6 +4,8 @@ module Rails
       # Auto-picking names from bundled .txt files and tracking retired names.
       # rubocop:disable Metrics/ModuleLength
       module NamePicking
+        FILE_ENCODING = 'UTF-8'.freeze
+
         private
 
         def resolve_worktree_name(project_name, workspaces)
@@ -48,7 +50,7 @@ module Rails
         end
 
         def source_names(source_file)
-          File.readlines(source_file, chomp: true).filter_map do |line|
+          File.readlines(source_file, chomp: true, encoding: FILE_ENCODING).filter_map do |line|
             name = line.delete_suffix("\r").strip
             next if name.empty? || name.start_with?('#')
 
@@ -74,7 +76,7 @@ module Rails
           state_file = retired_names_file
           return false unless state_file
 
-          File.foreach(state_file).any? { |line| line.split("\t", 2).first == candidate }
+          File.foreach(state_file, encoding: FILE_ENCODING).any? { |line| line.split("\t", 2).first == candidate }
         end
 
         def record_retired_name(worktree_name, project_name)

data/lib/rails/worktrees/env_bootstrapper.rb

@@ -13,6 +13,7 @@ module Rails
       end
 
       ENV_FILE_NAME = '.env'.freeze
+      FILE_ENCODING = 'UTF-8'.freeze
 
       def initialize(target_dir:, worktree_name:, configuration:, peer_roots: nil)
         @target_dir = target_dir
@@ -44,7 +45,9 @@ module Rails
         result(false, [message], values)
       end
 
-      def existing_env_lines = File.exist?(env_path) ? File.readlines(env_path, chomp: true) : []
+      def existing_env_lines
+        File.exist?(env_path) ? File.readlines(env_path, chomp: true, encoding: FILE_ENCODING) : []
+      end
 
       def resolved_values(lines)
         dev_port = (env_value(lines, 'DEV_PORT') || allocate_dev_port).to_s
@@ -123,7 +126,7 @@ module Rails
 
       def peer_env_lines(path)
         env_file = File.join(path, ENV_FILE_NAME)
-        File.exist?(env_file) ? File.readlines(env_file, chomp: true) : []
+        File.exist?(env_file) ? File.readlines(env_file, chomp: true, encoding: FILE_ENCODING) : []
       end
 
       def peers_root = File.dirname(@target_dir)

data/lib/rails/worktrees/initializer_updater.rb

@@ -12,6 +12,7 @@ module Rails
       end
 
       TEMPLATE_PATH = File.expand_path('../../generators/rails/worktrees/templates/rails_worktrees.rb.tt', __dir__)
+      FILE_ENCODING = 'UTF-8'.freeze
       CURRENT_WRAPPER_CALL = 'Rails.application.config.x.rails_worktrees.tap do |config|'.freeze
       CONFIGURE_CALL = 'Rails::Worktrees.configure do |config|'.freeze
       KNOWN_GUARD_FRAGMENTS = [
@@ -135,7 +136,9 @@ module Rails
       end
 
       def render_default_template
-        ERB.new(File.read(TEMPLATE_PATH), trim_mode: '-').result(template_context.instance_eval { binding })
+        ERB.new(File.read(TEMPLATE_PATH, encoding: FILE_ENCODING), trim_mode: '-').result(
+          template_context.instance_eval { binding }
+        )
       end
 
       def template_context

data/lib/rails/worktrees/project_configuration_loader.rb

@@ -22,7 +22,7 @@ module Rails
       def call
         return configuration unless initializer_path && File.file?(initializer_path)
 
-        body = extract_configuration_body(File.read(initializer_path))
+        body = extract_configuration_body(File.read(initializer_path, encoding: 'UTF-8'))
         return configuration unless body
 
         recorder = AssignmentRecorder.new(configuration)

data/lib/rails/worktrees/project_maintenance.rb

@@ -49,6 +49,7 @@ module Rails
       # rubocop:enable Style/RedundantStructKeywordInit
 
       TEMPLATE_ROOT = File.expand_path('../../generators/rails/worktrees/templates', __dir__)
+      FILE_ENCODING = 'UTF-8'.freeze
 
       def initialize(root:)
         @root = root
@@ -100,10 +101,10 @@ module Rails
         path = absolute_path(config.fetch(:relative_path))
         return nil if config.fetch(:optional) && !File.exist?(path)
 
-        desired_content = File.read(config.fetch(:template_path))
+        desired_content = read_text(config.fetch(:template_path))
         return template_missing_check(config, desired_content) unless File.exist?(path)
 
-        current_content = File.read(path)
+        current_content = read_text(path)
         if current_content == desired_content
           if executable_mode_current?(config, path)
             return ok_check(config, "#{config.fetch(:relative_path)} is up to date.")
@@ -168,7 +169,7 @@ module Rails
           )
         end
 
-        updater_result_check(config, InitializerUpdater.new(content: File.read(path)).call)
+        updater_result_check(config, InitializerUpdater.new(content: read_text(path)).call)
       end
 
       def database_check
@@ -187,7 +188,7 @@ module Rails
           )
         end
 
-        result = DatabaseConfigUpdater.new(content: File.read(path)).call
+        result = DatabaseConfigUpdater.new(content: read_text(path)).call
         return updated_database_check(config, result) if result.changed?
 
         if database_configured?(result)
@@ -244,7 +245,7 @@ module Rails
         path = absolute_path(config.fetch(:relative_path))
         return unless File.exist?(path)
 
-        updater_result_check(config, yield(File.read(path)))
+        updater_result_check(config, yield(read_text(path)))
       end
 
       def mise_check
@@ -265,7 +266,7 @@ module Rails
 
       def mise_updater_result(relative_path)
         MiseTomlUpdater.new(
-          content: File.read(absolute_path(relative_path)),
+          content: read_text(absolute_path(relative_path)),
           file_name: File.basename(relative_path)
         ).call
       end
@@ -319,6 +320,10 @@ module Rails
         )
       end
 
+      def read_text(path)
+        File.read(path, encoding: FILE_ENCODING)
+      end
+
       def absolute_path(relative_path)
         File.join(root, relative_path)
       end

data/lib/rails/worktrees/version.rb

@@ -1,5 +1,5 @@
 module Rails
   module Worktrees
-    VERSION = '0.7.0'.freeze
+    VERSION = '0.7.1'.freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails-worktrees
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Asjer Querido