kettle-family 1.2.4 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da7381b4cfaa486889d244554f6b1fda061e61a0425f0c9bcb6d16d1e0193618
-  data.tar.gz: 57d3827d32081abf403728035aed2b58c2aba097ee726b5ddf2de87cc3f3982e
+  metadata.gz: 87022fba999d5343044afcf1c679be7b53f49648ce71ff7aebfe29044ee6064a
+  data.tar.gz: 775df5e0ce6843e9013fbe7a4cc17ea2608322aae8139f9116f51a456051a5b8
 SHA512:
-  metadata.gz: 8dd7fd4a57106d5dd7b542e619d36fb8de0cdebbcd4678be1cf1257b69b046c1743ec8b52cb32eb5f13b7a802c71fc08e0df7233f7c7c6ea180bf0fed9c6b945
-  data.tar.gz: 8f691261815c402a0d2264778b39b8effd298850502c6e12bd2a68b05ac2bbe35185e8a2bd856997136b27c507a1c5318065d1efd4271e8de349a997c7d1a592
+  metadata.gz: 258275ea92c47f043220780188c6967427e700bf66f7e8675700ac39d4ffb4a7da775a809a587babfa839f32778bc81e4b525f2f33f839648cf11be1be1b239c
+  data.tar.gz: ec9fd4d7a541edd9f82b4bb9e57510563f264b5893734814c27a6eae24f3af4ca05fbd80baa1986de388ab6a4b83daa4bbfafae3117bf748693fe50a2261a2d3

data/CHANGELOG.md

@@ -30,6 +30,31 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Security
 
+## [1.2.6] - 2026-07-29
+
+- TAG: [v1.2.6][1.2.6t]
+- COVERAGE: 94.00% -- 3649/3882 lines in 27 files
+- BRANCH COVERAGE: 76.43% -- 1391/1820 branches in 27 files
+- 28.01% documented
+
+## [1.2.5] - 2026-07-29
+
+- TAG: [v1.2.5][1.2.5t]
+- COVERAGE: 94.00% -- 3649/3882 lines in 27 files
+- BRANCH COVERAGE: 76.43% -- 1391/1820 branches in 27 files
+- 28.01% documented
+
+### Fixed
+
+- `kettle-family template` now defers `kettle-jem` bootstrap commits for
+  executed monorepo templating and runs a serialized member-scoped
+  `commit_template` phase, avoiding parallel `.git/index.lock` races when many
+  members share one Git repository.
+
+- kettle-jem-template-20260730-001 - Gemspec package file enumeration now runs
+  relative to the gemspec directory, so packaged template assets are included
+  even when the gemspec is loaded from another working directory.
+
 ## [1.2.4] - 2026-07-29
 
 - TAG: [v1.2.4][1.2.4t]
@@ -1251,7 +1276,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.4...HEAD
+[Unreleased]: https://github.com/kettle-dev/kettle-family/compare/v1.2.6...HEAD
+[1.2.6]: https://github.com/kettle-dev/kettle-family/compare/v1.2.5...v1.2.6
+[1.2.6t]: https://github.com/kettle-dev/kettle-family/releases/tag/v1.2.6
+[1.2.5]: https://github.com/kettle-dev/kettle-family/compare/v1.2.4...v1.2.5
+[1.2.5t]: https://github.com/kettle-dev/kettle-family/releases/tag/v1.2.5
 [1.2.4]: https://github.com/kettle-dev/kettle-family/compare/v1.2.3...v1.2.4
 [1.2.4t]: https://github.com/kettle-dev/kettle-family/releases/tag/v1.2.4
 [1.2.3]: https://github.com/kettle-dev/kettle-family/compare/v1.2.2...v1.2.3

data/README.md

@@ -814,7 +814,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.864-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
+[🧮kloc-img]: https://img.shields.io/badge/KLOC-3.882-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.4"
+      VERSION = "1.2.6"
     end
     # Current gem version exposed at the traditional constant location.
     VERSION = Version::VERSION # Traditional Constant Location

data/lib/kettle/family/workflow.rb

@@ -132,6 +132,7 @@ module Kettle
         @bex_args = bex_args
         @start_member = start_member
         @start_branch = start_branch
+        @template_commit_mutex = Mutex.new
       end
 
       def results
@@ -265,6 +266,8 @@ module Kettle
 
           normalize_lockfiles(member: member, runner: runner, memo: memo, phase: "normalize_lockfiles")
           emit_member_result_progress(member, memo.last, progress: progress)
+          commit_template_changes(member: member, runner: runner, memo: memo)
+          emit_member_result_progress(member, memo.last, progress: progress) if memo.last&.phase == "commit_template"
         ensure
           template_result = memo.find { |result| result.phase == "template" } || memo.last
           if template_result
@@ -1348,7 +1351,7 @@ module Kettle
       end
 
       def append_template_skip_commit(command_text)
-        return command_text if commit
+        return command_text unless template_skip_commit?(command_text)
         return command_text if command_text.is_a?(Array) && command_text.include?("--skip-commit")
         return [*command_text, "--skip-commit"] if command_text.is_a?(Array)
         return command_text if command_text.include?("--skip-commit")
@@ -1356,6 +1359,15 @@ module Kettle
         "#{command_text} --skip-commit"
       end
 
+      def template_skip_commit?(command_text)
+        !commit || deferred_monorepo_template_commit?(command_text: command_text)
+      end
+
+      def deferred_monorepo_template_commit?(member = nil, command_text: nil)
+        command_text ||= config.template_command || (member ? default_template_command(member) : DEFAULT_COMMANDS.fetch("template"))
+        execute && commit && monorepo_template? && kettle_jem_template_command?(command_text)
+      end
+
       def default_template_command(member)
         return DEFAULT_COMMANDS.fetch("template") if templating_bundle_wired?(member)
 
@@ -1481,6 +1493,7 @@ module Kettle
         total = 1
         total += 2 if config.normalize_lockfiles?
         total += 1 if member.nil? || template_prepares_dependencies?(member)
+        total += 1 if deferred_monorepo_template_commit?(member)
         total
       end
 
@@ -1865,6 +1878,34 @@ module Kettle
         result.ok?
       end
 
+      def commit_template_changes(member:, runner:, memo:)
+        return unless deferred_monorepo_template_commit?(member)
+        return unless memo.all?(&:ok?)
+
+        synchronize_template_commit do
+          memo << runner.call(
+            member: member,
+            phase: "commit_template",
+            command: [
+              "sh",
+              "-lc",
+              "if [ -n \"$(git status --porcelain -- .)\" ]; then " \
+                "git add -A -- . && git commit -m #{Shellwords.escape(template_commit_message(member))}; " \
+                "fi"
+            ],
+            env: workflow_env
+          )
+        end
+      end
+
+      def template_commit_message(member)
+        "🎨 Template #{member.name} by kettle-family"
+      end
+
+      def synchronize_template_commit(&block)
+        @template_commit_mutex.synchronize(&block)
+      end
+
       def template_prepare_env
         env = workflow_env
         family_env_name = config.family_local_path_env_name

metadata

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