kettle-family 1.2.30 → 1.2.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 945e285ec99d1d336abdf5a51c05135c99485cafeb1b47a65b81ab72818a6786
-  data.tar.gz: 29bd40256a7b84edaf06dd9adc4f0d21db43a470b07e71b17dc3295e23f9fe4e
+  metadata.gz: 0e7218af91f4e5ff65ed580ef1eb24d8abc3e3c12e4f8f07eaa0061ed525bbe7
+  data.tar.gz: 462a5f7b86214cc3de01bc0a83dbcd67f9108176c9a0bf7ff4584edeb0034642
 SHA512:
-  metadata.gz: 6a25b8669590d61a7a2ecd48fc64bf7d32d7d6090fcea810b13673534827f6609f700ecbeb0ef8b5dded509c4de135f385323a034a236bfd092a9d789c93d178
-  data.tar.gz: '0508285a2bc3905833dffe7e0387909613f0ff669d9e600f640d1a052ab53f06fb67d6a7bc64a4bfbae1b8175f4bf5efc268f22e012fe6978802cbc01b4da55b'
+  metadata.gz: e98b590ac4ccbbb439943091520efd1fdf81605bbc966564aedb8578ce10c63aac85a6dabdc68a600e002239a3f6797c02b10130239ec303bdab2e041dad64a3
+  data.tar.gz: fdbf33733f9dd73fb52af5458b89b2b3c5d85ecd2c7ae954f7cf4b5b9d77fcb07e6a57fd25e5684fb3b7261ecdba7258b0e234d7247114007bdb4e77a1f13bb4

data/CHANGELOG.md

@@ -30,6 +30,19 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Security
 
+## [1.2.31] - 2026-08-05
+
+- TAG: [v1.2.31][1.2.31t]
+- COVERAGE: 94.10% -- 4976/5288 lines in 32 files
+- BRANCH COVERAGE: 76.53% -- 1969/2573 branches in 32 files
+- 29.61% documented
+
+### Fixed
+
+- Route kettle-family GHA pin maintenance through kettle-gha-pins instead of the legacy kettle-gha-sha-pins executable.
+
+- Run kettle-family release-state checks concurrently with --jobs while preserving ordered results.
+
 ## [1.2.30] - 2026-08-04
 
 - TAG: [v1.2.30][1.2.30t]
@@ -1787,7 +1800,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.30...HEAD
+[Unreleased]: https://github.com/kettle-dev/kettle-family/compare/v1.2.31...HEAD
+[1.2.31]: https://github.com/kettle-dev/kettle-family/compare/v1.2.30...v1.2.31
+[1.2.31t]: https://github.com/kettle-dev/kettle-family/releases/tag/v1.2.31
 [1.2.30]: https://github.com/kettle-dev/kettle-family/compare/v1.2.29...v1.2.30
 [1.2.30t]: https://github.com/kettle-dev/kettle-family/releases/tag/v1.2.30
 [1.2.29]: https://github.com/kettle-dev/kettle-family/compare/v1.2.28...v1.2.29

data/README.md

@@ -329,6 +329,7 @@ Audit changelog release state across the selected family members:
 ```console
 kettle-family release-state
 kettle-family state
+kettle-family state --jobs 8
 ```
 
 `state` is an alias for `release-state`. The release-state report lists each
@@ -374,6 +375,10 @@ The supported release-state tokens are:
 When `--only` is omitted, `kettle-family bump` defaults to `--only bump` and
 `kettle-family release` defaults to `--only pending`.
 
+State checks run concurrently by default, using up to four jobs or the number
+of available CPU cores, whichever is lower. Use `--jobs N` to set an explicit
+limit; results remain in family order.
+
 Most commands accept `--json` to print a machine-readable report instead of the
 text report, and `--report PATH` to write that JSON report while still printing
 the normal text report.
@@ -387,6 +392,10 @@ kettle-family gha-sha-pins --execute
 kettle-family gha-sha-pins --execute --upgrade minor
 ```
 
+The family command name is retained for compatibility, but it delegates to
+the current `kettle-gha-pins` executable for each selected member. The older
+`kettle-gha-sha-pins` executable is a legacy direct entrypoint.
+
 Run release prep/build phases without publishing:
 
 ```console
@@ -828,7 +837,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.254-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
+[🧮kloc-img]: https://img.shields.io/badge/KLOC-5.288-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/cli.rb

@@ -68,11 +68,17 @@ module Kettle
         end
       end
 
+      module ParallelOptions
+        def self.included(base)
+          base.option :jobs, value: {type: Integer, usage: "N"}, desc: "Parallel jobs for supported workflows"
+        end
+      end
+
       module WorkflowOptions
         def self.included(base)
           base.option :debug, desc: "Preserve debug environment for workflow commands"
           base.option :verbose, desc: "Pass verbose mode through to supported workflow commands"
-          base.option :jobs, value: {type: Integer, usage: "N"}, desc: "Parallel jobs for supported executed workflows"
+          ParallelOptions.included(base)
           base.option :env, value: {type: String, usage: "KEY=VALUE"}, desc: "Override an environment variable for each member workflow command" do |value|
             parse_env_override(value, workflow_env)
           end
@@ -279,6 +285,8 @@ module Kettle
       end
 
       class ReleaseState < BaseCommand
+        include ParallelOptions
+
         command_name "release-state"
         usage "[options]"
         description "Report changelog release state for family members."
@@ -375,7 +383,7 @@ module Kettle
       class GhaShaPins < WorkflowCommand
         command_name "gha-sha-pins"
         usage "[options]"
-        description "Plan or execute kettle-gha-sha-pins per member."
+        description "Plan or execute kettle-gha-pins per member."
 
         option :check, desc: "Check whether SHA pins would need edits"
         option :upgrade, value: {type: String, usage: "LEVEL"}, desc: "SHA pin upgrade strategy: major, minor, patch" do |value|
@@ -646,7 +654,7 @@ module Kettle
           Orderer.new(members: members, mode: config.order_mode, hints: config.order_hints).ordered
         end
         state_event_tape = release_state_event_tape(command: command, config: config, options: options)
-        release_state_results = release_state_results_for_selection(config: config, members: ordered, only: effective_only)
+        release_state_results = release_state_results_for_selection(config: config, members: ordered, only: effective_only, jobs: options[:jobs])
         selected = Selection.new(members: ordered, release_state_results: release_state_results).apply(only: effective_only, exclude: options[:exclude], start_at: start_at.member)
         result_members = selected
         display_members = display_members_for(command: command, config: config, members: ordered, selected_members: selected)
@@ -698,10 +706,10 @@ module Kettle
         command_results_for_current_branch(command: command, config: config, members: members, options: options, start_at: start_at, state_event_handler: state_event_handler)
       end
 
-      def release_state_results_for_selection(config:, members:, only:)
+      def release_state_results_for_selection(config:, members:, only:, jobs: nil)
         return nil unless only.to_s.split(",").map(&:strip).any? { |token| Selection.status_token?(token) }
 
-        ReleaseStateCheck.new(config: config, members: members).results
+        ReleaseStateCheck.new(config: config, members: members, jobs: jobs).results
       end
 
       def default_only_filter(command:, only:)
@@ -743,7 +751,7 @@ module Kettle
         return clean_unreleased_results(config: config, members: members, options: options) if command == "clean-unreleased"
         return reconcile_release_results(config: config, members: members, options: options) if command == "reconcile-releases"
         return branch_lane_results(config: config, members: members) if command == "branch-lanes"
-        return release_state_results(config: config, members: members, event_handler: state_event_handler) if command == "release-state"
+        return release_state_results(config: config, members: members, jobs: options[:jobs], event_handler: state_event_handler) if command == "release-state"
         return install_results(config: config, members: members, options: options) if command == "install"
         return [] unless WORKFLOW_COMMANDS.include?(command)
 
@@ -1089,8 +1097,8 @@ module Kettle
         LocalInstall.new(config: config, members: members, execute: options[:execute], jobs: options[:jobs]).results
       end
 
-      def release_state_results(config:, members:, event_handler: nil)
-        ReleaseStateCheck.new(config: config, members: members).results(event_handler: event_handler)
+      def release_state_results(config:, members:, jobs: nil, event_handler: nil)
+        ReleaseStateCheck.new(config: config, members: members, jobs: jobs).results(event_handler: event_handler)
       end
 
       def release_state_event_tape(command:, config:, options:)

data/lib/kettle/family/release_state_check.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "json"
+require "etc"
 require "fileutils"
 require "open3"
 require "rbconfig"
@@ -18,33 +19,34 @@ module Kettle
         ".kettle-jem.yml"
       ].freeze
       TRANSFER_CHANGELOG_TOTAL_UNSET = Object.new.freeze
+      CACHE_MISS = Object.new.freeze
 
-      def initialize(members:, config: nil)
+      def initialize(members:, config: nil, jobs: nil)
         @members = members
         @config = config
+        @jobs = jobs
         @github_latest_release_by_repo = {}
         @transfer_changelog_status_by_root = {}
         @transfer_changelog_lag_by_key = {}
         @transfer_changelog_total_count = TRANSFER_CHANGELOG_TOTAL_UNSET
+        @cache_mutex = Mutex.new
+        @transfer_changelog_total_mutex = Mutex.new
       end
 
       def results(event_handler: nil)
         return branch_results(event_handler: event_handler) unless release_target_branches.empty?
-        return members.map { |member| check_shared_changelog_member_or_local(member, event_handler: event_handler) } if shared_changelog?
+        return parallel_map(members) { |member| check_shared_changelog_member_or_local(member, event_handler: event_handler) } if shared_changelog?
 
-        members.each_with_object([]) do |member, memo|
+        member_results = parallel_map(members) do |member|
           member_branch_results = member_local_branch_results(member, event_handler: event_handler)
-          if member_branch_results
-            memo.concat(member_branch_results)
-          else
-            memo << check_member(member, event_handler: event_handler)
-          end
+          member_branch_results || check_member(member, event_handler: event_handler)
         end
+        member_results.flat_map { |result| Array(result) }
       end
 
       private
 
-      attr_reader :members, :config
+      attr_reader :members, :config, :jobs
 
       def branch_results(event_handler: nil)
         root = git_root
@@ -53,11 +55,11 @@ module Kettle
           with_branch_worktree(root: root, branch: branch) do |worktree_root|
             branch_members = discover_branch_members(worktree_root: worktree_root, selected_names: selected_names)
             if shared_changelog?
-              memo.concat(branch_members.map { |member| check_shared_changelog_member_or_local(member, branch: branch, event_handler: event_handler) })
+              memo.concat(parallel_map(branch_members) { |member| check_shared_changelog_member_or_local(member, branch: branch, event_handler: event_handler) })
               next
             end
 
-            memo.concat(branch_members.map { |member| check_member(member, branch: branch, event_handler: event_handler) })
+            memo.concat(parallel_map(branch_members) { |member| check_member(member, branch: branch, event_handler: event_handler) })
           end
         rescue Error => error
           memo << error_result(branch: branch, error: error)
@@ -418,8 +420,8 @@ module Kettle
 
       def transfer_changelog_lag(last_entry_key)
         cache_key = last_entry_key.to_s
-        @transfer_changelog_lag_by_key.fetch(cache_key) do
-          @transfer_changelog_lag_by_key[cache_key] = in_process_transfer_changelog_lag(last_entry_key) || external_transfer_changelog_lag(cache_key)
+        cached_value(@transfer_changelog_lag_by_key, cache_key) do
+          in_process_transfer_changelog_lag(last_entry_key) || external_transfer_changelog_lag(cache_key)
         end
       rescue
         nil
@@ -427,18 +429,20 @@ module Kettle
 
       def transfer_changelog_status(root)
         cache_key = File.expand_path(root.to_s)
-        @transfer_changelog_status_by_root.fetch(cache_key) do
-          @transfer_changelog_status_by_root[cache_key] = in_process_transfer_changelog_status(cache_key) || external_transfer_changelog_status(cache_key)
+        cached_value(@transfer_changelog_status_by_root, cache_key) do
+          in_process_transfer_changelog_status(cache_key) || external_transfer_changelog_status(cache_key)
         end
       rescue
         nil
       end
 
       def transfer_changelog_total_count
-        return @transfer_changelog_total_count unless @transfer_changelog_total_count.equal?(TRANSFER_CHANGELOG_TOTAL_UNSET)
+        @transfer_changelog_total_mutex.synchronize do
+          return @transfer_changelog_total_count unless @transfer_changelog_total_count.equal?(TRANSFER_CHANGELOG_TOTAL_UNSET)
 
-        total_lag = transfer_changelog_lag(nil)
-        @transfer_changelog_total_count = total_lag ? total_lag.fetch("missing_count", 0).to_i : nil
+          total_lag = transfer_changelog_lag(nil)
+          @transfer_changelog_total_count = total_lag ? total_lag.fetch("missing_count", 0).to_i : nil
+        end
       end
 
       def in_process_transfer_changelog_lag(last_entry_key)
@@ -509,15 +513,62 @@ module Kettle
         repo = github_repo_slug(root)
         return nil unless repo
 
-        @github_latest_release_by_repo.fetch(repo) do
+        cached_value(@github_latest_release_by_repo, repo) do
           stdout, _stderr, status = Open3.capture3("gh", "release", "view", "--repo", repo, "--json", "tagName", "--jq", ".tagName")
-          tag = status.success? ? normalize_github_release_tag(stdout) : nil
-          @github_latest_release_by_repo[repo] = tag
+          status.success? ? normalize_github_release_tag(stdout) : nil
         end
       rescue SystemCallError
         nil
       end
 
+      def cached_value(cache, key)
+        cached = @cache_mutex.synchronize { cache.fetch(key, CACHE_MISS) }
+        return cached unless cached.equal?(CACHE_MISS)
+
+        value = yield
+        @cache_mutex.synchronize do
+          cache[key] = value unless cache.key?(key)
+          cache.fetch(key)
+        end
+      end
+
+      def state_jobs(items)
+        return 1 if items.length < 2
+
+        requested = jobs || [Etc.nprocessors, 4].min
+        requested.to_i.clamp(1, items.length)
+      end
+
+      def parallel_map(items, &block)
+        return [] if items.empty?
+
+        worker_count = state_jobs(items)
+        return items.map { |item| block.call(item) } if worker_count == 1
+
+        queue = Queue.new
+        items.each_with_index { |item, index| queue << [index, item] }
+        results = Array.new(items.length)
+        errors = []
+        errors_mutex = Mutex.new
+        workers = Array.new(worker_count) do
+          Thread.new do # rubocop:disable ThreadSafety/NewThread -- release-state checks intentionally run independently within the jobs limit.
+            loop do
+              index, item = queue.pop(true)
+              results[index] = block.call(item)
+            rescue ThreadError
+              break
+            rescue => error
+              errors_mutex.synchronize { errors << error }
+              break
+            end
+          end
+        end
+        workers.each(&:join)
+        raise errors.first unless errors.empty?
+
+        results
+      end
+
       def normalize_github_release_tag(value)
         tag = value.to_s.strip
         return nil if tag.empty?

data/lib/kettle/family/release_state_event_tape.rb

@@ -33,7 +33,7 @@ module Kettle
           payload["sequence"] = @sequence_by_member.fetch(member)
           line = JSON.generate(payload)
           File.open(path_for(member), "a") { |file| file.puts(line) }
-          @stream.puts(line) if @stream
+          @stream&.puts(line)
           @stream.flush if @stream&.respond_to?(:flush)
         end
         payload

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

data/lib/kettle/family/workflow.rb

@@ -5,7 +5,7 @@ require "fileutils"
 require "json"
 require "etc"
 require "open3"
-require "pathname"
+require "pathname" # rubocop:disable Lint/RedundantRequireStatement -- Workflow uses Pathname directly and must load it when required standalone.
 require "rbconfig"
 require "shellwords"
 require "yaml"
@@ -23,7 +23,7 @@ module Kettle
         "test" => "bundle exec kettle-test",
         "lint" => "bundle exec rake rubocop_gradual",
         "docs" => "bundle exec rake yard",
-        "gha-sha-pins" => "bundle exec kettle-gha-sha-pins",
+        "gha-sha-pins" => "bundle exec kettle-gha-pins",
         "sync" => [
           "sh",
           "-lc",
@@ -2281,24 +2281,15 @@ module Kettle
         executable = local_kettle_jem_executable
         return command_text unless executable
 
-        if command_text.is_a?(Array)
-          argv = command_text.map(&:to_s)
-          index = argv.index("kettle-jem")
-          return command_text unless index
-
-          prefix = argv[0...index]
-          prefix = prefix[0...-2] if prefix.last(2) == %w[bundle exec]
-          prefix + [RbConfig.ruby, executable] + argv[(index + 1)..]
-        else
-          argv = Shellwords.split(command_text.to_s)
-          index = argv.index("kettle-jem")
-          return command_text unless index
-          return command_text if argv.any? { |token| %w[&& || ; |].include?(token) }
+        array_command = command_text.is_a?(Array)
+        argv = array_command ? command_text.map(&:to_s) : Shellwords.split(command_text.to_s)
+        index = argv.index("kettle-jem")
+        return command_text unless index
+        return command_text if !array_command && argv.any? { |token| %w[&& || ; |].include?(token) }
 
-          prefix = argv[0...index]
-          prefix = prefix[0...-2] if prefix.last(2) == %w[bundle exec]
-          prefix + [RbConfig.ruby, executable] + argv[(index + 1)..]
-        end
+        prefix = argv[0...index]
+        prefix = prefix[0...-2] if prefix.last(2) == %w[bundle exec]
+        prefix + [RbConfig.ruby, executable] + argv[(index + 1)..]
       rescue ArgumentError
         command_text
       end
@@ -2965,10 +2956,8 @@ module Kettle
           env[key] = value if key.end_with?("_DEV", "_LOCAL") && local_path_env_requested?(key)
         end
         env.merge!(env_overrides)
-        env.merge!(
-          "K_JEM_TEMPLATING" => "false",
-          "BUNDLE_DISABLE_CHECKSUM_VALIDATION" => "true"
-        )
+        env["K_JEM_TEMPLATING"] = "false"
+        env["BUNDLE_DISABLE_CHECKSUM_VALIDATION"] = "true"
         env
       end
 

metadata

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