kettle-family 1.2.57 → 1.2.58

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52aa49a65290b1653f400046c8d546cc2df665a4bdc84caf8b0340263d1cb690
-  data.tar.gz: e24c1ec35cfe71dbbad12d18c58a9f8ef9806074bf4047e615012791d0559c99
+  metadata.gz: 34d40e983c125c689f16bf8ca75d566190006c61796efd6c403ed341df8f067b
+  data.tar.gz: 118ebf6ca455659ed4b0789b5fed52f301c4bf89990ced82f5ea64ead678712e
 SHA512:
-  metadata.gz: 0f33b6e0dac6143695041e5ca5de53dff3855b7bbfbbbe3750426dc140171464d4ae5ee0f97a42636362fed3ace79ff20e82320b72a16030003a2847ec1d4f15
-  data.tar.gz: d65b31d38b3585bed66c85499e97f98f0f0a6998a55cb73b167a991f0cd111af482399d44b1c64d3dbf838932b0b96b3e26a9ac0a806bc496b167926661a4cc6
+  metadata.gz: 2dce07e1ffe8a539914a1916278e530a38dbed599672f49360e4d97ec49e48496860d61812c0bee3fccd980ec867dbdd7371ffc406a793ac9e4c0c70a5f7e86c
+  data.tar.gz: a0c7eec1e7992797dc59d459bda064302e93353ae66c7239182c2a16f4515fc15f3a3f48463d7b5a076b0a1679d58d08c9ebc05e603d2d196afbd52af670fc14

data/CHANGELOG.md

@@ -30,6 +30,17 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Security
 
+## [1.2.58] - 2026-08-23
+
+- TAG: [v1.2.58][1.2.58t]
+- COVERAGE: 93.50% -- 5354/5726 lines in 33 files
+- BRANCH COVERAGE: 76.29% -- 2169/2843 branches in 33 files
+- 29.78% documented
+
+### Added
+
+- Family releases support member-scoped CI fast recovery and an explicit global remote-CI bypass.
+
 ## [1.2.57] - 2026-08-23
 
 - TAG: [v1.2.57][1.2.57t]
@@ -2142,7 +2153,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.57...HEAD
+[Unreleased]: https://github.com/kettle-dev/kettle-family/compare/v1.2.58...HEAD
+[1.2.58]: https://github.com/kettle-dev/kettle-family/compare/v1.2.57...v1.2.58
+[1.2.58t]: https://github.com/kettle-dev/kettle-family/releases/tag/v1.2.58
 [1.2.57]: https://github.com/kettle-dev/kettle-family/compare/v1.2.56...v1.2.57
 [1.2.57t]: https://github.com/kettle-dev/kettle-family/releases/tag/v1.2.57
 [1.2.56]: https://github.com/kettle-dev/kettle-family/compare/v1.2.55...v1.2.56

data/README.md

@@ -432,6 +432,26 @@ and leaves RubyGems MFA prompts interactive by default:
 kettle-family release --publish --execute
 ```
 
+Use named recovery modes when a publish wave has already prepared a member:
+
+```console
+kettle-family release --publish --execute --fast-recovery retry-ci --fast-recovery-members gem_name
+kettle-family release --publish --execute --fast-recovery skip-ci --fast-recovery-members gem_name
+```
+
+`retry-ci` resumes the named members at CI monitoring; `skip-ci` bypasses that
+monitor and continues with the merge and publish steps. Both modes are intended
+only for the same release commit. They apply only to the named members, so other
+members continue their normal release flow. To run every selected member from
+step 0 while skipping remote CI monitoring, use `--skip-ci` instead:
+
+```console
+kettle-family release --publish --execute --skip-ci
+```
+
+The existing `--continue-ci-failures` option still monitors CI and only changes
+whether a failed result blocks the release; it does not skip CI monitoring.
+
 By default, family publish runs pass `--yes` to configured `kettle-changelog`
 family changelog commands and child `kettle-release` commands. Use
 `--no-accept` when you want each child command to ask its own confirmation
@@ -836,7 +856,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.667-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
+[🧮kloc-img]: https://img.shields.io/badge/KLOC-5.726-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

@@ -160,6 +160,9 @@ module Kettle
             publish: false,
             release_start_step: nil,
             release_skip_steps: nil,
+            release_fast_recovery: nil,
+            release_fast_recovery_members: nil,
+            release_skip_ci: false,
             release_skip_changelog: false,
             release_local_ci: false,
             release_continue_ci_failures: false,
@@ -520,6 +523,9 @@ module Kettle
         end
         option :start_step, long: "--start-step", value: {type: Integer, usage: "N"}, desc: "Pass start_step=N through to kettle-release commands"
         option :skip_steps, long: "--skip-steps", value: {type: String, usage: "LIST"}, desc: "Pass skip_steps=LIST through to kettle-release commands"
+        option :fast_recovery, long: "--fast-recovery", value: {type: String, usage: "MODE"}, desc: "Recover selected CI failures with retry-ci or skip-ci"
+        option :fast_recovery_members, long: "--fast-recovery-members", value: {type: String, usage: "MEMBERS"}, desc: "Limit fast recovery to comma-separated selected members"
+        option :skip_ci, long: "--skip-ci", desc: "Skip remote CI monitoring for every selected member while running from step 0"
         option :skip_changelog, long: "--skip-changelog", desc: "Run pre-release gates and specs, but skip kettle-changelog"
         option :local_ci, long: "--local-ci", desc: "Pass --local-ci through to kettle-release commands"
         option :continue_ci_failures, long: "--continue-ci-failures", desc: "Set K_RELEASE_CI_CONTINUE=true for release commands"
@@ -545,6 +551,9 @@ module Kettle
             publish: truthy_option?(:publish),
             release_start_step: options[:start_step],
             release_skip_steps: options[:skip_steps],
+            release_fast_recovery: options[:fast_recovery],
+            release_fast_recovery_members: options[:fast_recovery_members],
+            release_skip_ci: truthy_option?(:skip_ci),
             release_skip_changelog: truthy_option?(:skip_changelog),
             release_local_ci: truthy_option?(:local_ci),
             release_continue_ci_failures: truthy_option?(:continue_ci_failures),
@@ -817,6 +826,9 @@ module Kettle
           tag: options[:tag],
           start_step: options[:release_start_step],
           skip_steps: options[:release_skip_steps],
+          fast_recovery: options[:release_fast_recovery],
+          fast_recovery_members: options[:release_fast_recovery_members],
+          skip_ci: options[:release_skip_ci],
           skip_changelog: options[:release_skip_changelog],
           local_ci: options[:release_local_ci],
           continue_ci_failures: options[:release_continue_ci_failures],
@@ -915,6 +927,18 @@ module Kettle
         start_label = start_at.branch ? "#{start_at.member}@#{start_at.branch}" : start_at.member
         stdout.puts("  start: #{start_label}") if start_at.member
         stdout.puts("  members: #{members.map(&:name).join(", ")}")
+        if options[:release_fast_recovery]
+          fast_members = options[:release_fast_recovery_members] || "selected members"
+          stdout.puts("  fast recovery: #{options[:release_fast_recovery]} (#{fast_members})")
+          recovery_warning = if options[:release_fast_recovery].to_s.tr("_", "-") == "retry-ci"
+            "fast recovery resumes the named members at CI monitoring; use only for the same release commit"
+          else
+            "fast recovery bypasses CI monitoring for the named members; use only for the same release commit"
+          end
+          stdout.puts("  warning: #{recovery_warning}")
+        elsif options[:release_skip_ci]
+          stdout.puts("  warning: remote CI monitoring is skipped for every selected member")
+        end
         stdout.flush
         countdown_before_execution
       end

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

data/lib/kettle/family/workflow.rb

@@ -102,7 +102,7 @@ module Kettle
       REGISTRY_WAIT_ATTEMPTS = 15
       REGISTRY_WAIT_INTERVAL_SECONDS = 15
 
-      def initialize(command:, config:, members:, family_members: nil, execute: false, accept: true, commit: true, allow_dirty: false, autostash: true, publish: false, push: false, tag: false, start_step: nil, skip_steps: nil, skip_changelog: false, local_ci: false, continue_ci_failures: false, ci_workflows: nil, skip_bundle_audit: false, skip_remotes: nil, required_remotes: nil, auto_dependency_floors: nil, gha_sha_pins_upgrade: "patch", gha_sha_pins_check: false, gha_sha_pins_ttl_days: nil, env_overrides: {}, debug: false, verbose: false, gem_signing_password: nil, secrets_provider: nil, jobs: nil, progress_io: nil, reset_target: nil, bup_args: [], bex_args: [], start_member: nil, start_branch: nil, **options)
+      def initialize(command:, config:, members:, family_members: nil, execute: false, accept: true, commit: true, allow_dirty: false, autostash: true, publish: false, push: false, tag: false, start_step: nil, skip_steps: nil, fast_recovery: nil, fast_recovery_members: nil, skip_ci: false, skip_changelog: false, local_ci: false, continue_ci_failures: false, ci_workflows: nil, skip_bundle_audit: false, skip_remotes: nil, required_remotes: nil, auto_dependency_floors: nil, gha_sha_pins_upgrade: "patch", gha_sha_pins_check: false, gha_sha_pins_ttl_days: nil, env_overrides: {}, debug: false, verbose: false, gem_signing_password: nil, secrets_provider: nil, jobs: nil, progress_io: nil, reset_target: nil, bup_args: [], bex_args: [], start_member: nil, start_branch: nil, **options)
         @command = command
         @config = config
         @members = members
@@ -117,6 +117,19 @@ module Kettle
         @tag = tag
         @start_step = start_step
         @skip_steps = skip_steps
+        @fast_recovery = normalize_fast_recovery(fast_recovery, publish: publish)
+        if (@fast_recovery || skip_ci) && !kettle_release_command?(raw_release_command)
+          raise Error, "named CI recovery requires a kettle-release publish command"
+        end
+        raise Error, "--skip-ci requires --publish" if skip_ci && !publish
+        if @fast_recovery && (start_step || (skip_steps && !skip_steps.to_s.empty?) || skip_ci)
+          raise Error, "--fast-recovery cannot be combined with --start-step, --skip-steps, or --skip-ci"
+        end
+        if fast_recovery_members_given?(fast_recovery_members) && !@fast_recovery
+          raise Error, "--fast-recovery-members requires --fast-recovery"
+        end
+        @fast_recovery_members = normalize_fast_recovery_members(fast_recovery_members)
+        @skip_ci = !!skip_ci
         @skip_changelog = !!skip_changelog
         @local_ci = local_ci
         @continue_ci_failures = continue_ci_failures
@@ -186,7 +199,7 @@ module Kettle
         execute && release_command_delegates_secrets_to_kettle_release?
       end
 
-      attr_reader :command, :config, :members, :family_members, :execute, :accept, :commit, :allow_dirty, :autostash, :publish, :push, :tag, :start_step, :skip_steps, :skip_changelog, :local_ci, :continue_ci_failures, :ci_workflows, :skip_bundle_audit, :skip_remotes, :required_remotes, :auto_dependency_floors, :gha_sha_pins_upgrade, :gha_sha_pins_check, :gha_sha_pins_ttl_days, :env_overrides, :debug, :verbose, :jobs, :progress_io, :reset_target, :bup_args, :bex_args, :start_member, :start_branch
+      attr_reader :command, :config, :members, :family_members, :execute, :accept, :commit, :allow_dirty, :autostash, :publish, :push, :tag, :start_step, :skip_steps, :fast_recovery, :fast_recovery_members, :skip_ci, :skip_changelog, :local_ci, :continue_ci_failures, :ci_workflows, :skip_bundle_audit, :skip_remotes, :required_remotes, :auto_dependency_floors, :gha_sha_pins_upgrade, :gha_sha_pins_check, :gha_sha_pins_ttl_days, :env_overrides, :debug, :verbose, :jobs, :progress_io, :reset_target, :bup_args, :bex_args, :start_member, :start_branch
 
       def template_with_worktree_sync_results
         runner = command_runner
@@ -1096,6 +1109,9 @@ module Kettle
           tag: tag,
           start_step: start_step,
           skip_steps: skip_steps,
+          fast_recovery: fast_recovery,
+          fast_recovery_members: fast_recovery_members,
+          skip_ci: skip_ci,
           skip_changelog: skip_changelog,
           local_ci: local_ci,
           continue_ci_failures: continue_ci_failures,
@@ -1286,7 +1302,7 @@ module Kettle
           release_result = runner.call(
             member: member,
             phase: release_phase,
-            command: release_command,
+            command: release_command_for(member),
             env: release_env_for_member(member),
             interactive: release_command_interactive?,
             stdout_line_handler: release_event_line_handler(member, progress: progress),
@@ -1915,7 +1931,7 @@ module Kettle
         CommandResult.new(
           member_name: member.name,
           phase: release_phase,
-          command: release_command,
+          command: release_command_for(member),
           workdir: member.root,
           status: nil,
           success: true,
@@ -2032,8 +2048,12 @@ module Kettle
       end
 
       def release_command
+        release_command_for(nil)
+      end
+
+      def release_command_for(member)
         command = raw_release_command
-        kettle_release_command?(command) ? append_kettle_release_args(command) : command
+        kettle_release_command?(command) ? append_kettle_release_args(command, member: member) : command
       end
 
       def family_changelog_command
@@ -2077,11 +2097,13 @@ module Kettle
         end
       end
 
-      def append_kettle_release_args(command)
+      def append_kettle_release_args(command, member: nil)
         command = replace_kettle_release_provider(command) if @release_secrets_broker
         args = []
-        args << "start_step=#{start_step}" if start_step
-        args << "skip_steps=#{skip_steps}" if skip_steps && !skip_steps.to_s.empty?
+        effective_start_step = release_start_step_for(member)
+        effective_skip_steps = release_skip_steps_for(member)
+        args << "start_step=#{effective_start_step}" if effective_start_step
+        args << "skip_steps=#{effective_skip_steps}" unless effective_skip_steps.empty?
         args << "--skip-changelog" if skip_changelog
         args << "--ci-workflows=#{ci_workflows}" if ci_workflows && !ci_workflows.to_s.empty?
         args << "--local-ci" if local_ci
@@ -2099,6 +2121,25 @@ module Kettle
         command.is_a?(Array) ? [*command, *args] : "#{command} #{args.join(" ")}"
       end
 
+      def release_start_step_for(member)
+        return start_step unless fast_recovery_for?(member)
+
+        (fast_recovery == "retry-ci") ? 10 : 11
+      end
+
+      def release_skip_steps_for(_member)
+        steps = Array(skip_steps).flat_map { |entry| entry.to_s.split(",") }.map(&:strip).reject(&:empty?)
+        steps << "10" if skip_ci
+        steps.uniq.join(",")
+      end
+
+      def fast_recovery_for?(member)
+        return false unless fast_recovery
+        return false unless member
+
+        fast_recovery_members.include?(member.name)
+      end
+
       def replace_kettle_release_provider(command)
         case command
         when Array
@@ -2129,6 +2170,43 @@ module Kettle
         workflows.join(",")
       end
 
+      def normalize_fast_recovery(value, publish:)
+        return nil if value.nil? || value.to_s.strip.empty?
+        raise Error, "--fast-recovery requires --publish" unless publish
+
+        mode = value.to_s.strip.downcase.tr("_", "-")
+        return mode if %w[retry-ci skip-ci].include?(mode)
+
+        raise Error, "invalid --fast-recovery value #{value.inspect}; use retry-ci or skip-ci"
+      end
+
+      def normalize_fast_recovery_members(value)
+        return [] unless fast_recovery
+
+        names = if value.nil? || value.to_s.strip.empty?
+          members.map(&:name)
+        else
+          value.to_s.split(",").map(&:strip).reject(&:empty?).uniq
+        end
+        raise Error, "--fast-recovery-members requires at least one member" if names.empty?
+
+        known = family_members.map(&:name)
+        unknown = names - known
+        raise Error, "unknown fast recovery member(s): #{unknown.join(", ")}" unless unknown.empty?
+
+        selected = members.map(&:name)
+        unselected = names - selected
+        unless unselected.empty?
+          raise Error, "fast recovery member(s) must be selected: #{unselected.join(", ")}"
+        end
+
+        names
+      end
+
+      def fast_recovery_members_given?(value)
+        Array(value).flat_map { |entry| entry.to_s.split(",") }.map(&:strip).reject(&:empty?).any?
+      end
+
       def validate_remote_list(value, option_name)
         return nil if value.nil?
 

data.tar.gz.sig

@@ -1,2 +1 @@
-'a*��G��ߠ��\�-xv�O%E]��9ָ����?��lɒ�٪�#&�ԁ�h}f�n4�^�cn�����Yj��o
��;=sd2�1`&\�ܩs&��}.`�~�+\�C���"u�}��N�0n��ymI�‘9:�r���W���Đ��Z�0����P��Uw%4�qnZsچ*ӣ\!)Ӎ5CX�<QW,c��̆���d]����d���`ߤJ%��.�}&�RcTn�����~�S��
-Z���[I�>h��V�����R��gG���)�[y���W��k�J
+r�%��k���������

metadata

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