kettle-family 1.2.90 → 1.2.91

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd4de333d6aa3b2bc027ec582b2bcc0b890d61b20a0a57c70bcf25196b2f9c32
-  data.tar.gz: 67754f998efad13f47f00f0e07222a17e9413c890b2cee1097ffbccd1114801d
+  metadata.gz: e63a81da6b871ee1c27d813b23f7840e7c0e0a577e3a992076922ff2750574b3
+  data.tar.gz: 859158cd1aa7b293126edb628f02eb8bc641a0fcd4797a6f097af9fe46a9ef27
 SHA512:
-  metadata.gz: 7238680a28fa74944856d3ebe514193ac070df02fa25b319e28090bbb18f8f6a0f989ccf0d73e84f485d5e7d446de692440304dd0e99cf79b9834f4ba1212143
-  data.tar.gz: 75c99992e6539a9aa9e37f6ad5ea45afa0692bd9214f10df75f9c604f56af1799099e4cb1fa80b47bd9e843fa8a130103dffae010b14eb8e8f64936834447c35
+  metadata.gz: ee75302308856eb21755bfdc3a598fe9e0d3992b4a493c84825e891dbd76f514f976549fde093de80bfe55d822567d36cba2375a666c1ca2fc6b4a9844f8ae5c
+  data.tar.gz: 3845dff951350adc5177e8ea3bb4ce9b80a155a4a6fbb2b05618acb2363e77e9e8ce158129521f03ca8d02816b8bdfd1f1c5ec80507c982a0546e95314815068

data/CHANGELOG.md

@@ -30,6 +30,19 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Security
 
+## [1.2.91] - 2026-09-06
+
+- TAG: [v1.2.91][1.2.91t]
+- COVERAGE: 93.58% -- 6109/6528 lines in 35 files
+- BRANCH COVERAGE: 78.06% -- 2483/3181 branches in 35 files
+- 32.41% documented
+
+### Fixed
+
+- Trust Mise configurations in disposable worktrees before member commands run.
+
+- Remove retired appraisal declarations cleanly from files without a trailing newline during template bootstrap.
+
 ## [1.2.90] - 2026-09-06
 
 - TAG: [v1.2.90][1.2.90t]
@@ -2592,7 +2605,9 @@ Please file a bug if you notice a violation of semantic versioning.
 - Fixed CI load failures on engines without compatible `pty` support by falling back to Open3 for interactive release commands.
 - Fixed Ruby 3.2 version-bump support by loading Prism lazily and wiring the Prism gem only for MRI versions that need it.
 
-[Unreleased]: https://github.com/kettle-dev/kettle-family/compare/v1.2.90...HEAD
+[Unreleased]: https://github.com/kettle-dev/kettle-family/compare/v1.2.91...HEAD
+[1.2.91]: https://github.com/kettle-dev/kettle-family/compare/v1.2.90...v1.2.91
+[1.2.91t]: https://github.com/kettle-dev/kettle-family/releases/tag/v1.2.91
 [1.2.90]: https://github.com/kettle-dev/kettle-family/compare/v1.2.89...v1.2.90
 [1.2.90t]: https://github.com/kettle-dev/kettle-family/releases/tag/v1.2.90
 [1.2.89]: https://github.com/kettle-dev/kettle-family/compare/v1.2.88...v1.2.89

data/README.md

@@ -1121,7 +1121,7 @@ Thanks for RTFM. ☺️
 [📌gitmoji]: https://gitmoji.dev
 [📌gitmoji-img]: https://img.shields.io/badge/gitmoji_commits-%20%F0%9F%98%9C%20%F0%9F%98%8D-34495e.svg?style=flat-square
 [🧮kloc]: https://www.youtube.com/watch?v=dQw4w9WgXcQ
-[🧮kloc-img]: https://img.shields.io/badge/KLOC-6.494-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
+[🧮kloc-img]: https://img.shields.io/badge/KLOC-6.528-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
 [🔐security]: https://github.com/kettle-dev/kettle-family/blob/main/SECURITY.md
 [🔐security-img]: https://img.shields.io/badge/security-policy-259D6C.svg?style=flat
 [📄copyright-notice-explainer]: https://opensource.stackexchange.com/questions/5778/why-do-licenses-such-as-the-mit-license-specify-a-single-year

data/lib/kettle/family/appraisal_bootstrap.rb

@@ -66,7 +66,8 @@ module Kettle
       def obsolete_appraisal_edit(path, source, node)
         return unless legacy_appraisal_call?(node)
 
-        line_start = source.rindex("\n", node.location.start_offset - 1).to_i + 1
+        preceding_newline = source.rindex("\n", node.location.start_offset - 1)
+        line_start = preceding_newline ? preceding_newline + 1 : 0
         line_end = source.index("\n", node.location.end_offset) || source.length
         line_end += 1 if line_end < source.length
         if final_standalone_call?(source, node, line_start, line_end)

data/lib/kettle/family/command_runner.rb

@@ -230,8 +230,8 @@ module Kettle
         @otp_coordinator = otp_coordinator
       end
 
-      def call(member:, phase:, command:, env: {}, interactive: false, stdout_line_handler: nil, log_path: nil, passthrough_output: true)
-        argv = command_argv(member: member, command: command, env: env)
+      def call(member:, phase:, command:, env: {}, interactive: false, raw: false, stdout_line_handler: nil, log_path: nil, passthrough_output: true)
+        argv = command_argv(member: member, command: command, env: env, raw: raw)
         process_env = process_env(member: member, env: env)
         spawn_options = process_options
         return skipped_result(member: member, phase: phase, argv: argv) unless execute
@@ -598,9 +598,9 @@ module Kettle
         nil
       end
 
-      def command_argv(member:, command:, env: {})
+      def command_argv(member:, command:, env: {}, raw: false)
         argv = normalize_command(command)
-        return argv unless mise_configured?(member)
+        return argv if raw || !mise_configured?(member)
 
         command_env = nonsensitive_env(env)
         unset_env, set_env = command_env.partition { |_key, value| value.nil? }

data/lib/kettle/family/version.rb

@@ -5,7 +5,7 @@ module Kettle
     # Version namespace for this gem.
     module Version
       # Current gem version.
-      VERSION = "1.2.90"
+      VERSION = "1.2.91"
     end
     # Current gem version exposed at the traditional constant location.
     VERSION = Version::VERSION # Traditional Constant Location

data/lib/kettle/family/workflow.rb

@@ -717,11 +717,14 @@ module Kettle
           results << result
           break unless result.ok?
 
-          entries << {
+          entry = {
             member: relocate_member_to_worktree(member, worktree_root, source_root: config.root),
             original_member: member,
             worktree_root: worktree_root
           }
+          entries << entry
+          results.concat(worktree_mise_trust_results(entry, runner: runner, phase: "test_member_worktree_mise_trust"))
+          break unless results.last.ok?
         end
         [entries, results]
       end
@@ -1038,11 +1041,14 @@ module Kettle
           results << result
           break unless result.ok?
 
-          entries << {
+          entry = {
             member: relocate_member_to_worktree(member, worktree_root, source_root: config.root),
             original_member: member,
             worktree_root: worktree_root
           }
+          entries << entry
+          results.concat(worktree_mise_trust_results(entry, runner: runner, phase: "template_member_worktree_mise_trust"))
+          break unless results.last.ok?
         end
         [entries, results]
       end
@@ -1435,7 +1441,11 @@ module Kettle
               outcomes << add
               break unless add.ok?
 
-              entries << {branch: branch, member: relocate_member_to_worktree(member, worktree_root), worktree_root: worktree_root}
+              entry = {branch: branch, member: relocate_member_to_worktree(member, worktree_root), worktree_root: worktree_root}
+              entries << entry
+              trust_results = worktree_mise_trust_results(entry.merge(original_member: member), runner: runner, phase: "template_worktree_mise_trust")
+              outcomes.concat(trust_results)
+              break unless trust_results.all?(&:ok?)
             end
 
             if outcomes.all?(&:ok?)
@@ -1491,6 +1501,45 @@ module Kettle
         end
       end
 
+      # A git worktree has a distinct absolute path, and Mise deliberately
+      # tracks trust by config path. Trust every active config between the
+      # worktree root and the member command directory before invoking a
+      # command there. This bootstrap must run raw: wrapping it in `mise exec`
+      # would require the trust it is establishing.
+      def worktree_mise_trust_results(entry, runner:, phase:)
+        member = entry.fetch(:member)
+        original_member = entry.fetch(:original_member, member)
+        worktree_root = entry.fetch(:worktree_root)
+        mise_config_roots_in_worktree(worktree_root, member.root).map do |root|
+          result = runner.call(
+            member: member,
+            phase: phase,
+            command: ["mise", "trust", "-C", root],
+            raw: true
+          )
+          result.member_name = original_member.name
+          result
+        end
+      end
+
+      def mise_config_roots_in_worktree(worktree_root, member_root)
+        root_path = Pathname.new(worktree_root).realpath
+        member_path = Pathname.new(member_root).realpath
+        return [] unless member_path.to_s.start_with?("#{root_path}#{File::SEPARATOR}") || member_path == root_path
+
+        current = member_path
+        roots = []
+        loop do
+          roots << current.to_s if %w[mise.toml .mise.toml].any? { |name| File.file?(current.join(name)) }
+          break if current == root_path
+
+          current = current.parent
+        end
+        roots.reverse
+      rescue Errno::ENOENT
+        []
+      end
+
       def template_branch_worktree_entries_results(entries)
         wave_jobs = template_jobs(entries)
         queue = Queue.new
@@ -2038,7 +2087,10 @@ module Kettle
           results << result
           break unless result.ok?
 
-          entries << {member: relocate_member_to_worktree(member, root, source_root: config.root), original_member: member, worktree_root: root}
+          entry = {member: relocate_member_to_worktree(member, root, source_root: config.root), original_member: member, worktree_root: root}
+          entries << entry
+          results.concat(worktree_mise_trust_results(entry, runner: runner, phase: "release_worktree_mise_trust"))
+          break unless results.last.ok?
         end
         [entries, results]
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kettle-family
 version: !ruby/object:Gem::Version
-  version: 1.2.90
+  version: 1.2.91
 platform: ruby
 authors:
 - Peter H. Boling
@@ -443,10 +443,10 @@ licenses:
 - AGPL-3.0-only
 metadata:
   homepage_uri: https://kettle-family.galtzo.com
-  source_code_uri: https://github.com/kettle-dev/kettle-family/tree/v1.2.90
-  changelog_uri: https://github.com/kettle-dev/kettle-family/blob/v1.2.90/CHANGELOG.md
+  source_code_uri: https://github.com/kettle-dev/kettle-family/tree/v1.2.91
+  changelog_uri: https://github.com/kettle-dev/kettle-family/blob/v1.2.91/CHANGELOG.md
   bug_tracker_uri: https://github.com/kettle-dev/kettle-family/issues
-  documentation_uri: https://www.rubydoc.info/gems/kettle-family/1.2.90
+  documentation_uri: https://www.rubydoc.info/gems/kettle-family/1.2.91
   funding_uri: https://github.com/sponsors/pboling
   wiki_uri: https://github.com/kettle-dev/kettle-family/wiki
   news_uri: https://www.railsbling.com/tags/kettle-family