kettle-family 1.2.0 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aefb679d0cc2bdabed07ed294dfe6a270a2c8739bcb11b80c1eb1a367a8c72c9
-  data.tar.gz: c77c800317e98d86444d28ef032956d57dcfa187cb79a39b622ef266502a5a34
+  metadata.gz: ddcf479118174c5d73c7e38cb2302228892c6839d03f92470f9c10dd6709ec02
+  data.tar.gz: 0ad307c778e0f8d5b717a65fdc4bc9c37c335c9c209a31666b5749dc1405b870
 SHA512:
-  metadata.gz: 77f54999801132c906f45e29b377c088e6459fa4103649a06f4e1679fee57ffa99f43c38d5af5af9dae12c9352ef027e896775c897ba077a28057122f700aa5f
-  data.tar.gz: a213bee6bf3d05686cfe38957c47a8554190283b944037532426097a1d23285c5132a9aef20f71637305aba02421d9761ac5ae0605f8fcd59d43418d673150e8
+  metadata.gz: 3f2342cbfa65d51517bbb7325a743e7b48f40b1c8af410685f61ec0e9e76c747576d8454070835127db94217454372a8ad2c6dbddb48ca21740aab62a6e36290
+  data.tar.gz: 289dd394d9566713f7bc6b1718b944344d353c92b2377bfc588b0045453b1ee3f0af693b75129636d2bfd0cee17585afaeaef2076bb20284b5e7e7dac309123e

data/CHANGELOG.md

@@ -30,6 +30,34 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Security
 
+## [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]
+- COVERAGE: 93.86% -- 3561/3794 lines in 27 files
+- BRANCH COVERAGE: 76.24% -- 1341/1759 branches in 27 files
+- 28.10% documented
+
+### Fixed
+
+- `kettle-family reset Gemfile.lock` now launches `kettle-reset` outside each
+  member bundle, so it can repair lockfiles that reference uninstalled
+  unreleased dependency versions.
+
 ## [1.2.0] - 2026-07-27
 
 - TAG: [v1.2.0][1.2.0t]
@@ -1163,7 +1191,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.0...HEAD
+[Unreleased]: https://github.com/kettle-dev/kettle-family/compare/v1.2.2...HEAD
+[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
 [1.2.0t]: https://github.com/kettle-dev/kettle-family/releases/tag/v1.2.0
 [1.1.9]: https://github.com/kettle-dev/kettle-family/compare/v1.1.8...v1.1.9

data/README.md

@@ -457,9 +457,12 @@ kettle-family reset Gemfile.lock
 kettle-family reset Gemfile.lock --execute
 ```
 
-`reset Gemfile.lock` runs each member's `bundle exec kettle-reset release-lockfiles`
-with configured, inferred, and path-like local `*_DEV`/`*_LOCAL` environment
-variables disabled. The member-level reset rewrites local sibling paths and
+`reset Gemfile.lock` runs each member's `kettle-reset release-lockfiles`
+through an unbundled `bundler/inline` helper, with configured, inferred, and
+path-like local `*_DEV`/`*_LOCAL` environment variables disabled. The helper
+declares its own `kettle-dev` dependency from `https://gem.coop`, so reset can
+repair a member even when its current lockfile is too broken for `bundle exec`
+to materialize. The member-level reset rewrites local sibling paths and
 checksum-less local gem versions back to released registry versions with
 `sha256=` checksums in `Gemfile.lock` and `Appraisal.root.gemfile.lock`.
 Executed family resets fail if the resulting lockfiles still contain sibling
@@ -810,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.790-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
+[🧮kloc-img]: https://img.shields.io/badge/KLOC-3.802-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.0"
+      VERSION = "1.2.2"
     end
     # Current gem version exposed at the traditional constant location.
     VERSION = Version::VERSION # Traditional Constant Location

data/lib/kettle/family/workflow.rb

@@ -5,6 +5,7 @@ require "json"
 require "net/http"
 require "etc"
 require "open3"
+require "rbconfig"
 require "shellwords"
 require "uri"
 require "yaml"
@@ -77,6 +78,23 @@ module Kettle
         "BUNDLE_SILENCE_ROOT_WARNING" => "true",
         "BUNDLE_SUPPRESS_INSTALL_USING_MESSAGES" => "true"
       }.freeze
+      RESET_LOCKFILE_HELPER = <<~RUBY
+        require "bundler/inline"
+
+        source_url = ENV.fetch("KETTLE_FAMILY_RESET_GEM_SOURCE", "https://gem.coop")
+        kettle_dev_version = ENV["KETTLE_FAMILY_RESET_KETTLE_DEV_VERSION"].to_s
+
+        gemfile(true) do
+          source source_url
+          if kettle_dev_version.empty?
+            gem "kettle-dev"
+          else
+            gem "kettle-dev", kettle_dev_version
+          end
+        end
+
+        load Gem.bin_path("kettle-dev", "kettle-reset")
+      RUBY
       REGISTRY_WAIT_ATTEMPTS = 15
       REGISTRY_WAIT_INTERVAL_SECONDS = 15
 
@@ -712,7 +730,27 @@ module Kettle
       end
 
       def reset_gemfile_lock_command(member)
-        ["bundle", "exec", "kettle-reset", "release-lockfiles"]
+        [
+          "env",
+          "-u",
+          "BUNDLE_BIN_PATH",
+          "-u",
+          "BUNDLE_FROZEN",
+          "-u",
+          "BUNDLE_GEMFILE",
+          "-u",
+          "BUNDLER_VERSION",
+          "-u",
+          "RUBYOPT",
+          reset_helper_ruby,
+          "-e",
+          RESET_LOCKFILE_HELPER,
+          "release-lockfiles"
+        ]
+      end
+
+      def reset_helper_ruby
+        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:)
@@ -1267,11 +1305,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")

metadata

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