kettle-family 1.3.35 → 1.3.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df70ef40b82ccb54155fc57a43a1137d620d3cbd78cd74643d050b9056f3ecdb
-  data.tar.gz: aff84d0529ac6ef7b78a3248160eb72b4077f51609362c887837b1cd390a9a10
+  metadata.gz: 90c20dc69493246554befc819ed36f9e5c1bc81ef54f44257c7c8e2347bbe457
+  data.tar.gz: 410f4b020a832c51c372ab3230b859c8ec7b1e8829c26c595582a22f27d6901d
 SHA512:
-  metadata.gz: e3ba12f341362839b45835afda346efa79c49aa886cf5d731980e0d9a2090ffe0297abb752bf72a293135e6ab4fa64c1f132210c882edfef2583c56204fb8355
-  data.tar.gz: 7cd500810f8b034e00be64dc03574d957c578be29ef1df6d17ca4bf73999c1c47a381d57799e445f1f4c0cabae3622c0ad44152b1152175c1a4b252e0800a034
+  metadata.gz: 9268ee8a2ee002ca7394d0c67c55a579f2eeb2621bf2b09362b3ca8f776ff02ab98a39923b343b5c805f7c42276ed25fe34e35efc2b605cb282ae704140ad45b
+  data.tar.gz: bf88cb60646c3adbe20b397ea8e4e2e6829435b078ad9841e75623090233c5575682dc1f8695192b92706b34fa9635e07de1e0abd2f8d833d2ec1447bd1511d1

data/CHANGELOG.md

@@ -30,6 +30,27 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Security
 
+## [1.3.36] - 2026-10-28
+
+- TAG: [v1.3.36][1.3.36t]
+- COVERAGE: 93.12% -- 7601/8163 lines in 45 files
+- BRANCH COVERAGE: 77.34% -- 3041/3932 branches in 45 files
+- 38.89% documented
+
+### Changed
+
+- [kc] template-family-resume-hints: Template failures now produce one combined retry hint for failed and pending members, preserving member@branch selectors for branch-stack templates.
+
+- [kc] kettle-jem/prepare: updated 7 project files:
+  - configuration (1)
+  - dependencies (6)
+
+- [kc] kettle-jem/template: updated 5 project files:
+  - code and tests (1)
+  - documentation (1)
+  - other (2)
+  - workflows (1)
+
 ## [1.3.35] - 2026-10-26
 
 - TAG: [v1.3.35][1.3.35t]
@@ -3299,7 +3320,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.35...HEAD
+[Unreleased]: https://github.com/kettle-dev/kettle-family/compare/v1.3.36...HEAD
+[1.3.36]: https://github.com/kettle-dev/kettle-family/compare/v1.3.35...v1.3.36
+[1.3.36t]: https://github.com/kettle-dev/kettle-family/releases/tag/v1.3.36
 [1.3.35]: https://github.com/kettle-dev/kettle-family/compare/v1.3.34...v1.3.35
 [1.3.35t]: https://github.com/kettle-dev/kettle-family/releases/tag/v1.3.35
 [1.3.34]: https://github.com/kettle-dev/kettle-family/compare/v1.3.33...v1.3.34

data/README.md

@@ -64,12 +64,12 @@ configuration, create their own GitHub Release through `kettle-release`.
 
 ### Compatibility
 
-Compatible with MRI Ruby 4.0.0+.
+The gem's declared runtime compatibility floor is MRI Ruby 4.0.0+, with concordant releases of JRuby and TruffleRuby.
 CI workflows and Appraisals are generated for MRI Ruby 4.0.0+.
 The current MRI CI lane runs on Linux and macOS.
-This test floor is configured by `ruby.test_minimum` in `.kettle-jem.yml` and
-may be higher than the gem's runtime compatibility floor when legacy Rubies are
-not practical for the current toolchain.
+The test floor is configured by `ruby.test_minimum` in `.kettle-jem.yml`.
+When it is higher than the runtime floor, older runtime-compatible Rubies are
+not covered by the generated CI or Appraisal matrix.
 
 <a href="https://github.com/kettle-dev"><img alt="kettle-dev Logo by Aboling0, CC BY-SA 4.0" src="https://logos.galtzo.com/assets/images/kettle-dev/avatar-128px.svg" width="14%" align="right"/></a>
 
@@ -1191,7 +1191,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-8.121-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
+[🧮kloc-img]: https://img.shields.io/badge/KLOC-8.163-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/release_state_check.rb

@@ -113,7 +113,7 @@ module Kettle
 
       def check_member(member, branch: nil, event_handler: nil)
         started = Process.clock_gettime(Process::CLOCK_MONOTONIC)
-        command = release_state_command
+        command = release_state_command(member)
         emit_event(event_handler, member: member, branch: branch, action: "member_start", status: "running", command: command)
         emit_event(event_handler, member: member, branch: branch, action: "changelog_command", status: "running", command: command)
         stdout, stderr, status = capture_release_state(
@@ -142,15 +142,16 @@ module Kettle
         emit_event(event_handler, member: member, branch: branch, action: "member_complete", status: success ? "ok" : "failed", elapsed_seconds: elapsed, status_code: status.exitstatus)
         result
       rescue JSON::ParserError => error
-        result = result(member: member, command: command || release_state_command, stdout: stdout, stderr: stderr, status: 1, elapsed: elapsed || 0.0, success: false, state: {}, reason: "invalid release-state JSON: #{error.message}", branch: branch)
+        result = result(member: member, command: command || release_state_command(member), stdout: stdout, stderr: stderr, status: 1, elapsed: elapsed || 0.0, success: false, state: {}, reason: "invalid release-state JSON: #{error.message}", branch: branch)
         emit_event(event_handler, member: member, branch: branch, action: "member_complete", status: "failed", elapsed_seconds: elapsed || 0.0, status_code: 1, reason: result.reason)
         result
       end
 
-      def release_state_command
-        [RbConfig.ruby, kettle_changelog_executable, "--release-state", "--json"]
+      def release_state_command(member = nil)
+        version_args = member&.version ? ["--version", member.version.to_s] : []
+        [RbConfig.ruby, kettle_changelog_executable, *version_args, "--release-state", "--json"]
       rescue Gem::Exception
-        [RbConfig.ruby, "-S", "kettle-changelog", "--release-state", "--json"]
+        [RbConfig.ruby, "-S", "kettle-changelog", *version_args, "--release-state", "--json"]
       end
 
       def kettle_changelog_executable
@@ -176,7 +177,7 @@ module Kettle
 
       def check_shared_changelog_member(member, branch: nil, event_handler: nil)
         started = Process.clock_gettime(Process::CLOCK_MONOTONIC)
-        command = release_state_command
+        command = release_state_command(member)
         emit_event(event_handler, member: member, branch: branch, action: "member_start", status: "running", command: command)
         emit_event(event_handler, member: member, branch: branch, action: "changelog_command", status: "running", command: command)
         stdout, stderr, status = capture_release_state(
@@ -216,13 +217,13 @@ module Kettle
         emit_event(event_handler, member: member, branch: branch, action: "member_complete", status: success ? "ok" : "failed", elapsed_seconds: elapsed, status_code: status.exitstatus)
         result
       rescue JSON::ParserError => error
-        result = result(member: member, command: command || release_state_command, stdout: stdout, stderr: stderr, status: 1, elapsed: elapsed || 0.0, success: false, state: {}, reason: "invalid release-state JSON: #{error.message}", branch: branch)
+        result = result(member: member, command: command || release_state_command(member), stdout: stdout, stderr: stderr, status: 1, elapsed: elapsed || 0.0, success: false, state: {}, reason: "invalid release-state JSON: #{error.message}", branch: branch)
         emit_event(event_handler, member: member, branch: branch, action: "member_complete", status: "failed", elapsed_seconds: elapsed || 0.0, status_code: 1, reason: result.reason)
         result
       rescue Error => error
         result = result(
           member: member,
-          command: command || release_state_command,
+          command: command || release_state_command(member),
           stdout: "",
           stderr: error.message,
           status: 1,
@@ -804,8 +805,6 @@ module Kettle
         return unless member_config
 
         current_result = check_member(member, event_handler: event_handler)
-        return [current_result] unless current_result.ok?
-
         [current_result, *self.class.new(config: member_config, members: [member]).results(event_handler: event_handler)]
       end
 

data/lib/kettle/family/report.rb

@@ -125,7 +125,7 @@ module Kettle
           lines << "  #{result_state(result)} #{result_identity(result)} #{result.phase} #{result.reason || ""}".rstrip
           append_result_stdout(lines, result)
           append_indented_output(lines, result.stderr) if !result.ok? && !result.stderr.to_s.empty?
-          resume_hint = resume_hint_for(result)
+          resume_hint = resume_hint_for(result) unless command == "template"
           lines << "    resume: #{resume_hint}" if !result.ok? && resume_hint
         end
         append_template_summary(lines) if command == "template"
@@ -764,11 +764,10 @@ module Kettle
         failed ? [resume_hint_for(failed)] : []
       end
 
-      # Mirrors release_resume_hints: one hint per failure, plus a single set-based
-      # hint naming every member that never ran. --only selects by name rather
-      # than position, so it resumes exactly the unfinished members regardless of
-      # how dispatch ordered them, and the wave grouping is re-derived from the
-      # selected subset.
+      # Test gets one hint per failure plus a set-based hint for members that never
+      # ran. --only selects by name rather than position, so it resumes exactly the
+      # unfinished members regardless of how dispatch ordered them. Template uses
+      # one combined hint because it is idempotent and family-lockstep.
       #
       # A family-root failure takes precedence and suppresses the set-based hint:
       # that phase aborts the entire run before member dispatch, so every member
@@ -776,6 +775,7 @@ module Kettle
       def non_positional_resume_hints
         root_failure = results.find { |result| !result.ok? && family_root_phase?(result.phase) }
         return [resume_hint_for(root_failure)] if root_failure
+        return template_resume_hints if command == "template"
 
         failed_hints = visible_results.reject(&:ok?).filter_map { |result| resume_hint_for(result) }.uniq
         pending_names = summary_pending.map { |entry| entry.fetch("member") }
@@ -784,6 +784,15 @@ module Kettle
         [*failed_hints, "kettle-family #{command} --only #{pending_names.join(",")}"]
       end
 
+      def template_resume_hints
+        member_names = visible_results.reject(&:ok?).map { |result| result_identity(result) }
+        member_names.concat(summary_pending.map { |entry| entry.fetch("member") })
+        member_names = member_names.compact.uniq.sort
+        return ["kettle-family template"] if member_names.empty?
+
+        ["kettle-family template --only #{member_names.join(",")}"]
+      end
+
       def release_resume_hints
         failed_hints = visible_results.reject(&:ok?).filter_map { |result| resume_hint_for(result) }.uniq
         pending_names = summary_pending.map { |entry| entry.fetch("member") }

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

data/lib/kettle/family/version_bump.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "kettle/dev"
+require "ast/crispr/ruby/prism"
 
 module Kettle
   module Family
@@ -74,12 +75,20 @@ module Kettle
       end
 
       def collect_edits(member, member_target_version)
-        version_edits = with_dev_errors do
-          Kettle::Dev::VersionBump.new(
-            root: member.root,
-            current_version: member.version,
-            target_version: member_target_version
-          ).edits
+        begin
+          version_edits = with_dev_errors do
+            Kettle::Dev::VersionBump.new(
+              root: member.root,
+              current_version: member.version,
+              target_version: member_target_version
+            ).edits
+          end
+        rescue Error => error
+          bump = Kettle::Dev::VersionBump.new(root: member.root, current_version: member.version, target_version: member_target_version)
+          computed_version_edits = prism_computed_version_edits(member, member_target_version)
+          raise error if computed_version_edits.empty?
+
+          version_edits = computed_version_edits + bump.send(:gemspec_version_edits)
         end
         version_edits = version_edits.map do |edit|
           if same_file?(edit.fetch(:path), member.gemspec_path)
@@ -91,6 +100,33 @@ module Kettle
         version_edits + gemspec_dependency_edits(member)
       end
 
+      def prism_computed_version_edits(member, target_version)
+        version = Gem::Version.new(target_version)
+        replacements = {major: version.segments[0] || 0, minor: version.segments[1] || 0, patch: version.segments[2] || 0}
+        Kettle::Dev::Versioning.version_file_candidates(member.root).flat_map do |path|
+          source = File.read(path)
+          analysis = Ast::Crispr::Ruby::Prism.document_context(content: source, source_label: path).ast
+          root = analysis.parse_result.value
+          nodes = Kettle::Dev::VersionBump.each_node(root).to_a
+          version_constant = nodes.find do |node|
+            node.is_a?(Prism::ConstantWriteNode) && node.name == :VERSION && node.value.is_a?(Prism::CallNode) && node.value.name == :to_s
+          end
+          next [] unless version_constant
+
+          replacements.filter_map do |method_name, replacement_value|
+            method = nodes.find { |node| node.is_a?(Prism::DefNode) && node.name == method_name }
+            literal = method&.body&.body&.last
+            next unless literal.is_a?(Prism::IntegerNode) || literal.is_a?(Prism::StringNode)
+
+            next if literal.is_a?(Prism::IntegerNode) && literal.value == replacement_value
+            next if literal.is_a?(Prism::StringNode) && literal.unescaped == replacement_value.to_s
+
+            replacement = literal.is_a?(Prism::StringNode) ? Kettle::Dev::VersionBump.quote_like(literal.location.slice, replacement_value.to_s) : replacement_value.to_s
+            Kettle::Dev::VersionBump.file_edit(path, source, literal.location.start_offset, literal.location.end_offset, replacement)
+          end
+        end
+      end
+
       def same_file?(left, right)
         right && File.identical?(left, right)
       rescue SystemCallError

data/lib/kettle/family/workflow.rb

@@ -3789,6 +3789,7 @@ module Kettle
       def append_kettle_release_args(command, member: nil)
         command = replace_kettle_release_provider(command) if @release_secrets_broker
         args = []
+        args << "--version=#{member.version}" if member&.version && !command_includes_arg?(command, "--version")
         effective_start_step = release_start_step_for(member)
         command, configured_skip_steps = extract_kettle_release_skip_steps(command)
         effective_skip_steps = (configured_skip_steps + release_skip_steps_for(member).split(",")).uniq.join(",")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kettle-family
 version: !ruby/object:Gem::Version
-  version: 1.3.35
+  version: 1.3.36
 platform: ruby
 authors:
 - Peter H. Boling
@@ -57,6 +57,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 7.1.11
+- !ruby/object:Gem::Dependency
+  name: ast-crispr-ruby-prism
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '7.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 7.1.10
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '7.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 7.1.10
 - !ruby/object:Gem::Dependency
   name: ast-crispr-toml
   requirement: !ruby/object:Gem::Requirement
@@ -114,7 +134,7 @@ dependencies:
         version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.14
+        version: 1.0.15
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -124,7 +144,7 @@ dependencies:
         version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.14
+        version: 1.0.15
 - !ruby/object:Gem::Dependency
   name: kettle-deps-floor
   requirement: !ruby/object:Gem::Requirement
@@ -134,7 +154,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -144,7 +164,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.1
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: kettle-dev
   requirement: !ruby/object:Gem::Requirement
@@ -154,7 +174,7 @@ dependencies:
         version: '3.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.25
+        version: 3.1.26
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -164,7 +184,7 @@ dependencies:
         version: '3.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.25
+        version: 3.1.26
 - !ruby/object:Gem::Dependency
   name: kettle-gha-pins
   requirement: !ruby/object:Gem::Requirement
@@ -174,7 +194,7 @@ dependencies:
         version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.19
+        version: 0.3.20
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -184,7 +204,7 @@ dependencies:
         version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.19
+        version: 0.3.20
 - !ruby/object:Gem::Dependency
   name: kettle-jem
   requirement: !ruby/object:Gem::Requirement
@@ -608,10 +628,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.35
-  changelog_uri: https://github.com/kettle-dev/kettle-family/blob/v1.3.35/CHANGELOG.md
+  source_code_uri: https://github.com/kettle-dev/kettle-family/tree/v1.3.36
+  changelog_uri: https://github.com/kettle-dev/kettle-family/blob/v1.3.36/CHANGELOG.md
   bug_tracker_uri: https://github.com/kettle-dev/kettle-family/issues
-  documentation_uri: https://www.rubydoc.info/gems/kettle-family/1.3.35
+  documentation_uri: https://www.rubydoc.info/gems/kettle-family/1.3.36
   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