kettle-family 1.3.22 → 1.3.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96db982e6915d29a69f7d70da67d8bc64cba1ac9d2e5c98cfc6f25a0007a8915
-  data.tar.gz: 18df52948a5ed1578f0c1d65d1da40fe93b3c13cd16bec671849651eb3cade02
+  metadata.gz: fb4b30fa1f9686486190145163ab60e6cefb229baa32a20c998d68ba922839a6
+  data.tar.gz: 3907e7ac24a0b8e2292aac9bcf994a4af8dc26ed65815de6a938b2ebc595c8f7
 SHA512:
-  metadata.gz: 543de4d2b9c10fe77cb0ed64231b381bd3c2553def379d4af9d4c84429821f0ddda8f6c300fcad022fe529654d8d11eb496afd3927c2a4d9b83bc5a1d3417d69
-  data.tar.gz: 36b14df59d36b187d978391d3e0e4be771f241e8eb816be8e13b01e703b56c957ee51d5545aa8f68c85f3575c1a0227d72b0a69ede2b9b29bacfe2775f3450d8
+  metadata.gz: e5453963f37698bc584bcd170b5856f1080fa37b5a85a3635806809a785bb3da15efbe11e5020933a27e8ae9a769cb7b40db6a109606cece50c0f012fb37d857
+  data.tar.gz: f0a93ff85d5881c187eae578b26e87e083424bf3e5646e4573b80ca0c1468d70a176fc2b365da1da538fb82a48fa2c198a5e38fbfa194fb45fb51a8d040bae0a

data/CHANGELOG.md

@@ -30,6 +30,28 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Security
 
+## [1.3.24] - 2026-10-19
+
+- TAG: [v1.3.24][1.3.24t]
+- COVERAGE: 93.01% -- 7372/7926 lines in 44 files
+- BRANCH COVERAGE: 77.25% -- 2947/3815 branches in 44 files
+- 37.55% documented
+
+### Fixed
+
+- [kc] bup-nomono-bootstrap: Add a bup bootstrap phase that bumps stale nomono floors and reconciles member lockfiles with a pinned nomono update before member bundle update --all, so family-root floor raises no longer deadlock on older activated nomono releases. Dry-run bup plans the reconciliation without editing files.
+
+## [1.3.23] - 2026-10-19
+
+- TAG: [v1.3.23][1.3.23t]
+- COVERAGE: 93.00% -- 7352/7905 lines in 44 files
+- BRANCH COVERAGE: 77.31% -- 2937/3799 branches in 44 files
+- 37.55% documented
+
+### Fixed
+
+- Template dependency preparation records its changelog entries where the family config says changelogs go (K_CHANGELOG_PATH resolved from changelog mode/path), so a shared-changelog family no longer gets transferred template entries written into a member-local CHANGELOG.md — which split a lock-step member into its own release lane.
+
 ## [1.3.22] - 2026-10-19
 
 - TAG: [v1.3.22][1.3.22t]
@@ -3121,7 +3143,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.3.22...HEAD
+[Unreleased]: https://github.com/kettle-dev/kettle-family/compare/v1.3.24...HEAD
+[1.3.24]: https://github.com/kettle-dev/kettle-family/compare/v1.3.23...v1.3.24
+[1.3.24t]: https://github.com/kettle-dev/kettle-family/releases/tag/v1.3.24
+[1.3.23]: https://github.com/kettle-dev/kettle-family/compare/v1.3.22...v1.3.23
+[1.3.23t]: https://github.com/kettle-dev/kettle-family/releases/tag/v1.3.23
 [1.3.22]: https://github.com/kettle-dev/kettle-family/compare/v1.3.21...v1.3.22
 [1.3.22t]: https://github.com/kettle-dev/kettle-family/releases/tag/v1.3.22
 [1.3.21]: https://github.com/kettle-dev/kettle-family/compare/v1.3.18...v1.3.21

data/README.md

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

@@ -10,12 +10,13 @@ module Kettle
     class NomonoBootstrap
       GEM_NAME = "nomono"
 
-      def initialize(latest_version:, mode: :dry_run)
+      def initialize(latest_version:, mode: :dry_run, phase: "template_bootstrap_dependencies")
         @latest_version = Gem::Version.new(latest_version.to_s)
         @mode = mode
+        @phase = phase
       end
 
-      attr_reader :latest_version, :mode
+      attr_reader :latest_version, :mode, :phase
 
       def member_needs_bootstrap?(member)
         !!(gemfile_floor_outdated?(member) || lockfile_version_outdated?(member))
@@ -26,7 +27,7 @@ module Kettle
         write_edits(edits)
         CommandResult.new(
           member.name,
-          "template_bootstrap_dependencies",
+          phase,
           ["internal", "nomono-bootstrap", latest_version.to_s],
           member.root,
           0,

data/lib/kettle/family/version.rb

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

data/lib/kettle/family/workflow.rb

@@ -578,6 +578,9 @@ module Kettle
         update_family_root_bundle(runner: runner, memo: results) if %w[bup bupb update-bundler].include?(command)
         return results unless results.all?(&:ok?)
 
+        results.concat(bup_bootstrap_dependency_results(workflow_members, runner: runner, memo: results)) if %w[bup bupb update-bundler].include?(command)
+        return results unless results.all?(&:ok?)
+
         if %w[bup bupb update-bundler].include?(command) && release_mode_bundle_update?
           results.concat(release_pre_clean_results(runner: runner))
           return results unless results.last.nil? || results.last.ok?
@@ -1324,6 +1327,53 @@ module Kettle
         )
       end
 
+      # Before a bundle update resolves the dependency graph, the member's
+      # bootstrap must declare and lock the newest Nomono floor, otherwise the
+      # generated bootstrap activates an older installed release and Bundler
+      # rejects the duplicate requirement raised by the family-root floor bump.
+      # This is the bup analogue of template_bootstrap_dependency_results.
+      def bup_bootstrap_dependency_results(workflow_members, runner:, memo:)
+        return [] if workflow_members.empty?
+
+        candidate_members = workflow_members.select { |member| nomono_bootstrap_candidate?(member) }
+        return [] if candidate_members.empty?
+
+        latest_nomono_version = latest_released_nomono_version
+        bootstrap = NomonoBootstrap.new(
+          latest_version: latest_nomono_version,
+          mode: execute ? :execute : :dry_run,
+          phase: "bup_bootstrap_dependencies"
+        )
+        candidate_members.each_with_object([]) do |member, results|
+          next unless bootstrap.member_needs_bootstrap?(member)
+
+          floor_result = bootstrap.bootstrap_member(member)
+          results << floor_result
+          break results unless results.last.ok?
+
+          results << runner.call(
+            member: member,
+            phase: "bup_bootstrap_dependencies",
+            command: pinned_bundler_update_command(extra_gems: %w[nomono]),
+            env: bup_bootstrap_dependency_env(member)
+          )
+          break results unless results.last.ok?
+        end
+      rescue => error
+        [template_bootstrap_failure_result(workflow_members.first, error.message)]
+      end
+
+      def bup_bootstrap_dependency_env(member)
+        bundle_update_env.merge(
+          # A standalone update re-resolves against the member's own bundle. The
+          # member Gemfile bootstrap floor has already been bumped; here we only
+          # reconcile the member lockfile for that gem, so the subsequent member
+          # Gemfile.lock is not stale and the new floor resolves from the family
+          # root local path instead of activating an older installed release.
+          "BUNDLE_GEMFILE" => "#{member.root}/Gemfile"
+        )
+      end
+
       def template_bootstrap_dependency_results(workflow_members)
         return [] if workflow_members.empty?
 
@@ -5776,6 +5826,20 @@ module Kettle
           exclusions = compute_local_gem_exclusions(member)
           env["KETTLE_JEM_LOCAL_GEM_EXCLUSIONS"] = exclusions.join(",") unless exclusions.empty?
         end
+        # Template dependency preparation records what it changed as changelog
+        # entries. Changelogs go where the family config says they go — the
+        # family root changelog for shared-changelog families, each member's
+        # own otherwise — exactly like add-changelog. Without this, prepare
+        # writes transferred entries into a member-local CHANGELOG.md even
+        # when the family shares one, splitting a lock-step member into its
+        # own release lane.
+        if kettle_jem_template_command?(config.template_command || default_template_command(member))
+          if config&.shared_changelog?
+            env["K_CHANGELOG_PATH"] = File.expand_path(config.changelog_path, config.root)
+          elsif member
+            env["K_CHANGELOG_PATH"] = File.join(member.root, "CHANGELOG.md")
+          end
+        end
         tool_gemfile = local_kettle_jem_gemfile if member && local_nomono_path_locked?(member)
         # Nomono's existing generated bootstrap can activate an installed
         # release before Bundler resolves a path-locked local Nomono. Start

metadata

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