kettle-family 0.1.26 → 0.1.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19ca7e62279303fb49a70e0f20282369460c9f57209de5a3d76ffe40f06c91d9
-  data.tar.gz: c9c0a6f497f51997c83fcf02a83c7878ccf9a0dee5cfd821cf6068f3fddc35c5
+  metadata.gz: e9e37861434b48448ce84ade0fe78e8f58f774ef8bf69c3b58cd15db95b7fec7
+  data.tar.gz: 30c6f85a22d4af9d7590e703f74d22d021582cbe55425b8f576397f6e19cd27a
 SHA512:
-  metadata.gz: ece5ecc423f749383cd783683a36f5a04d5c4695a7dbd5e21a448b23f36362100be375e533b25fb063fe0fad217015f64e377f9bccb2a64c6318e9b1b8b34cc1
-  data.tar.gz: 4a6c0aa7cdf54f3e8ee36819632cb95e3f59b57ab8e1f82b216bab60a4f1dba78d0b6ba4f602940631b8dab008075ab2f5611c70dc21e435b7fa35e4ec49650d
+  metadata.gz: 1493009541e59ff4b55d746edff3f44fb9a063eb1feb3e2f6a3d71a271c70ca91210be347141074fcae29b0d42cd357a6ce66bcf7a55b34bd35cf996309e2bff
+  data.tar.gz: 0bac251bdbe718310a6a0b1026e04c40d1922df2489e0626270af541c83612e00745f67c56c38ee0d851f9eaa6eb3b380636c25389e6e6d6fea1291b63d59aa7

data/CHANGELOG.md

@@ -30,6 +30,24 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Security
 
+## [0.1.27] - 2026-06-28
+
+- TAG: [v0.1.27][0.1.27t]
+- COVERAGE: 95.13% -- 1854/1949 lines in 21 files
+- BRANCH COVERAGE: 74.79% -- 638/853 branches in 21 files
+- 38.60% documented
+
+### Added
+
+- Added `kettle-family bup [GEM]` for family-wide `bundle update --all` or
+  targeted `bundle update GEM`, and `kettle-family bupb` for family-wide
+  `bundle update --bundler`.
+
+### Fixed
+
+- `kettle-family bup` and `bupb` now commit bundle lockfile changes after a
+  successful member update so branch-stack runs can continue to the next branch.
+
 ## [0.1.26] - 2026-06-27
 
 - TAG: [v0.1.26][0.1.26t]
@@ -465,7 +483,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/v0.1.26...HEAD
+[Unreleased]: https://github.com/kettle-dev/kettle-family/compare/v0.1.27...HEAD
+[0.1.27]: https://github.com/kettle-dev/kettle-family/compare/v0.1.26...v0.1.27
+[0.1.27t]: https://github.com/kettle-dev/kettle-family/releases/tag/v0.1.27
 [0.1.26]: https://github.com/kettle-dev/kettle-family/compare/v0.1.25...v0.1.26
 [0.1.26t]: https://github.com/kettle-dev/kettle-family/releases/tag/v0.1.26
 [0.1.25]: https://github.com/kettle-dev/kettle-family/compare/v0.1.24...v0.1.25

data/README.md

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

@@ -6,8 +6,8 @@ require "optparse"
 module Kettle
   module Family
     class CLI
-      COMMANDS = %w[discover plan report metadata check test lint docs template gha-sha-pins install bump-version add-changelog release push pull up branch-lanes release-state].freeze
-      WORKFLOW_COMMANDS = %w[check test lint docs template gha-sha-pins release push pull up].freeze
+      COMMANDS = %w[discover plan report metadata check test lint docs template gha-sha-pins bup bupb install bump-version add-changelog release push pull up branch-lanes release-state].freeze
+      WORKFLOW_COMMANDS = %w[check test lint docs template gha-sha-pins bup bupb release push pull up].freeze
 
       def self.call(argv, out: $stdout, err: $stderr)
         new(argv, out: out, err: err).call
@@ -27,9 +27,11 @@ module Kettle
 
         target_version = argv.shift if command == "bump-version"
         raise Error, "bump-version requires VERSION, major, minor, patch, or pre" if command == "bump-version" && !target_version
+        bup_args = parse_bup_args(command)
 
         options = parse_options
         options[:target_version] = target_version
+        options[:bup_args] = bup_args
         return help if options.delete(:help)
 
         report = build_report(command, options)
@@ -51,6 +53,7 @@ module Kettle
 
           Usage: kettle-family COMMAND [options]
                  kettle-family bump-version VERSION|major|minor|patch|pre [options]
+                 kettle-family bup [GEM] [options]
 
           Commands:
               discover        Discover family members and print selected order
@@ -63,6 +66,8 @@ module Kettle
               docs            Plan or execute configured docs command per member
               template        Plan or execute kettle-jem templating per member
               gha-sha-pins    Plan or execute kettle-gha-sha-pins per member
+              bup             Plan or execute bundle update --all, or bundle update GEM
+              bupb            Plan or execute bundle update --bundler
               install         Build and install selected local family gems
               bump-version    Check, plan, or execute family version alignment
               add-changelog   Add an entry to an existing Unreleased changelog section
@@ -241,10 +246,19 @@ module Kettle
           env_overrides: options[:workflow_env],
           debug: options[:debug],
           jobs: options[:jobs],
-          progress_io: progress_io(command, options)
+          progress_io: progress_io(command, options),
+          bup_args: options[:bup_args]
         ).results
       end
 
+      def parse_bup_args(command)
+        return [] unless command == "bup"
+
+        args = []
+        args << argv.shift while argv.first && !argv.first.start_with?("-")
+        args
+      end
+
       def progress_io(command, options)
         return nil unless command == "template"
         return nil unless options[:execute]

data/lib/kettle/family/local_install.rb

@@ -78,7 +78,7 @@ module Kettle
         wave.each_with_index { |member, index| queue << [index, member] }
         ordered_results = Array.new(wave.length)
         Array.new(install_jobs(wave)) do
-          Thread.new do
+          Thread.new do # rubocop:disable ThreadSafety/NewThread -- family install intentionally runs independent members concurrently.
             loop do
               index, member = queue.pop(true)
               ordered_results[index] = install_member(member)
@@ -114,7 +114,7 @@ module Kettle
 
       def install_jobs(candidate_members)
         count = jobs ? jobs.to_i : [Etc.nprocessors, 4].min
-        [[count, 1].max, candidate_members.length].min
+        count.clamp(1, candidate_members.length)
       end
 
       def member_from_path(path)

data/lib/kettle/family/release_state_check.rb

@@ -142,13 +142,15 @@ module Kettle
         stdout, stderr, status = Open3.capture3("git", "tag", "--list", "v*", chdir: root)
         raise Error, "could not list release tags for #{root}: #{stderr}" unless status.success?
 
-        stdout.lines.filter_map do |line|
+        stdout.lines.each_with_object([]) do |line, memo|
           tag = line.strip
           next unless tag.start_with?("v")
 
-          gem_version(tag.delete_prefix("v"))
-        rescue ArgumentError
-          nil
+          begin
+            memo << gem_version(tag.delete_prefix("v"))
+          rescue ArgumentError
+            nil
+          end
         end
       end
 
@@ -218,7 +220,7 @@ module Kettle
         start = lines.index { |line| line.start_with?("## [Unreleased]") }
         return false unless start
 
-        following = lines[(start + 1)..] || []
+        following = lines.drop(start + 1)
         block = following.take_while { |line| !line.start_with?("## [") }
         block.any? { |line| line.match?(/\S/) && !line.match?(/\A###? /) }
       end

data/lib/kettle/family/selection.rb

@@ -31,7 +31,7 @@ module Kettle
         index = selected.index { |candidate| candidate.name == start_at }
         raise Error, "unknown member #{start_at.inspect}" unless index
 
-        selected[index..]
+        selected.drop(index)
       end
     end
   end

data/lib/kettle/family/version.rb

@@ -3,7 +3,7 @@
 module Kettle
   module Family
     module Version
-      VERSION = "0.1.26"
+      VERSION = "0.1.27"
     end
     VERSION = Version::VERSION # Traditional Constant Location
   end

data/lib/kettle/family/workflow.rb

@@ -15,7 +15,8 @@ module Kettle
         "test" => "bundle exec kettle-test",
         "lint" => "bundle exec rake rubocop_gradual",
         "docs" => "bundle exec rake yard",
-        "gha-sha-pins" => "bundle exec kettle-gha-sha-pins"
+        "gha-sha-pins" => "bundle exec kettle-gha-sha-pins",
+        "bupb" => %w[bundle update --bundler]
       }.freeze
       GIT_SYNC_COMMANDS = {
         "push" => [["push", %w[git push]]],
@@ -43,7 +44,7 @@ module Kettle
         "BUNDLE_SUPPRESS_INSTALL_USING_MESSAGES" => "true"
       }.freeze
 
-      def initialize(command:, config:, members:, execute: false, accept: true, commit: true, allow_dirty: false, publish: false, push: false, tag: false, start_step: nil, skip_steps: nil, local_ci: false, continue_ci_failures: false, gha_sha_pins_upgrade: "patch", gha_sha_pins_check: false, env_overrides: {}, debug: false, gem_signing_password: nil, jobs: nil, progress_io: nil)
+      def initialize(command:, config:, members:, execute: false, accept: true, commit: true, allow_dirty: false, publish: false, push: false, tag: false, start_step: nil, skip_steps: nil, local_ci: false, continue_ci_failures: false, gha_sha_pins_upgrade: "patch", gha_sha_pins_check: false, env_overrides: {}, debug: false, gem_signing_password: nil, jobs: nil, progress_io: nil, bup_args: [])
         @command = command
         @config = config
         @members = members
@@ -65,6 +66,7 @@ module Kettle
         @gem_signing_password = gem_signing_password
         @jobs = jobs
         @progress_io = progress_io
+        @bup_args = bup_args
       end
 
       def results
@@ -77,7 +79,7 @@ module Kettle
 
       private
 
-      attr_reader :command, :config, :members, :execute, :accept, :commit, :allow_dirty, :publish, :push, :tag, :start_step, :skip_steps, :local_ci, :continue_ci_failures, :gha_sha_pins_upgrade, :gha_sha_pins_check, :env_overrides, :debug, :jobs, :progress_io
+      attr_reader :command, :config, :members, :execute, :accept, :commit, :allow_dirty, :publish, :push, :tag, :start_step, :skip_steps, :local_ci, :continue_ci_failures, :gha_sha_pins_upgrade, :gha_sha_pins_check, :env_overrides, :debug, :jobs, :progress_io, :bup_args
 
       def current_branch_results(workflow_members)
         return check_results(workflow_members) if command == "check"
@@ -104,6 +106,7 @@ 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"
+          commit_bundle_update(member: member, runner: runner, memo: memo) if %w[bup bupb].include?(command)
         end
       end
 
@@ -115,7 +118,7 @@ module Kettle
         stop = false
         emit_template_progress_start(workflow_members)
         Array.new(template_jobs(workflow_members)) do
-          Thread.new do
+          Thread.new do # rubocop:disable ThreadSafety/NewThread -- family templating intentionally runs independent members concurrently.
             loop do
               break if mutex.synchronize { stop }
               index, member = queue.pop(true)
@@ -153,7 +156,7 @@ module Kettle
       def template_jobs(workflow_members)
         requested = jobs || config.template_jobs
         count = requested ? requested.to_i : [Etc.nprocessors, 4].min
-        [[count, 1].max, workflow_members.length].min
+        count.clamp(1, workflow_members.length)
       end
 
       def check_results(workflow_members)
@@ -232,7 +235,8 @@ module Kettle
           env_overrides: env_overrides,
           gem_signing_password: @gem_signing_password,
           jobs: jobs,
-          progress_io: progress_io
+          progress_io: progress_io,
+          bup_args: bup_args
         )
       end
 
@@ -266,7 +270,7 @@ module Kettle
         wave_jobs = release_jobs(wave)
         release_otp_coordinator&.queue_total = wave_jobs
         Array.new(wave_jobs) do
-          Thread.new do
+          Thread.new do # rubocop:disable ThreadSafety/NewThread -- family release intentionally runs independent members concurrently.
             runner = release_command_runner
             loop do
               index, member = queue.pop(true)
@@ -350,7 +354,7 @@ module Kettle
       def release_jobs(release_members)
         requested = jobs || config.release_jobs
         count = requested ? requested.to_i : [Etc.nprocessors, 4].min
-        [[count, 1].max, release_members.length].min
+        count.clamp(1, release_members.length)
       end
 
       def release_waves(release_members)
@@ -545,10 +549,18 @@ module Kettle
       def workflow_command(member = nil)
         return template_command(member) if command == "template"
         return gha_sha_pins_command if command == "gha-sha-pins"
+        return bup_command if command == "bup"
 
         command_for(command)
       end
 
+      def bup_command
+        args = Array(bup_args).map(&:to_s).reject(&:empty?)
+        return ["bundle", "update", "--all"] if args.empty?
+
+        ["bundle", "update", *args]
+      end
+
       def gha_sha_pins_command
         command_text = command_for(command)
         args = []
@@ -742,6 +754,22 @@ module Kettle
         memo << result
       end
 
+      def commit_bundle_update(member:, runner:, memo:)
+        return unless commit
+
+        result = runner.call(
+          member: member,
+          phase: "commit_bundle_update",
+          command: [
+            "sh",
+            "-lc",
+            "files=$(git ls-files --modified --others --exclude-standard -- Gemfile.lock '*.lock' '**/*.lock'); " \
+              "if [ -n \"$files\" ]; then printf '%s\\n' \"$files\" | xargs git add -- && git commit -m '🔒 Update bundle'; fi"
+          ]
+        )
+        memo << result
+      end
+
       def family_member
         Member.new(
           name: config.family_name,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kettle-family
 version: !ruby/object:Gem::Version
-  version: 0.1.26
+  version: 0.1.27
 platform: ruby
 authors:
 - Peter H. Boling
@@ -310,10 +310,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/v0.1.26
-  changelog_uri: https://github.com/kettle-dev/kettle-family/blob/v0.1.26/CHANGELOG.md
+  source_code_uri: https://github.com/kettle-dev/kettle-family/tree/v0.1.27
+  changelog_uri: https://github.com/kettle-dev/kettle-family/blob/v0.1.27/CHANGELOG.md
   bug_tracker_uri: https://github.com/kettle-dev/kettle-family/issues
-  documentation_uri: https://www.rubydoc.info/gems/kettle-family/0.1.26
+  documentation_uri: https://www.rubydoc.info/gems/kettle-family/0.1.27
   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