kettle-family 1.2.84 → 1.2.86

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d60e9fc61486c0ac3adcbbd20df98c09cab7c9758e9eb5caa3a95c4308bb168
-  data.tar.gz: 0bb55d3a77da5d9fdf94c73d4295ae8f5a772b8f9a07e5da4108970135b690c2
+  metadata.gz: 21a652aea8226a4e77e30eec15208ab8337acb1c588828c2513d74b73d83186b
+  data.tar.gz: fe8cefdd96d256b3a0c08db1eab5ff75c03a2afe7f70d1a8ca3778d9b1609444
 SHA512:
-  metadata.gz: f868bb0dbf6665ea261cb0011a04b33125c8bf794a51e2b4092359993a6ab5d35fa19ed2d006279f0c1d13694aedd439caf913c3918763d0c03304808a2649cc
-  data.tar.gz: 8fe0c820e3b2b2d17c627b0a6fb7d44e28b8f885c4daa1d379fed8b45fac134b9b84e6b9037829bdfb22026d17e0e74b183f3c4067ecc90b57433189ac583fe1
+  metadata.gz: 491966653b36eb913a447b028de8f68dc7bf3f9e8291bea3205d95083d7d7173fe310eb8f81f456793a7f4f86650229ac2b940ef6f29bb0a7620c949c6444dbd
+  data.tar.gz: 98e477f02f7d1d7dbfd142108430061d11061e215702544cb304e0a126403ec2fc15aa41f89b0431436cfe6b0c53c1dcc7eb60239805d8a0d4c384bd2558985d

data/CHANGELOG.md

@@ -30,6 +30,34 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Security
 
+## [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]
+- COVERAGE: 93.08% -- 5785/6215 lines in 33 files
+- BRANCH COVERAGE: 76.04% -- 2345/3084 branches in 33 files
+- 30.69% documented
+
+### Fixed
+
+- Keep local template dependency activation enabled while bootstrapping nomono.
+
+- Use the complete template dependency graph when bootstrapping nomono; reserve the changelog dependency opt-out for explicit constraint conflicts.
+
 ## [1.2.84] - 2026-09-05
 
 - TAG: [v1.2.84][1.2.84t]
@@ -2510,7 +2538,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.84...HEAD
+[Unreleased]: https://github.com/kettle-dev/kettle-family/compare/v1.2.86...HEAD
+[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
 [1.2.84t]: https://github.com/kettle-dev/kettle-family/releases/tag/v1.2.84
 [1.2.83]: https://github.com/kettle-dev/kettle-family/compare/v1.2.82...v1.2.83

data/README.md

@@ -797,6 +797,38 @@ kettle-family template --execute \
   --env STRUCTUREDMERGE_DEV=/home/me/src/structuredmerge/ruby/gems
 ```
 
+### 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. 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
+  normalization setting.
+- The configured family `*_DEV` selector is preserved or inferred from the
+  family configuration. It tells `nomono` where that sibling closure lives.
+- `BUNDLE_DISABLE_CHECKSUM_VALIDATION=true` is retained for template bootstrap
+  and template application, where a template can legitimately update a
+  lockfile before its checksums are normalized.
+- `KETTLE_DEV_SKIP_CHANGELOG_DEPENDENCY` defaults to `false`. Set it explicitly
+  only when the optional `kettle-changelog` dependency has an incompatible
+  version constraint with the graph being bootstrapped. It does not select
+  local dependencies and must not be used as a general Bundler-resolution or
+  release-lockfile workaround.
+
+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].
@@ -1049,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.213-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
+[🧮kloc-img]: https://img.shields.io/badge/KLOC-6.236-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.84"
+      VERSION = "1.2.86"
     end
     # Current gem version exposed at the traditional constant location.
     VERSION = Version::VERSION # Traditional Constant Location

data/lib/kettle/family/workflow.rb

@@ -824,14 +824,25 @@ module Kettle
 
       def template_bootstrap_dependency_env(_member)
         env = template_prepare_env
-        # This refresh only activates nomono. Changelog tooling is not needed
-        # and can pin a previously released monorepo dependency graph.
-        env["KETTLE_DEV_SKIP_CHANGELOG_DEPENDENCY"] = "true"
-        env["K_JEM_TEMPLATING"] = "false"
-        env["BUNDLE_DISABLE_CHECKSUM_VALIDATION"] = "true"
+        # Bootstrap must evaluate the same development graph as template
+        # preparation. In particular, K_JEM_TEMPLATING activates the generated
+        # local sibling closure; without it, stale generated Gemfiles can make
+        # Bundler look for an unreleased family gem in a registry.
+        #
+        # kettle-changelog is part of that normal graph. Its opt-out remains
+        # 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
       end
 
+      def template_bootstrap_changelog_dependency_setting
+        env_overrides.fetch(
+          "KETTLE_DEV_SKIP_CHANGELOG_DEPENDENCY",
+          ENV.fetch("KETTLE_DEV_SKIP_CHANGELOG_DEPENDENCY", "false")
+        )
+      end
+
       def template_results_for_member(member, progress: nil)
         progress&.start_member(member, total: template_phase_total(member), status: template_initial_status(member))
         runner = CommandRunner.new(execute: execute, accept: accept)
@@ -4373,13 +4384,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(
@@ -4404,15 +4415,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)
@@ -4618,7 +4625,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)
@@ -4672,10 +4709,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.84
+  version: 1.2.86
 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.84
-  changelog_uri: https://github.com/kettle-dev/kettle-family/blob/v1.2.84/CHANGELOG.md
+  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
   bug_tracker_uri: https://github.com/kettle-dev/kettle-family/issues
-  documentation_uri: https://www.rubydoc.info/gems/kettle-family/1.2.84
+  documentation_uri: https://www.rubydoc.info/gems/kettle-family/1.2.86
   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