kettle-family 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f81e03e49736eb1884f0272f7af5ee78b14239ace620cf5427da26cfbaf2df5c
-  data.tar.gz: cc974713f574848b1740c413c1db51913bd99f8fc91fa2683b312f7cdbcfcf91
+  metadata.gz: fceb2fadcbbc93ac056bf4a56e6efc3b628a5891c094af2fdf626886ea211acb
+  data.tar.gz: a3b0a7d51a2fc8d3c6ef63209fff25912f8d144d223de52d2649c2144c58c5e2
 SHA512:
-  metadata.gz: 7fb8fa2d38f8a84c537558ab48d90fd17f9933cd27e8017b60a9f6ecf89f54a928d0c21b058dcc0e41766d47372dffb4a2a125c18c0e7049d11ce31ddaac24cd
-  data.tar.gz: 2e546a76ba606eb8078a477b696109a30a0acdfe23bda7267905fc926cb65dec5237f938f5d42ab8e8e75fb131a316d0303a3ec637284c7c41331e98a02bcdd2
+  metadata.gz: d0fbc13bfb0ed888c274d07cb7f59dacecb9aeeb0ef22fe6dcaf0e15632450d910000f6dc25dcacf1dc5bae5c603115073a0b48209c427a45508de40ecd2ba17
+  data.tar.gz: c684031130496ae7a414b4411fb62934bbdd6610f0f64cc27645b9074db07b03c7be05ab71aa033a1b5ecd19724e9601e6197c1c543b6bcaec2ee7b3ba93b84a

data/CHANGELOG.md

@@ -30,6 +30,25 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Security
 
+## [1.0.5] - 2026-07-23
+
+- TAG: [v1.0.5][1.0.5t]
+- COVERAGE: 94.41% -- 2772/2936 lines in 24 files
+- BRANCH COVERAGE: 76.59% -- 978/1277 branches in 24 files
+- 29.23% documented
+
+### Fixed
+
+- Family releases now retry `bundle update` for dependent members after
+  wave-aware dependency floor bumps, and reject empty lockfile checksum entries
+  for the just-published gems, so a registry version endpoint becoming visible
+  before Bundler's dependency index no longer breaks the next publish.
+- Failed interactive release results now summarize streamed command output
+  instead of replaying the full child-process transcript in the final report.
+- `kettle-family state` now reports per-gem release-state rows for monorepos
+  that use a shared root changelog, while still preferring member-local
+  changelogs when present and retaining branch-stack release-state output.
+
 ## [1.0.4] - 2026-07-21
 
 - TAG: [v1.0.4][1.0.4t]
@@ -859,7 +878,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.0.4...HEAD
+[Unreleased]: https://github.com/kettle-dev/kettle-family/compare/v1.0.5...HEAD
+[1.0.5]: https://github.com/kettle-dev/kettle-family/compare/v1.0.4...v1.0.5
+[1.0.5t]: https://github.com/kettle-dev/kettle-family/releases/tag/v1.0.5
 [1.0.4]: https://github.com/kettle-dev/kettle-family/compare/v1.0.3...v1.0.4
 [1.0.4t]: https://github.com/kettle-dev/kettle-family/releases/tag/v1.0.4
 [1.0.3]: https://github.com/kettle-dev/kettle-family/compare/v1.0.2...v1.0.3

data/README.md

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

@@ -14,7 +14,8 @@ module Kettle
       :elapsed_seconds,
       :skipped,
       :reason,
-      :branch
+      :branch,
+      :output_streamed
     ) do
       def to_h
         {
@@ -29,7 +30,8 @@ module Kettle
           "stderr" => summarize(stderr),
           "elapsed_seconds" => elapsed_seconds,
           "skipped" => skipped,
-          "reason" => reason
+          "reason" => reason,
+          "output_streamed" => output_streamed?
         }
       end
 
@@ -37,6 +39,10 @@ module Kettle
         success || skipped
       end
 
+      def output_streamed?
+        !!output_streamed
+      end
+
       private
 
       def summarize(output)

data/lib/kettle/family/command_runner.rb

@@ -139,7 +139,8 @@ module Kettle
           stderr: stderr,
           elapsed_seconds: elapsed.round(3),
           skipped: false,
-          reason: status.success? ? nil : "command failed"
+          reason: status.success? ? nil : "command failed",
+          output_streamed: interactive
         )
       end
 

data/lib/kettle/family/release_state_check.rb

@@ -17,7 +17,7 @@ module Kettle
 
       def results
         return branch_results unless release_target_branches.empty?
-        return [check_family_changelog] if shared_changelog?
+        return members.map { |member| check_shared_changelog_member_or_local(member) } if shared_changelog?
 
         members.each_with_object([]) do |member, memo|
           member_branch_results = member_local_branch_results(member)
@@ -38,12 +38,12 @@ module Kettle
         selected_names = members.map(&:name)
         release_target_branches.each_with_object([]) do |branch, memo|
           with_branch_worktree(root: root, branch: branch) do |worktree_root|
+            branch_members = discover_branch_members(worktree_root: worktree_root, selected_names: selected_names)
             if shared_changelog?
-              memo << check_family_changelog(branch: branch, worktree_root: worktree_root)
+              memo.concat(branch_members.map { |member| check_shared_changelog_member_or_local(member, branch: branch) })
               next
             end
 
-            branch_members = discover_branch_members(worktree_root: worktree_root, selected_names: selected_names)
             memo.concat(branch_members.map { |member| check_member(member, branch: branch) })
           end
         rescue Error => error
@@ -54,7 +54,7 @@ module Kettle
       def check_member(member, branch: nil)
         started = Process.clock_gettime(Process::CLOCK_MONOTONIC)
         command = release_state_command
-        stdout, stderr, status = Open3.capture3(release_state_env, *command, chdir: release_state_workdir(member))
+        stdout, stderr, status = Open3.capture3(release_state_env(member), *command, chdir: release_state_workdir(member))
         elapsed = Process.clock_gettime(Process::CLOCK_MONOTONIC) - started
         success = status.success?
         state = success ? JSON.parse(stdout) : {}
@@ -69,26 +69,38 @@ module Kettle
         [RbConfig.ruby, "-S", "kettle-changelog", "--release-state", "--json"]
       end
 
-      def check_family_changelog(branch: nil, worktree_root: nil)
-        member = family_member(root: worktree_root ? branch_config_root(worktree_root) : config.root)
+      def check_shared_changelog_member_or_local(member, branch: nil)
+        return check_member(member, branch: branch) if member_local_changelog?(member)
+
+        check_shared_changelog_member(member, branch: branch)
+      end
+
+      def check_shared_changelog_member(member, branch: nil)
         started = Process.clock_gettime(Process::CLOCK_MONOTONIC)
-        state = family_changelog_state(member.root)
+        command = release_state_command
+        stdout, stderr, status = Open3.capture3(shared_changelog_env(member), *command, chdir: config.root)
         elapsed = Process.clock_gettime(Process::CLOCK_MONOTONIC) - started
+        success = status.success?
+        state = success ? JSON.parse(stdout) : {}
+        state = branch_filtered_state(member, state, branch) if success && branch
+        state = enrich_git_state(member.root, state) if success
         result(
           member: member,
-          command: ["internal", "release-state", "root-changelog"],
-          stdout: "",
-          stderr: "",
-          status: 0,
+          command: command,
+          stdout: stdout,
+          stderr: stderr,
+          status: status.exitstatus,
           elapsed: elapsed,
-          success: true,
+          success: success,
           state: state,
           branch: branch
         )
+      rescue JSON::ParserError => error
+        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)
       rescue Error => error
         result(
           member: member,
-          command: ["internal", "release-state", "root-changelog"],
+          command: command || release_state_command,
           stdout: "",
           stderr: error.message,
           status: 1,
@@ -100,28 +112,35 @@ module Kettle
         )
       end
 
-      def family_member(root:)
-        Member.new(
-          name: config.family_name,
-          root: root,
-          gemspec_path: nil,
-          version_file: nil,
-          version: nil,
-          dependencies: []
-        )
-      end
-
       def release_state_workdir(member)
         return member.root unless config
-        return member.root if config.shared_changelog?
+        return config.root if config.shared_changelog? && !member_local_changelog?(member)
 
         config.changelog_workdir(member) || member.root
       end
 
-      def release_state_env
+      def release_state_env(member = nil)
+        return member_changelog_env(member) if member && shared_changelog? && member_local_changelog?(member)
+
         config ? config.changelog_env : {}
       end
 
+      def shared_changelog_env(member)
+        env = release_state_env(member).merge("K_CHANGELOG_GEM_NAME" => member.name.to_s)
+        env["K_CHANGELOG_VERSION_FILE"] = member.version_file.to_s if member.version_file
+        env
+      end
+
+      def member_changelog_env(member)
+        env = {"K_CHANGELOG_GEM_NAME" => member.name.to_s}
+        env["K_CHANGELOG_VERSION_FILE"] = member.version_file.to_s if member.version_file
+        env
+      end
+
+      def member_local_changelog?(member)
+        File.file?(File.join(member.root, "CHANGELOG.md"))
+      end
+
       def branch_filtered_state(member, state, _branch)
         latest_released = branch_latest_released(member, state["latest_changelog_version"])
         return state unless latest_released

data/lib/kettle/family/report.rb

@@ -162,7 +162,9 @@ module Kettle
       def append_result_stdout(lines, result)
         return if suppress_success_output?(result)
 
-        if template_event_stdout?(result)
+        if output_streamed?(result)
+          append_streamed_output_summary(lines, result) unless result.ok?
+        elsif template_event_stdout?(result)
           append_template_event_failure_summary(lines, result.stdout) unless result.ok?
         else
           append_indented_output(lines, result.stdout)
@@ -177,6 +179,33 @@ module Kettle
         command == "template" && result.phase == "template" && template_events(result.stdout).any?
       end
 
+      def output_streamed?(result)
+        result.respond_to?(:output_streamed?) && result.output_streamed?
+      end
+
+      def append_streamed_output_summary(lines, result)
+        summary = streamed_output_summary(result)
+        lines << "    summary: #{summary}" if summary
+        recommended_fix = streamed_recommended_fix(result)
+        lines << "    recommended fix: #{recommended_fix}" if recommended_fix
+        lines << "    output: omitted because it was already streamed"
+      end
+
+      def streamed_output_summary(result)
+        streamed_output_lines(result).reverse.find do |line|
+          line.match?(/(?:failed|failure|error|exited|aborted)/i) && !line.match?(/\A(?:Files|CI|Actions)/)
+        end
+      end
+
+      def streamed_recommended_fix(result)
+        line = streamed_output_lines(result).reverse.find { |candidate| candidate.match?(/\ARecommended fix:\s+/) }
+        line&.sub(/\ARecommended fix:\s+/, "")
+      end
+
+      def streamed_output_lines(result)
+        [result.stdout, result.stderr].join("\n").lines.map(&:strip).reject(&:empty?)
+      end
+
       def append_template_event_failure_summary(lines, output)
         diagnostics = template_events(output).filter_map do |event|
           next unless event["type"] == "diagnostic"

data/lib/kettle/family/version.rb

@@ -3,7 +3,7 @@
 module Kettle
   module Family
     module Version
-      VERSION = "1.0.4"
+      VERSION = "1.0.5"
     end
     VERSION = Version::VERSION # Traditional Constant Location
   end

data/lib/kettle/family/workflow.rb

@@ -542,6 +542,9 @@ module Kettle
         return if memo.any? && !memo.last.ok?
 
         append_registry_wait_result(released_members: released_members, dependent_members: affected_dependent_members, memo: memo)
+        return if memo.any? && !memo.last.ok?
+
+        append_dependency_floor_lockfile_results(released_members: released_members, dependent_members: affected_dependent_members, runner: runner, memo: memo)
       end
 
       def dependent_members_depending_on(released_members:, dependent_members:)
@@ -562,6 +565,85 @@ module Kettle
         memo << wait_for_registry_result(released_members: released_members, dependent_members: dependent_members)
       end
 
+      def append_dependency_floor_lockfile_results(released_members:, dependent_members:, runner:, memo:)
+        return unless execute && publish
+        return if dependent_members.empty?
+
+        dependent_members.each do |member|
+          memo << wait_for_dependency_floor_lockfiles_result(member: member, released_members: released_members, runner: runner)
+          break unless memo.last.ok?
+        end
+      end
+
+      def wait_for_dependency_floor_lockfiles_result(member:, released_members:, runner:)
+        result = nil
+        REGISTRY_WAIT_ATTEMPTS.times do |index|
+          result = runner.call(
+            member: member,
+            phase: "dependency_floor_lockfiles",
+            command: ["bundle", "update", *released_members.map(&:name)],
+            env: release_lockfile_env
+          )
+          validate_dependency_floor_lockfile_result(result: result, member: member, released_members: released_members) if result.ok?
+          annotate_dependency_floor_lockfile_result(result, index + 1)
+          break if result.ok?
+
+          sleep(REGISTRY_WAIT_INTERVAL_SECONDS) if index + 1 < REGISTRY_WAIT_ATTEMPTS
+        end
+        result
+      end
+
+      def validate_dependency_floor_lockfile_result(result:, member:, released_members:)
+        diagnostics = dependency_floor_lockfile_diagnostics(member: member, released_members: released_members)
+        return if diagnostics.empty?
+
+        result.status = 1
+        result.success = false
+        result.stderr = [result.stderr, *diagnostics].reject(&:empty?).join("\n")
+      end
+
+      def dependency_floor_lockfile_diagnostics(member:, released_members:)
+        lockfile = File.join(member.root, "Gemfile.lock")
+        return ["Gemfile.lock was not created by dependency floor lockfile refresh"] unless File.file?(lockfile)
+
+        lockfile_source = File.read(lockfile)
+        released_members.filter_map do |released_member|
+          checksum_line = checksum_line_for(lockfile_source: lockfile_source, member: released_member)
+          if checksum_line.nil?
+            "Gemfile.lock CHECKSUMS is missing #{released_member.name} #{released_member.version}"
+          elsif !checksum_line.include?("sha256=")
+            "Gemfile.lock CHECKSUMS has no sha256 for #{released_member.name} #{released_member.version}"
+          end
+        end
+      end
+
+      def checksum_line_for(lockfile_source:, member:)
+        in_checksums = false
+        lockfile_source.each_line do |line|
+          stripped = line.chomp
+          if stripped == "CHECKSUMS"
+            in_checksums = true
+            next
+          end
+          next unless in_checksums
+          break if !stripped.empty? && stripped == stripped.upcase && !stripped.start_with?(" ")
+
+          return stripped if stripped.start_with?("  #{member.name} (#{member.version})")
+        end
+        nil
+      end
+
+      def annotate_dependency_floor_lockfile_result(result, attempts)
+        return unless result
+
+        if result.ok?
+          message = "refreshed dependency floor lockfiles after #{attempts} attempt(s)"
+          result.stdout = [result.stdout, message].reject(&:empty?).join("\n")
+        else
+          result.reason = "dependency floor lockfile refresh failed after #{attempts} attempt(s)"
+        end
+      end
+
       def commit_dependency_floor_changes(dependent_members:, runner:, memo:)
         by_name = members.to_h { |member| [member.name, member] }
         dependent_members.each do |member_name|

data.tar.gz.sig

@@ -1,2 +1,2 @@
-�w����y�/�J��ө��Uv�]��K���I��B�L0��<���_����2��}ު~�ˇ���惴��toz�]rKwg;{[� ݖ���?^غ�b}�����y�X�+�p1ݕ���k�|�	u
N��V�[~L�k� "�+��Zw����Y]�k�f��M�R���P&���iY>넄|���6��<���9�;����
-t�3R)�TT�S�S_�׻L���3$��p��M�����G8r���i��'3n�?�54��K/h��kb�xm����Gw�BiTVpsvf�|���l{��C���)��ɀ6{uV�lGL��I^��+�~����w.={�旐�Lq36��Z)�TM�d	�'l�
+i�n��xD�˯6�-kԇC!:A���G�K��%��
�!~�n>�25c�:�0<��s��?}���Ĉr

P0���Bz�%��j��Ffs9�8��2����B�{�#�@ �<��\u�J�B�d�`�'��q��v�J��&�B_k��}��͟#��Ǣ�
+����y���8

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kettle-family
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Peter H. Boling
@@ -74,7 +74,7 @@ dependencies:
         version: '2.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.4
+        version: 2.3.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -84,7 +84,7 @@ dependencies:
         version: '2.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.4
+        version: 2.3.10
 - !ruby/object:Gem::Dependency
   name: kettle-test
   requirement: !ruby/object:Gem::Requirement
@@ -94,7 +94,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.10
+        version: 2.0.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -104,7 +104,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.10
+        version: 2.0.12
 - !ruby/object:Gem::Dependency
   name: tsort
   requirement: !ruby/object:Gem::Requirement
@@ -304,10 +304,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.0.4
-  changelog_uri: https://github.com/kettle-dev/kettle-family/blob/v1.0.4/CHANGELOG.md
+  source_code_uri: https://github.com/kettle-dev/kettle-family/tree/v1.0.5
+  changelog_uri: https://github.com/kettle-dev/kettle-family/blob/v1.0.5/CHANGELOG.md
   bug_tracker_uri: https://github.com/kettle-dev/kettle-family/issues
-  documentation_uri: https://www.rubydoc.info/gems/kettle-family/1.0.4
+  documentation_uri: https://www.rubydoc.info/gems/kettle-family/1.0.5
   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
@@ -337,7 +337,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.16
+rubygems_version: 4.0.17
 specification_version: 4
 summary: "\U0001F469‍\U0001F469‍\U0001F467‍\U0001F467 CLI helpers for managing related
   Ruby gems as a family."