kettle-family 1.3.25 → 1.3.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5fd8e91edaffccff9ac6016c1dbf3ce50eb1c1453c344f1568d111797a2e838c
-  data.tar.gz: 1f25730d8c419d87600e48dc06793cb7aff484369e2ba05643d1ce6faa3a596e
+  metadata.gz: 6cd05963542f86f54bc825842b8f73649a7520e61ddc695c505a6d19b3897581
+  data.tar.gz: c4fc9a81de19c42aa0265fa04d255dc4f40ddcd5485aff3eec57b44647a26ddd
 SHA512:
-  metadata.gz: 408834a4d45b2e802c857459f2c48930f25d2750928412770e81852eb063d8712896b13154f0953ac9034eef1d41cf72c4587b6456a512b15dfb14ada10b53b8
-  data.tar.gz: e3218229fdd996dc95bb2e1f9a5036d3e0366625e9b960593897f2b088cfc525f890c21b544d691eead4ceccda14fe9aeadb97fdaca631dd73e5074bd6364149
+  metadata.gz: 97f87951b90ef59a674a55678be2af49d853f874d221297f3dd8661311400997f5430b9dd9b9e4ce88b32c543baf0d60977b975602a2d01c54f3c0217442c495
+  data.tar.gz: d25120f0322dc957334262f218c07ad8be84669d3632ddcc33aecc7e4f9217407246489b3bcca24aae5e26a43618bc8be888fbba0a3278b8920f6985468be242

data/CHANGELOG.md

@@ -30,6 +30,17 @@ 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]
@@ -3154,7 +3165,9 @@ 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.25...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

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.935-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/version.rb

@@ -5,7 +5,7 @@ module Kettle
     # Version namespace for this gem.
     module Version
       # Current gem version.
-      VERSION = "1.3.25"
+      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
               )
@@ -1486,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?
@@ -1769,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?)
@@ -1784,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
@@ -1795,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)
@@ -4822,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.25
+  version: 1.3.26
 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.25
-  changelog_uri: https://github.com/kettle-dev/kettle-family/blob/v1.3.25/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.25
+  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