kettle-family 1.2.74 → 1.2.76

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7be7ab5d418e657e0da7272a46b2725e68ff8042a44875edda3f49b0fa5e53d3
-  data.tar.gz: f95c1046814dcec472dd0ef3daf85b471b86c6fde589b9fc8e7fec878aa17159
+  metadata.gz: ea5e2e449c39979639ba25d8ef16b2319801caae9cad7484aa06ea42b02b6ba5
+  data.tar.gz: 356a1d85acb9691fc5cf224ac02ebc184bf9ad2a27cbdff10041234ab09a5ad6
 SHA512:
-  metadata.gz: 2add7602ea8b5ec1b28ad47aa9e83b6cab6592cc79dd8e7dbf8b233eacc0b0639591abc4731c370be387757a898de8c584e1fba8ad129796d81077aeb253ce3f
-  data.tar.gz: 8cb1a3425743d37a25a023c9ee68c689da44902dc9076e404fab3a7fd76a1b8b2b7a5c1d4bcc8c51fa32570e34936f4b59d4d125137e9b6c0bc6b78ebcb379d3
+  metadata.gz: aca651e1786dd95149f72b06ea89f1cf105a517f24d9d7ced1cff15027d2ab3865e76c6584f661f2cb82eb68d2f7f19322a68031ff173d859f51eed593fd280e
+  data.tar.gz: 0ec5a86efdbcdb299dab0326b0079f156d8d2ef27164e11da8fbf60852d0a05f68336875f1ac3135916aff2f0871b787c9b0552fc2a331018c17b9b4e501c624

data/CHANGELOG.md

@@ -30,6 +30,30 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Security
 
+## [1.2.76] - 2026-08-31
+
+- TAG: [v1.2.76][1.2.76t]
+- COVERAGE: 93.32% -- 5558/5956 lines in 33 files
+- BRANCH COVERAGE: 76.76% -- 2286/2978 branches in 33 files
+- 30.69% documented
+
+### Fixed
+
+- Avoid invalid member-scoped resume hints for synthetic aggregate GitHub Release failures.
+
+- Include all shared-family artifacts when recovering an interrupted aggregate GitHub Release.
+
+## [1.2.75] - 2026-08-31
+
+- TAG: [v1.2.75][1.2.75t]
+- COVERAGE: 93.31% -- 5553/5951 lines in 33 files
+- BRANCH COVERAGE: 76.70% -- 2281/2974 branches in 33 files
+- 30.50% documented
+
+### Fixed
+
+- Restrict monorepo aggregate GitHub Releases to the shared-version cohort, preserving independently versioned excluded members' own releases.
+
 ## [1.2.74] - 2026-08-31
 
 - TAG: [v1.2.74][1.2.74t]
@@ -2392,7 +2416,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.2.74...HEAD
+[Unreleased]: https://github.com/kettle-dev/kettle-family/compare/v1.2.76...HEAD
+[1.2.76]: https://github.com/kettle-dev/kettle-family/compare/v1.2.75...v1.2.76
+[1.2.76t]: https://github.com/kettle-dev/kettle-family/releases/tag/v1.2.76
+[1.2.75]: https://github.com/kettle-dev/kettle-family/compare/v1.2.74...v1.2.75
+[1.2.75t]: https://github.com/kettle-dev/kettle-family/releases/tag/v1.2.75
 [1.2.74]: https://github.com/kettle-dev/kettle-family/compare/v1.2.73...v1.2.74
 [1.2.74t]: https://github.com/kettle-dev/kettle-family/releases/tag/v1.2.74
 [1.2.73]: https://github.com/kettle-dev/kettle-family/compare/v1.2.72...v1.2.73

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

@@ -17,7 +17,8 @@ module Kettle
       :branch,
       :output_streamed,
       :log_path,
-      :resume_step
+      :resume_step,
+      :resume_command
     ) do
       def to_h
         {
@@ -35,7 +36,8 @@ module Kettle
           "reason" => reason,
           "output_streamed" => output_streamed?,
           "log_path" => log_path,
-          "resume_step" => resume_step
+          "resume_step" => resume_step,
+          "resume_command" => resume_command
         }
       end
 

data/lib/kettle/family/report.rb

@@ -122,7 +122,8 @@ module Kettle
           lines << "  #{result_state(result)} #{result.member_name} #{result.phase} #{result.reason || ""}".rstrip
           append_result_stdout(lines, result)
           append_indented_output(lines, result.stderr) if !result.ok? && !result.stderr.to_s.empty?
-          lines << "    resume: #{resume_hint_for(result)}" unless result.ok?
+          resume_hint = resume_hint_for(result)
+          lines << "    resume: #{resume_hint}" if !result.ok? && resume_hint
         end
         append_template_summary(lines) if command == "template"
       end
@@ -687,7 +688,7 @@ module Kettle
       end
 
       def release_resume_hints
-        failed_hints = visible_results.reject(&:ok?).map { |result| resume_hint_for(result) }.uniq
+        failed_hints = visible_results.reject(&:ok?).filter_map { |result| resume_hint_for(result) }.uniq
         pending_names = summary_pending.map { |entry| entry.fetch("member") }
         return failed_hints if pending_names.empty?
 
@@ -701,6 +702,9 @@ module Kettle
       end
 
       def release_resume_hint(result)
+        return result.resume_command if result.respond_to?(:resume_command) && !result.resume_command.to_s.empty?
+        return nil if result.phase == "aggregate_github_release"
+
         hint = release_resume_base
         hint = "#{hint} --only #{result.member_name}" if result.member_name
         hint = "#{hint} --start-step #{result.resume_step}" if result.respond_to?(:resume_step) && result.resume_step

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

data/lib/kettle/family/workflow.rb

@@ -520,7 +520,8 @@ module Kettle
           results.concat(release_member_results(workflow_members, include_family_changelog: !skip_changelog))
           return results unless explicit_monorepo_mode? && results.all?(&:ok?)
 
-          results << aggregate_monorepo_github_release(workflow_members)
+          selected_aggregate_members = aggregate_release_members(workflow_members)
+          results << aggregate_monorepo_github_release(aggregate_github_release_members) unless selected_aggregate_members.empty?
           return results
         end
         return git_sync_results(workflow_members) if GIT_SYNC_COMMANDS.key?(command)
@@ -2382,6 +2383,26 @@ module Kettle
         member && member.name == (@aggregate_validation_member_name || aggregate_validation_members.first&.name)
       end
 
+      # The aggregate GitHub Release represents the shared-version cohort. An
+      # aggregate-validation exclusion retains an independently versioned
+      # member's complete release lifecycle, including its own GitHub Release.
+      def aggregate_release_members(release_members = members)
+        return Array(release_members) unless config.release_aggregate_validation? && config.shared_changelog?
+
+        aggregate_validation_members(release_members)
+      end
+
+      def aggregate_release_member?(member)
+        member && aggregate_release_members.include?(member)
+      end
+
+      # A resumed release may select only the members that remain unpublished.
+      # The repository-level release still needs every shared-version artifact,
+      # including members published by an earlier interrupted wave.
+      def aggregate_github_release_members
+        aggregate_release_members(family_members)
+      end
+
       def fast_recovery_for?(member)
         return false unless fast_recovery
         return false unless member
@@ -2506,7 +2527,7 @@ module Kettle
           # after their member gems. A standalone gem uses the default
           # monorepo mode too, but must let kettle-release create its own
           # GitHub Release.
-          env["KETTLE_RELEASE_SKIP_GITHUB_RELEASE"] = "true" if aggregate_monorepo_github_release?
+          env["KETTLE_RELEASE_SKIP_GITHUB_RELEASE"] = "true" if aggregate_monorepo_github_release? && aggregate_release_member?(member)
         end
         if aggregate_validation_member?(member)
           env["KETTLE_RELEASE_FAMILY_CI_MODE"] = aggregate_validation_member_name?(member) ? "validation" : "member"
@@ -2613,7 +2634,7 @@ module Kettle
         env["KETTLE_DEV_DEV"] = local_kettle_dev if local_path_env_value?(local_kettle_dev)
         started = Process.clock_gettime(Process::CLOCK_MONOTONIC)
         stdout, stderr, status = Open3.capture3(env, *command, chdir: config.root)
-        CommandResult.new(
+        result = CommandResult.new(
           member_name: config.family_name,
           phase: "aggregate_github_release",
           command: command,
@@ -2626,6 +2647,8 @@ module Kettle
           skipped: false,
           reason: status.success? ? nil : "aggregate GitHub release failed"
         )
+        result.resume_command = aggregate_github_release_resume_command(env, command) unless result.ok?
+        result
       rescue => error
         aggregate_release_result("#{error.class}: #{error.message}")
       end
@@ -2637,6 +2660,13 @@ module Kettle
       def aggregate_monorepo_github_release?
         explicit_monorepo_mode? && family_members.length > 1
       end
+
+      def aggregate_github_release_resume_command(env, command)
+        assignments = env.sort_by { |key, _value| key }.filter_map do |key, value|
+          "#{key}=#{Shellwords.escape(value.to_s)}" unless value.nil?
+        end
+        (["env", *assignments].join(" ") + " " + Shellwords.join(command)).strip
+      end
       # simplecov:enable
 
       def aggregate_release_result(reason)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kettle-family
 version: !ruby/object:Gem::Version
-  version: 1.2.74
+  version: 1.2.76
 platform: ruby
 authors:
 - Peter H. Boling
@@ -91,7 +91,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.24
+        version: 3.0.26
     - - "<"
       - !ruby/object:Gem::Version
         version: 4.0.0
@@ -101,7 +101,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.24
+        version: 3.0.26
     - - "<"
       - !ruby/object:Gem::Version
         version: 4.0.0
@@ -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.74
-  changelog_uri: https://github.com/kettle-dev/kettle-family/blob/v1.2.74/CHANGELOG.md
+  source_code_uri: https://github.com/kettle-dev/kettle-family/tree/v1.2.76
+  changelog_uri: https://github.com/kettle-dev/kettle-family/blob/v1.2.76/CHANGELOG.md
   bug_tracker_uri: https://github.com/kettle-dev/kettle-family/issues
-  documentation_uri: https://www.rubydoc.info/gems/kettle-family/1.2.74
+  documentation_uri: https://www.rubydoc.info/gems/kettle-family/1.2.76
   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