kettle-family 1.2.16 → 1.2.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b8259b472f99ca594e7956ac519a565fc7aa0fbab0ac70c27f04e23859aff81
-  data.tar.gz: a07e5341f564dff2585318124c8967f20bda0fff30367d267ddcba6a4a758814
+  metadata.gz: cb71df81d320a71ba34e6f2f09233f8a02a59f84f266c3e55e92acbe6c35cae1
+  data.tar.gz: 0dd9fa2f1ef0f3ec59f4bbee09992245b03dc4fb8f991807d5b8eac70a817c3b
 SHA512:
-  metadata.gz: 9b9cc51b230513a0c2e68429525ec18536079e9bbfd380add869fb141fa030d234a6a1768dfe80a5b54b73889b8272e730fc50594dae66bdc775d887415792fe
-  data.tar.gz: ae21a58c95d2b3300fdf9c4b1f8c45b1698c32602038f2afcff5d836fa21949734acfdc525fe96d7aec05af080e1d1c80d81b498ffc51800d42f9c52e93fe681
+  metadata.gz: 2b81c2dc8313b89e2777a60fddadd2d459c8db4c5ba723f26aedb66eebec1d6e6fa91a7d4ebc57d9e040a87d1703b5cdb86758b256fb76e8e9621c999d1eeb19
+  data.tar.gz: afe0839807601723753b1e5c78849648a2af65bf19ee13b9a2fbe50e1e3e11d4980e5ed82a9d214f1bdddfacf299e1483c9c8d30884bb1daeb5406abbfeda5d1

data/CHANGELOG.md

@@ -30,6 +30,21 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Security
 
+## [1.2.17] - 2026-07-31
+
+- TAG: [v1.2.17][1.2.17t]
+- COVERAGE: 94.10% -- 4225/4490 lines in 28 files
+- BRANCH COVERAGE: 76.58% -- 1658/2165 branches in 28 files
+- 28.88% documented
+
+### Fixed
+
+- Template branch-target workflows now recover a sole locally sourced
+  `Gemfile.lock` with the existing release-safe reset helper before checkout,
+  and retry a failed Bundler lock normalization once after recovery.
+- Checksum-aware template lock normalization now upgrades Bundler and retries
+  once when the active Bundler rejects `--add-checksums`.
+
 ## [1.2.16] - 2026-07-31
 
 - TAG: [v1.2.16][1.2.16t]
@@ -1525,7 +1540,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.16...HEAD
+[Unreleased]: https://github.com/kettle-dev/kettle-family/compare/v1.2.17...HEAD
+[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
 [1.2.16t]: https://github.com/kettle-dev/kettle-family/releases/tag/v1.2.16
 [1.2.15]: https://github.com/kettle-dev/kettle-family/compare/v1.2.14...v1.2.15

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

@@ -5,7 +5,7 @@ module Kettle
     # Version namespace for this gem.
     module Version
       # Current gem version.
-      VERSION = "1.2.16"
+      VERSION = "1.2.17"
     end
     # Current gem version exposed at the traditional constant location.
     VERSION = Version::VERSION # Traditional Constant Location

data/lib/kettle/family/workflow.rb

@@ -151,13 +151,13 @@ module Kettle
         end
 
         preflight = branch_checkout_dirty_preflight_results
-        return preflight unless preflight.empty?
+        return preflight if preflight.any? { |result| !result.ok? }
 
         prompt_for_gem_signing_password if command == "release" && execute && release_signing_prompt_required?
-        return branch_target_results unless config.release_target_branches.empty?
-        return member_local_branch_target_results if member_local_branch_targets?
+        return preflight + branch_target_results unless config.release_target_branches.empty?
+        return preflight + member_local_branch_target_results if member_local_branch_targets?
 
-        current_branch_results(members)
+        preflight + current_branch_results(members)
       end
 
       private
@@ -509,14 +509,26 @@ module Kettle
         return [] if allow_dirty
         return [] unless branch_checkout_preflight_required?
 
-        branch_checkout_preflight_members.filter_map do |member|
+        branch_checkout_preflight_members.each_with_object([]) do |member, results|
           dirty_paths = GitStatus.dirty_paths(member.root)
           next if dirty_paths.empty?
 
-          branch_checkout_dirty_result(member, dirty_paths)
+          if recoverable_template_lockfile_dirt?(member, dirty_paths)
+            recover_template_lockfiles(member: member, runner: command_runner, memo: results, phase: "template_lockfile_recovery")
+            next if results.last&.ok? && GitStatus.dirty_paths(member.root).empty?
+          end
+
+          results << branch_checkout_dirty_result(member, GitStatus.dirty_paths(member.root))
         end
       end
 
+      def recoverable_template_lockfile_dirt?(member, 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)
+      end
+
       def branch_checkout_preflight_required?
         !config.release_target_branches.empty? || member_local_branch_targets?
       end
@@ -1061,17 +1073,17 @@ module Kettle
         path.to_s
       end
 
-      def reset_gemfile_lock(member:, runner:, memo:)
+      def reset_gemfile_lock(member:, runner:, memo:, phase: "reset_gemfile_lock", env: release_lockfile_env(member))
         result = runner.call(
           member: member,
-          phase: "reset_gemfile_lock",
+          phase: phase,
           command: reset_gemfile_lock_command(member),
-          env: release_lockfile_env(member)
+          env: env
         )
         memo << result
         return unless result.ok? && execute
 
-        validate_reset_gemfile_lock(member: member, memo: memo)
+        validate_reset_gemfile_lock(member: member, memo: memo, phase: phase)
       end
 
       def reset_gemfile_lock_command(member)
@@ -1098,13 +1110,13 @@ module Kettle
         env_overrides["KETTLE_FAMILY_RESET_RUBY"].to_s.empty? ? RbConfig.ruby : env_overrides["KETTLE_FAMILY_RESET_RUBY"].to_s
       end
 
-      def validate_reset_gemfile_lock(member:, memo:)
+      def validate_reset_gemfile_lock(member:, memo:, phase: "reset_gemfile_lock")
         diagnostics = reset_gemfile_lock_diagnostics(member)
         return if diagnostics.empty?
 
         memo << CommandResult.new(
           member.name,
-          "reset_gemfile_lock_readiness",
+          "#{phase}_readiness",
           ["internal", "validate", "Gemfile.lock"],
           member.root,
           1,
@@ -2399,9 +2411,73 @@ module Kettle
             env: workflow_env
           )
         end
+        if checksum_option_unsupported?(result)
+          recovery = runner.call(
+            member: member,
+            phase: "#{phase}_bundler_recovery",
+            command: %w[bundle update --bundler],
+            env: workflow_env
+          )
+          memo << recovery
+          return unless recovery.ok?
+
+          result = runner.call(
+            member: member,
+            phase: phase,
+            command: normalize_lockfiles_command(member: member, phase: phase),
+            env: workflow_env
+          )
+        end
+        if template_lockfile_phase?(phase) && recoverable_bundle_failure?(result)
+          recover_template_lockfiles(member: member, runner: runner, memo: memo, phase: "#{phase}_recovery")
+          return unless memo.last&.ok?
+
+          result = runner.call(
+            member: member,
+            phase: phase,
+            command: normalize_lockfiles_command(member: member, phase: phase),
+            env: workflow_env
+          )
+        end
         memo << result
       end
 
+      def recover_template_lockfiles(member:, runner:, memo:, phase:)
+        reset_gemfile_lock(
+          member: member,
+          runner: runner,
+          memo: memo,
+          phase: phase,
+          env: template_lockfile_recovery_env(member)
+        )
+        return unless memo.last&.ok?
+
+        commit_normalized_lockfiles(
+          branch_members: [member],
+          runner: runner,
+          memo: memo,
+          reason: "reset",
+          force: true
+        )
+      end
+
+      def recoverable_bundle_failure?(result)
+        return false unless execute && !result.ok?
+
+        output = [result.stdout, result.stderr].join("\n")
+        output.match?(/Bundler::(?:GemNotFound|VersionConflict)|Could not (?:find|resolve) |already activated .* but your Gemfile requires/)
+      end
+
+      def checksum_option_unsupported?(result)
+        return false unless execute && !result.ok?
+
+        [result.stdout, result.stderr].join("\n").match?(/Unknown switches? .*--add-checksums/)
+      end
+
+      def template_lockfile_recovery_env(member)
+        release_lockfile_env(member).merge("K_JEM_TEMPLATING" => "false")
+      end
+
       def normalize_lockfiles_command(member:, phase:)
         configured = config.normalize_lockfiles_command
         return configured unless template_prepare_lockfiles_phase?(phase)
@@ -2461,6 +2537,10 @@ module Kettle
         command == "template" && phase == "prepare_lockfiles"
       end
 
+      def template_lockfile_phase?(phase)
+        command == "template" && %w[prepare_lockfiles normalize_lockfiles].include?(phase)
+      end
+
       def repair_checksum_mismatches(member, result)
         return false unless execute
         return false if result.ok?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kettle-family
 version: !ruby/object:Gem::Version
-  version: 1.2.16
+  version: 1.2.17
 platform: ruby
 authors:
 - Peter H. Boling
@@ -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.16
-  changelog_uri: https://github.com/kettle-dev/kettle-family/blob/v1.2.16/CHANGELOG.md
+  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
   bug_tracker_uri: https://github.com/kettle-dev/kettle-family/issues
-  documentation_uri: https://www.rubydoc.info/gems/kettle-family/1.2.16
+  documentation_uri: https://www.rubydoc.info/gems/kettle-family/1.2.17
   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