kettle-family 1.2.79 → 1.2.80

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de4d61b6ce08f508328ee4b060eb64c15e0d6fab02a2be03a09c0a373ee7f975
-  data.tar.gz: e31c6e4f532a22f4fcb08606bc619986d83ef44f12302986ce087be914536cf4
+  metadata.gz: 6ccfe598bd7e6f842c4020a1763565a3a626ac61c6726f7a37652227494d6947
+  data.tar.gz: a49bf719e3d7bbf184baa6e9a2f3de8080a56af789dcc08b1b8df81ae074656c
 SHA512:
-  metadata.gz: 84c2e9ac41a1d3da7cafb586952a9d2a3e218c774a1a71640fb9d1c334336b91d12a33b00bff6615911830e3bde06efb29bbe7fa9c9ae57291cdad324027b288
-  data.tar.gz: bb2ccf29a236cb2e8e601a8f767dfb342347ca52a6d99446a03983011e1b5b7e2da628498abc34c47562c3f63de3940ec4aa30c15701ff10cc7e009dc51752db
+  metadata.gz: 4656fb34c6cffb5ebbd33c3052a62dec50a2c075e6abce72f2ff58d392d4918f1bf8cee49de268f09c2130ccad4bf2bde5c60537092e83de586e6d3ac42f6ed8
+  data.tar.gz: 0c681c8436b1246fcd0882c2dcd89a77255d6d77942ab29dfca35471f9a4f69f7b0efdfe09f2019fb55a6e2b0c775ac79c741b132c8124403aa026770c49d1e1

data/CHANGELOG.md

@@ -30,6 +30,23 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Security
 
+## [1.2.80] - 2026-09-01
+
+- TAG: [v1.2.80][1.2.80t]
+- COVERAGE: 93.26% -- 5662/6071 lines in 33 files
+- BRANCH COVERAGE: 76.39% -- 2316/3032 branches in 33 files
+- 30.69% documented
+
+### Added
+
+- Template member target branches concurrently in isolated Git worktrees, while retaining the primary checkout for its current branch.
+
+### Fixed
+
+- Keep non-targeted members in the dependency-aware parallel template scheduler when another family member has release target branches.
+
+- Leave an unrelated primary checkout untouched while templating configured target branches in worktrees.
+
 ## [1.2.79] - 2026-09-01
 
 - TAG: [v1.2.79][1.2.79t]
@@ -2449,7 +2466,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.2.79...HEAD
+[Unreleased]: https://github.com/kettle-dev/kettle-family/compare/v1.2.80...HEAD
+[1.2.80]: https://github.com/kettle-dev/kettle-family/compare/v1.2.79...v1.2.80
+[1.2.80t]: https://github.com/kettle-dev/kettle-family/releases/tag/v1.2.80
 [1.2.79]: https://github.com/kettle-dev/kettle-family/compare/v1.2.78...v1.2.79
 [1.2.79t]: https://github.com/kettle-dev/kettle-family/releases/tag/v1.2.79
 [1.2.78]: https://github.com/kettle-dev/kettle-family/compare/v1.2.77...v1.2.78

data/README.md

@@ -1049,7 +1049,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-5.974-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
+[🧮kloc-img]: https://img.shields.io/badge/KLOC-6.071-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.2.79"
+      VERSION = "1.2.80"
     end
     # Current gem version exposed at the traditional constant location.
     VERSION = Version::VERSION # Traditional Constant Location

data/lib/kettle/family/workflow.rb

@@ -457,7 +457,7 @@ module Kettle
       end
 
       def template_sync_members_for(candidates)
-        candidates.each_with_object([]) do |member, unique_members|
+        candidates.reject { |member| template_worktree_only_member?(member) }.each_with_object([]) do |member, unique_members|
           unique_members << member unless unique_members.any? { |candidate| git_root_for(candidate) == git_root_for(member) }
         end
       end
@@ -925,15 +925,181 @@ module Kettle
       def member_local_branch_target_results
         return release_member_local_branch_target_results if command == "release"
 
-        members.each_with_object([]) do |member, memo|
+        target_members, current_branch_members = members.partition do |member|
+          member_local_release_config(member)
+        end
+        results = []
+        results = current_branch_results(current_branch_members) unless current_branch_members.empty?
+        return results unless results.all?(&:ok?)
+
+        target_members.each do |member|
           member_config = member_local_release_config(member)
-          if member_config
-            memo.concat(member_local_workflow(member: member, member_config: member_config).results)
+          if template_branch_worktrees?(member_config)
+            results.concat(template_branch_worktree_results(member: member, member_config: member_config))
           else
-            memo.concat(current_branch_results([member]))
+            results.concat(member_local_workflow(member: member, member_config: member_config).results)
           end
-          break memo unless memo.last&.ok?
+          break unless results.last&.ok?
         end
+        results
+      end
+
+      # Release target branches are independent checkouts. Templating them in
+      # linked worktrees avoids repeatedly switching the primary checkout and
+      # allows the branch stack to use the requested template worker budget.
+      def template_branch_worktree_results(member:, member_config:)
+        branches = BranchTargetConfig.branch_targets_for(command, member_config.release_target_branches)
+        return [] if branches.empty?
+
+        entries = []
+        outcomes = []
+        runner = command_runner
+        fetch = runner.call(member: member, phase: "template_branch_fetch", command: %w[git fetch --all --prune])
+        outcomes << fetch
+        if fetch.ok?
+          current_branch = template_current_branch(member)
+          if current_branch.is_a?(CommandResult)
+            outcomes << current_branch
+          else
+            branches.each do |branch|
+              if branch == current_branch
+                entries << {branch: branch, member: member, worktree_root: nil}
+                next
+              end
+
+              worktree_root = template_branch_worktree_path(member, branch)
+              add = runner.call(
+                member: member,
+                phase: "template_worktree_add",
+                command: ["git", "worktree", "add", worktree_root, branch]
+              )
+              add.branch = branch
+              outcomes << add
+              break unless add.ok?
+
+              entries << {branch: branch, member: relocate_member_to_worktree(member, worktree_root), worktree_root: worktree_root}
+            end
+
+            if outcomes.all?(&:ok?)
+              emit_template_event_line(member, ">", "branch worktrees #{entries.length} branches, #{template_jobs(entries)} jobs")
+              outcomes.concat(template_branch_worktree_entries_results(entries))
+            end
+          end
+        end
+        outcomes
+      ensure
+        outcomes&.concat(template_branch_worktree_cleanup_results(entries, runner: runner, control_member: member))
+      end
+
+      def template_branch_worktrees?(member_config)
+        command == "template" && execute && !member_config&.release_target_branches.to_a.empty?
+      end
+
+      def template_worktree_only_member?(member)
+        member_config = member_local_release_config(member)
+        return false unless template_branch_worktrees?(member_config)
+
+        current_branch = template_current_branch(member)
+        return false if current_branch.is_a?(CommandResult)
+
+        !member_config.release_target_branches.include?(current_branch)
+      end
+
+      def template_current_branch(member)
+        stdout, stderr, status = Open3.capture3("git", "branch", "--show-current", chdir: member.root)
+        branch = stdout.strip
+        return branch if status.success? && !branch.empty?
+
+        template_branch_failure_result(member, "could not determine current branch: #{stderr}")
+      end
+
+      def template_branch_worktree_path(member, branch)
+        safe_member = member.name.to_s.gsub(/[^A-Za-z0-9_.-]+/, "_")
+        safe_branch = branch.to_s.gsub(/[^A-Za-z0-9_.-]+/, "_")
+        File.join(config.root, "tmp", "kettle-family", "template-worktrees", safe_member, "#{Process.pid}-#{safe_branch}")
+      end
+
+      def relocate_member_to_worktree(member, worktree_root)
+        relocate = lambda do |path|
+          next unless path
+
+          relative = Pathname.new(path).relative_path_from(Pathname.new(member.root))
+          File.join(worktree_root, relative)
+        end
+        member.dup.tap do |worktree_member|
+          worktree_member.root = worktree_root
+          worktree_member.gemspec_path = relocate.call(member.gemspec_path)
+          worktree_member.version_file = relocate.call(member.version_file)
+        end
+      end
+
+      def template_branch_worktree_entries_results(entries)
+        queue = Queue.new
+        entries.each_with_index { |entry, index| queue << [index, entry] }
+        ordered_results = Array.new(entries.length)
+        mutex = Mutex.new
+        stop = false
+        Array.new(template_jobs(entries)) 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)
+              mutex.synchronize do
+                ordered_results[index] = branch_results
+                stop = true unless branch_results.all?(&:ok?)
+              end
+            rescue ThreadError
+              break
+            end
+          end
+        end.each(&:join)
+        ordered_results.compact.flatten
+      end
+
+      def template_branch_worktree_entry_results(entry)
+        member = entry.fetch(:member)
+        branch = entry.fetch(:branch)
+        runner = command_runner
+        results = []
+        if git_upstream_for(member)
+          results << runner.call(member: member, phase: "template_branch_sync", command: ["git", "rebase", "@{upstream}"])
+        end
+        results.concat(template_results_for_member(member)) if results.all?(&:ok?)
+        tag_branch_results(results, branch)
+        emit_template_event_line(member, results.all?(&:ok?) ? "." : "F", "branch #{branch}")
+        results
+      end
+
+      def template_branch_worktree_cleanup_results(entries, runner:, control_member:)
+        entries.filter_map do |entry|
+          worktree_root = entry[:worktree_root]
+          next unless worktree_root && Dir.exist?(worktree_root)
+
+          result = runner.call(
+            member: control_member,
+            phase: "template_worktree_remove",
+            command: ["git", "worktree", "remove", "--force", worktree_root]
+          )
+          result.branch = entry.fetch(:branch)
+          result
+        end
+      end
+
+      def template_branch_failure_result(member, message)
+        CommandResult.new(
+          member_name: member.name,
+          phase: "template_worktree",
+          command: ["internal", "template-worktree"],
+          workdir: member.root,
+          status: 1,
+          success: false,
+          stdout: "",
+          stderr: message,
+          elapsed_seconds: 0.0,
+          skipped: false,
+          reason: "template branch worktree failed"
+        )
       end
 
       def branch_generated_lockfile_cleanup_required?
@@ -1150,7 +1316,9 @@ module Kettle
       end
 
       def branch_checkout_preflight_members
-        members_with_targets = members.select { |member| member_local_release_config(member) }
+        members_with_targets = members.select do |member|
+          member_local_release_config(member) && !template_worktree_only_member?(member)
+        end
         members_with_targets = [family_member] if !config.release_target_branches.empty?
         members_with_targets
       end
@@ -3793,7 +3961,7 @@ module Kettle
       end
 
       def emit_template_event_line(member, mark, label)
-        return if label.to_s.empty?
+        return if label.to_s.empty? || !progress_io
 
         synchronize_template_progress do
           progress_io.puts("[#{member.name}] #{mark} #{label}")

metadata

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