kettle-family 1.2.22 → 1.2.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8352dd3e0095e5bdec1437a5e0098a50e375f64362ffa592aa01aa056d48172b
-  data.tar.gz: 947519ebac1a4a0ad9c468efd5defaaddcec2feabdaff037e3470e3c19a0cc2c
+  metadata.gz: c7444a3d6ecfad0866aae1d481043a9daebb360a185d628ffff7250dc46d8cf4
+  data.tar.gz: dbfa71d55c722830254b219d60b98e330918fc853e5d76f026c90e1b6929d971
 SHA512:
-  metadata.gz: bd6b1cf2bbef2d4cabdcb2c8fadaf2a71c4437b1fbef55c5d2ae716997dc69276ac1dd3cc95a2d8b457a5599754169f7d004bbe38ba52c2afdbae3b41e04d5b9
-  data.tar.gz: 2e6ea899f8012f72619f58fb1cefb1495511b8a3252d5e7c8be57c1f204ed92b55439e1d0c10278b57f4793bab8043d572ba38eed9b7b0b1f218f6468ab54997
+  metadata.gz: a10e4a4db9fe4bc4769c45757a93767286b19de7657b09b4e6cac32877510f5a46342c9a566dd35776d3ed26ac91e4b7c688deaf646107e8d162873331ed64de
+  data.tar.gz: dbb1cab4664586a13210038ac5e48a8fb8be2b7e5ec6022cc516f40f58da2c9587c7f3d884b6acc31c7afd89fc01b4b1e9d15b8296bff2986e037b9d5474f6c7

data/CHANGELOG.md

@@ -30,6 +30,36 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Security
 
+## [1.2.23] - 2026-08-02
+
+- TAG: [v1.2.23][1.2.23t]
+- COVERAGE: 93.91% -- 4658/4960 lines in 31 files
+- BRANCH COVERAGE: 76.23% -- 1822/2390 branches in 31 files
+- 29.31% documented
+
+### Changed
+
+- Budget kettle-jem template workers across concurrent family members.
+
+### Fixed
+
+- Remove trailing blank lines when retiring legacy appraisal source declarations during templating.
+
+- Allow direct --only member selections to proceed when unrelated member Gemfiles are temporarily unparsable.
+
+- kettle-jem-template-20260802-001 - Devcontainer JSON files now merge as JSONC,
+  preserving comments and trailing commas during template updates.
+
+- Preserve the completed generated kettle-jem lockfile when restoring an autostash conflicts only on that file.
+
+- Mise-managed template members now retain PATH when launching nested Bundler commands.
+
+- Local kettle-jem template commands now bypass login-shell PATH resets.
+
+- Nested Bundler commands now retain the active Ruby executable paths during autostashed templating.
+
+- Autostashed mise configuration remains available while templating runs.
+
 ## [1.2.22] - 2026-08-01
 
 - TAG: [v1.2.22][1.2.22t]
@@ -440,10 +470,6 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Added
 
-- kettle-jem-template-20260729-005 - Gemspec metadata now publishes this
-  project's RubyForum tag as `mailing_list_uri`, and support docs link to the
-  tagged RubyForum community alongside Discord.
-
 ### Fixed
 
 - Family release changelog phases now pass `--yes` to configured
@@ -451,25 +477,16 @@ Please file a bug if you notice a violation of semantic versioning.
   behavior and keeping publish runs non-interactive unless `--no-accept` is
   used.
 
-- kettle-jem-template-20260728-003 - Generated dep-heads workflows now run
-  TruffleRuby jobs with current RubyGems and Bundler, avoiding setup failures
-  before the test suite starts.
 - kettle-jem-template-20260728-004 - Generated dep-heads workflows now use the
   setup-ruby Bundler install path for direct appraisal Gemfiles, avoiding rv
   lockfile parser failures on Git and path dependencies.
 - kettle-jem-template-20260728-005 - VersionGem bootstrap now creates the
   missing canonical version spec when a project only has shim namespace version
   specs.
-- kettle-jem-template-20260729-001 - Generated JRuby 9.4 workflows now use the
-  legacy manual bundle install path, avoiding setup-time Bundler full-index
-  failures against `gem.coop`.
 - kettle-jem-template-20260729-002 - VersionGem bootstrap now preserves
   and templates dedicated `version_gem.rb` entrypoints even when the gemspec
   dependency is intentionally omitted, and generated anonymous-loader specs
   cover both `version.rb` and `version_gem.rb`.
-- kettle-jem-template-20260729-003 - Old-Ruby gems below the VersionGem runtime
-  floor now get managed minimal `version.rb` files and anonymous-loader version
-  specs without adding `version_gem`.
 
 ## [1.2.3] - 2026-07-28
 
@@ -691,11 +708,6 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Changed
 
-- kettle-jem-template-20260725-001 - Generated JRuby and TruffleRuby workflow
-  files now run when pull request head branches start with `feature/release`,
-  so release CI monitoring does not report intentionally skipped engine
-  workflows as failures.
-
 ## [1.1.5] - 2026-07-25
 
 - TAG: [v1.1.5][1.1.5t]
@@ -879,8 +891,6 @@ Please file a bug if you notice a violation of semantic versioning.
 
 - `kettle-family release-state` now reports the checked-out branch and displays
   release distance as local/remote ahead and behind counts.
-- kettle-jem-template-20260720-001 - Generated READMEs can now render
-  template-managed corporate sponsor logos from project or family config.
 - kettle-jem-template-20260720-002 - Generated development Gemfiles now use the
   released `tree_sitter_language_pack` gem 1.13.3 or newer by default.
 - kettle-jem-template-20260720-003 - Generated StructuredMerge Git diff driver
@@ -967,8 +977,6 @@ Please file a bug if you notice a violation of semantic versioning.
   the next `kettle-jem` release depends on unreleased `kettle-family` fixes.
 - Raised the runtime Ruby floor to 4.0.0.
 
-- kettle-jem-template-20260716-001 - Shim gemspec manifests now include
-  `LICENSE.md` instead of nonexistent `LICENSE.txt`.
 - kettle-jem-template-20260716-002 - Generated gemspec manifests now ship fewer
   repository-only files by default to reduce downstream distro packaging churn.
 
@@ -1652,7 +1660,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.22...HEAD
+[Unreleased]: https://github.com/kettle-dev/kettle-family/compare/v1.2.23...HEAD
+[1.2.23]: https://github.com/kettle-dev/kettle-family/compare/v1.2.22...v1.2.23
+[1.2.23t]: https://github.com/kettle-dev/kettle-family/releases/tag/v1.2.23
 [1.2.22]: https://github.com/kettle-dev/kettle-family/compare/v1.2.21...v1.2.22
 [1.2.22t]: https://github.com/kettle-dev/kettle-family/releases/tag/v1.2.22
 [1.2.21]: https://github.com/kettle-dev/kettle-family/compare/v1.2.20...v1.2.21

data/README.md

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

@@ -69,9 +69,22 @@ module Kettle
         line_start = source.rindex("\n", node.location.start_offset - 1).to_i + 1
         line_end = source.index("\n", node.location.end_offset) || source.length
         line_end += 1 if line_end < source.length
+        if final_standalone_call?(source, node, line_start, line_end)
+          # Remove the preceding separator and normalize EOF when the retired
+          # declaration is the final standalone line in the file.
+          line_start = source[0...line_start].rstrip.length
+          return Kettle::Dev::VersionBump.file_edit(path, source, line_start, source.length, "\n")
+        end
+
         Kettle::Dev::VersionBump.file_edit(path, source, line_start, line_end, "")
       end
 
+      def final_standalone_call?(source, node, line_start, line_end)
+        source[line_start...node.location.start_offset].to_s.strip.empty? &&
+          source[node.location.end_offset...line_end].to_s.strip.empty? &&
+          source[line_end..].to_s.strip.empty?
+      end
+
       def legacy_appraisal_call?(node)
         return false unless node.is_a?(Prism::CallNode) && node.name == :gem
 

data/lib/kettle/family/cli.rb

@@ -625,7 +625,11 @@ module Kettle
       def build_report(command, options)
         config = Config.load(root: options[:root], path: options[:config])
         start_at = parse_start_at(options[:start_at])
-        discovery = Discovery.new(config: config)
+        effective_only = default_only_filter(command: command, only: options[:only])
+        discovery = Discovery.new(
+          config: config,
+          release_dependency_member_names: direct_member_only_names(effective_only)
+        )
         members = discovery.members
         ordered = if command == "install"
           install_order(members, config)
@@ -634,7 +638,6 @@ module Kettle
         else
           Orderer.new(members: members, mode: config.order_mode, hints: config.order_hints).ordered
         end
-        effective_only = default_only_filter(command: command, only: options[:only])
         release_state_results = release_state_results_for_selection(config: config, members: ordered, only: effective_only)
         selected = Selection.new(members: ordered, release_state_results: release_state_results).apply(only: effective_only, exclude: options[:exclude], start_at: start_at.member)
         result_members = selected
@@ -683,6 +686,13 @@ module Kettle
         only
       end
 
+      def direct_member_only_names(only)
+        names = only.to_s.split(",").map(&:strip).reject(&:empty?)
+        return nil if names.empty? || names.any? { |name| Selection.status_token?(name) }
+
+        names
+      end
+
       def command_results_for_current_branch(command:, config:, members:, options:, start_at: StartAt.new(nil, nil))
         return mise_trust_results(config: config, members: members) if command == "mise-trust"
         return bump_version_results(members: members, options: options, phase: command) if %w[bump bump-version].include?(command)

data/lib/kettle/family/command_runner.rb

@@ -586,6 +586,15 @@ module Kettle
 
       def process_env(member:, env:)
         base_env = unbundled_process_env
+        # Bundler's unbundled environment intentionally omits activation
+        # variables, but it may also omit PATH. When `unsetenv_others` is used
+        # for mise-managed members, dropping PATH makes nested commands such
+        # as `bundle` unresolvable inside kettle-jem.
+        base_env["PATH"] = if base_env.key?("PATH")
+          executable_path(base_env["PATH"])
+        else
+          ENV["PATH"]
+        end
         return base_env.merge(env) unless mise_configured?(member)
 
         base_env.merge(sensitive_env(env))
@@ -603,6 +612,11 @@ module Kettle
         SENSITIVE_ENV_KEYS.include?(key.to_s)
       end
 
+      def executable_path(path)
+        paths = [Gem.bindir, File.dirname(RbConfig.ruby), path, ENV["PATH"]]
+        paths.compact.map(&:to_s).flat_map { |value| value.split(File::PATH_SEPARATOR) }.reject(&:empty?).uniq.join(File::PATH_SEPARATOR)
+      end
+
       def unbundled_process_env
         return Bundler.original_env if defined?(Bundler) && Bundler.respond_to?(:original_env)
         return Bundler.unbundled_env if defined?(Bundler) && Bundler.respond_to?(:unbundled_env)

data/lib/kettle/family/discovery.rb

@@ -5,8 +5,9 @@ require "open3"
 module Kettle
   module Family
     class Discovery
-      def initialize(config:)
+      def initialize(config:, release_dependency_member_names: nil)
         @config = config
+        @release_dependency_member_names = release_dependency_member_names&.map(&:to_s)
         @warnings = []
       end
 
@@ -18,7 +19,7 @@ module Kettle
 
       private
 
-      attr_reader :config
+      attr_reader :config, :release_dependency_member_names
 
       def build_members
         @warnings = []
@@ -51,11 +52,15 @@ module Kettle
       end
 
       def configured_root_members
-        config.configured_member_roots.map { |root| member_from_gemspec(primary_gemspec(root)) }
+        config.configured_member_roots
+          .select { |root| selected_configured_root?(root) }
+          .map { |root| member_from_gemspec(primary_gemspec(root)) }
       end
 
       def explicit_members
-        config.explicit_members.map do |entry|
+        config.explicit_members.filter_map do |entry|
+          next unless selected_configured_root?(entry.fetch("root"))
+
           gemspec_path = if entry["gemspec"]
             File.expand_path(entry["gemspec"], entry.fetch("root"))
           else
@@ -65,6 +70,12 @@ module Kettle
         end
       end
 
+      def selected_configured_root?(root)
+        return true if release_dependency_member_names.nil?
+
+        release_dependency_member_names.include?(File.basename(File.expand_path(root)))
+      end
+
       def primary_gemspec(root)
         gemspecs = Dir.glob(File.join(root, "*.gemspec"))
         raise Error, "no gemspec found in #{root}" if gemspecs.empty?
@@ -104,18 +115,23 @@ module Kettle
           version_file: version_file(root, spec.name),
           version: spec.version.to_s,
           dependencies: dependencies,
-          release_dependencies: release_dependencies(root: root, spec: spec, dependencies: dependencies),
+          release_dependencies: release_dependencies(
+            root: root,
+            spec: spec,
+            dependencies: dependencies,
+            include_gemfile_dependencies: release_dependency_member_names.nil? || release_dependency_member_names.include?(spec.name)
+          ),
           required_ruby_version: required_ruby_version(spec),
           licenses: licenses(spec),
           authors: authors(spec)
         )
       end
 
-      def release_dependencies(root:, spec:, dependencies:)
+      def release_dependencies(root:, spec:, dependencies:, include_gemfile_dependencies:)
         (
           dependencies +
           spec.development_dependencies.map(&:name) +
-          gemfile_dependencies(root)
+          (include_gemfile_dependencies ? gemfile_dependencies(root) : [])
         ).uniq.sort
       end
 

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

data/lib/kettle/family/workflow.rb

@@ -237,22 +237,25 @@ module Kettle
             phase: "template_autostash_restore",
             command: ["git", "stash", "pop", stash.fetch(:ref)]
           )
-          next restore if restore.ok? || !template_lockfile_only_conflict?(stash.fetch(:member))
+          next restore if restore.ok? || !template_generated_lockfile_only_conflict?(stash.fetch(:member))
 
           runner.call(
             member: stash.fetch(:member),
-            phase: "template_autostash_lockfile_recovery",
+            phase: "template_autostash_generated_lockfile_recovery",
             command: [
               "sh", "-lc",
-              "git checkout --ours -- Gemfile.lock && git add -- Gemfile.lock && git stash drop #{Shellwords.escape(stash.fetch(:ref))}"
+              "paths=$(git diff --name-only --diff-filter=U); " \
+                "git checkout --ours -- $paths && git add -- $paths && " \
+                "git stash drop #{Shellwords.escape(stash.fetch(:ref))}"
             ]
           )
         end
       end
 
-      def template_lockfile_only_conflict?(member)
+      def template_generated_lockfile_only_conflict?(member)
         stdout, _stderr, status = Open3.capture3("git", "diff", "--name-only", "--diff-filter=U", chdir: member.root)
-        status.success? && stdout.lines.map(&:strip).reject(&:empty?) == ["Gemfile.lock"]
+        conflicts = stdout.lines.map(&:strip).reject(&:empty?).sort
+        status.success? && !conflicts.empty? && conflicts.all? { |path| ["Gemfile.lock", ".structuredmerge/kettle-jem.lock"].include?(path) }
       end
 
       def template_branch_sync_results(branch_members, runner:)
@@ -281,7 +284,12 @@ module Kettle
 
       def template_autostash_command(member)
         label = "kettle-family-template-#{member.name}-#{Process.pid}-#{Time.now.to_i}"
-        "git stash push --include-untracked --message #{Shellwords.escape(label)} && git stash list -1 --format=%gd"
+        "git stash push --include-untracked --message #{Shellwords.escape(label)} && " \
+          "ref=$(git stash list -1 --format=%gd) && " \
+          "git checkout \"$ref\" -- .tool-versions 2>/dev/null || true; " \
+          "for path in mise.toml .mise.toml; do " \
+          "if git cat-file -e \"$ref^3:$path\" 2>/dev/null; then git show \"$ref^3:$path\" > \"$path\"; fi; " \
+          "done; printf '%s\\n' \"$ref\""
       end
 
       def template_dirty_worktree_result(member, dirty_paths)
@@ -2031,6 +2039,7 @@ module Kettle
           if command == "template"
             env["KETTLE_JEM_TEMPLATE_PROFILE"] = config.template_profile if config.template_profile
             env["KJ_REPOSITORY_TOPOLOGY"] = config.template_repository_topology if config.template_repository_topology
+            env["KETTLE_JEM_THREAD_WORKERS"] ||= template_thread_worker_budget.to_s
             if monorepo_template?
               template_git_lock_path = template_git_commit_lock_path
               env["KETTLE_JEM_GIT_LOCK"] = template_git_lock_path
@@ -2114,12 +2123,17 @@ module Kettle
           prefix = prefix[0...-2] if prefix.last(2) == %w[bundle exec]
           prefix + [RbConfig.ruby, executable] + argv[(index + 1)..]
         else
-          replacement = "#{Shellwords.escape(RbConfig.ruby)} #{Shellwords.escape(executable)}"
-          text = command_text.to_s
-          return text.sub(/\bbundle\s+exec\s+kettle-jem\b/, replacement) if text.match?(/\bbundle\s+exec\s+kettle-jem\b/)
+          argv = Shellwords.split(command_text.to_s)
+          index = argv.index("kettle-jem")
+          return command_text unless index
+          return command_text if argv.any? { |token| %w[&& || ; |].include?(token) }
 
-          text.sub(/\bkettle-jem\b/, replacement)
+          prefix = argv[0...index]
+          prefix = prefix[0...-2] if prefix.last(2) == %w[bundle exec]
+          prefix + [RbConfig.ruby, executable] + argv[(index + 1)..]
         end
+      rescue ArgumentError
+        command_text
       end
 
       def local_kettle_jem_executable
@@ -2958,6 +2972,11 @@ module Kettle
         env
       end
 
+      def template_thread_worker_budget
+        member_jobs = template_jobs(members)
+        [1, (Etc.nprocessors / member_jobs) - 1].max
+      end
+
       def normalize_release_lockfiles(member:, runner:, memo:)
         result = runner.call(
           member: member,

data/lib/kettle/family.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require_relative "family/version"
 require_relative "family/member"
 require_relative "family/command_result"
 require_relative "family/release_state_result"
@@ -26,6 +25,7 @@ require_relative "family/orderer"
 require_relative "family/selection"
 require_relative "family/report"
 require_relative "family/cli"
+require_relative "family/version"
 
 module Kettle
   module Family

metadata

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