kettle-family 0.1.27 → 0.1.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e9e37861434b48448ce84ade0fe78e8f58f774ef8bf69c3b58cd15db95b7fec7
-  data.tar.gz: 30c6f85a22d4af9d7590e703f74d22d021582cbe55425b8f576397f6e19cd27a
+  metadata.gz: 064f3f14703f9a178aba7cb549a0c55139f52397caa413adafa1137e44e504bb
+  data.tar.gz: c1c7ae833d6b815d7f7a52ba287fa186d51be53b09ab4e91d442b2cc6e94ab44
 SHA512:
-  metadata.gz: 1493009541e59ff4b55d746edff3f44fb9a063eb1feb3e2f6a3d71a271c70ca91210be347141074fcae29b0d42cd357a6ce66bcf7a55b34bd35cf996309e2bff
-  data.tar.gz: 0bac251bdbe718310a6a0b1026e04c40d1922df2489e0626270af541c83612e00745f67c56c38ee0d851f9eaa6eb3b380636c25389e6e6d6fea1291b63d59aa7
+  metadata.gz: 9c71cc770c2d719561d0d6ef91d4c43a329ac75559cebaaf62732efbc0dd02f03e52684d9fa60ff26ac5ea1ad785c51af7e33e56573dc270b6def694d9bfec39
+  data.tar.gz: 9a4bc82e5d51c3ff52ccc5b93243c6c36a55e4769b29c0f17f320f1386f1336908acddca9e7dcf508e04680717262a63e6e80c47d5d5aaafdd569ba87fc0d12a

data/CHANGELOG.md

@@ -30,6 +30,18 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Security
 
+## [0.1.28] - 2026-06-28
+
+- TAG: [v0.1.28][0.1.28t]
+- COVERAGE: 95.24% -- 1899/1994 lines in 21 files
+- BRANCH COVERAGE: 74.86% -- 658/879 branches in 21 files
+- 38.37% documented
+
+### Added
+
+- `kettle-family --start-at MEMBER@BRANCH` now resumes member-local and family
+  branch-stack workflows at a specific release target branch.
+
 ## [0.1.27] - 2026-06-28
 
 - TAG: [v0.1.27][0.1.27t]
@@ -483,7 +495,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.27...HEAD
+[Unreleased]: https://github.com/kettle-dev/kettle-family/compare/v0.1.28...HEAD
+[0.1.28]: https://github.com/kettle-dev/kettle-family/compare/v0.1.27...v0.1.28
+[0.1.28t]: https://github.com/kettle-dev/kettle-family/releases/tag/v0.1.28
 [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

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.949-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
+[🧮kloc-img]: https://img.shields.io/badge/KLOC-1.994-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

@@ -81,7 +81,7 @@ module Kettle
               --root PATH      Workspace or family root (default: current directory)
               --config PATH    Family config path
               --only MEMBER    Select exactly one member
-              --start-at NAME  Select from member through the end of order
+              --start-at NAME  Select from member through the end of order; use MEMBER@BRANCH for branch stacks
               --json           Print JSON report to stdout
               --report PATH    Write JSON report to PATH
               --execute        Execute external workflow commands
@@ -145,7 +145,7 @@ module Kettle
           parser.on("--root PATH") { |value| options[:root] = value }
           parser.on("--config PATH") { |value| options[:config] = value }
           parser.on("--only MEMBER") { |value| options[:only] = value }
-          parser.on("--start-at MEMBER") { |value| options[:start_at] = value }
+          parser.on("--start-at MEMBER[@BRANCH]") { |value| options[:start_at] = value }
           parser.on("--json") { options[:json] = true }
           parser.on("--report PATH") { |value| options[:report] = value }
           parser.on("--execute") { options[:execute] = true }
@@ -180,6 +180,7 @@ module Kettle
 
       def build_report(command, options)
         config = Config.load(root: options[:root], path: options[:config])
+        start_at = parse_start_at(options[:start_at])
         members = Discovery.new(config: config).members
         ordered = if command == "install"
           install_order(members, config)
@@ -188,13 +189,13 @@ module Kettle
         else
           Orderer.new(members: members, mode: config.order_mode, hints: config.order_hints).ordered
         end
-        selected = Selection.new(members: ordered).apply(only: options[:only], start_at: options[:start_at])
+        selected = Selection.new(members: ordered).apply(only: options[:only], start_at: start_at.member)
         result_members = if command == "branch-lanes"
           ordered
         else
           selected
         end
-        results = command_results(command: command, config: config, members: result_members, options: options)
+        results = command_results(command: command, config: config, members: result_members, options: options, start_at: start_at)
         Report.new(
           family_name: config.family_name,
           family_mode: config.family_mode,
@@ -203,22 +204,24 @@ module Kettle
           selected_members: selected,
           config_path: config.path,
           branch_lanes: config.branch_lanes,
-          release_target_branches: BranchTargetConfig.branch_targets_for(command, config.release_target_branches),
-          member_release_target_branches: member_release_target_branches(command: command, members: selected, config: config),
+          release_target_branches: release_target_branches(command: command, config: config, start_at: start_at),
+          member_release_target_branches: member_release_target_branches(command: command, members: selected, config: config, start_at: start_at),
           release_mode: release_mode(command: command, options: options),
           command: command,
           results: results
         )
       end
 
-      def command_results(command:, config:, members:, options:)
-        return branch_target_command_results(command: command, config: config, members: members, options: options) if branch_target_command?(command, config)
-        return member_local_branch_target_command_results(command: command, config: config, members: members, options: options) if member_local_branch_target_command?(command, config, members)
+      StartAt = Struct.new(:member, :branch)
 
-        command_results_for_current_branch(command: command, config: config, members: members, options: options)
+      def command_results(command:, config:, members:, options:, start_at:)
+        return branch_target_command_results(command: command, config: config, members: members, options: options, start_at: start_at) if branch_target_command?(command, config)
+        return member_local_branch_target_command_results(command: command, config: config, members: members, options: options, start_at: start_at) if member_local_branch_target_command?(command, config, members)
+
+        command_results_for_current_branch(command: command, config: config, members: members, options: options, start_at: start_at)
       end
 
-      def command_results_for_current_branch(command:, config:, members:, options:)
+      def command_results_for_current_branch(command:, config:, members:, options:, start_at: StartAt.new(nil, nil))
         return bump_version_results(members: members, options: options) if command == "bump-version"
         return add_changelog_results(members: members, options: options) if command == "add-changelog"
         return branch_lane_results(config: config, members: members) if command == "branch-lanes"
@@ -247,7 +250,9 @@ module Kettle
           debug: options[:debug],
           jobs: options[:jobs],
           progress_io: progress_io(command, options),
-          bup_args: options[:bup_args]
+          bup_args: options[:bup_args],
+          start_member: start_at.member,
+          start_branch: start_at.branch
         ).results
       end
 
@@ -283,20 +288,23 @@ module Kettle
         members.any? { |member| member_local_release_config(member: member, config: config) }
       end
 
-      def branch_target_command_results(command:, config:, members:, options:)
+      def branch_target_command_results(command:, config:, members:, options:, start_at:)
         runner = CommandRunner.new(execute: options[:execute])
         selected_names = members.map(&:name)
-        BranchTargetConfig.branch_targets_for(command, config.release_target_branches).each_with_object([]) do |branch, memo|
+        release_target_branches(command: command, config: config, start_at: start_at).each_with_object([]) do |branch, memo|
           memo << runner.call(
             member: family_member(config),
             phase: "release_checkout",
             command: ["git", "checkout", branch]
           )
+          memo.last.branch = branch
           break memo unless memo.last.ok?
 
           branch_members = rediscovered_selected_members(config: config, selected_names: selected_names, command: command)
           branch_members = members if branch_members.empty?
-          memo.concat(command_results_for_current_branch(command: command, config: config, members: branch_members, options: options))
+          branch_results = command_results_for_current_branch(command: command, config: config, members: branch_members, options: options)
+          branch_results.each { |result| result.branch = branch if result.respond_to?(:branch=) }
+          memo.concat(branch_results)
           break memo unless memo.last&.ok?
 
           commit_changelog_entries(branch_members: branch_members, runner: runner, memo: memo) if command == "add-changelog"
@@ -304,7 +312,7 @@ module Kettle
         end
       end
 
-      def member_local_branch_target_command_results(command:, config:, members:, options:)
+      def member_local_branch_target_command_results(command:, config:, members:, options:, start_at:)
         runner = CommandRunner.new(execute: options[:execute])
         members.each_with_object([]) do |member, memo|
           member_config = member_local_release_config(member: member, config: config)
@@ -314,17 +322,20 @@ module Kettle
             next
           end
 
-          BranchTargetConfig.branch_targets_for(command, member_config.release_target_branches).each do |branch|
+          member_branch_targets(command: command, member: member, member_config: member_config, start_at: start_at).each do |branch|
             memo << runner.call(
               member: member,
               phase: "release_checkout",
               command: ["git", "checkout", branch]
             )
+            memo.last.branch = branch
             break unless memo.last.ok?
 
             branch_members = rediscovered_selected_members(config: member_config, selected_names: [member.name], command: command)
             branch_members = [member] if branch_members.empty?
-            memo.concat(command_results_for_current_branch(command: command, config: member_config, members: branch_members, options: options))
+            branch_results = command_results_for_current_branch(command: command, config: member_config, members: branch_members, options: options)
+            branch_results.each { |result| result.branch = branch if result.respond_to?(:branch=) }
+            memo.concat(branch_results)
             break unless memo.last&.ok?
           end
           break memo unless memo.last&.ok?
@@ -363,6 +374,16 @@ module Kettle
         raise OptionParser::InvalidArgument, "--upgrade must be one of: major, minor, patch"
       end
 
+      def parse_start_at(value)
+        return StartAt.new(nil, nil) unless value
+
+        member, branch = value.split("@", 2)
+        raise Error, "--start-at requires MEMBER before @BRANCH" if member.to_s.empty?
+        raise Error, "--start-at requires BRANCH after MEMBER@" if value.include?("@") && branch.to_s.empty?
+
+        StartAt.new(member, branch)
+      end
+
       def bump_version_results(members:, options:)
         results = VersionBump.new(
           members: members,
@@ -449,13 +470,36 @@ module Kettle
         options[:publish] ? "publish" : "build-only"
       end
 
-      def member_release_target_branches(command:, members:, config:)
+      def release_target_branches(command:, config:, start_at:)
+        branch_targets = BranchTargetConfig.branch_targets_for(command, config.release_target_branches)
+        return branch_targets if branch_targets.empty?
+
+        slice_branch_targets(branch_targets, start_at.branch)
+      end
+
+      def member_release_target_branches(command:, members:, config:, start_at:)
         members.each_with_object({}) do |member, memo|
           member_config = member_local_release_config(member: member, config: config)
-          memo[member.name] = BranchTargetConfig.branch_targets_for(command, member_config.release_target_branches) if member_config
+          memo[member.name] = member_branch_targets(command: command, member: member, member_config: member_config, start_at: start_at) if member_config
         end
       end
 
+      def member_branch_targets(command:, member:, member_config:, start_at:)
+        branch_targets = BranchTargetConfig.branch_targets_for(command, member_config.release_target_branches)
+        return branch_targets unless start_at.branch && start_at.member == member.name
+
+        slice_branch_targets(branch_targets, start_at.branch)
+      end
+
+      def slice_branch_targets(branch_targets, start_branch)
+        return branch_targets unless start_branch
+
+        index = branch_targets.index(start_branch)
+        raise Error, "unknown branch target #{start_branch.inspect}" unless index
+
+        branch_targets.drop(index)
+      end
+
       def member_local_release_config(member:, config:)
         BranchTargetConfig.member_local_release_config(member: member, config: config)
       end

data/lib/kettle/family/command_result.rb

@@ -13,11 +13,13 @@ module Kettle
       :stderr,
       :elapsed_seconds,
       :skipped,
-      :reason
+      :reason,
+      :branch
     ) do
       def to_h
         {
           "member" => member_name,
+          "branch" => branch,
           "phase" => phase,
           "command" => command,
           "workdir" => workdir,

data/lib/kettle/family/version.rb

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

data/lib/kettle/family/workflow.rb

@@ -44,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, bup_args: [])
+      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: [], start_member: nil, start_branch: nil)
         @command = command
         @config = config
         @members = members
@@ -67,6 +67,8 @@ module Kettle
         @jobs = jobs
         @progress_io = progress_io
         @bup_args = bup_args
+        @start_member = start_member
+        @start_branch = start_branch
       end
 
       def results
@@ -79,7 +81,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, :bup_args
+      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, :start_member, :start_branch
 
       def current_branch_results(workflow_members)
         return check_results(workflow_members) if command == "check"
@@ -175,10 +177,13 @@ module Kettle
 
           branch_members = rediscovered_selected_members(selected_names)
           branch_members = members if branch_members.empty?
-          memo.concat(current_branch_results(branch_members))
+          branch_results = current_branch_results(branch_members)
+          tag_branch_results(branch_results, branch)
+          memo.concat(branch_results)
           break memo unless memo.last&.ok?
 
           commit_normalized_lockfiles(branch_members: branch_members, runner: runner, memo: memo)
+          tag_branch_results(memo.last(1), branch)
           break memo unless memo.last&.ok?
         end
       end
@@ -236,10 +241,18 @@ module Kettle
           gem_signing_password: @gem_signing_password,
           jobs: jobs,
           progress_io: progress_io,
-          bup_args: bup_args
+          bup_args: bup_args,
+          start_member: start_member,
+          start_branch: start_branch_for_member(member)
         )
       end
 
+      def start_branch_for_member(member)
+        return unless member.name == start_member
+
+        start_branch
+      end
+
       def release_member_results(release_members, include_family_changelog: false)
         runner = release_command_runner
         results = []
@@ -400,7 +413,17 @@ module Kettle
       end
 
       def branch_targets
-        BranchTargetConfig.branch_targets_for(command, config.release_target_branches)
+        targets = BranchTargetConfig.branch_targets_for(command, config.release_target_branches)
+        slice_branch_targets(targets, start_branch)
+      end
+
+      def slice_branch_targets(targets, branch)
+        return targets unless branch
+
+        index = targets.index(branch)
+        raise Error, "unknown branch target #{branch.inspect}" unless index
+
+        targets.drop(index)
       end
 
       def member_local_release_config(member)
@@ -408,11 +431,17 @@ module Kettle
       end
 
       def checkout_branch_result(branch:, runner:)
-        runner.call(
+        result = runner.call(
           member: family_member,
           phase: "release_checkout",
           command: ["git", "checkout", branch]
         )
+        result.branch = branch
+        result
+      end
+
+      def tag_branch_results(results, branch)
+        results.each { |result| result.branch = branch if result.respond_to?(:branch=) }
       end
 
       def append_release_internal_checks(member:, memo:)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kettle-family
 version: !ruby/object:Gem::Version
-  version: 0.1.27
+  version: 0.1.28
 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.27
-  changelog_uri: https://github.com/kettle-dev/kettle-family/blob/v0.1.27/CHANGELOG.md
+  source_code_uri: https://github.com/kettle-dev/kettle-family/tree/v0.1.28
+  changelog_uri: https://github.com/kettle-dev/kettle-family/blob/v0.1.28/CHANGELOG.md
   bug_tracker_uri: https://github.com/kettle-dev/kettle-family/issues
-  documentation_uri: https://www.rubydoc.info/gems/kettle-family/0.1.27
+  documentation_uri: https://www.rubydoc.info/gems/kettle-family/0.1.28
   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