kettle-family 1.2.96 → 1.2.98

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2f776638603414ab6c27f457473dea3f6088bae63f58a45fcbc0f165fe0e026
-  data.tar.gz: b44e74efb8e840e929df24573b815df7b7a749f27e67f86f76561ab654b406ea
+  metadata.gz: a170049375aa0330277e878596e92a61b58655a29ca9aeba1e9ab0006fa46c04
+  data.tar.gz: 5bfcd0c99c774fad470b8510188e6eaad700c2ca3157f64eb1a9b52ac320d6c6
 SHA512:
-  metadata.gz: 77f9c29784b453d8d270398c675ed52e18d8ba5f374fc8add80465bce88f59a679ab254080e3fe349685bff16134bb97541ef087d5c32116123c95e443b64685
-  data.tar.gz: 4e750df4e8f1f7f92ee8a653bac8ed02a95ee7ddfa5daa8f8eef92003b78e2c58c93b41498b0b93f8649626dcaf3a645f36fdedabf78928e35653131f14431c3
+  metadata.gz: c527202894d4bca3ada36684b9a7f3700052ebd53967ebb7ea7a65cc0db5cc20a5bf04eec6730f380a444fd69ed6828428fc29e16a1718371eab48eea0647601
+  data.tar.gz: b147945409bca869bf23ea6ab8773b7fc8fc6c7677ef877367d2970b3c73edb1efe628606c267de48f58af8cb4db761d527ce8df457b1fe6d4f729ae8c662229

data/CHANGELOG.md

@@ -30,6 +30,30 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Security
 
+## [1.2.98] - 2026-09-09
+
+- TAG: [v1.2.98][1.2.98t]
+- COVERAGE: 93.50% -- 6245/6679 lines in 35 files
+- BRANCH COVERAGE: 78.08% -- 2529/3239 branches in 35 files
+- 32.75% documented
+
+### Fixed
+
+- Commit the final normalized Gemfile.lock after sibling and branch-worktree template runs.
+
+- Bootstrap member releases from the family tool bundle before registry lockfile normalization.
+
+## [1.2.97] - 2026-09-08
+
+- TAG: [v1.2.97][1.2.97t]
+- COVERAGE: 93.49% -- 6236/6670 lines in 35 files
+- BRANCH COVERAGE: 77.99% -- 2523/3235 branches in 35 files
+- 32.75% documented
+
+### Fixed
+
+- Attribute release-preflight failures to the selected member so retry hints do not target an unselected family sibling.
+
 ## [1.2.96] - 2026-09-08
 
 - TAG: [v1.2.96][1.2.96t]
@@ -2668,7 +2692,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.96...HEAD
+[Unreleased]: https://github.com/kettle-dev/kettle-family/compare/v1.2.98...HEAD
+[1.2.98]: https://github.com/kettle-dev/kettle-family/compare/v1.2.97...v1.2.98
+[1.2.98t]: https://github.com/kettle-dev/kettle-family/releases/tag/v1.2.98
+[1.2.97]: https://github.com/kettle-dev/kettle-family/compare/v1.2.96...v1.2.97
+[1.2.97t]: https://github.com/kettle-dev/kettle-family/releases/tag/v1.2.97
 [1.2.96]: https://github.com/kettle-dev/kettle-family/compare/v1.2.95...v1.2.96
 [1.2.96t]: https://github.com/kettle-dev/kettle-family/releases/tag/v1.2.96
 [1.2.95]: https://github.com/kettle-dev/kettle-family/compare/v1.2.94...v1.2.95

data/README.md

@@ -662,6 +662,15 @@ and leaves RubyGems MFA prompts interactive by default:
 kettle-family release --publish --execute
 ```
 
+Release uses two explicitly separate execution contexts. `release_bootstrap`
+starts `kettle-release` from the family-root tool bundle, so a family can retain
+its configured local sibling graph while it prepares a release wave. It never
+uses a member's development Gemfile to boot the release tool. `release_registry`
+then resets each tracked release lockfile against registry dependencies and is
+also used by every project release child command. Local sibling paths therefore
+remain available only before that transition; they cannot enter the canonical
+lockfile, the release-preparation commit, or CI-facing project commands.
+
 Use named recovery modes when a publish wave has already prepared a member:
 
 ```console
@@ -1171,7 +1180,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.669-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
+[🧮kloc-img]: https://img.shields.io/badge/KLOC-6.679-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

@@ -40,6 +40,18 @@ module Kettle
           host_platform_policy: :active_platform_must_resolve,
           allowed_mutations: %i[template development_lockfiles generated]
         ),
+        # This profile only starts the release implementation from the family
+        # tool bundle. It is intentionally distinct from release_registry:
+        # canonical lockfile reset and all project release children use that
+        # registry-only profile after the tool has booted.
+        release_bootstrap: Definition.new(
+          name: :release_bootstrap,
+          path_gem_policy: :configured_siblings,
+          lockfile_role: :tool,
+          install_location: :family,
+          host_platform_policy: :active_platform_must_resolve,
+          allowed_mutations: %i[release_tool_bootstrap]
+        ),
         release_registry: Definition.new(
           name: :release_registry,
           path_gem_policy: :registry_only,

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.96"
+      VERSION = "1.2.98"
     end
     # Current gem version exposed at the traditional constant location.
     VERSION = Version::VERSION # Traditional Constant Location

data/lib/kettle/family/workflow.rb

@@ -1451,6 +1451,7 @@ module Kettle
           normalize_lockfiles(member: member, runner: runner, memo: memo, phase: "normalize_lockfiles", commit_changes: commit_changes)
           emit_member_result_progress(member, memo.last, progress: progress, progress_key: progress_key, progress_label: progress_label)
           commit_template_changes(member: member, runner: runner, memo: memo) if commit_changes
+          commit_template_normalized_gemfile_lock(member: member, runner: runner, memo: memo, commit_changes: commit_changes)
           emit_member_result_progress(member, memo.last, progress: progress, progress_key: progress_key, progress_label: progress_label) if memo.last&.phase == "commit_template"
         ensure
           template_result = memo.find { |result| result.phase == "template" } || memo.last
@@ -1944,11 +1945,15 @@ module Kettle
       end
 
       def release_preflight_error_result(phase, message)
+        # A preflight failure blocks the selected release invocation. Attribute
+        # it to that invocation's first member so generated resume commands do
+        # not target the synthetic family name or an unselected sibling.
+        member = members.first || family_member
         CommandResult.new(
-          member_name: family_member.name,
+          member_name: member.name,
           phase: phase,
           command: ["internal", phase],
-          workdir: config.root,
+          workdir: member.root,
           status: 1,
           success: false,
           stdout: "",
@@ -3633,7 +3638,7 @@ module Kettle
       # changelog may live at the family root. Pass the shared paths to the
       # member release phase as well as to the separate family phase.
       def release_env_for_member(member, family_root: config.root, wave_jobs: 1)
-        env = release_env
+        env = execution_profile(release_bootstrap_execution_profile, release_env)
         env.merge!(release_wave_local_path_env_for(member, family_root: family_root))
         env.merge!(release_local_path_policy_env(family_root: family_root))
         # Family release performs one live pin review before member releases.
@@ -3699,15 +3704,15 @@ module Kettle
         candidates.find { |path| File.file?(path) }
       end
 
-      # A member's development lockfile can pin an older kettle-dev than the
-      # family runner. That older release tool may not understand the current
-      # family policy, notably configured monorepo PATH dependencies. Launch
-      # kettle-release from the family bundle instead; the release tool still
-      # runs member project commands from the member checkout.
+      # A member's development Gemfile can contain a deliberately local family
+      # graph that is not independently bootable after an earlier release wave
+      # changes a sibling's dependency floor. Launch kettle-release from the
+      # family tool bundle instead. The release tool still runs project commands
+      # from the member checkout, where it first normalizes canonical lockfiles
+      # with local paths disabled.
       def release_tool_gemfile_path(local_kettle_dev)
         local_kettle_dev_gemfile = local_kettle_dev_gemfile_path(local_kettle_dev)
         return local_kettle_dev_gemfile if local_kettle_dev_gemfile
-        return unless config.configured_monorepo_release?
 
         family_gemfile = File.join(config.root, "Gemfile")
         family_gemfile if File.file?(family_gemfile)
@@ -5315,6 +5320,23 @@ module Kettle
         end
       end
 
+      # Kettle Jem commits its own changes for sibling repositories. The final
+      # lockfile normalization therefore happens after that commit and needs a
+      # separate, deliberately narrow cleanup commit. Monorepos defer the
+      # template commit, which already includes the normalized lockfile.
+      def commit_template_normalized_gemfile_lock(member:, runner:, memo:, commit_changes:)
+        return unless execute && commit_changes && memo.all?
+        return if deferred_monorepo_template_commit?(member)
+
+        commit_normalized_lockfiles(
+          branch_members: [member],
+          runner: runner,
+          memo: memo,
+          reason: "template",
+          paths: ["Gemfile.lock"]
+        )
+      end
+
       def template_commit_message(member)
         "🎨 Template #{member.name} by kettle-family"
       end
@@ -5353,6 +5375,10 @@ module Kettle
         ExecutionProfile.fetch(:template_local)
       end
 
+      def release_bootstrap_execution_profile
+        ExecutionProfile.fetch(:release_bootstrap)
+      end
+
       def release_lockfile_execution_profile
         return ExecutionProfile.fetch(:release_recovery) if release_recovery?
         return ExecutionProfile.fetch(:release_monorepo) if preserve_monorepo_template_context?
@@ -5371,7 +5397,7 @@ module Kettle
         when :template_local
           env["K_JEM_TEMPLATING"] = "true"
           env["BUNDLE_DISABLE_CHECKSUM_VALIDATION"] = "true"
-        when :release_registry, :release_monorepo, :release_recovery
+        when :release_bootstrap, :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.
@@ -5584,10 +5610,14 @@ module Kettle
         text.include?(File::SEPARATOR)
       end
 
-      def commit_normalized_lockfiles(branch_members:, runner:, memo:, reason: command, force: false)
+      def commit_normalized_lockfiles(branch_members:, runner:, memo:, reason: command, force: false, paths: nil)
         return unless commit
         return unless force || commit_normalized_lockfiles?(reason)
 
+        pathspecs = Array(paths).map { |path| Shellwords.escape(path) }
+        pathspecs = ["Gemfile.lock", "'*.lock'", "'**/*.lock'"] if pathspecs.empty?
+        pathspec = pathspecs.join(" ")
+
         branch_members.each do |member|
           result = runner.call(
             member: member,
@@ -5595,7 +5625,7 @@ module Kettle
             command: [
               "sh",
               "-lc",
-              "files=$(git ls-files --modified --others --exclude-standard -- Gemfile.lock '*.lock' '**/*.lock'); " \
+              "files=$(git ls-files --modified --others --exclude-standard -- #{pathspec}); " \
                 "if [ -n \"$files\" ]; then printf '%s\\n' \"$files\" | xargs git add -- && git commit -m " \
                 "#{Shellwords.escape(normalized_lockfiles_commit_message(reason))}; fi"
             ]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kettle-family
 version: !ruby/object:Gem::Version
-  version: 1.2.96
+  version: 1.2.98
 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.96
-  changelog_uri: https://github.com/kettle-dev/kettle-family/blob/v1.2.96/CHANGELOG.md
+  source_code_uri: https://github.com/kettle-dev/kettle-family/tree/v1.2.98
+  changelog_uri: https://github.com/kettle-dev/kettle-family/blob/v1.2.98/CHANGELOG.md
   bug_tracker_uri: https://github.com/kettle-dev/kettle-family/issues
-  documentation_uri: https://www.rubydoc.info/gems/kettle-family/1.2.96
+  documentation_uri: https://www.rubydoc.info/gems/kettle-family/1.2.98
   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