rails-worktrees 0.7.3 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ca5bda1caef0299d08ce62341cebeb9fe2cf35be6acb2c84438af5cfcb11f8e
-  data.tar.gz: c3278894ecf06ef752d15ff56ab64c47b56bdb2f0cf39e0773012ce71eda8823
+  metadata.gz: 4eed6634afda26cca90bd9f6e2540a7ace8f865ec53f97a283fc873e137cffe8
+  data.tar.gz: 6a2541a2a026af4ed0ccd8e14f3d1ceac78e0da7c5e4d1fc01c1fb6d4b34e0ad
 SHA512:
-  metadata.gz: bdb2583a6e1f1e8785599a31907c5a69c50eed1a8ebc9909fa139a59d4dd0ae5df0e941403aff68b3742f3c5c565461021418320b7a98054e7c710b491f3405a
-  data.tar.gz: 9ee5cc2bbd46b0b1cf152576be8269ee03bc0b3f749c3d878ce01976a6166fb2de2d4862dd4789b45569161e3f04802cdb2864a2973514a11f9184f0923e3fd4
+  metadata.gz: 0a8cf44f39ec11d98faa0d7e3b18badb5b1c4a8dcb3c31c67a0f26d4442656554cb5658275ccc96df69364d5a46572ab2408f57ea08deb31a0568bf284daf2da
+  data.tar.gz: 588ba219467bee9baa350d06d44a8eaf56fc1eab7e361bb1ff233cd7b9efa1e0e7041ad9f96d90d1bd059ae378789388caf0d4b7c2556cd29b6f7c28cfc63c07

data/.release-please-manifest.json

@@ -1 +1 @@
-{".":"0.7.3"}
+{".":"0.7.4"}

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [0.7.4](https://github.com/asjer/rails-worktrees/compare/v0.7.3...v0.7.4) (2026-08-15)
+
+
+### Bug Fixes
+
+* **wt:** bootstrap Ruby through mise for legacy wrappers ([#45](https://github.com/asjer/rails-worktrees/issues/45)) ([b3326ab](https://github.com/asjer/rails-worktrees/commit/b3326ab737fb814d826a1b4870433028a455f582))
+
 ## [0.7.3](https://github.com/asjer/rails-worktrees/compare/v0.7.2...v0.7.3) (2026-07-08)
 
 

data/README.md

@@ -23,7 +23,7 @@ The generated initializer writes app config under `Rails.application.config.x.ra
 
 The installer adds:
 
-- `bin/wt` — a thin wrapper that executes the gem-owned CLI
+- `bin/wt` — a mise-aware bootstrap wrapper that executes the gem-owned CLI
 - `bin/ob` — an optional browser helper generated by `--browser` or `--yolo`
 - `config/initializers/rails_worktrees.rb` — optional configuration
 - `Procfile.dev.worktree.example` — a copy-paste helper for `${DEV_PORT:-3000}` in `Procfile.dev` on regular installs
@@ -160,6 +160,37 @@ bin/wt prune --dry-run
 
 `bin/wt update` is intentionally conservative: it only applies safe file-based fixes for managed templates and supported config shapes. It does **not** delete branches, remove worktrees, or rewrite ambiguous custom files automatically.
 
+### Updating old `bin/wt` wrappers
+
+Versions before 0.7.1 generated `bin/wt` as a Ruby shebang wrapper. On hosts where Ruby is provided by mise but not already on `PATH`, that legacy wrapper can fail with `/usr/bin/env: ruby: No such file or directory` before rails-worktrees can activate mise.
+
+Use the current gem executable once to repair the app-owned wrapper. Scope mise discovery to the checkout and treat in-repository mise configs as trusted for this recovery shell, so `mise exec` loads Ruby from the same configuration the repaired wrapper will use:
+
+```bash
+# From the Rails app root
+root=$(pwd -P)
+trust_root=$(
+  unset GIT_DIR GIT_WORK_TREE GIT_COMMON_DIR GIT_INDEX_FILE \
+    GIT_OBJECT_DIRECTORY GIT_ALTERNATE_OBJECT_DIRECTORIES
+  git -C "$root" rev-parse --show-toplevel 2>/dev/null || printf '%s' "$root"
+)
+trust_root=$(cd "$trust_root" && pwd -P)
+MISE_CEILING_PATHS=$(dirname "$trust_root")
+MISE_TRUSTED_CONFIG_PATHS="$trust_root"
+export MISE_CEILING_PATHS MISE_TRUSTED_CONFIG_PATHS
+
+mise exec -C "$root" -- ruby -v
+mise exec -C "$root" -- gem install rails-worktrees --no-document
+mise exec -C "$root" -- ruby -e 'load Gem.bin_path("rails-worktrees", "wt")' -- update --dry-run "$root"
+mise exec -C "$root" -- ruby -e 'load Gem.bin_path("rails-worktrees", "wt")' -- update "$root"
+git status --short
+git diff --stat
+```
+
+Review the diff before committing. `wt update` applies every safe managed maintenance fix it finds, so the resulting commit can include `bin/wt` plus other generated installer drift such as the initializer, database configuration, Procfile, Puma config, mise config, or `bin/ob`.
+
+New installs and repaired apps use a bash bootstrap wrapper that activates mise from the app root before loading Ruby/Bundler, trusting mise configs only inside the repository root and bounding discovery above the checkout. That covers app-local, in-repository higher-scope, local override, and environment-specific mise configuration without trusting an unrelated caller directory or configs above the checkout. The wrapper also falls back to the globally installed `wt` executable for bootstrap-safe commands such as `wt setup --dry-run` when the app bundle is incomplete.
+
 
 ### Interactive prompts
 

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

@@ -47,18 +47,29 @@ 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"
+wt_path_within() {
+  case "$1" in
+    "$2"|"$2"/*) return 0 ;;
+    *) return 1 ;;
+  esac
+}
+
+WT_MISE_TRUST_ROOT="$WT_APP_ROOT"
+if command -v git >/dev/null 2>&1; then
+  WT_GIT_ROOT="$(unset GIT_DIR GIT_WORK_TREE GIT_COMMON_DIR GIT_INDEX_FILE GIT_OBJECT_DIRECTORY GIT_ALTERNATE_OBJECT_DIRECTORIES; git -C "$WT_APP_ROOT" rev-parse --show-toplevel 2>/dev/null || true)"
+  if [ -n "$WT_GIT_ROOT" ]; then
+    WT_GIT_ROOT="$(cd "$WT_GIT_ROOT" && pwd -P)"
+    wt_path_within "$WT_APP_ROOT" "$WT_GIT_ROOT" && WT_MISE_TRUST_ROOT="$WT_GIT_ROOT"
+  fi
 fi
+WT_MISE_CEILING_PATH="$(dirname "$WT_MISE_TRUST_ROOT")"
 
-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
+if [ -z "${RAILS_WORKTREES_BOOTSTRAPPED:-}" ] && command -v mise >/dev/null 2>&1; then
+  export MISE_CEILING_PATHS="$WT_MISE_CEILING_PATH"
+  export MISE_TRUSTED_CONFIG_PATHS="$WT_MISE_TRUST_ROOT"
   export RAILS_WORKTREES_BOOTSTRAPPED=1
-  exec mise exec -- "$WT_SCRIPT_PATH" "$@"
+  exec mise exec -C "$WT_APP_ROOT" -- "$WT_SCRIPT_PATH" "$@"
 fi
 
 export BUNDLE_GEMFILE="${BUNDLE_GEMFILE:-$WT_APP_ROOT/Gemfile}"

data/lib/rails/worktrees/command.rb

@@ -214,7 +214,8 @@ module Rails
         validate_update_args!
         announce_dry_run if dry_run?
 
-        current_root = resolve_repository_context[:current_root]
+        repository_root = resolve_repository_context[:current_root]
+        current_root = update_target_root(repository_root)
         report = project_maintenance_report(current_root)
         updated_count = 0
         identical_count = 0
@@ -258,11 +259,25 @@ module Rails
       end
 
       def validate_update_args!
-        raise Error, 'Usage: wt update [--dry-run]' unless @argv.length == 1
+        raise Error, 'Usage: wt update [--dry-run] [path]' unless [1, 2].include?(@argv.length)
         raise Error, 'The --force flag is only supported with wt remove.' if force?
         raise Error, 'The --skip-setup flag is only supported when creating a worktree.' if skip_setup?
       end
 
+      def update_target_root(repository_root)
+        return repository_root unless @argv[1]
+
+        target_root = canonical_path(File.expand_path(@argv[1], @cwd))
+        raise Error, "Update target does not exist: #{target_root}" unless File.directory?(target_root)
+
+        assert_within_root!(
+          target_root,
+          repository_root,
+          "Refusing to update a path outside the current Git repository: #{target_root}"
+        )
+        target_root
+      end
+
       def announce_prune_candidates(candidates)
         info("Found #{candidates.length} merged worktree#{'s' unless candidates.length == 1} created by wt:")
       end

data/lib/rails/worktrees/mise_environment.rb

@@ -7,7 +7,7 @@ module Rails
     class MiseEnvironment
       Result = Struct.new(:env, :messages)
 
-      CONFIG_FILES = %w[mise.toml .mise.toml].freeze
+      CONFIG_FILES = %w[mise.toml .mise.toml mise.local.toml .mise.local.toml].freeze
 
       def initialize(target_dir:, env:)
         @target_dir = target_dir

data/lib/rails/worktrees/post_create_runner.rb

@@ -164,18 +164,66 @@ module Rails
       attr_reader :runtime_env
 
       def resolved_runtime_env(dry_run:)
-        env = shell_env.merge(@bootstrapped_env)
+        env = shell_env.merge(@bootstrapped_env).merge(target_mise_scope_env)
         return env if dry_run
 
-        env.merge(toolchain_env)
+        env.merge(toolchain_env(env))
       end
 
-      def toolchain_env
-        result = MiseEnvironment.new(target_dir: @target_dir, env: shell_env.merge(@bootstrapped_env)).call
+      def toolchain_env(env)
+        result = MiseEnvironment.new(target_dir: @target_dir, env: env).call
         result.messages.each { |message| info(message) }
         result.env
       end
 
+      def target_mise_scope_env
+        trust_root = target_git_root || canonical_target_dir
+
+        {
+          'MISE_CEILING_PATHS' => File.dirname(trust_root),
+          'MISE_TRUSTED_CONFIG_PATHS' => trust_root
+        }
+      end
+
+      def target_git_root
+        stdout_str, status = capture_target_git_root
+        return nil unless status.success?
+
+        root = File.realpath(stdout_str.strip)
+        target_within_root?(root) ? root : nil
+      rescue Errno::ENOENT, Errno::ENOTDIR
+        nil
+      end
+
+      def capture_target_git_root
+        stdout_str, _stderr_str, status = Open3.capture3(
+          git_discovery_env,
+          'git', '-C', @target_dir, 'rev-parse', '--show-toplevel'
+        )
+        [stdout_str, status]
+      end
+
+      def git_discovery_env
+        shell_env.merge(
+          'GIT_DIR' => nil,
+          'GIT_WORK_TREE' => nil,
+          'GIT_COMMON_DIR' => nil,
+          'GIT_INDEX_FILE' => nil,
+          'GIT_OBJECT_DIRECTORY' => nil,
+          'GIT_ALTERNATE_OBJECT_DIRECTORIES' => nil
+        )
+      end
+
+      def target_within_root?(root)
+        canonical_target_dir.start_with?("#{root}#{File::SEPARATOR}") || canonical_target_dir == root
+      end
+
+      def canonical_target_dir
+        @canonical_target_dir ||= File.realpath(@target_dir)
+      rescue Errno::ENOENT
+        File.expand_path(@target_dir)
+      end
+
       def yarn_lock_present?
         File.exist?(File.join(@target_dir, 'yarn.lock'))
       end

data/lib/rails/worktrees/version.rb

@@ -1,5 +1,5 @@
 module Rails
   module Worktrees
-    VERSION = '0.7.3'.freeze
+    VERSION = '0.7.4'.freeze
   end
 end

metadata

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