kettle-family 1.2.67 → 1.2.69

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6cce9c43c8db0ddb5984da9e0656dd3790a47dc718fa28195716a73d7b84a68
-  data.tar.gz: accd2cad6a1265c9c954e9908e6ab22ed02282bd0258c8116da295a9e6bf725f
+  metadata.gz: a3f10c970b0e0ae29cdb82ca1a9b3b6cc714cd94368cd9ec371ff2ac870b9800
+  data.tar.gz: 2721e7a64d0fce16c6891a68c48972089c27b9d2a7a69892879a8d4f2dbb06f0
 SHA512:
-  metadata.gz: f9bb56dbb8b43e418441588cd45c904d874086a7f9af349e097aa78a738779e86cef91dadf41e3f5ca0ae99737f717ccda23f0be250944646c247e24a0b3a99a
-  data.tar.gz: 45ea1c723af5437ec77d50961d3c0deca340358b2a904961addd8396ec47c28592faeaf68a94badbad8eb69da92b8124db7ad15fdf904fb91b29234830c6481e
+  metadata.gz: 1f2da27cc1a98f1652d0ee74e4d00863faa531ee18bf584a050fa0887d574f470c698b3a0b62025b6483fc90c5672e594082c7939d4d3a4e19e6e4a02b071bd2
+  data.tar.gz: fb463b7508060c144a365c7e6cd856933354ddad5bed11efaaea44759fccb8d24efd33f5527bf26a3f9291c173e9d868b16f85607d13f8af972dafbbbd68ac11

data/CHANGELOG.md

@@ -30,6 +30,32 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Security
 
+## [1.2.69] - 2026-08-30
+
+- TAG: [v1.2.69][1.2.69t]
+- COVERAGE: 93.22% -- 5500/5900 lines in 33 files
+- BRANCH COVERAGE: 76.36% -- 2255/2953 branches in 33 files
+- 30.50% documented
+
+### Fixed
+
+- Block release execution before family changelog generation when a selected member still requires a version bump.
+
+- Avoid release-state probes for executed build-only releases.
+
+- Replay original release options in member-scoped family release resume hints.
+
+## [1.2.68] - 2026-08-30
+
+- TAG: [v1.2.68][1.2.68t]
+- COVERAGE: 93.17% -- 5457/5857 lines in 33 files
+- BRANCH COVERAGE: 76.14% -- 2212/2905 branches in 33 files
+- 30.32% documented
+
+### Fixed
+
+- Exclude the optional member changelog dependency when resetting locks for a shared root changelog family.
+
 ## [1.2.67] - 2026-08-30
 
 - TAG: [v1.2.67][1.2.67t]
@@ -2307,7 +2333,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.67...HEAD
+[Unreleased]: https://github.com/kettle-dev/kettle-family/compare/v1.2.69...HEAD
+[1.2.69]: https://github.com/kettle-dev/kettle-family/compare/v1.2.68...v1.2.69
+[1.2.69t]: https://github.com/kettle-dev/kettle-family/releases/tag/v1.2.69
+[1.2.68]: https://github.com/kettle-dev/kettle-family/compare/v1.2.67...v1.2.68
+[1.2.68t]: https://github.com/kettle-dev/kettle-family/releases/tag/v1.2.68
 [1.2.67]: https://github.com/kettle-dev/kettle-family/compare/v1.2.66...v1.2.67
 [1.2.67t]: https://github.com/kettle-dev/kettle-family/releases/tag/v1.2.67
 [1.2.66]: https://github.com/kettle-dev/kettle-family/compare/v1.2.65...v1.2.66

data/README.md

@@ -527,6 +527,12 @@ 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`.
 
+Before starting release work, `kettle-family release` checks the selected
+members' release state. If any selected member has `bump: yes`, the release
+stops before family changelog generation or coverage and reports the members
+that need a version bump. Run `kettle-family bump --execute patch` first, then
+rerun the release.
+
 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.
@@ -678,7 +684,12 @@ to materialize. The member-level reset rewrites local sibling paths and
 checksum-less local gem versions back to released registry versions with
 `sha256=` checksums in `Gemfile.lock` and `Appraisal.root.gemfile.lock`.
 Executed family resets fail if the resulting lockfiles still contain sibling
-path remotes or checksum gaps.
+path remotes or checksum gaps. For a family with a shared root changelog,
+member resets pass `--skip-changelog-dependency`: the root changelog is
+prepared in its own bundle, and omitting the optional member development tool
+prevents a partly published coordinated release from resolving an obsolete
+registry dependency chain. Members with their own `CHANGELOG.md` retain the
+normal dependency.
 
 Resume a failed family publish after fixing the failure. Already published
 versions are skipped automatically. A release report gives a member-scoped
@@ -688,6 +699,13 @@ time. If any members were never started, the report also gives a separate
 normal-flow command for exactly those members. Use `--start-step` only after
 the pre-release gate already passed or the failure was intentionally handled:
 
+The generated command replays the original release's relevant options, such as
+`--secrets-provider`, release skip controls, CI selection, dependency-floor
+mode, explicit workflow environment values, and non-default commit or prompt
+behavior. It replaces member selection and any original recovery position with
+the failed member and its recorded child step; original `--start-step` and
+fast-recovery selections are not replayed.
+
 ```console
 kettle-family release --publish --execute --start-step 10
 ```
@@ -1031,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.853-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
+[🧮kloc-img]: https://img.shields.io/badge/KLOC-5.900-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

@@ -691,7 +691,15 @@ module Kettle
         end
         state_event_tape = release_state_event_tape(command: command, config: config, options: options)
         Selection.validate_release_state_only_filter!(effective_only)
-        release_state_results = release_state_results_for_selection(config: config, members: ordered, only: effective_only, jobs: options[:jobs])
+        release_state_results = release_state_results_for_selection(
+          command: command,
+          config: config,
+          members: ordered,
+          only: effective_only,
+          execute: options[:execute],
+          publish: options[:publish],
+          jobs: options[:jobs]
+        )
         selected = Selection.new(
           members: ordered,
           release_state_results: release_state_results,
@@ -732,6 +740,7 @@ module Kettle
           release_target_branches: release_target_branches(command: command, config: config, start_at: start_at),
           member_release_target_branches: member_release_target_branches(command: command, members: selected, config: config, start_at: start_at),
           release_mode: release_mode(command: command, options: options),
+          release_resume_arguments: release_resume_arguments(command: command, options: options),
           command: command,
           results: results,
           warnings: discovery.warnings,
@@ -778,8 +787,10 @@ module Kettle
         )
       end
 
-      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) }
+      def release_state_results_for_selection(command:, config:, members:, only:, execute: false, publish: false, jobs: nil)
+        status_filter = only.to_s.split(",").map(&:strip).any? { |token| Selection.status_token?(token) }
+        should_check = status_filter || (command == "release" && execute && publish)
+        return nil unless should_check
 
         ReleaseStateCheck.new(config: config, members: members, jobs: jobs).results
       end
@@ -869,7 +880,8 @@ module Kettle
           bup_args: options[:bup_args],
           bex_args: options[:bex_args],
           start_member: start_at.member,
-          start_branch: start_at.branch
+          start_branch: start_at.branch,
+          release_state_results: release_state_results
         ).results
       end
 
@@ -1273,6 +1285,33 @@ module Kettle
         options[:publish] ? "publish" : "build-only"
       end
 
+      def release_resume_arguments(command:, options:)
+        return [] unless command == "release"
+
+        arguments = []
+        arguments.concat(["--secrets-provider", options[:release_secrets_provider]]) if options[:release_secrets_provider]
+        arguments.concat(["--skip-steps", options[:release_skip_steps]]) if options[:release_skip_steps]
+        arguments << "--skip-ci" if options[:release_skip_ci]
+        arguments << "--skip-changelog" if options[:release_skip_changelog]
+        arguments << "--skip-appraisals" if options[:release_skip_appraisals]
+        arguments << "--local-ci" if options[:release_local_ci]
+        arguments << "--continue-ci-failures" if options[:release_continue_ci_failures]
+        arguments.concat(["--ci-workflows", options[:release_ci_workflows]]) if options[:release_ci_workflows]
+        arguments << "--skip-bundle-audit" if options[:release_skip_bundle_audit]
+        arguments.concat(["--skip-remotes", options[:release_skip_remotes]]) if options[:release_skip_remotes]
+        arguments.concat(["--required-remotes", options[:release_required_remotes]]) if options[:release_required_remotes]
+        arguments << "--no-auto-floors" unless options[:release_auto_dependency_floors]
+        arguments << "--validate-ci-bundles" if options[:release_validate_ci_bundles]
+        arguments << "--no-accept" unless options[:accept]
+        arguments << "--no-commit" unless options[:commit]
+        arguments << "--no-autostash" unless options[:autostash]
+        arguments << "--tag" if options[:tag]
+        arguments << "--push" if options[:push]
+        arguments.concat(["--jobs", options[:jobs].to_s]) if options[:jobs]
+        options[:workflow_env].each { |key, value| arguments.concat(["--env", "#{key}=#{value}"]) }
+        arguments
+      end
+
       def release_target_branches(command:, config:, start_at:)
         branch_targets = BranchTargetConfig.branch_targets_for(command, config.release_target_branches)
         return branch_targets if branch_targets.empty?

data/lib/kettle/family/report.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "json"
+require "shellwords"
 
 module Kettle
   module Family
@@ -30,9 +31,9 @@ module Kettle
         up
       ].freeze
 
-      attr_reader :family_name, :family_mode, :order_mode, :members, :selected_members, :config_path, :command, :results, :branch_lanes, :release_target_branches, :member_release_target_branches, :release_mode, :warnings, :event_log_dirs
+      attr_reader :family_name, :family_mode, :order_mode, :members, :selected_members, :config_path, :command, :results, :branch_lanes, :release_target_branches, :member_release_target_branches, :release_mode, :release_resume_arguments, :warnings, :event_log_dirs
 
-      def initialize(family_name:, order_mode:, members:, selected_members:, config_path:, family_mode: nil, branch_lanes: {}, release_target_branches: [], member_release_target_branches: {}, release_mode: nil, command: nil, results: [], warnings: [], event_log_dirs: [], elapsed_seconds: nil)
+      def initialize(family_name:, order_mode:, members:, selected_members:, config_path:, family_mode: nil, branch_lanes: {}, release_target_branches: [], member_release_target_branches: {}, release_mode: nil, release_resume_arguments: [], command: nil, results: [], warnings: [], event_log_dirs: [], elapsed_seconds: nil)
         @family_name = family_name
         @family_mode = family_mode
         @order_mode = order_mode
@@ -45,6 +46,7 @@ module Kettle
         @release_target_branches = release_target_branches
         @member_release_target_branches = member_release_target_branches
         @release_mode = release_mode
+        @release_resume_arguments = release_resume_arguments.dup.freeze
         @warnings = warnings
         @event_log_dirs = event_log_dirs
         @elapsed_seconds = elapsed_seconds
@@ -710,8 +712,16 @@ module Kettle
       end
 
       def release_resume_base
-        hint = "kettle-family release --execute"
-        (release_mode == "publish") ? "#{hint} --publish" : hint
+        arguments = ["kettle-family", "release", "--execute"]
+        arguments << "--publish" if release_mode == "publish"
+        shell_join([*arguments, *release_resume_arguments])
+      end
+
+      def shell_join(arguments)
+        arguments.map do |argument|
+          value = argument.to_s
+          value.match?(/\A[A-Za-z0-9_.,:=+\/-]+\z/) ? value : Shellwords.escape(value)
+        end.join(" ")
       end
     end
   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.67"
+      VERSION = "1.2.69"
     end
     # Current gem version exposed at the traditional constant location.
     VERSION = Version::VERSION # Traditional Constant Location

data/lib/kettle/family/workflow.rb

@@ -106,7 +106,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, template_cleanup: 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, skip_appraisals: 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, validate_ci_bundles: 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, template_cleanup: 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, skip_appraisals: 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, validate_ci_bundles: 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, release_state_results: nil, **options)
         @command = command
         @config = config
         @members = members
@@ -160,6 +160,7 @@ module Kettle
         @bex_args = bex_args
         @start_member = start_member
         @start_branch = start_branch
+        @release_state_results = Array(release_state_results)
         @template_commit_mutex = Mutex.new
       end
 
@@ -206,7 +207,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, :template_cleanup, :publish, :push, :tag, :start_step, :skip_steps, :fast_recovery, :fast_recovery_members, :skip_ci, :skip_changelog, :skip_appraisals, :local_ci, :continue_ci_failures, :ci_workflows, :skip_bundle_audit, :skip_remotes, :required_remotes, :auto_dependency_floors, :validate_ci_bundles, :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, :template_cleanup, :publish, :push, :tag, :start_step, :skip_steps, :fast_recovery, :fast_recovery_members, :skip_ci, :skip_changelog, :skip_appraisals, :local_ci, :continue_ci_failures, :ci_workflows, :skip_bundle_audit, :skip_remotes, :required_remotes, :auto_dependency_floors, :validate_ci_bundles, :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, :release_state_results
 
       def template_with_worktree_sync_results
         runner = command_runner
@@ -1009,12 +1010,33 @@ module Kettle
       end
 
       def release_preflight_phases
+        bump_phase = {label: "release version bump", method: :release_preflight_version_bump_results} unless release_state_results.empty?
         dirty_phase = {label: "branch checkout readiness", method: :release_preflight_branch_checkout_dirty_results}
         signing_phase = {label: "gem signing password", method: :release_preflight_signing_password_results}
         secrets_phase = release_secrets_authorization_required? ? {label: "secrets provider authorization", method: :release_preflight_secrets_authorization_results} : nil
         gha_sha_pins_phase = release_gha_sha_pins_review_required? ? {label: "GitHub Actions SHA pins", method: :release_preflight_gha_sha_pins_results} : nil
 
-        [secrets_phase, gha_sha_pins_phase, dirty_phase, signing_phase].compact
+        [bump_phase, secrets_phase, gha_sha_pins_phase, dirty_phase, signing_phase].compact
+      end
+
+      def release_preflight_version_bump_results
+        failed_members = release_state_results.reject(&:ok?).map(&:member_name).compact.uniq
+        unless failed_members.empty?
+          return [release_preflight_error_result(
+            "release_state",
+            "Release blocked because release state could not be determined for: #{failed_members.join(", ")}. Run kettle-family state and resolve the failed probes before retrying."
+          )]
+        end
+
+        bump_members = release_state_results.select do |result|
+          members.any? { |member| member.name == result.member_name } && result.state["bump_release_pending"] == true
+        end.map(&:member_name)
+        return [] if bump_members.empty?
+
+        [release_preflight_error_result(
+          "release_version_bump",
+          "Release blocked: selected member(s) require a version bump: #{bump_members.join(", ")}. Run kettle-family bump --execute patch, then rerun the release."
+        )]
       end
 
       def release_preflight_gha_sha_pins_results
@@ -1854,7 +1876,7 @@ module Kettle
       end
 
       def reset_gemfile_lock_command(member)
-        [
+        command = [
           "env",
           "-u",
           "BUNDLE_BIN_PATH",
@@ -1871,6 +1893,16 @@ module Kettle
           RESET_LOCKFILE_HELPER,
           "release-lockfiles"
         ]
+        command.insert(-1, "--skip-changelog-dependency") if reset_skips_member_changelog_dependency?(member)
+        command
+      end
+
+      # Root-changelog families already prepare the changelog in a dedicated
+      # root bundle. Keeping the optional member Gemfile dependency while a
+      # coordinated monorepo release is only partly published can force
+      # Bundler to select the prior registry dependency graph instead.
+      def reset_skips_member_changelog_dependency?(member)
+        config.shared_changelog? && !config.member_local_changelog?(member)
       end
 
       def reset_helper_ruby

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kettle-family
 version: !ruby/object:Gem::Version
-  version: 1.2.67
+  version: 1.2.69
 platform: ruby
 authors:
 - Peter H. Boling
@@ -91,7 +91,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.22
+        version: 3.0.23
     - - "<"
       - !ruby/object:Gem::Version
         version: 4.0.0
@@ -101,7 +101,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.22
+        version: 3.0.23
     - - "<"
       - !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.67
-  changelog_uri: https://github.com/kettle-dev/kettle-family/blob/v1.2.67/CHANGELOG.md
+  source_code_uri: https://github.com/kettle-dev/kettle-family/tree/v1.2.69
+  changelog_uri: https://github.com/kettle-dev/kettle-family/blob/v1.2.69/CHANGELOG.md
   bug_tracker_uri: https://github.com/kettle-dev/kettle-family/issues
-  documentation_uri: https://www.rubydoc.info/gems/kettle-family/1.2.67
+  documentation_uri: https://www.rubydoc.info/gems/kettle-family/1.2.69
   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