kettle-family 1.2.53 → 1.2.54

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 142cc12e09a0cef0f2a8c41fa8344118ac2b7b364e276b737dbef3af2c1e9610
-  data.tar.gz: e2ef27781a88460028c6b726718c1e28820122573a81cbff719db1d1c4b7eb1f
+  metadata.gz: c0f5a2c157047beb738100cc8d76c0df51c1664ebd6156fe4b8df9d6a2f80c1a
+  data.tar.gz: 930877d4514aa57efadabc0a22a39cbae5fcb3610ef07019c5fce3b050b4bcb2
 SHA512:
-  metadata.gz: 729b27a105e4311d47dcf413c21d4aa728fca9153d9a2f3a29acec90e63aaef1b75374cdadb5c785dd370abb147f7e40c8ae4e761758cb49e4489676017a423b
-  data.tar.gz: 210f2898d436674e9ba408f592bf1fd6c85dd56d186c85e3b50b21c08f8fdfc93d04c2b615c01ffed68824ba75ab52290a5622b169913a9d1e4b72e40539467c
+  metadata.gz: 5c4811b61a654bb5e496c3f0069f56b788d0262b3b6276a02e926b68dfb8a7c985a251af93b45fe3d6824586ee49b2c7e331124b911f88a4b63853e504f55aa5
+  data.tar.gz: 42b4aef5d2795e99cb011ef56f8607fb5a24ff9a338230959cf72f2e9ef6474ca2c2b75fa8adb12daed8fce22b654094eaaf35183150d367c0d7154c10c4dd95

data/CHANGELOG.md

@@ -30,6 +30,17 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Security
 
+## [1.2.54] - 2026-08-12
+
+- TAG: [v1.2.54][1.2.54t]
+- COVERAGE: 93.57% -- 5270/5632 lines in 33 files
+- BRANCH COVERAGE: 76.23% -- 2120/2781 branches in 33 files
+- 29.86% documented
+
+### Fixed
+
+- Family releases now reconcile already-published sibling dependency floors and remote lockfiles before resuming a selected release set.
+
 ## [1.2.53] - 2026-08-12
 
 - TAG: [v1.2.53][1.2.53t]
@@ -2098,7 +2109,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.53...HEAD
+[Unreleased]: https://github.com/kettle-dev/kettle-family/compare/v1.2.54...HEAD
+[1.2.54]: https://github.com/kettle-dev/kettle-family/compare/v1.2.53...v1.2.54
+[1.2.54t]: https://github.com/kettle-dev/kettle-family/releases/tag/v1.2.54
 [1.2.53]: https://github.com/kettle-dev/kettle-family/compare/v1.2.52...v1.2.53
 [1.2.53t]: https://github.com/kettle-dev/kettle-family/releases/tag/v1.2.53
 [1.2.52]: https://github.com/kettle-dev/kettle-family/compare/v1.2.51...v1.2.52

data/README.md

@@ -836,7 +836,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.613-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
+[🧮kloc-img]: https://img.shields.io/badge/KLOC-5.632-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

@@ -652,7 +652,10 @@ module Kettle
         effective_only = default_only_filter(command: command, only: options[:only])
         discovery = Discovery.new(
           config: config,
-          release_dependency_member_names: direct_member_only_names(effective_only)
+          # Release reconciliation needs the complete family graph: a
+          # dependency that published in an earlier invocation is not part of
+          # a subsequent --only pend selection.
+          release_dependency_member_names: (command == "release") ? nil : direct_member_only_names(effective_only)
         )
         members = discovery.members
         ordered = if command == "install"
@@ -685,6 +688,7 @@ module Kettle
           command: command,
           config: config,
           members: result_members,
+          family_members: ordered,
           options: options,
           start_at: start_at,
           state_event_handler: state_event_handler
@@ -712,11 +716,11 @@ module Kettle
 
       StartAt = Struct.new(:member, :branch)
 
-      def command_results(command:, config:, members:, options:, start_at:, state_event_handler: nil)
-        return branch_target_command_results(command: command, config: config, members: members, options: options, start_at: start_at) if branch_target_command?(command, config)
-        return member_local_branch_target_command_results(command: command, config: config, members: members, options: options, start_at: start_at) if member_local_branch_target_command?(command, config, members)
+      def command_results(command:, config:, members:, family_members:, options:, start_at:, state_event_handler: nil)
+        return branch_target_command_results(command: command, config: config, members: members, family_members: family_members, options: options, start_at: start_at) if branch_target_command?(command, config)
+        return member_local_branch_target_command_results(command: command, config: config, members: members, family_members: family_members, options: options, start_at: start_at) if member_local_branch_target_command?(command, config, members)
 
-        command_results_for_current_branch(command: command, config: config, members: members, options: options, start_at: start_at, state_event_handler: state_event_handler)
+        command_results_for_current_branch(command: command, config: config, members: members, family_members: family_members, options: options, start_at: start_at, state_event_handler: state_event_handler)
       end
 
       def release_state_results_for_selection(config:, members:, only:, jobs: nil)
@@ -757,7 +761,7 @@ module Kettle
         members
       end
 
-      def command_results_for_current_branch(command:, config:, members:, options:, start_at: StartAt.new(nil, nil), state_event_handler: nil)
+      def command_results_for_current_branch(command:, config:, members:, options:, family_members: members, start_at: StartAt.new(nil, nil), state_event_handler: nil)
         return mise_trust_results(config: config, members: members) if command == "mise-trust"
         return bump_version_results(config: config, members: members, options: options, phase: command) if %w[bump bump-version].include?(command)
         return add_changelog_results(members: members, options: options) if command == "add-changelog"
@@ -772,6 +776,7 @@ module Kettle
           command: command,
           config: config,
           members: members,
+          family_members: family_members,
           execute: options[:execute],
           accept: options[:accept],
           commit: options[:commit],
@@ -931,7 +936,7 @@ module Kettle
         members.any? { |member| member_release_config(member: member, config: config) }
       end
 
-      def branch_target_command_results(command:, config:, members:, options:, start_at:)
+      def branch_target_command_results(command:, config:, members:, family_members:, options:, start_at:)
         runner = CommandRunner.new(execute: options[:execute])
         selected_names = members.map(&:name)
         release_target_branches(command: command, config: config, start_at: start_at).each_with_object([]) do |branch, memo|
@@ -945,7 +950,7 @@ module Kettle
 
           branch_members = rediscovered_selected_members(config: config, selected_names: selected_names, command: command)
           branch_members = members if branch_members.empty?
-          branch_results = command_results_for_current_branch(command: command, config: config, members: branch_members, options: options)
+          branch_results = command_results_for_current_branch(command: command, config: config, members: branch_members, family_members: family_members, options: options)
           branch_results.each { |result| result.branch = branch if result.respond_to?(:branch=) }
           memo.concat(branch_results)
           break memo unless memo.last&.ok?
@@ -955,12 +960,12 @@ module Kettle
         end
       end
 
-      def member_local_branch_target_command_results(command:, config:, members:, options:, start_at:)
+      def member_local_branch_target_command_results(command:, config:, members:, family_members:, options:, start_at:)
         runner = CommandRunner.new(execute: options[:execute])
         members.each_with_object([]) do |member, memo|
           member_config = member_release_config(member: member, config: config)
           unless member_config
-            memo.concat(command_results_for_current_branch(command: command, config: config, members: [member], options: options))
+            memo.concat(command_results_for_current_branch(command: command, config: config, members: [member], family_members: family_members, options: options))
             break memo unless memo.last&.ok?
             next
           end
@@ -976,7 +981,7 @@ module Kettle
 
             branch_members = rediscovered_selected_members(config: member_config, selected_names: [member.name], command: command)
             branch_members = [member] if branch_members.empty?
-            branch_results = command_results_for_current_branch(command: command, config: member_config, members: branch_members, options: options)
+            branch_results = command_results_for_current_branch(command: command, config: member_config, members: branch_members, family_members: family_members, options: options)
             branch_results.each { |result| result.branch = branch if result.respond_to?(:branch=) }
             memo.concat(branch_results)
             break unless memo.last&.ok?

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

data/lib/kettle/family/workflow.rb

@@ -102,10 +102,11 @@ module Kettle
       REGISTRY_WAIT_ATTEMPTS = 15
       REGISTRY_WAIT_INTERVAL_SECONDS = 15
 
-      def initialize(command:, config:, members:, 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, 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
+        @family_members = family_members || members
         @execute = execute
         @accept = accept
         @commit = commit
@@ -185,7 +186,7 @@ module Kettle
         execute && release_command_delegates_secrets_to_kettle_release?
       end
 
-      attr_reader :command, :config, :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, :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
@@ -421,7 +422,10 @@ module Kettle
         return check_results(workflow_members) if command == "check"
         return reset_member_results(workflow_members) if command == "reset"
         if command == "release"
-          results = release_member_results(workflow_members, include_family_changelog: !skip_changelog)
+          results = release_dependency_floor_reconciliation_results(workflow_members)
+          return results unless results.all?(&:ok?)
+
+          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)
@@ -1082,6 +1086,7 @@ module Kettle
           command: command,
           config: member_config,
           members: [member],
+          family_members: family_members,
           execute: execute,
           accept: accept,
           commit: commit,
@@ -1358,6 +1363,38 @@ module Kettle
         ReleaseWaves.new(members: release_members, configured_waves: config.release_waves, strict_cycles: true).waves
       end
 
+      def release_dependency_floor_reconciliation_results(release_members)
+        return [] unless execute && auto_dependency_floors
+
+        published_members = published_family_dependencies_for(release_members)
+        return [] if published_members.empty?
+
+        results = []
+        append_dependency_floor_results(
+          released_members: published_members,
+          dependent_members: release_members,
+          runner: release_command_runner,
+          memo: results
+        )
+        results
+      end
+
+      # A resumed --only pend release no longer includes members that finished
+      # in an earlier invocation. Reconcile against the registry before the
+      # next release wave so those already-published versions still update
+      # sibling floors and lockfiles.
+      def published_family_dependencies_for(release_members)
+        dependency_names = release_members.flat_map { |member| release_dependency_names(member) }.uniq
+        family_members_by_name = family_members.to_h { |member| [member.name, member] }
+        dependency_names.filter_map do |dependency_name|
+          member = family_members_by_name[dependency_name]
+          next unless member
+          next unless released_version?(member.name, member.version)
+
+          member
+        end
+      end
+
       def append_dependency_floor_results(released_members:, dependent_members:, runner:, memo:)
         return unless auto_dependency_floors
         return if dependent_members.empty?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kettle-family
 version: !ruby/object:Gem::Version
-  version: 1.2.53
+  version: 1.2.54
 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.53
-  changelog_uri: https://github.com/kettle-dev/kettle-family/blob/v1.2.53/CHANGELOG.md
+  source_code_uri: https://github.com/kettle-dev/kettle-family/tree/v1.2.54
+  changelog_uri: https://github.com/kettle-dev/kettle-family/blob/v1.2.54/CHANGELOG.md
   bug_tracker_uri: https://github.com/kettle-dev/kettle-family/issues
-  documentation_uri: https://www.rubydoc.info/gems/kettle-family/1.2.53
+  documentation_uri: https://www.rubydoc.info/gems/kettle-family/1.2.54
   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