kettle-family 1.3.24 → 1.3.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb4b30fa1f9686486190145163ab60e6cefb229baa32a20c998d68ba922839a6
-  data.tar.gz: 3907e7ac24a0b8e2292aac9bcf994a4af8dc26ed65815de6a938b2ebc595c8f7
+  metadata.gz: 6cd05963542f86f54bc825842b8f73649a7520e61ddc695c505a6d19b3897581
+  data.tar.gz: c4fc9a81de19c42aa0265fa04d255dc4f40ddcd5485aff3eec57b44647a26ddd
 SHA512:
-  metadata.gz: e5453963f37698bc584bcd170b5856f1080fa37b5a85a3635806809a785bb3da15efbe11e5020933a27e8ae9a769cb7b40db6a109606cece50c0f012fb37d857
-  data.tar.gz: f0a93ff85d5881c187eae578b26e87e083424bf3e5646e4573b80ca0c1468d70a176fc2b365da1da538fb82a48fa2c198a5e38fbfa194fb45fb51a8d040bae0a
+  metadata.gz: 97f87951b90ef59a674a55678be2af49d853f874d221297f3dd8661311400997f5430b9dd9b9e4ce88b32c543baf0d60977b975602a2d01c54f3c0217442c495
+  data.tar.gz: d25120f0322dc957334262f218c07ad8be84669d3632ddcc33aecc7e4f9217407246489b3bcca24aae5e26a43618bc8be888fbba0a3278b8920f6985468be242

data/CHANGELOG.md

@@ -30,6 +30,28 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Security
 
+## [1.3.26] - 2026-10-20
+
+- TAG: [v1.3.26][1.3.26t]
+- COVERAGE: 93.00% -- 7399/7956 lines in 44 files
+- BRANCH COVERAGE: 77.40% -- 2962/3827 branches in 44 files
+- 37.68% documented
+
+### Fixed
+
+- Register template progress starts atomically with queue dispatch, and render progress rows in dependency-queue order.
+
+## [1.3.25] - 2026-10-20
+
+- TAG: [v1.3.25][1.3.25t]
+- COVERAGE: 93.02% -- 7381/7935 lines in 44 files
+- BRANCH COVERAGE: 77.32% -- 2953/3819 branches in 44 files
+- 37.68% documented
+
+### Fixed
+
+- [kc] bup-nomono-bootstrap: Reconcile stale nomono floors and lockfiles before member bup; commit each bootstrap
+
 ## [1.3.24] - 2026-10-19
 
 - TAG: [v1.3.24][1.3.24t]
@@ -3143,7 +3165,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.24...HEAD
+[Unreleased]: https://github.com/kettle-dev/kettle-family/compare/v1.3.26...HEAD
+[1.3.26]: https://github.com/kettle-dev/kettle-family/compare/v1.3.25...v1.3.26
+[1.3.26t]: https://github.com/kettle-dev/kettle-family/releases/tag/v1.3.26
+[1.3.25]: https://github.com/kettle-dev/kettle-family/compare/v1.3.24...v1.3.25
+[1.3.25t]: https://github.com/kettle-dev/kettle-family/releases/tag/v1.3.25
 [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

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.926-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
+[🧮kloc-img]: https://img.shields.io/badge/KLOC-7.956-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

@@ -22,6 +22,12 @@ module Kettle
         !!(gemfile_floor_outdated?(member) || lockfile_version_outdated?(member))
       end
 
+      # Return the project-relative Gemfile paths whose Nomono floor this
+      # bootstrap will raise. Capture before bootstrap_member writes them.
+      def paths_to_update(member)
+        gemfile_edits(member).map { |edit| Paths.relative(edit.fetch(:path), member.root) }.compact.uniq
+      end
+
       def bootstrap_member(member)
         edits = gemfile_edits(member)
         write_edits(edits)

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

data/lib/kettle/family/workflow.rb

@@ -943,8 +943,9 @@ module Kettle
         bootstrap_results = template_member_bootstrap_results(workflow_members)
         return bootstrap_results unless bootstrap_results.all?(&:ok?)
 
-        template_progress = start_template_progress(workflow_members)
-        results = template_dependency_waves(workflow_members).each_with_object([]) do |wave, memo|
+        template_waves = template_dependency_waves(workflow_members)
+        template_progress = start_template_progress(template_waves.flatten)
+        results = template_waves.each_with_object([]) do |wave, memo|
           wave_results = template_results_for_wave(wave, progress: template_progress)
           memo.concat(wave_results)
           break memo unless wave_results.all?(&:ok?)
@@ -998,9 +999,21 @@ module Kettle
         Array.new(wave_jobs) do
           Thread.new do # rubocop:disable ThreadSafety/NewThread -- family templating intentionally runs independent members concurrently.
             loop do
-              break if mutex.synchronize { stop }
-              index, member = queue.pop(true)
-              member_results = template_results_for_member(member, progress: progress, wave_jobs: wave_jobs)
+              assignment = mutex.synchronize do
+                next if stop
+
+                begin
+                  index, member = queue.pop(true)
+                  start_template_member_progress(progress, member)
+                  [index, member]
+                rescue ThreadError
+                  nil
+                end
+              end
+              break unless assignment
+
+              index, member = assignment
+              member_results = template_results_for_member(member, progress: progress, progress_started: true, wave_jobs: wave_jobs)
               mutex.synchronize do
                 ordered_results[index] = member_results
                 stop = true unless member_results.all?(&:ok?)
@@ -1130,12 +1143,24 @@ module Kettle
         Array.new(wave_jobs) do
           Thread.new do # rubocop:disable ThreadSafety/NewThread -- detached worktrees isolate concurrent monorepo template members.
             loop do
-              break if mutex.synchronize { stop }
+              assignment = mutex.synchronize do
+                next if stop
+
+                begin
+                  index, entry = queue.pop(true)
+                  start_template_member_progress(progress, entry.fetch(:member))
+                  [index, entry]
+                rescue ThreadError
+                  nil
+                end
+              end
+              break unless assignment
 
-              index, entry = queue.pop(true)
+              index, entry = assignment
               member_results = template_results_for_member(
                 entry.fetch(:member),
                 progress: progress,
+                progress_started: true,
                 commit_changes: false,
                 wave_jobs: wave_jobs
               )
@@ -1347,6 +1372,7 @@ module Kettle
         candidate_members.each_with_object([]) do |member, results|
           next unless bootstrap.member_needs_bootstrap?(member)
 
+          floor_paths = bootstrap.paths_to_update(member)
           floor_result = bootstrap.bootstrap_member(member)
           results << floor_result
           break results unless results.last.ok?
@@ -1358,11 +1384,30 @@ module Kettle
             env: bup_bootstrap_dependency_env(member)
           )
           break results unless results.last.ok?
+
+          results << commit_bup_bootstrap(member: member, paths: floor_paths, runner: runner) if commit
+          break results unless results.last.ok? || !commit
         end
       rescue => error
         [template_bootstrap_failure_result(workflow_members.first, error.message)]
       end
 
+      def commit_bup_bootstrap(member:, paths:, runner:)
+        paths = (Array(paths) + ["Gemfile.lock"]).uniq
+        pathspecs = paths.map { |path| Shellwords.escape(path) }.join(" ")
+        runner.call(
+          member: member,
+          phase: "commit_bup_bootstrap",
+          command: [
+            "sh",
+            "-lc",
+            "git add -- #{pathspecs} && " \
+              "if git diff --cached --quiet -- #{pathspecs}; then exit 0; fi; " \
+              "git commit --only -m '🔒️ Update nomono bootstrap' -- #{pathspecs}"
+          ]
+        )
+      end
+
       def bup_bootstrap_dependency_env(member)
         bundle_update_env.merge(
           # A standalone update re-resolves against the member's own bundle. The
@@ -1466,15 +1511,10 @@ module Kettle
         )
       end
 
-      def template_results_for_member(member, progress: nil, progress_key: nil, progress_label: nil, commit_changes: true, wave_jobs: 1)
+      def template_results_for_member(member, progress: nil, progress_key: nil, progress_label: nil, progress_started: false, commit_changes: true, wave_jobs: 1)
         progress_key ||= member.name
         progress_label ||= member.name
-        progress&.start_member(
-          member,
-          total: template_phase_total(member),
-          status: template_initial_status(member),
-          **template_progress_identity_options(member, progress_key, progress_label)
-        )
+        start_template_member_progress(progress, member, progress_key: progress_key, progress_label: progress_label) unless progress_started
         runner = CommandRunner.new(execute: execute, accept: accept)
         [].tap do |memo|
           if config.normalize_lockfiles?
@@ -1749,9 +1789,26 @@ module Kettle
         Array.new(wave_jobs) do
           Thread.new do # rubocop:disable ThreadSafety/NewThread -- independent branch worktrees are safe to template concurrently.
             loop do
-              break if mutex.synchronize { stop }
-              index, entry = queue.pop(true)
-              branch_results = template_branch_worktree_entry_results(entry, progress: progress, wave_jobs: wave_jobs)
+              assignment = mutex.synchronize do
+                next if stop
+
+                begin
+                  index, entry = queue.pop(true)
+                  start_template_member_progress(
+                    progress,
+                    entry.fetch(:member),
+                    progress_key: template_branch_progress_key(entry),
+                    progress_label: template_branch_progress_label(entry)
+                  )
+                  [index, entry]
+                rescue ThreadError
+                  nil
+                end
+              end
+              break unless assignment
+
+              index, entry = assignment
+              branch_results = template_branch_worktree_entry_results(entry, progress: progress, progress_started: true, wave_jobs: wave_jobs)
               mutex.synchronize do
                 ordered_results[index] = branch_results
                 stop = true unless branch_results.all?(&:ok?)
@@ -1764,7 +1821,7 @@ module Kettle
         results + ordered_results.compact.flatten
       end
 
-      def template_branch_worktree_entry_results(entry, progress: nil, wave_jobs: 1)
+      def template_branch_worktree_entry_results(entry, progress: nil, progress_started: false, wave_jobs: 1)
         member = entry.fetch(:member)
         branch = entry.fetch(:branch)
         # Bootstrap and upstream synchronization are deliberately performed
@@ -1775,6 +1832,7 @@ module Kettle
           progress: progress,
           progress_key: template_branch_progress_key(entry),
           progress_label: template_branch_progress_label(entry),
+          progress_started: progress_started,
           wave_jobs: wave_jobs
         )
         tag_branch_results(results, branch)
@@ -4802,6 +4860,15 @@ module Kettle
         progress
       end
 
+      def start_template_member_progress(progress, member, progress_key: member.name, progress_label: member.name)
+        progress&.start_member(
+          member,
+          total: template_phase_total(member),
+          status: template_initial_status(member),
+          **template_progress_identity_options(member, progress_key, progress_label)
+        )
+      end
+
       def start_release_progress(release_members)
         wave_numbers = release_waves(release_members).each_with_index.flat_map do |wave, index|
           wave.map { |member| [member.name, index + 1] }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kettle-family
 version: !ruby/object:Gem::Version
-  version: 1.3.24
+  version: 1.3.26
 platform: ruby
 authors:
 - Peter H. Boling
@@ -134,7 +134,7 @@ dependencies:
         version: '3.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.18
+        version: 3.1.19
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -144,7 +144,7 @@ dependencies:
         version: '3.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.18
+        version: 3.1.19
 - !ruby/object:Gem::Dependency
   name: kettle-gha-pins
   requirement: !ruby/object:Gem::Requirement
@@ -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.24
-  changelog_uri: https://github.com/kettle-dev/kettle-family/blob/v1.3.24/CHANGELOG.md
+  source_code_uri: https://github.com/kettle-dev/kettle-family/tree/v1.3.26
+  changelog_uri: https://github.com/kettle-dev/kettle-family/blob/v1.3.26/CHANGELOG.md
   bug_tracker_uri: https://github.com/kettle-dev/kettle-family/issues
-  documentation_uri: https://www.rubydoc.info/gems/kettle-family/1.3.24
+  documentation_uri: https://www.rubydoc.info/gems/kettle-family/1.3.26
   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