rails-worktrees 0.7.1 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36b6c2a6e2e481803b035ba28c575c1619ba5fb1d158f0e4c6e4180d69aeafee
-  data.tar.gz: 9265e0459e03d34cbc4962b181bdd62836ddb4433c392d8aac43b65f445992a1
+  metadata.gz: 4ca5bda1caef0299d08ce62341cebeb9fe2cf35be6acb2c84438af5cfcb11f8e
+  data.tar.gz: c3278894ecf06ef752d15ff56ab64c47b56bdb2f0cf39e0773012ce71eda8823
 SHA512:
-  metadata.gz: 7cfecdcffdaeb1e229332c1a8a20ed80f2600886a58deb4f2f9b186c70957f2b70224a950e1c9109b3d9d234db3c18fe7789074ba1109e58d6e1da35236e2923
-  data.tar.gz: 977ebc76e219d9e31d05595852ab830355c6ca30f2617d2ead869b4d5ccce18b0bbc0360dd4e533aff6ffab53c7eee7c20480ec2f380881c69d5387e859526b0
+  metadata.gz: bdb2583a6e1f1e8785599a31907c5a69c50eed1a8ebc9909fa139a59d4dd0ae5df0e941403aff68b3742f3c5c565461021418320b7a98054e7c710b491f3405a
+  data.tar.gz: 9ee5cc2bbd46b0b1cf152576be8269ee03bc0b3f749c3d878ce01976a6166fb2de2d4862dd4789b45569161e3f04802cdb2864a2973514a11f9184f0923e3fd4

data/.release-please-manifest.json

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

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## [0.7.3](https://github.com/asjer/rails-worktrees/compare/v0.7.2...v0.7.3) (2026-07-08)
+
+
+### Bug Fixes
+
+* **wt:** add bundle fallback for wt bootstrap ([f5ab21e](https://github.com/asjer/rails-worktrees/commit/f5ab21ef1014ea2baaa67dca1ce085b6b70dfcd5))
+
+## [0.7.2](https://github.com/asjer/rails-worktrees/compare/v0.7.1...v0.7.2) (2026-07-06)
+
+
+### Bug Fixes
+
+* **wt:** normalize non-UTF-8 locale values before bundler ([17e644b](https://github.com/asjer/rails-worktrees/commit/17e644b0b5f4e2174802baae9bc844b29f5ff36d))
+
 ## [0.7.1](https://github.com/asjer/rails-worktrees/compare/v0.7.0...v0.7.1) (2026-07-06)
 
 

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

@@ -17,8 +17,8 @@ export PATH
 
 wt_locale_needs_utf8() {
   case "${1:-}" in
-    ""|C|POSIX) return 0 ;;
-    *) return 1 ;;
+    *[._-][Uu][Tt][Ff]-8*|*[._-][Uu][Tt][Ff]8*) return 1 ;;
+    *) return 0 ;;
   esac
 }
 
@@ -62,4 +62,53 @@ if [ -n "$WT_MISE_CONFIG" ] && [ -z "${RAILS_WORKTREES_BOOTSTRAPPED:-}" ] && com
 fi
 
 export BUNDLE_GEMFILE="${BUNDLE_GEMFILE:-$WT_APP_ROOT/Gemfile}"
-exec ruby -rbundler/setup -e 'load Gem.bin_path("rails-worktrees", "wt")' -- "$@"
+exec ruby /dev/fd/3 "$@" 3<<'RUBY'
+def rails_worktrees_bootstrap_safe_invocation?(argv)
+  args = argv.map(&:to_s)
+  return true if args.empty?
+  return true if %w[-h --help -v --version].include?(args.first)
+  return true if %w[--env --print-env].include?(args.first)
+
+  command_args = args.reject { |arg| %w[--dry-run --skip-setup --env --print-env].include?(arg) }
+  command = command_args.first
+
+  return true if %w[setup doctor update].include?(command)
+  return false if %w[remove delete prune].include?(command)
+
+  command_args.length <= 1
+end
+
+def rails_worktrees_incomplete_bundle_message(error)
+  error.message.to_s.lines.first.to_s.strip
+end
+
+def rails_worktrees_load_without_bundler(original_error)
+  ENV.delete('BUNDLE_GEMFILE')
+  Gem.clear_paths if Gem.respond_to?(:clear_paths)
+  load Gem.bin_path('rails-worktrees', 'wt')
+rescue Gem::Exception, LoadError => fallback_error
+  warn 'rails-worktrees: app bundle is incomplete and no fallback rails-worktrees executable could be loaded.'
+  warn "  Bundler: #{rails_worktrees_incomplete_bundle_message(original_error)}"
+  warn "  Fallback: #{fallback_error.class}: #{fallback_error.message}"
+  warn 'Run `bundle install` or install rails-worktrees outside the app bundle, then retry `bin/wt setup`.'
+  exit 1
+end
+
+begin
+  require 'bundler/setup'
+  load Gem.bin_path('rails-worktrees', 'wt')
+rescue StandardError => error
+  raise unless defined?(Bundler::GemNotFound) && error.is_a?(Bundler::GemNotFound)
+
+  if rails_worktrees_bootstrap_safe_invocation?(ARGV)
+    warn 'rails-worktrees: app bundle is incomplete; falling back to the globally installed wt executable.'
+    warn "  #{rails_worktrees_incomplete_bundle_message(error)}"
+    rails_worktrees_load_without_bundler(error)
+  end
+
+  warn 'rails-worktrees: cannot start wt because the app bundle is incomplete.'
+  warn "  #{rails_worktrees_incomplete_bundle_message(error)}"
+  warn 'Run `bundle install` or `bin/wt setup` to install missing gems, then retry.'
+  exit 1
+end
+RUBY

data/lib/rails/worktrees/browser_command.rb

@@ -137,7 +137,7 @@ module Rails
       def env_value(lines, key)
         line = lines.reverse.find { |entry| entry.start_with?("#{key}=") }
         value = line&.split('=', 2)&.last
-        value unless value&.empty?
+        presence(value)
       end
 
       def dev_port_resolution

data/lib/rails/worktrees/env_bootstrapper.rb

@@ -92,7 +92,7 @@ module Rails
       def env_value(lines, key)
         line = lines.reverse.find { |entry| entry.start_with?("#{key}=") }
         value = line&.split('=', 2)&.last
-        value unless value&.empty?
+        value if value && !value.empty?
       end
 
       def allocate_dev_port

data/lib/rails/worktrees/project_maintenance.rb

@@ -3,7 +3,6 @@ module Rails
     # Audits and prepares safe file-based maintenance updates for the current checkout.
     # rubocop:disable Metrics/ClassLength, Metrics/MethodLength, Metrics/AbcSize
     class ProjectMaintenance
-      # rubocop:disable Style/RedundantStructKeywordInit
       Check = Struct.new(
         :identifier,
         :category,

data/lib/rails/worktrees/version.rb

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

metadata

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