kettle-family 1.2.8 → 1.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29d07c7927fc1e4369d1deaf88fe88855c533f1f2794f012a5452705df3c332c
-  data.tar.gz: 24eece688e92ec4253be48cf041d6e97ae3457f3668215dbc1edb82c13160eb0
+  metadata.gz: 474dff47cad0747a8328ad14c08eda3c04ef0fc37d3f078f3c3b3c07a71be282
+  data.tar.gz: 98805c6965950435d49971dba56b44f7f03e0fbc29525fde74df8a6f958051e4
 SHA512:
-  metadata.gz: d47c545b53878e0fa85111529a912263f829293ec111d7d929936d84dde80b9e9504fe123674c3b903bd360ab73d889cc88dbc65a5fd4f9ff07bed50a1f00637
-  data.tar.gz: 7198da5864c986c0e5b8a94b07e67fa5153588fb179f87d073972baa5b51b97f6814d576cc20d1565acaf068a0310c695d3eec06c0264c706fb2802aae345a79
+  metadata.gz: 20db1e16211f9a9ef03facee953930043c19a4a2a5004f5ae0fcabec6bb2bc9bc779dff453ea33d6a4f498ad53c3fe0557ce36a94acec30d05a6ea20c61ab68a
+  data.tar.gz: b4519fa9ce27b70185f1bba643859257f2a639ef0640e4361e77d902c86a51a9194c4d570ef3ba059970b46a74528163d67ed5df4ade5ea83833e7f95bdc4e6a

data/CHANGELOG.md

@@ -30,6 +30,19 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Security
 
+## [1.2.9] - 2026-07-30
+
+- TAG: [v1.2.9][1.2.9t]
+- COVERAGE: 94.00% -- 3698/3934 lines in 27 files
+- BRANCH COVERAGE: 76.24% -- 1409/1848 branches in 27 files
+- 28.01% documented
+
+### Fixed
+
+- Shared-root changelog release phases now run `kettle-changelog` inside the
+  member gem that owns the configured shared version file, while passing the
+  root changelog path explicitly.
+
 ## [1.2.8] - 2026-07-29
 
 - TAG: [v1.2.8][1.2.8t]
@@ -39,6 +52,13 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Fixed
 
+- Monorepo `kettle-family template` now runs local `kettle-jem` through its
+  checked-out `exe/kettle-jem` when `STRUCTUREDMERGE_DEV` points at a local
+  stack, avoiding transient RubyGems executable wrapper failures during highly
+  parallel templating.
+- Deferred monorepo template commits now hold the same shared Git operation lock
+  passed to `kettle-jem`, preventing `.git/index.lock` races with member
+  templating Git preflight checks.
 - `kettle-family bup` and `bupb` now disable family local-path envs even when
   `release.env` already sets those keys to false, avoiding leaked monorepo roots
   such as `STRUCTUREDMERGE_DEV=/path/to/family/root` during bundle updates.
@@ -1306,7 +1326,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.8...HEAD
+[Unreleased]: https://github.com/kettle-dev/kettle-family/compare/v1.2.9...HEAD
+[1.2.9]: https://github.com/kettle-dev/kettle-family/compare/v1.2.8...v1.2.9
+[1.2.9t]: https://github.com/kettle-dev/kettle-family/releases/tag/v1.2.9
 [1.2.8]: https://github.com/kettle-dev/kettle-family/compare/v1.2.7...v1.2.8
 [1.2.8t]: https://github.com/kettle-dev/kettle-family/releases/tag/v1.2.8
 [1.2.7]: https://github.com/kettle-dev/kettle-family/compare/v1.2.6...v1.2.7

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

data/lib/kettle/family/workflow.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "io/console"
+require "fileutils"
 require "json"
 require "net/http"
 require "etc"
@@ -983,14 +984,45 @@ module Kettle
       def append_family_changelog_result(runner:, memo:)
         return unless config.release_family_changelog?
 
+        member = family_changelog_member
         memo << runner.call(
-          member: family_member,
+          member: member,
           phase: "family_changelog",
           command: family_changelog_command,
-          env: release_env.merge(config.changelog_env)
+          env: family_changelog_env
         )
       end
 
+      def family_changelog_member
+        return family_member unless config.shared_changelog?
+
+        version_file = config.changelog_version_file.to_s
+        raise Error, "shared root changelog release requires changelog.version_file" if version_file.empty?
+
+        version_path = File.expand_path(version_file, config.root)
+        member = members.find { |candidate| path_inside?(version_path, candidate.root) }
+        return member if member
+
+        raise Error, "shared root changelog version file #{version_file} is not inside any selected family member"
+      end
+
+      def family_changelog_env
+        env = release_env.merge(config.changelog_env)
+        return env unless config.shared_changelog?
+
+        env.merge(
+          "K_CHANGELOG_GEM_NAME" => config.family_name.to_s,
+          "K_CHANGELOG_PATH" => File.expand_path(config.changelog_path, config.root),
+          "K_CHANGELOG_VERSION_FILE" => File.expand_path(config.changelog_version_file, config.root)
+        )
+      end
+
+      def path_inside?(path, root)
+        expanded_path = File.expand_path(path)
+        expanded_root = File.expand_path(root)
+        expanded_path == expanded_root || expanded_path.start_with?("#{expanded_root}#{File::SEPARATOR}")
+      end
+
       def release_phase
         publish ? "release_publish" : "release_build"
       end
@@ -1327,12 +1359,14 @@ module Kettle
 
       def template_command(member)
         command_text = config.template_command || default_template_command(member)
+        command_text = localize_kettle_jem_template_command(command_text)
         command_text = append_template_family_args(command_text) if kettle_jem_template_command?(command_text)
         append_template_skip_commit(command_text)
       end
 
       def template_prepare_command(member)
         command_text = template_prepare_command_from(config.template_command || default_template_command(member))
+        command_text = localize_kettle_jem_template_command(command_text)
         command_text = append_template_family_args(command_text)
         append_template_skip_commit(command_text)
       end
@@ -1451,7 +1485,47 @@ module Kettle
       end
 
       def kettle_jem_template_command?(command_text)
-        command_text.is_a?(Array) ? command_text.map(&:to_s).include?("kettle-jem") : command_text.to_s.include?("kettle-jem")
+        if command_text.is_a?(Array)
+          command_text.map(&:to_s).any? { |token| token == "kettle-jem" || File.basename(token) == "kettle-jem" }
+        else
+          command_text.to_s.include?("kettle-jem")
+        end
+      end
+
+      def localize_kettle_jem_template_command(command_text)
+        executable = local_kettle_jem_executable
+        return command_text unless executable
+
+        if command_text.is_a?(Array)
+          argv = command_text.map(&:to_s)
+          index = argv.index("kettle-jem")
+          return command_text unless index
+
+          argv[0...index] + [RbConfig.ruby, executable] + argv[(index + 1)..]
+        else
+          command_text.to_s.sub(/\bkettle-jem\b/, "#{Shellwords.escape(RbConfig.ruby)} #{Shellwords.escape(executable)}")
+        end
+      end
+
+      def local_kettle_jem_executable
+        root = template_local_kettle_jem_root
+        return nil unless root
+
+        candidate = File.join(root, "kettle-jem", "exe", "kettle-jem")
+        File.file?(candidate) ? candidate : nil
+      end
+
+      def template_local_kettle_jem_root
+        values = [
+          env_overrides["STRUCTUREDMERGE_DEV"],
+          workflow_family_local_path_env["STRUCTUREDMERGE_DEV"],
+          ENV["STRUCTUREDMERGE_DEV"]
+        ].compact.map(&:to_s).map(&:strip)
+        values.find do |value|
+          !value.empty? &&
+            !%w[false 0 no off].include?(value.downcase) &&
+            File.directory?(File.join(value, "kettle-jem"))
+        end
       end
 
       def append_template_family_args(command_text)
@@ -1903,7 +1977,20 @@ module Kettle
       end
 
       def synchronize_template_commit(&block)
-        @template_commit_mutex.synchronize(&block)
+        @template_commit_mutex.synchronize do
+          lock_path = monorepo_template? ? template_git_commit_lock_path : nil
+          if lock_path
+            FileUtils.mkdir_p(File.dirname(lock_path))
+            File.open(lock_path, File::RDWR | File::CREAT, 0o644) do |lock|
+              lock.flock(File::LOCK_EX)
+              block.call
+            ensure
+              lock&.flock(File::LOCK_UN)
+            end
+          else
+            block.call
+          end
+        end
       end
 
       def template_prepare_env

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kettle-family
 version: !ruby/object:Gem::Version
-  version: 1.2.8
+  version: 1.2.9
 platform: ruby
 authors:
 - Peter H. Boling
@@ -74,7 +74,7 @@ dependencies:
         version: '2.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.10
+        version: 2.5.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -84,7 +84,7 @@ dependencies:
         version: '2.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.10
+        version: 2.5.7
 - !ruby/object:Gem::Dependency
   name: kettle-test
   requirement: !ruby/object:Gem::Requirement
@@ -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.8
-  changelog_uri: https://github.com/kettle-dev/kettle-family/blob/v1.2.8/CHANGELOG.md
+  source_code_uri: https://github.com/kettle-dev/kettle-family/tree/v1.2.9
+  changelog_uri: https://github.com/kettle-dev/kettle-family/blob/v1.2.9/CHANGELOG.md
   bug_tracker_uri: https://github.com/kettle-dev/kettle-family/issues
-  documentation_uri: https://www.rubydoc.info/gems/kettle-family/1.2.8
+  documentation_uri: https://www.rubydoc.info/gems/kettle-family/1.2.9
   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