kettle-family 1.3.2 → 1.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b4a15c15f854710fb75ab2c866cf5ebb2b6dd24f1418a1e694446139a347421
-  data.tar.gz: 70bd34977e27daf2f6e5f8ef465b02c938438eb1346d3574fd7080f2f54d3661
+  metadata.gz: 99e6506531c29efe6259ee3f592eb50d654eeef9f7074a1179f4f61960d7efdd
+  data.tar.gz: d3424e4481d1ced32dbb89228de517e3a0adf30a099883879c16fbb9f6feec8e
 SHA512:
-  metadata.gz: 271e6a288806993a5cf584f9ba8293854c9b7ecb32dbec18b8b6cf293856d8ca7f92bb6d320f8fd97de6ba82622573dee01112974416c95ee2d87e11312dc463
-  data.tar.gz: 3fd884813e4bb730575704ceda96b874cacac2b83a80d597f86e1212ba266cb575526808abe1eb5061404cb5446c64946fa0575d10fae1993dd96868c3479639
+  metadata.gz: dfe9f450d1c65671d3599bfe3625952dc7106cfbfe896960bc236d0df04c033dd73116a94b49b5dba82502022ff503339e7a1457ff6c507888df0736489b5dd7
+  data.tar.gz: 4fc7889e44bd08e673899b0f3ea040ecec5129e4b90ef2ef166f11c51de0e4a05c2066036a8a600bf9dc9e35fd495f95ac60f603799709ec08e0e74522f22ef8

data/CHANGELOG.md

@@ -30,6 +30,34 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Security
 
+## [1.3.4] - 2026-10-02
+
+- TAG: [v1.3.4][1.3.4t]
+- COVERAGE: 93.26% -- 6571/7046 lines in 37 files
+- BRANCH COVERAGE: 77.70% -- 2666/3431 branches in 37 files
+- 33.33% documented
+
+### Added
+
+- kettle-family installs the latest stable Bundler and updates family lockfiles with `update-bundler`.
+
+### Fixed
+
+- Lock each repository's worktree registry across process setup, parallel branch probes, and cleanup to prevent intermittent Git worktree failures.
+
+- Family reports now include results from the update-bundler command.
+
+## [1.3.3] - 2026-09-28
+
+- TAG: [v1.3.3][1.3.3t]
+- COVERAGE: 93.25% -- 6538/7011 lines in 37 files
+- BRANCH COVERAGE: 77.76% -- 2660/3421 branches in 37 files
+- 33.57% documented
+
+### Fixed
+
+- Compare filesystem paths by canonical identity throughout family workflows.
+
 ## [1.3.2] - 2026-09-28
 
 - TAG: [v1.3.2][1.3.2t]
@@ -2819,7 +2847,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.3.2...HEAD
+[Unreleased]: https://github.com/kettle-dev/kettle-family/compare/v1.3.4...HEAD
+[1.3.4]: https://github.com/kettle-dev/kettle-family/compare/v1.3.3...v1.3.4
+[1.3.4t]: https://github.com/kettle-dev/kettle-family/releases/tag/v1.3.4
+[1.3.3]: https://github.com/kettle-dev/kettle-family/compare/v1.3.2...v1.3.3
+[1.3.3t]: https://github.com/kettle-dev/kettle-family/releases/tag/v1.3.3
 [1.3.2]: https://github.com/kettle-dev/kettle-family/compare/v1.3.1...v1.3.2
 [1.3.2t]: https://github.com/kettle-dev/kettle-family/releases/tag/v1.3.2
 [1.3.1]: https://github.com/kettle-dev/kettle-family/compare/v1.3.0...v1.3.1

data/README.md

@@ -510,6 +510,7 @@ The command names below are available from `kettle-family --help`:
 | `gha-sha-pins` | Inspect or update GitHub Actions SHA pins. |
 | `bup` | Run `bundle update --all`, or update a named dependency, at the family root and per member. |
 | `bupb` | Run `bundle update --bundler` at the family root and per member. |
+| `update-bundler` | Install the latest stable Bundler from RubyGems, then update family lockfiles. |
 | `bex` | Run an arbitrary `bundle exec` command per member. |
 | `install` | Build and install selected local family gems. |
 | `bump` | Check, plan, or execute family version alignment. |
@@ -614,6 +615,11 @@ root-first order with `bundle update --bundler`. A root that is itself a member
 is updated only once. A gem name may be passed to `bup` to update only that
 dependency, for example `kettle-family bup --execute kettle-test`.
 
+`update-bundler` installs the latest stable Bundler from `https://rubygems.org`
+without enabling prereleases, then runs the same root-first lockfile update as
+`bupb`. Family mise tasks select an installed stable Bundler explicitly to
+start the command, so an installed prerelease cannot intercept startup.
+
 Executed member updates commit successful lockfile changes by default. The
 family-root lockfile is also validated and committed for monorepos, where the
 root and members share one Git repository. A sibling-repository family root is
@@ -1186,7 +1192,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-7.010-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
+[🧮kloc-img]: https://img.shields.io/badge/KLOC-7.046-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/branch_target_config.rb

@@ -55,7 +55,7 @@ module Kettle
         return false if left.to_s.empty? || right.to_s.empty?
         return false unless File.file?(left) && File.file?(right)
 
-        File.realpath(left) == File.realpath(right)
+        Paths.same?(left, right)
       end
 
       def member_local_release_config_from_branch(member)

data/lib/kettle/family/cli.rb

@@ -4,14 +4,15 @@ require "command_kit"
 require "command_kit/commands"
 require "fileutils"
 require "optparse"
+require "rubygems/dependency_installer"
 
 module Kettle
   module Family
     class CLI < CommandKit::Command
       include CommandKit::Commands
 
-      COMMANDS = %w[version mise-trust discover plan report metadata check clean-unreleased reconcile-releases reset test lint docs template gha-sha-pins bup bupb bex install bump bump-version add-changelog release push pull sync up branch-lanes release-state state].freeze
-      WORKFLOW_COMMANDS = %w[check reset test lint docs template gha-sha-pins bup bupb bex release push pull sync up].freeze
+      COMMANDS = %w[version mise-trust discover plan report metadata check clean-unreleased reconcile-releases reset test lint docs template gha-sha-pins bup bupb update-bundler bex install bump bump-version add-changelog release push pull sync up branch-lanes release-state state].freeze
+      WORKFLOW_COMMANDS = %w[check reset test lint docs template gha-sha-pins bup bupb update-bundler bex release push pull sync up].freeze
 
       command_name "kettle-family"
       usage "[options] COMMAND [ARGS...]"
@@ -434,6 +435,31 @@ module Kettle
         description "Plan or execute bundle update --bundler."
       end
 
+      class UpdateBundler < WorkflowCommand
+        command_name "update-bundler"
+        usage "[options]"
+        description "Install the latest stable Bundler, then update family lockfiles."
+
+        def run(*args)
+          unexpected_arguments!(args)
+          install_latest_stable_bundler if truthy_option?(:execute)
+          run_family("update-bundler")
+        end
+
+        private
+
+        def install_latest_stable_bundler
+          original_sources = Gem.sources.to_a
+          Gem.sources = ["https://rubygems.org"]
+          Gem::DependencyInstaller.new(domain: :remote, prerelease: false, document: []).install("bundler")
+          Gem::Specification.reset
+        rescue => error
+          raise Error, "could not install latest stable Bundler from RubyGems: #{error.message}"
+        ensure
+          Gem.sources = original_sources if original_sources
+        end
+      end
+
       class Bex < WorkflowCommand
         command_name "bex"
         usage "[options] -- COMMAND [ARGS...]"
@@ -626,6 +652,7 @@ module Kettle
       command GhaShaPins
       command Bup
       command Bupb
+      command UpdateBundler
       command Bex
       command Install
       command Bump

data/lib/kettle/family/release_state_check.rb

@@ -23,6 +23,7 @@ module Kettle
       ].freeze
       TRANSFER_CHANGELOG_TOTAL_UNSET = Object.new.freeze
       CACHE_MISS = Object.new.freeze
+      WORKTREE_ADMIN_MUTEX = Mutex.new
 
       def initialize(members:, config: nil, jobs: nil)
         @members = members
@@ -57,21 +58,30 @@ module Kettle
       def branch_results(event_handler: nil)
         root = git_root
         selected_names = members.map(&:name)
-        parallel_map(release_target_branches) do |branch|
-          branch_results_for(branch: branch, root: root, selected_names: selected_names, event_handler: event_handler)
-        end.flatten
+        with_branch_worktrees(root: root, branches: release_target_branches) do |entries|
+          parallel_map(entries) do |entry|
+            if entry[:error]
+              error_result(branch: entry[:branch], error: entry[:error])
+            else
+              branch_results_for_worktree(
+                branch: entry[:branch],
+                worktree_root: entry[:worktree_root],
+                selected_names: selected_names,
+                event_handler: event_handler
+              )
+            end
+          end.flatten
+        end
       end
 
-      def branch_results_for(branch:, root:, selected_names:, event_handler:)
-        with_branch_worktree(root: root, branch: branch) do |worktree_root|
-          branch_members = discover_branch_members(worktree_root: worktree_root, selected_names: selected_names)
-          if shared_changelog?
-            results = parallel_map(branch_members) { |member| check_shared_changelog_member_or_local(member, branch: branch, event_handler: event_handler) }
-            next normalize_shared_version_bump(results)
-          end
-
-          parallel_map(branch_members) { |member| check_member(member, branch: branch, event_handler: event_handler) }
+      def branch_results_for_worktree(branch:, worktree_root:, selected_names:, event_handler:)
+        branch_members = discover_branch_members(worktree_root: worktree_root, selected_names: selected_names)
+        if shared_changelog?
+          results = parallel_map(branch_members) { |member| check_shared_changelog_member_or_local(member, branch: branch, event_handler: event_handler) }
+          return normalize_shared_version_bump(results)
         end
+
+        parallel_map(branch_members) { |member| check_member(member, branch: branch, event_handler: event_handler) }
       rescue Error => error
         [error_result(branch: branch, error: error)]
       end
@@ -826,25 +836,52 @@ module Kettle
         File.realpath(stdout.strip)
       end
 
-      def with_branch_worktree(root:, branch:)
-        base = File.join(root, "tmp", "kettle-family-release-state")
-        FileUtils.mkdir_p(base)
-        worktree_root = File.join(base, "worktree-#{Process.pid}-#{SecureRandom.hex(8)}")
-        add_branch_worktree(root: root, branch: branch, worktree_root: worktree_root)
-        yield worktree_root
-      ensure
-        remove_branch_worktree(root: root, worktree_root: worktree_root)
+      def with_branch_worktrees(root:, branches:)
+        with_worktree_registry_lock(root: root) do
+          base = File.join(root, "tmp", "kettle-family-release-state")
+          FileUtils.mkdir_p(base)
+          entries = branches.map do |branch|
+            {branch: branch, worktree_root: File.join(base, "worktree-#{Process.pid}-#{SecureRandom.hex(8)}")}
+          end
+          entries.each do |entry|
+            add_branch_worktree(root: root, branch: entry[:branch], worktree_root: entry[:worktree_root])
+          rescue Error => error
+            entry[:error] = error
+          end
+          yield entries
+        ensure
+          entries&.reverse_each do |entry|
+            remove_branch_worktree(root: root, worktree_root: entry[:worktree_root])
+          end
+        end
+      end
+
+      def with_worktree_registry_lock(root:)
+        stdout, stderr, status = Open3.capture3("git", "rev-parse", "--git-common-dir", chdir: root)
+        raise Error, "could not determine git common directory for #{root}: #{stderr}" unless status.success?
+
+        lock_path = File.join(File.expand_path(stdout.strip, root), "kettle-family-worktree.lock")
+        File.open(lock_path, File::RDWR | File::CREAT, 0o600) do |lock_file|
+          lock_file.flock(File::LOCK_EX)
+          yield
+        ensure
+          lock_file&.flock(File::LOCK_UN)
+        end
       end
 
       def add_branch_worktree(root:, branch:, worktree_root:)
-        _stdout, stderr, status = Open3.capture3("git", "worktree", "add", "--detach", worktree_root, branch, chdir: root)
-        raise Error, "could not add worktree for #{branch}: #{stderr}" unless status.success?
+        WORKTREE_ADMIN_MUTEX.synchronize do
+          _stdout, stderr, status = Open3.capture3("git", "worktree", "add", "--detach", worktree_root, branch, chdir: root)
+          raise Error, "could not add worktree for #{branch}: #{stderr}" unless status.success?
+        end
       end
 
       def remove_branch_worktree(root:, worktree_root:)
         return unless worktree_root && Dir.exist?(worktree_root)
 
-        Open3.capture3("git", "worktree", "remove", "--force", worktree_root, chdir: root)
+        WORKTREE_ADMIN_MUTEX.synchronize do
+          Open3.capture3("git", "worktree", "remove", "--force", worktree_root, chdir: root)
+        end
       end
 
       def discover_branch_members(worktree_root:, selected_names:)

data/lib/kettle/family/report.rb

@@ -29,6 +29,7 @@ module Kettle
         template
         test
         up
+        update-bundler
       ].freeze
 
       attr_reader :family_name, :family_mode, :order_mode, :members, :selected_members, :config_path, :command, :results, :branch_lanes, :release_target_branches, :member_release_target_branches, :release_mode, :release_resume_arguments, :warnings, :event_log_dirs

data/lib/kettle/family/version.rb

@@ -5,7 +5,7 @@ module Kettle
     # Version namespace for this gem.
     module Version
       # Current gem version.
-      VERSION = "1.3.2"
+      VERSION = "1.3.4"
     end
     # Current gem version exposed at the traditional constant location.
     VERSION = Version::VERSION # Traditional Constant Location

data/lib/kettle/family/workflow.rb

@@ -574,7 +574,7 @@ module Kettle
 
         runner = CommandRunner.new(execute: execute, accept: accept)
         results = []
-        update_family_root_bundle(runner: runner, memo: results) if %w[bup bupb].include?(command)
+        update_family_root_bundle(runner: runner, memo: results) if %w[bup bupb update-bundler].include?(command)
         return results unless results.all?(&:ok?)
 
         if command == "gha-sha-pins" && execute
@@ -607,10 +607,10 @@ module Kettle
 
           normalize_lockfiles(member: member, runner: runner, memo: memo, phase: "normalize_lockfiles") if command == "template"
           commit_gha_sha_pins(member: member, runner: runner, memo: memo) if command == "gha-sha-pins"
-          if command == "bupb"
+          if %w[bupb update-bundler].include?(command)
             bupb_appraisal_results(member: member, runner: runner, memo: memo)
           end
-          if %w[bup bupb].include?(command) && memo.last&.ok? && validate_bundle_update_lockfile(member: member, memo: memo)
+          if %w[bup bupb update-bundler].include?(command) && memo.last&.ok? && validate_bundle_update_lockfile(member: member, memo: memo)
             commit_bundle_update(member: member, runner: runner, memo: memo)
           end
           commit_bex_changes(member: member, runner: runner, memo: memo) if command == "bex"
@@ -644,7 +644,7 @@ module Kettle
         return false unless File.file?(File.join(config.root, "Gemfile"))
 
         family_members.none? do |member|
-          File.expand_path(member.root) == File.expand_path(config.root)
+          Paths.same?(member.root, config.root)
         end
       end
 
@@ -1752,9 +1752,11 @@ module Kettle
       end
 
       def tag_template_worktree_results(results, entries)
-        branches_by_root = entries.to_h { |entry| [File.expand_path(entry.fetch(:member).root), entry.fetch(:branch)] }
         results.each do |result|
-          result.branch = branches_by_root[File.expand_path(result.workdir)] if result.workdir
+          next unless result.workdir
+
+          entry = entries.find { |candidate| Paths.same?(candidate.fetch(:member).root, result.workdir) }
+          result.branch = entry.fetch(:branch) if entry
         end
       end
 
@@ -4081,7 +4083,7 @@ module Kettle
           return gha_sha_pins_command(command_text: command_text)
         end
         return bup_command if command == "bup"
-        return bupb_command if command == "bupb"
+        return bupb_command if %w[bupb update-bundler].include?(command)
         return bex_command if command == "bex"
 
         command_for(command)
@@ -4106,11 +4108,11 @@ module Kettle
 
       def stable_bundler_version
         active_version = Gem.loaded_specs["bundler"]&.version
-        return active_version if active_version && !active_version.prerelease?
-
         Gem::Specification
           .find_all_by_name("bundler")
           .map(&:version)
+          .push(active_version)
+          .compact
           .reject(&:prerelease?)
           .max
       end
@@ -4348,15 +4350,15 @@ module Kettle
         return false if config.path
         return false unless config.family_mode == "monorepo"
         return false unless members.one?
-        return false unless File.expand_path(config.members_root) == File.expand_path(config.root)
-        return false unless File.expand_path(members.first.root) == File.expand_path(config.root)
+        return false unless Paths.same?(config.members_root, config.root)
+        return false unless Paths.same?(members.first.root, config.root)
 
         family_env_name = config.family_local_path_env_name
         family_env_name && !env_overrides.key?(family_env_name)
       end
 
       def command_env
-        return bundle_update_env if %w[bup bupb].include?(command)
+        return bundle_update_env if %w[bup bupb update-bundler].include?(command)
 
         workflow_env
       end
@@ -5531,7 +5533,7 @@ module Kettle
         end
         return false unless spec&.source.is_a?(Bundler::Source::Path)
 
-        File.expand_path(spec.source.path.to_s) == File.expand_path(File.join(template_local_kettle_jem_root, "kettle-jem"))
+        Paths.same?(spec.source.path.to_s, File.join(template_local_kettle_jem_root, "kettle-jem"))
       rescue Bundler::LockfileError, Errno::ENOENT
         false
       end
@@ -5696,7 +5698,7 @@ module Kettle
       end
 
       def family_local_path_root_for(family_root)
-        return config.family_local_path_root if File.expand_path(family_root) == File.expand_path(config.root)
+        return config.family_local_path_root if Paths.same?(family_root, config.root)
 
         relative = Pathname.new(config.family_local_path_root).relative_path_from(Pathname.new(config.root))
         File.expand_path(relative, family_root)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kettle-family
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.4
 platform: ruby
 authors:
 - Peter H. Boling
@@ -94,7 +94,7 @@ dependencies:
         version: '3.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.4
+        version: 3.1.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -104,7 +104,7 @@ dependencies:
         version: '3.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.4
+        version: 3.1.5
 - !ruby/object:Gem::Dependency
   name: kettle-gha-pins
   requirement: !ruby/object:Gem::Requirement
@@ -459,10 +459,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.3.2
-  changelog_uri: https://github.com/kettle-dev/kettle-family/blob/v1.3.2/CHANGELOG.md
+  source_code_uri: https://github.com/kettle-dev/kettle-family/tree/v1.3.4
+  changelog_uri: https://github.com/kettle-dev/kettle-family/blob/v1.3.4/CHANGELOG.md
   bug_tracker_uri: https://github.com/kettle-dev/kettle-family/issues
-  documentation_uri: https://www.rubydoc.info/gems/kettle-family/1.3.2
+  documentation_uri: https://www.rubydoc.info/gems/kettle-family/1.3.4
   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