kettle-family 1.2.17 → 1.2.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb71df81d320a71ba34e6f2f09233f8a02a59f84f266c3e55e92acbe6c35cae1
-  data.tar.gz: 0dd9fa2f1ef0f3ec59f4bbee09992245b03dc4fb8f991807d5b8eac70a817c3b
+  metadata.gz: e868e193e146eeb559019b4f24a860b25ccacee6f86a6f4b000fd2cdc101217d
+  data.tar.gz: c3dc9a386dde8a4d6ff1ee6918c966041d47b5316f96510b9c664c36a808fab5
 SHA512:
-  metadata.gz: 2b81c2dc8313b89e2777a60fddadd2d459c8db4c5ba723f26aedb66eebec1d6e6fa91a7d4ebc57d9e040a87d1703b5cdb86758b256fb76e8e9621c999d1eeb19
-  data.tar.gz: afe0839807601723753b1e5c78849648a2af65bf19ee13b9a2fbe50e1e3e11d4980e5ed82a9d214f1bdddfacf299e1483c9c8d30884bb1daeb5406abbfeda5d1
+  metadata.gz: d4665f48921ce7e0d339c17ea305790da6dd2ee4f5739df885535f99467a52db9ead2090cfca4e6c927e5b35106177f9642f97fdb86d77d06b872715773a441f
+  data.tar.gz: 43565531dce057aebe8f8bdc441f0d90cf33940dc13278eda9a55c0c5a02aa1a5aeb809a75fecc9b26131e12b294ab13be4fe69fbc90e19b48777911f2bf3b23

checksums.yaml.gz.sig

@@ -1,4 +1 @@
-b��d];�ڑc���g���k�:Q��˺#��P�=��\W��D���@r'��~��fd�*�6����><<!7���x��іաcY��%�
-���Y�`�U�����NN����fX*��&�m�n��6�&[[Q����r�==�<T�)�e�/�R�?�E�*���\����8�11��!E�P`���nF���<�ړ�
-���*{�?�v�ݗ���V�B6�L
-�}s瘢,:�i2cr���l�P-�gB�j+��]��T�K�0�R��j��I}]v+X`L�&6/3HTPq�{H��R!"���]��]WM)ǽ^i�/g���R�O{/-�����Ҕ����k�ŀ(��L\ID����|X��6#R�w9�����-���Pܗ^Y�	���x��O�
+׳�_�/4�:����s'e�s�$%�Ψ��a��_n�fK1;����|�S3?E�1�2�W9O9J�ak�\O�"��L:��P�ĸ��8́"��z�*)�6�r����p��Ndg����7Fb��%>ʹ���٢Uw�2���h.�Ne��vi�4�V�M���2�L�Hp

data/CHANGELOG.md

@@ -30,6 +30,21 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Security
 
+## [1.2.18] - 2026-07-31
+
+- TAG: [v1.2.18][1.2.18t]
+- COVERAGE: 94.14% -- 4277/4543 lines in 28 files
+- BRANCH COVERAGE: 76.75% -- 1680/2189 branches in 28 files
+- 28.88% documented
+
+### Added
+
+- Family template progress and final reports now aggregate checksum write
+  bypasses, rendered-but-unchanged files, and changed files from Kettle-Jem
+  NDJSON summaries.
+- Template summaries now distinguish exact checksum hits from source-matched
+  local destination changes protected by the template-only checksum policy.
+
 ## [1.2.17] - 2026-07-31
 
 - TAG: [v1.2.17][1.2.17t]
@@ -1540,7 +1555,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.17...HEAD
+[Unreleased]: https://github.com/kettle-dev/kettle-family/compare/v1.2.18...HEAD
+[1.2.18]: https://github.com/kettle-dev/kettle-family/compare/v1.2.17...v1.2.18
+[1.2.18t]: https://github.com/kettle-dev/kettle-family/releases/tag/v1.2.18
 [1.2.17]: https://github.com/kettle-dev/kettle-family/compare/v1.2.16...v1.2.17
 [1.2.17t]: https://github.com/kettle-dev/kettle-family/releases/tag/v1.2.17
 [1.2.16]: https://github.com/kettle-dev/kettle-family/compare/v1.2.15...v1.2.16

data/README.md

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

@@ -309,8 +309,15 @@ module Kettle
         return if template_results.empty?
 
         changed_files = template_results.sum { |result| template_changed_file_count(result) }
+        outcome_counts = template_results.map { |result| template_file_outcomes(result) }
         lines << "template summary:"
         lines << "  #{template_results.count(&:ok?)}/#{template_results.length} members ok"
+        if outcome_counts.all?
+          lines << "  #{outcome_counts.sum { |outcomes| outcomes.fetch(:checksum_hits) }} checksum hits"
+          protected = outcome_counts.sum { |outcomes| outcomes.fetch(:checksum_protected) }
+          lines << "  #{protected} checksum-protected changes" if protected.positive?
+          lines << "  #{outcome_counts.sum { |outcomes| outcomes.fetch(:unchanged) }} unchanged"
+        end
         lines << "  #{changed_files} file#{"s" unless changed_files == 1} changed"
       end
 
@@ -339,6 +346,20 @@ module Kettle
         summary&.fetch("changed_count")&.to_i
       end
 
+      def template_file_outcomes(result)
+        summary = template_events(result.stdout).reverse.find do |event|
+          event["type"] == "summary" && event.key?("checksum_hit_count") &&
+            event.key?("checksum_protected_count") && event.key?("unchanged_count")
+        end
+        return unless summary
+
+        {
+          checksum_hits: summary.fetch("checksum_hit_count").to_i,
+          checksum_protected: summary.fetch("checksum_protected_count").to_i,
+          unchanged: summary.fetch("unchanged_count").to_i
+        }
+      end
+
       def template_events(output)
         output.to_s.each_line.filter_map do |line|
           payload = JSON.parse(line)

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

data/lib/kettle/family/workflow.rb

@@ -513,8 +513,8 @@ module Kettle
           dirty_paths = GitStatus.dirty_paths(member.root)
           next if dirty_paths.empty?
 
-          if recoverable_template_lockfile_dirt?(member, dirty_paths)
-            recover_template_lockfiles(member: member, runner: command_runner, memo: results, phase: "template_lockfile_recovery")
+          if recoverable_template_lockfile_dirt?(dirty_paths)
+            recover_dirty_template_lockfile_before_branch_checkout(member: member, runner: command_runner, memo: results)
             next if results.last&.ok? && GitStatus.dirty_paths(member.root).empty?
           end
 
@@ -522,11 +522,25 @@ module Kettle
         end
       end
 
-      def recoverable_template_lockfile_dirt?(member, dirty_paths)
+      def recoverable_template_lockfile_dirt?(dirty_paths)
         return false unless command == "template" && config.normalize_lockfiles?
         return false unless dirty_paths.length == 1 && dirty_paths.first.end_with?(" Gemfile.lock")
 
-        release_lockfile_has_local_path_remote?(member)
+        true
+      end
+
+      def recover_dirty_template_lockfile_before_branch_checkout(member:, runner:, memo:)
+        if release_lockfile_has_local_path_remote?(member)
+          recover_template_lockfiles(member: member, runner: runner, memo: memo, phase: "template_lockfile_recovery")
+        else
+          commit_normalized_lockfiles(
+            branch_members: [member],
+            runner: runner,
+            memo: memo,
+            reason: "template",
+            force: true
+          )
+        end
       end
 
       def branch_checkout_preflight_required?
@@ -1897,9 +1911,15 @@ module Kettle
           index = argv.index("kettle-jem")
           return command_text unless index
 
-          argv[0...index] + [RbConfig.ruby, executable] + argv[(index + 1)..]
+          prefix = argv[0...index]
+          prefix = prefix[0...-2] if prefix.last(2) == %w[bundle exec]
+          prefix + [RbConfig.ruby, executable] + argv[(index + 1)..]
         else
-          command_text.to_s.sub(/\bkettle-jem\b/, "#{Shellwords.escape(RbConfig.ruby)} #{Shellwords.escape(executable)}")
+          replacement = "#{Shellwords.escape(RbConfig.ruby)} #{Shellwords.escape(executable)}"
+          text = command_text.to_s
+          return text.sub(/\bbundle\s+exec\s+kettle-jem\b/, replacement) if text.match?(/\bbundle\s+exec\s+kettle-jem\b/)
+
+          text.sub(/\bkettle-jem\b/, replacement)
         end
       end
 
@@ -2040,8 +2060,7 @@ module Kettle
       end
 
       def template_member_finish_status(result)
-        changed_files = template_changed_file_count(result)
-        "#{changed_files} file#{"s" unless changed_files == 1} changed"
+        template_summary_label(template_changed_file_count(result), template_file_outcomes(result))
       end
 
       def release_member_finish_status(result)
@@ -2053,8 +2072,9 @@ module Kettle
 
         template_results = results.select { |result| result.phase == "template" }
         changed_files = template_results.sum { |result| template_changed_file_count(result) }
+        outcome_counts = template_results.map { |result| template_file_outcomes(result) }
         progress.stop
-        progress.summary("template summary: #{template_results.count(&:ok?)}/#{template_results.length} members ok, #{changed_files} file#{"s" unless changed_files == 1} changed")
+        progress.summary(template_progress_summary_label(template_results, changed_files, outcome_counts))
       end
 
       def emit_release_progress_summary(results, progress:)
@@ -2119,7 +2139,7 @@ module Kettle
         when "diagnostic"
           emit_template_event_line(member, "!", diagnostic_event_label(event))
         when "summary"
-          emit_template_event_line(member, "done", "#{event["changed_count"].to_i} file#{"s" unless event["changed_count"].to_i == 1} changed")
+          emit_template_event_line(member, "done", template_event_summary_label(event))
         end
       end
 
@@ -2134,7 +2154,7 @@ module Kettle
         when "diagnostic"
           diagnostic_event_label(event)
         when "summary"
-          "#{event["changed_count"].to_i} file#{"s" unless event["changed_count"].to_i == 1} changed"
+          template_event_summary_label(event)
         end
         mark = template_event_status_mark(event)
         progress&.update(member, status: status, mark: mark) if status && !status.empty?
@@ -2394,6 +2414,61 @@ module Kettle
         summary&.fetch("changed_count")&.to_i
       end
 
+      def template_file_outcomes(result)
+        summaries = result.stdout.to_s.lines.filter_map do |line|
+          event = parse_template_event(line)
+          event if event && event["type"] == "summary"
+        end
+        summary = summaries.reverse.find { |event| template_file_outcome_event?(event) }
+        return unless summary
+
+        {
+          checksum_hits: summary.fetch("checksum_hit_count").to_i,
+          checksum_protected: summary.fetch("checksum_protected_count").to_i,
+          unchanged: summary.fetch("unchanged_count").to_i
+        }
+      end
+
+      def template_file_outcome_event?(event)
+        event.key?("checksum_hit_count") && event.key?("checksum_protected_count") && event.key?("unchanged_count")
+      end
+
+      def template_event_summary_label(event)
+        template_summary_label(
+          event["changed_count"].to_i,
+          template_file_outcome_event?(event) ? {
+            checksum_hits: event.fetch("checksum_hit_count").to_i,
+            checksum_protected: event.fetch("checksum_protected_count").to_i,
+            unchanged: event.fetch("unchanged_count").to_i
+          } : nil
+        )
+      end
+
+      def template_progress_summary_label(template_results, changed_files, outcome_counts)
+        label = "template summary: #{template_results.count(&:ok?)}/#{template_results.length} members ok"
+        return "#{label}, #{template_summary_label(changed_files)}" unless outcome_counts.all?
+
+        totals = outcome_counts.each_with_object({checksum_hits: 0, checksum_protected: 0, unchanged: 0}) do |outcomes, memo|
+          memo[:checksum_hits] += outcomes.fetch(:checksum_hits)
+          memo[:checksum_protected] += outcomes.fetch(:checksum_protected)
+          memo[:unchanged] += outcomes.fetch(:unchanged)
+          memo
+        end
+        "#{label}, #{template_summary_label(changed_files, totals)}"
+      end
+
+      def template_summary_label(changed_files, outcomes = nil)
+        changed_label = "#{changed_files} file#{"s" unless changed_files == 1} changed"
+        return changed_label unless outcomes
+
+        protected_label = if outcomes.fetch(:checksum_protected).positive?
+          ", #{outcomes.fetch(:checksum_protected)} checksum-protected changes"
+        else
+          ""
+        end
+        "#{outcomes.fetch(:checksum_hits)} checksum hits#{protected_label}, #{outcomes.fetch(:unchanged)} unchanged, #{changed_label}"
+      end
+
       def normalize_lockfiles(member:, runner:, memo:, phase:)
         return unless config.normalize_lockfiles?
 
@@ -2574,6 +2649,22 @@ module Kettle
           command: template_prepare_command(member),
           env: template_prepare_env
         )
+        if recoverable_bundle_failure?(result)
+          recover_template_lockfiles(
+            member: member,
+            runner: runner,
+            memo: memo,
+            phase: "prepare_template_dependencies_recovery"
+          )
+          return false unless memo.last&.ok?
+
+          result = runner.call(
+            member: member,
+            phase: "prepare_template_dependencies",
+            command: template_prepare_command(member),
+            env: template_prepare_env
+          )
+        end
         memo << result
         result.ok?
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kettle-family
 version: !ruby/object:Gem::Version
-  version: 1.2.17
+  version: 1.2.18
 platform: ruby
 authors:
 - Peter H. Boling
@@ -230,7 +230,7 @@ dependencies:
         version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.3
+        version: 3.2.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -240,7 +240,7 @@ dependencies:
         version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.3
+        version: 3.2.4
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
@@ -264,7 +264,7 @@ dependencies:
         version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.7
+        version: 1.0.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -274,7 +274,7 @@ dependencies:
         version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.7
+        version: 1.0.8
 - !ruby/object:Gem::Dependency
   name: gitmoji-regex
   requirement: !ruby/object:Gem::Requirement
@@ -284,7 +284,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.10
+        version: 2.0.11
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -294,7 +294,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.10
+        version: 2.0.11
 description: "\U0001F469‍\U0001F469‍\U0001F467‍\U0001F467 Kettle::Family provides
   scripts and conventions for coordinating related Ruby gems as one family."
 email:
@@ -342,10 +342,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.17
-  changelog_uri: https://github.com/kettle-dev/kettle-family/blob/v1.2.17/CHANGELOG.md
+  source_code_uri: https://github.com/kettle-dev/kettle-family/tree/v1.2.18
+  changelog_uri: https://github.com/kettle-dev/kettle-family/blob/v1.2.18/CHANGELOG.md
   bug_tracker_uri: https://github.com/kettle-dev/kettle-family/issues
-  documentation_uri: https://www.rubydoc.info/gems/kettle-family/1.2.17
+  documentation_uri: https://www.rubydoc.info/gems/kettle-family/1.2.18
   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