kettle-family 1.2.1 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 32b1ff960e0e144e10aecb3030c729660728827d69923dd054d923f8e58e8022
-  data.tar.gz: fe44fdcc8270d30c80294ed13464e5289b2182612e9af2d252137d4f08260cb3
+  metadata.gz: b45c2fb44c1bf149f0a2f9cfd25f9c3ff66223a7d83b1afd29a2ca3e34d899e2
+  data.tar.gz: 8b1ec3ef54ac02e16cbd93ede3412d411fd72bd33b69e99885d98152846a724a
 SHA512:
-  metadata.gz: 32b3a41cab5ad9c73ff7ddbea85871fb2ee111db1cc1b2b0af20672b49cd2c29ef0ba8c14e5c1eb9ff07d296f8b3ada17f07236bbca829aa233eed7586396ac5
-  data.tar.gz: eb3c14717ad2c6715653c9749931b3403cc41740ec0b5cb25f7b359febce2d7652e2cd8f2ad793dcf80d5c24ae5d2c3d0765d21113a1648c8377c5a4ea07305b
+  metadata.gz: 18ce32a11fcbb38cbeb32476699256a68e51b45786d91aa1eeb173fb1f2d9ffb9b7fce4009aac9d68e51c6ebadd973d5d63942deede6d939800ea80a0870f9a1
+  data.tar.gz: 3671daa647afe8e2d93c386793a74b64ed0f43984ed580760c5899706c4516d633fe0a47960810e0082f21147fbe27a1129aa27dd7bb0c77ef5378007e05c3b1

data/CHANGELOG.md

@@ -30,6 +30,41 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Security
 
+## [1.2.3] - 2026-07-28
+
+- TAG: [v1.2.3][1.2.3t]
+- COVERAGE: 93.83% -- 3617/3855 lines in 27 files
+- BRANCH COVERAGE: 76.18% -- 1369/1797 branches in 27 files
+- 28.01% documented
+
+### Fixed
+
+- `kettle-family template` now removes Bundler-reported stale CHECKSUMS entries
+  and retries pre-template lockfile normalization, allowing templating to
+  recover from local pre-release checksum drift.
+- `kettle-family template` now includes locked template bootstrap gems such as
+  `nomono` and `kettle-dev` in pre-template lockfile normalization so legacy
+  members can boot current `kettle-jem` preparation before their generated
+  templating gemfiles have been refreshed.
+- `kettle-family template` now uses `bundle install` for pre-template lockfile
+  preparation when a member has no `Gemfile.lock`, instead of running a
+  `bundle update` command before the bundle exists.
+
+## [1.2.2] - 2026-07-28
+
+- TAG: [v1.2.2][1.2.2t]
+- COVERAGE: 93.87% -- 3569/3802 lines in 27 files
+- BRANCH COVERAGE: 76.29% -- 1345/1763 branches in 27 files
+- 28.10% documented
+
+### Fixed
+
+- `kettle-family template` now runs the `kettle-jem prepare` phase through the
+  same member bundle shape as `kettle-jem install`, so local template-stack
+  overrides are honored during preparation.
+- Failed template preparation event streams are now summarized instead of being
+  dumped raw into the final text report.
+
 ## [1.2.1] - 2026-07-28
 
 - TAG: [v1.2.1][1.2.1t]
@@ -1176,7 +1211,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.1...HEAD
+[Unreleased]: https://github.com/kettle-dev/kettle-family/compare/v1.2.3...HEAD
+[1.2.3]: https://github.com/kettle-dev/kettle-family/compare/v1.2.2...v1.2.3
+[1.2.3t]: https://github.com/kettle-dev/kettle-family/releases/tag/v1.2.3
+[1.2.2]: https://github.com/kettle-dev/kettle-family/compare/v1.2.1...v1.2.2
+[1.2.2t]: https://github.com/kettle-dev/kettle-family/releases/tag/v1.2.2
 [1.2.1]: https://github.com/kettle-dev/kettle-family/compare/v1.2.0...v1.2.1
 [1.2.1t]: https://github.com/kettle-dev/kettle-family/releases/tag/v1.2.1
 [1.2.0]: https://github.com/kettle-dev/kettle-family/compare/v1.1.9...v1.2.0

data/README.md

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

@@ -193,7 +193,7 @@ module Kettle
       end
 
       def template_event_stdout?(result)
-        command == "template" && result.phase == "template" && template_events(result.stdout).any?
+        command == "template" && template_events(result.stdout).any?
       end
 
       def release_event_stdout?(result)

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

data/lib/kettle/family/workflow.rb

@@ -53,6 +53,7 @@ module Kettle
         ],
         "bupb" => %w[bundle update --bundler]
       }.freeze
+      PRE_TEMPLATE_BOOTSTRAP_GEMS = %w[nomono kettle-dev].freeze
       GIT_SYNC_COMMANDS = {
         "push" => [["push", %w[git push]]],
         "pull" => [["pull", %w[git pull --rebase]]],
@@ -1305,11 +1306,24 @@ module Kettle
       end
 
       def template_prepare_command(member)
-        command_text = "kettle-jem prepare"
+        command_text = template_prepare_command_from(config.template_command || default_template_command(member))
         command_text = append_template_family_args(command_text)
         append_template_skip_commit(command_text)
       end
 
+      def template_prepare_command_from(command_text)
+        if command_text.is_a?(Array)
+          argv = command_text.map(&:to_s)
+          index = argv.index("install")
+          return argv unless index
+
+          argv[index] = "prepare"
+          argv
+        else
+          command_text.to_s.sub(/\bkettle-jem\s+install\b/, "kettle-jem prepare")
+        end
+      end
+
       def append_template_skip_commit(command_text)
         return command_text if commit
         return command_text if command_text.is_a?(Array) && command_text.include?("--skip-commit")
@@ -1718,12 +1732,102 @@ module Kettle
         result = runner.call(
           member: member,
           phase: phase,
-          command: config.normalize_lockfiles_command,
+          command: normalize_lockfiles_command(member: member, phase: phase),
           env: workflow_env
         )
+        if template_prepare_lockfiles_phase?(phase) && repair_checksum_mismatches(member, result)
+          result = runner.call(
+            member: member,
+            phase: phase,
+            command: normalize_lockfiles_command(member: member, phase: phase),
+            env: workflow_env
+          )
+        end
         memo << result
       end
 
+      def normalize_lockfiles_command(member:, phase:)
+        configured = config.normalize_lockfiles_command
+        return configured unless template_prepare_lockfiles_phase?(phase)
+        return %w[bundle install] if bundle_update_command?(configured) && !File.file?(File.join(member.root, "Gemfile.lock"))
+
+        PRE_TEMPLATE_BOOTSTRAP_GEMS.select { |gem_name| member_lockfile_contains_gem?(member, gem_name) }.reduce(configured) do |command_text, gem_name|
+          append_command_arg(command_text, gem_name)
+        end
+      end
+
+      def bundle_update_command?(command_text)
+        argv = command_text.is_a?(Array) ? command_text.map(&:to_s) : Shellwords.split(command_text.to_s)
+        bundle_index = argv.index("bundle")
+        bundle_index && argv[bundle_index + 1] == "update"
+      rescue ArgumentError
+        false
+      end
+
+      def append_command_arg(command_text, arg)
+        return command_text if normalize_command_includes_arg?(command_text, arg)
+
+        argv = command_text.is_a?(Array) ? command_text.map(&:to_s) : Shellwords.split(command_text.to_s)
+        update_index = argv.index("update")
+        if update_index
+          option_index = argv[(update_index + 1)..]&.index { |token| token.start_with?("-") }
+          insert_index = option_index ? update_index + 1 + option_index : argv.length
+          argv.insert(insert_index, arg)
+        else
+          argv << arg
+        end
+        return argv if command_text.is_a?(Array)
+
+        argv.shelljoin
+      rescue ArgumentError
+        "#{command_text} #{Shellwords.escape(arg)}"
+      end
+
+      def normalize_command_includes_arg?(command_text, arg)
+        argv = if command_text.is_a?(Array)
+          command_text.map(&:to_s)
+        else
+          Shellwords.split(command_text.to_s)
+        end
+        argv.include?(arg)
+      rescue ArgumentError
+        false
+      end
+
+      def member_lockfile_contains_gem?(member, gem_name)
+        lockfile = File.join(member.root, "Gemfile.lock")
+        return false unless File.file?(lockfile)
+
+        File.readlines(lockfile).any? { |line| line.match?(/\A    #{Regexp.escape(gem_name)} \(/) }
+      end
+
+      def template_prepare_lockfiles_phase?(phase)
+        command == "template" && phase == "prepare_lockfiles"
+      end
+
+      def repair_checksum_mismatches(member, result)
+        return false unless execute
+        return false if result.ok?
+
+        line_numbers = checksum_mismatch_lockfile_lines(result.stderr)
+        return false if line_numbers.empty?
+
+        lockfile = File.join(member.root, "Gemfile.lock")
+        return false unless File.file?(lockfile)
+
+        lines = File.readlines(lockfile)
+        line_numbers.sort.reverse_each do |line_number|
+          index = line_number - 1
+          lines.delete_at(index) if index >= 0 && index < lines.length
+        end
+        File.write(lockfile, lines.join)
+        true
+      end
+
+      def checksum_mismatch_lockfile_lines(output)
+        output.to_s.scan(/from the lockfile CHECKSUMS at Gemfile\.lock:(\d+):\d+/).flatten.map(&:to_i).uniq
+      end
+
       def prepare_template_dependencies(member:, runner:, memo:)
         command_text = config.template_command || default_template_command(member)
         return true unless kettle_jem_template_command?(command_text)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kettle-family
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.3
 platform: ruby
 authors:
 - Peter H. Boling
@@ -341,10 +341,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.1
-  changelog_uri: https://github.com/kettle-dev/kettle-family/blob/v1.2.1/CHANGELOG.md
+  source_code_uri: https://github.com/kettle-dev/kettle-family/tree/v1.2.3
+  changelog_uri: https://github.com/kettle-dev/kettle-family/blob/v1.2.3/CHANGELOG.md
   bug_tracker_uri: https://github.com/kettle-dev/kettle-family/issues
-  documentation_uri: https://www.rubydoc.info/gems/kettle-family/1.2.1
+  documentation_uri: https://www.rubydoc.info/gems/kettle-family/1.2.3
   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