kettle-family 1.2.86 → 1.2.87

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21a652aea8226a4e77e30eec15208ab8337acb1c588828c2513d74b73d83186b
-  data.tar.gz: fe8cefdd96d256b3a0c08db1eab5ff75c03a2afe7f70d1a8ca3778d9b1609444
+  metadata.gz: 7086b3a051cb1074cba223e715123b349a3e7d4cb5f46722288e445fac66dc7c
+  data.tar.gz: e67273a3a81b3a2b8a471357715849f88edb5bcc93c22dc8d8ed3d2b98a20aad
 SHA512:
-  metadata.gz: 491966653b36eb913a447b028de8f68dc7bf3f9e8291bea3205d95083d7d7173fe310eb8f81f456793a7f4f86650229ac2b940ef6f29bb0a7620c949c6444dbd
-  data.tar.gz: 98e477f02f7d1d7dbfd142108430061d11061e215702544cb304e0a126403ec2fc15aa41f89b0431436cfe6b0c53c1dcc7eb60239805d8a0d4c384bd2558985d
+  metadata.gz: 225bf1edf702b9012649f4cd6a754a05bfbcec584c2bd2557a786a8b74be74991a63fc6e252902fdd42960bf3bf1b5ad1d3ad111e12d192a4ff11a6749dd5418
+  data.tar.gz: 3534c07147cf99302f3afdb23bad476335a4d8c7fba7ac9bf2e83db2895a242e0fb4802ecd3209bad259c7229d6b8cc1dd35f698e18fa40d8f2b17f7c9be2158

data/CHANGELOG.md

@@ -30,6 +30,17 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Security
 
+## [1.2.87] - 2026-09-06
+
+- TAG: [v1.2.87][1.2.87t]
+- COVERAGE: 93.10% -- 5813/6244 lines in 34 files
+- BRANCH COVERAGE: 76.17% -- 2356/3093 branches in 34 files
+- 31.79% documented
+
+### Fixed
+
+- Allow template-managed local lockfiles and modular Gemfiles to continue a template run without autostashing.
+
 ## [1.2.86] - 2026-09-06
 
 - TAG: [v1.2.86][1.2.86t]
@@ -2538,7 +2549,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.86...HEAD
+[Unreleased]: https://github.com/kettle-dev/kettle-family/compare/v1.2.87...HEAD
+[1.2.87]: https://github.com/kettle-dev/kettle-family/compare/v1.2.86...v1.2.87
+[1.2.87t]: https://github.com/kettle-dev/kettle-family/releases/tag/v1.2.87
 [1.2.86]: https://github.com/kettle-dev/kettle-family/compare/v1.2.85...v1.2.86
 [1.2.86t]: https://github.com/kettle-dev/kettle-family/releases/tag/v1.2.86
 [1.2.85]: https://github.com/kettle-dev/kettle-family/compare/v1.2.84...v1.2.85

data/README.md

@@ -1081,7 +1081,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.236-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
+[🧮kloc-img]: https://img.shields.io/badge/KLOC-6.244-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/version.rb

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

data/lib/kettle/family/workflow.rb

@@ -60,6 +60,7 @@ module Kettle
         "bupb" => %w[bundle update --bundler]
       }.freeze
       TEMPLATE_AUTOSTASH_ALLOWED_DIRECTORIES = %w[lib spec test].freeze
+      TEMPLATE_MANAGED_DIRTY_PATH_PATTERN = %r{(?:\A|/)(?:Gemfile\.lock|Appraisal\.root\.gemfile\.lock|\.structuredmerge/kettle-jem\.lock|gemfiles/modular/[^/]+_local\.gemfile)\z}
       PRE_TEMPLATE_BOOTSTRAP_GEMS = %w[nomono kettle-dev].freeze
       GIT_SYNC_COMMANDS = {
         "push" => [["push", %w[git push]]],
@@ -266,20 +267,23 @@ module Kettle
               break
             end
 
-            stash_result = runner.call(
-              member: member,
-              phase: "template_autostash",
-              command: ["sh", "-lc", template_autostash_command(member)]
-            )
-            results << stash_result
-            break unless stash_result.ok?
+            stashable_paths = template_autostashable_dirty_paths(dirty_paths)
+            if stashable_paths.any?
+              stash_result = runner.call(
+                member: member,
+                phase: "template_autostash",
+                command: ["sh", "-lc", template_autostash_command(member, stashable_paths)]
+              )
+              results << stash_result
+              break unless stash_result.ok?
 
-            stash_ref = stash_result.stdout.to_s.lines.last.to_s.strip
-            if stash_ref.empty?
-              results << template_sync_failure_result(member, "could not determine the temporary template autostash reference")
-              break
+              stash_ref = stash_result.stdout.to_s.lines.last.to_s.strip
+              if stash_ref.empty?
+                results << template_sync_failure_result(member, "could not determine the temporary template autostash reference")
+                break
+              end
+              stashes << {member: member, ref: stash_ref}
             end
-            stashes << {member: member, ref: stash_ref}
           end
 
           upstream = git_upstream_for(member)
@@ -304,7 +308,11 @@ module Kettle
       def template_blocking_dirty_paths(dirty_paths)
         return dirty_paths unless autostash
 
-        dirty_paths.reject { |path| template_autostash_allowed_path?(path) }
+        dirty_paths.reject { |path| template_autostash_allowed_path?(path) || template_managed_dirty_path?(path) }
+      end
+
+      def template_autostashable_dirty_paths(dirty_paths)
+        dirty_paths.select { |path| template_autostash_allowed_path?(path) }
       end
 
       def template_autostash_allowed_path?(status_line)
@@ -312,6 +320,10 @@ module Kettle
         TEMPLATE_AUTOSTASH_ALLOWED_DIRECTORIES.include?(path.split("/", 2).first)
       end
 
+      def template_managed_dirty_path?(status_line)
+        GitStatus.path_from_status_line(status_line).match?(TEMPLATE_MANAGED_DIRTY_PATH_PATTERN)
+      end
+
       def restore_template_autostashes(stashes, runner:, preserve_members: [])
         preserve_members = Array(preserve_members).map(&:to_s)
         stashes.reverse_each.map do |stash|
@@ -467,9 +479,10 @@ module Kettle
         status.success? ? stdout.strip : nil
       end
 
-      def template_autostash_command(member)
+      def template_autostash_command(member, paths)
         label = "kettle-family-template-#{member.name}-#{Process.pid}-#{Time.now.to_i}"
-        "git stash push --include-untracked --message #{Shellwords.escape(label)} && " \
+        pathspecs = paths.map { |path| Shellwords.escape(GitStatus.path_from_status_line(path)) }.join(" ")
+        "git stash push --include-untracked --message #{Shellwords.escape(label)} -- #{pathspecs} && " \
           "ref=$(git stash list -1 --format=%gd) && " \
           "git checkout \"$ref\" -- .tool-versions 2>/dev/null || true; " \
           "for path in mise.toml .mise.toml; do " \
@@ -479,7 +492,7 @@ module Kettle
 
       def template_dirty_worktree_result(member, dirty_paths)
         stash_guidance = if autostash
-          "automatic template autostash is limited to lib/, spec/, and test/ files"
+          "automatic template autostash is limited to lib/, spec/, and test/ files; generated lockfiles and modular *_local.gemfile files are left in place"
         else
           "automatic template autostash is disabled"
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kettle-family
 version: !ruby/object:Gem::Version
-  version: 1.2.86
+  version: 1.2.87
 platform: ruby
 authors:
 - Peter H. Boling
@@ -442,10 +442,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.86
-  changelog_uri: https://github.com/kettle-dev/kettle-family/blob/v1.2.86/CHANGELOG.md
+  source_code_uri: https://github.com/kettle-dev/kettle-family/tree/v1.2.87
+  changelog_uri: https://github.com/kettle-dev/kettle-family/blob/v1.2.87/CHANGELOG.md
   bug_tracker_uri: https://github.com/kettle-dev/kettle-family/issues
-  documentation_uri: https://www.rubydoc.info/gems/kettle-family/1.2.86
+  documentation_uri: https://www.rubydoc.info/gems/kettle-family/1.2.87
   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