kettle-family 1.2.85 → 1.2.87

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91a1c4bf31a3387bf5e7170148accfe48611ebe4596466384e2ac34a228a0a07
-  data.tar.gz: ac8fc14eae4354a6dc774158a60c4bd522cc0db9ed530b775f310e2c37eb5650
+  metadata.gz: 7086b3a051cb1074cba223e715123b349a3e7d4cb5f46722288e445fac66dc7c
+  data.tar.gz: e67273a3a81b3a2b8a471357715849f88edb5bcc93c22dc8d8ed3d2b98a20aad
 SHA512:
-  metadata.gz: 2495673c5566c9233553c229ac8e8b2973037a563fb97d29c22dc87852cb67811720768bfc290ffa78ac125eafb655614e857f42779f7441b8d6d5ba080bfe6d
-  data.tar.gz: 3909f42f4f582bd05fe26997963b9778c81afbd129775c9df77d7d229ffffb5a181fccce7a6f46caff377f819b15feb922009e849b75a1815ae94ac5d47e1f2d
+  metadata.gz: 225bf1edf702b9012649f4cd6a754a05bfbcec584c2bd2557a786a8b74be74991a63fc6e252902fdd42960bf3bf1b5ad1d3ad111e12d192a4ff11a6749dd5418
+  data.tar.gz: 3534c07147cf99302f3afdb23bad476335a4d8c7fba7ac9bf2e83db2895a242e0fb4802ecd3209bad259c7229d6b8cc1dd35f698e18fa40d8f2b17f7c9be2158

data/CHANGELOG.md

@@ -30,6 +30,32 @@ 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]
+- COVERAGE: 93.09% -- 5805/6236 lines in 34 files
+- BRANCH COVERAGE: 76.16% -- 2354/3091 branches in 34 files
+- 31.88% documented
+
+### Fixed
+
+- Recover template lockfiles in the configured local dependency graph instead of release normalization mode.
+
+- Use the templating dependency graph during initial template lockfile preparation.
+
+- Define execution profiles and add real Bundler compatibility scenarios for template and release lockfile isolation.
+
 ## [1.2.85] - 2026-09-06
 
 - TAG: [v1.2.85][1.2.85t]
@@ -2523,7 +2549,11 @@ 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.85...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
 [1.2.85t]: https://github.com/kettle-dev/kettle-family/releases/tag/v1.2.85
 [1.2.84]: https://github.com/kettle-dev/kettle-family/compare/v1.2.83...v1.2.84

data/README.md

@@ -799,9 +799,13 @@ kettle-family template --execute \
 
 ### Template Bootstrap Environment
 
+The complete path-gem, lockfile, install, platform, and mutation policy is
+defined in [Execution Profiles](EXECUTION_PROFILES.md). The rules below are
+the template-local portion of that policy.
+
 Before invoking `kettle-jem`, `kettle-family template` may refresh `nomono` so
-the member Gemfile can activate its generated local dependency wiring. That
-bootstrap uses the same development dependency graph as template preparation:
+the member Gemfile can activate its generated local dependency wiring. Both
+bootstrap and lockfile preparation use the same development dependency graph:
 
 - `K_JEM_TEMPLATING=true` is enforced. It selects the templating Gemfile graph
   and activates generated local sibling closures. It is not a release-lockfile
@@ -820,6 +824,11 @@ bootstrap uses the same development dependency graph as template preparation:
 Release lockfile normalization is a separate operation with its own local-path
 policy; it must not be inferred from template bootstrap settings.
 
+If template lockfile preparation needs a recovery update, that retry also uses
+the template dependency graph. It must not invoke release-lockfile reset logic:
+release normalization intentionally disables local paths, while template
+recovery needs configured sibling paths to resolve unreleased family versions.
+
 ## 🔐 Security
 
 See [SECURITY.md][🔐security].
@@ -1072,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.215-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/execution_profile.rb

@@ -0,0 +1,76 @@
+# frozen_string_literal: true
+
+module Kettle
+  module Family
+    # The execution context is a compatibility boundary, not a collection of
+    # incidental ENV assignments. Each workflow command selects one profile so
+    # path-gem, lockfile, install, and mutation rules remain reviewable.
+    class ExecutionProfile
+      Definition = Struct.new(
+        :name,
+        :path_gem_policy,
+        :lockfile_role,
+        :install_location,
+        :host_platform_policy,
+        :allowed_mutations
+      ) do
+        def local_path_gems?
+          path_gem_policy != :registry_only
+        end
+
+        def canonical_lockfile?
+          lockfile_role == :canonical
+        end
+      end
+
+      DEFINITIONS = {
+        development_local: Definition.new(
+          name: :development_local,
+          path_gem_policy: :configured_siblings,
+          lockfile_role: :canonical,
+          install_location: :member,
+          host_platform_policy: :active_platform_must_resolve,
+          allowed_mutations: %i[development_lockfiles source test]
+        ),
+        template_local: Definition.new(
+          name: :template_local,
+          path_gem_policy: :configured_siblings,
+          lockfile_role: :canonical,
+          install_location: :member,
+          host_platform_policy: :active_platform_must_resolve,
+          allowed_mutations: %i[template development_lockfiles generated]
+        ),
+        release_registry: Definition.new(
+          name: :release_registry,
+          path_gem_policy: :registry_only,
+          lockfile_role: :canonical,
+          install_location: :disposable,
+          host_platform_policy: :active_platform_must_resolve,
+          allowed_mutations: %i[canonical_release_lockfiles]
+        ),
+        release_monorepo: Definition.new(
+          name: :release_monorepo,
+          path_gem_policy: :configured_release_wave,
+          lockfile_role: :canonical,
+          install_location: :disposable,
+          host_platform_policy: :active_platform_must_resolve,
+          allowed_mutations: %i[canonical_release_lockfiles configured_wave_paths]
+        ),
+        release_recovery: Definition.new(
+          name: :release_recovery,
+          path_gem_policy: :configured_release_wave,
+          lockfile_role: :canonical,
+          install_location: :disposable,
+          host_platform_policy: :active_platform_must_resolve,
+          allowed_mutations: %i[canonical_release_lockfiles configured_wave_paths]
+        )
+      }.each_value(&:freeze).freeze
+
+      def self.fetch(name)
+        DEFINITIONS.fetch(name.to_sym)
+      rescue KeyError
+        raise ArgumentError, "unknown execution profile: #{name.inspect}"
+      end
+    end
+  end
+end

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.85"
+      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
@@ -833,8 +846,6 @@ module Kettle
         # available only for an explicit, known optional-dependency constraint
         # conflict; it is not a general solution for local-path resolution.
         env["KETTLE_DEV_SKIP_CHANGELOG_DEPENDENCY"] = template_bootstrap_changelog_dependency_setting
-        env["K_JEM_TEMPLATING"] = "true"
-        env["BUNDLE_DISABLE_CHECKSUM_VALIDATION"] = "true"
         env
       end
 
@@ -4386,13 +4397,13 @@ module Kettle
       end
 
       def recover_template_lockfiles(member:, runner:, memo:, phase:)
-        reset_gemfile_lock(
+        result = runner.call(
           member: member,
-          runner: runner,
-          memo: memo,
           phase: phase,
-          env: template_lockfile_recovery_env(member)
+          command: normalize_lockfiles_command(member: member, phase: "prepare_lockfiles"),
+          env: template_lockfile_recovery_env
         )
+        memo << result
         return unless memo.last&.ok?
 
         commit_normalized_lockfiles(
@@ -4417,15 +4428,11 @@ module Kettle
         [result.stdout, result.stderr].join("\n").match?(/Unknown switches? .*--add-checksums/)
       end
 
-      def template_lockfile_recovery_env(member)
-        env = release_lockfile_env(member).merge(workflow_env)
-        ENV.each do |key, value|
-          env[key] = value if key.end_with?("_DEV", "_LOCAL") && local_path_env_requested?(key)
-        end
-        env.merge!(env_overrides)
-        env["K_JEM_TEMPLATING"] = "false"
-        env["BUNDLE_DISABLE_CHECKSUM_VALIDATION"] = "true"
-        env
+      def template_lockfile_recovery_env(_member = nil)
+        # A failed template preparation can be caused by an unreleased sibling
+        # version. Recover in the template graph, not the release graph, so
+        # Bundler uses the configured monorepo paths.
+        execution_profile(template_execution_profile, workflow_env)
       end
 
       def normalize_lockfiles_command(member:, phase:, skip_checksum_option: false)
@@ -4631,7 +4638,37 @@ module Kettle
         # Templating is development work.  It must resolve the configured
         # family graph exactly as template application does; release-only
         # lockfile cleanup owns disabling local path sources.
-        workflow_env
+        execution_profile(template_execution_profile, workflow_env)
+      end
+
+      def template_execution_profile
+        ExecutionProfile.fetch(:template_local)
+      end
+
+      def release_lockfile_execution_profile
+        return ExecutionProfile.fetch(:release_recovery) if release_recovery?
+        return ExecutionProfile.fetch(:release_monorepo) if preserve_monorepo_template_context?
+
+        ExecutionProfile.fetch(:release_registry)
+      end
+
+      def release_recovery?
+        !start_step.nil? || !skip_steps.to_s.empty? || fast_recovery || skip_ci
+      end
+
+      def execution_profile(profile, env)
+        profile = ExecutionProfile.fetch(profile) unless profile.is_a?(ExecutionProfile::Definition)
+        env = env.dup
+        case profile.name
+        when :template_local
+          env["K_JEM_TEMPLATING"] = "true"
+          env["BUNDLE_DISABLE_CHECKSUM_VALIDATION"] = "true"
+        when :release_registry, :release_monorepo, :release_recovery
+          # Release profiles deliberately leave Bundler mutation decisions to
+          # kettle-dev. The profile selection controls which local-path
+          # overrides this workflow contributes below.
+        end
+        env
       end
 
       def local_path_env_requested?(name)
@@ -4685,10 +4722,13 @@ module Kettle
       end
 
       def release_lockfile_env(member = nil)
-        base_release_env
+        execution_profile(
+          release_lockfile_execution_profile,
+          base_release_env
           .merge(release_lockfile_bundler_env_resets)
           .merge(env_overrides)
           .merge(release_lockfile_local_path_env_overrides(member))
+        )
       end
 
       def release_lockfile_bundler_env_resets

data/lib/kettle/family.rb

@@ -21,6 +21,7 @@ require_relative "family/nomono_bootstrap"
 require_relative "family/debugger_bootstrap"
 require_relative "family/appraisal_bootstrap"
 require_relative "family/release_waves"
+require_relative "family/execution_profile"
 require_relative "family/workflow"
 require_relative "family/discovery"
 require_relative "family/orderer"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kettle-family
 version: !ruby/object:Gem::Version
-  version: 1.2.85
+  version: 1.2.87
 platform: ruby
 authors:
 - Peter H. Boling
@@ -91,7 +91,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.30
+        version: 3.0.31
     - - "<"
       - !ruby/object:Gem::Version
         version: 4.0.0
@@ -101,7 +101,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.30
+        version: 3.0.31
     - - "<"
       - !ruby/object:Gem::Version
         version: 4.0.0
@@ -414,6 +414,7 @@ files:
 - lib/kettle/family/debugger_bootstrap.rb
 - lib/kettle/family/dependency_floor.rb
 - lib/kettle/family/discovery.rb
+- lib/kettle/family/execution_profile.rb
 - lib/kettle/family/git_status.rb
 - lib/kettle/family/local_install.rb
 - lib/kettle/family/member.rb
@@ -441,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.85
-  changelog_uri: https://github.com/kettle-dev/kettle-family/blob/v1.2.85/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.85
+  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