kettle-family 0.1.16 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 927846e1574bcad8790c8cabb3a7c06cd9afbf8e0637354cd52bd8d5c08e959b
-  data.tar.gz: 958338770647aabe0a916d81a9ec7ed76fac09feec4670d53a25c57120b1e59b
+  metadata.gz: eee55351e363790b515db4ac4534a1763ac7dbbabb772acebabaaafda8579e58
+  data.tar.gz: 20fb7c07c3c12f2591bda364291859fd08721f68f24c4f5c0f0bb4fa585a1cd5
 SHA512:
-  metadata.gz: b750b13b10b5433d06d79a35a62bc7169e9321a3ca44b0af45bffb30b5fa713a12e4f026612c336a2bb761ef66f92abef17c66f35d0ebeceaf2ff3b75d9d8f6a
-  data.tar.gz: f36e586239ca4a3560dbae7d79357ac0ee2d6482e40b375c9e8c262849424b97395a230afc27f97d2770788cc81bc2a69b9ae5142670162c4abc66caea7d9709
+  metadata.gz: e7b378f322009660bd631d6ba9768bbee53ed53cdd1e2fd572f40f41bf0ba93a05f0f14cbc3232d8c649fc959b5c4ff0da1f2323127cef2e642dc906bd922e9b
+  data.tar.gz: 6aa53a5bbc7dbeca03d986d9980a7908f9e0013cb35c5e5d5ee461ad6736a7f7b65a2a03d483cacfc377a51e67ab68af795cf5c0eb7af8957878397cde356c2b

data/CHANGELOG.md

@@ -20,6 +20,25 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Added
 
+### Changed
+
+### Deprecated
+
+### Removed
+
+### Fixed
+
+### Security
+
+## [0.1.17] - 2026-06-25
+
+- TAG: [v0.1.17][0.1.17t]
+- COVERAGE: 94.67% -- 1510/1595 lines in 21 files
+- BRANCH COVERAGE: 76.00% -- 532/700 branches in 21 files
+- 39.63% documented
+
+### Added
+
 - `kettle-family push`, `kettle-family pull`, and `kettle-family up` now plan
   or execute family-wide git synchronization commands.
 - `kettle-family gha-sha-pins` now plans or executes
@@ -28,12 +47,8 @@ Please file a bug if you notice a violation of semantic versioning.
 - `kettle-family bump-version` now accepts the same relative bump targets as
   `kettle-bump` (`major`, `minor`, `patch`, and `pre`) and applies them per
   member from each member's current version.
-
-### Changed
-
-### Deprecated
-
-### Removed
+- Text output from `kettle-family` now starts with the loaded `kettle-family`
+  version so local runs show which executable is active.
 
 ### Fixed
 
@@ -48,8 +63,17 @@ Please file a bug if you notice a violation of semantic versioning.
   version bump edits, and uses member-local branch target stacks so branch
   traversal can continue safely.
 - Text reports now indent each line of multi-line command output consistently.
-
-### Security
+- `kettle-family release-state` now recovers member-local branch-stack release
+  configuration from another local branch when the current branch does not carry
+  `.kettle-family.yml`, restoring branch-matrix output for branch-stack families.
+- Branch `release-state` rows now report the latest released version from that
+  branch's major line instead of the repository-wide latest tag.
+- Member-local branch-stack configuration is now discovered through the same
+  shared path for `install`, `bump-version`, `add-changelog`, workflow commands,
+  and `release-state`, including configs that only exist on another local
+  branch.
+- Branch lane audits now run as part of `kettle-family check`, and
+  `branch-lanes` is no longer advertised as a separate user-facing command.
 
 ## [0.1.11] - 2026-06-23
 
@@ -295,7 +319,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.11...HEAD
+[Unreleased]: https://github.com/kettle-dev/kettle-family/compare/v0.1.17...HEAD
+[0.1.17]: https://github.com/kettle-dev/kettle-family/compare/v0.1.11...v0.1.17
+[0.1.17t]: https://github.com/kettle-dev/kettle-family/releases/tag/v0.1.17
 [0.1.12]: https://github.com/kettle-dev/kettle-family/compare/v0.1.11...v0.1.12
 [0.1.12t]: https://github.com/kettle-dev/kettle-family/releases/tag/v0.1.12
 [0.1.11]: https://github.com/kettle-dev/kettle-family/compare/v0.1.10...v0.1.11

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

@@ -0,0 +1,92 @@
+# frozen_string_literal: true
+
+require "open3"
+require "yaml"
+
+module Kettle
+  module Family
+    module BranchTargetConfig
+      MAIN_BRANCH_SKIPPING_COMMANDS = %w[install release].freeze
+
+      module_function
+
+      def branch_targets_for(command, branches)
+        return branches unless MAIN_BRANCH_SKIPPING_COMMANDS.include?(command)
+
+        branches.reject { |branch| branch == "main" }
+      end
+
+      def member_local_release_config(member:, config:)
+        member_config = Config.load(root: member.root)
+        member_config = member_local_release_config_from_branch(member) || member_config unless member_config.path
+        return unless member_config.path
+        return if same_config_path?(config&.path, member_config.path)
+        return if member_config.release_target_branches.empty?
+
+        member_config
+      rescue Errno::ENOENT
+        nil
+      end
+
+      def same_config_path?(left, right)
+        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)
+      end
+
+      def member_local_release_config_from_branch(member)
+        root = member_git_root(member)
+        relative_root = member_relative_root(member, root)
+        member_local_config_paths(root, relative_root).each do |config_ref, content|
+          loaded = YAML.safe_load(content) || {}
+          branch_config = Config.new(root: member.root, path: config_ref, data: loaded)
+          return branch_config unless branch_config.release_target_branches.empty?
+        end
+        nil
+      rescue Error, Psych::SyntaxError
+        nil
+      end
+
+      def member_git_root(member)
+        stdout, stderr, status = Open3.capture3("git", "rev-parse", "--show-toplevel", chdir: member.root)
+        raise Error, "could not determine git root for #{member.root}: #{stderr}" unless status.success?
+
+        File.realpath(stdout.strip)
+      end
+
+      def member_relative_root(member, root)
+        member_root = File.realpath(member.root)
+        return "." if member_root == root
+        return member_root.delete_prefix("#{root}/") if member_root.start_with?("#{root}/")
+
+        raise Error, "member root #{member.root} is outside git root #{root}"
+      end
+
+      def member_local_config_paths(root, relative_root)
+        branches = local_branches(root)
+        candidates = Config::DEFAULT_PATHS.map do |path|
+          (relative_root == ".") ? path : File.join(relative_root, path)
+        end
+        branches.each_with_object([]) do |branch, memo|
+          candidates.each do |path|
+            content = git_show(root, "#{branch}:#{path}")
+            memo << ["#{branch}:#{path}", content] if content
+          end
+        end
+      end
+
+      def local_branches(root)
+        stdout, stderr, status = Open3.capture3("git", "for-each-ref", "--format=%(refname:short)", "refs/heads", chdir: root)
+        raise Error, "could not list local branches for #{root}: #{stderr}" unless status.success?
+
+        stdout.lines.map(&:strip).reject(&:empty?)
+      end
+
+      def git_show(root, revision)
+        stdout, _stderr, status = Open3.capture3("git", "show", revision, chdir: root)
+        status.success? ? stdout : nil
+      end
+    end
+  end
+end

data/lib/kettle/family/cli.rb

@@ -8,7 +8,6 @@ module Kettle
     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
-      MAIN_BRANCH_SKIPPING_COMMANDS = %w[install release].freeze
 
       def self.call(argv, out: $stdout, err: $stderr)
         new(argv, out: out, err: err).call
@@ -48,6 +47,8 @@ module Kettle
 
       def help
         out.puts(<<~HELP)
+          kettle-family: #{Kettle::Family::VERSION}
+
           Usage: kettle-family COMMAND [options]
                  kettle-family bump-version VERSION|major|minor|patch|pre [options]
 
@@ -69,7 +70,6 @@ module Kettle
               push            Plan or execute git push per member
               pull            Plan or execute git pull --rebase per member
               up              Plan or execute git pull --rebase then git push per member
-              branch-lanes    Audit configured branch lane release mappings
               release-state   Report changelog release state for family members
 
           Options:
@@ -184,7 +184,7 @@ module Kettle
           selected_members: selected,
           config_path: config.path,
           branch_lanes: config.branch_lanes,
-          release_target_branches: branch_targets_for(command, config.release_target_branches),
+          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_mode: release_mode(command: command, options: options),
           command: command,
@@ -237,7 +237,7 @@ module Kettle
 
       def member_local_branch_target_command?(command, config, members)
         return false if !config.release_target_branches.empty?
-        return false unless command == "bump-version"
+        return false unless %w[bump-version install add-changelog].include?(command)
 
         members.any? { |member| member_local_release_config(member: member, config: config) }
       end
@@ -245,7 +245,7 @@ module Kettle
       def branch_target_command_results(command:, config:, members:, options:)
         runner = CommandRunner.new(execute: options[:execute])
         selected_names = members.map(&:name)
-        branch_targets_for(command, config.release_target_branches).each_with_object([]) do |branch, memo|
+        BranchTargetConfig.branch_targets_for(command, config.release_target_branches).each_with_object([]) do |branch, memo|
           memo << runner.call(
             member: family_member(config),
             phase: "release_checkout",
@@ -273,7 +273,7 @@ module Kettle
             next
           end
 
-          branch_targets_for(command, member_config.release_target_branches).each do |branch|
+          BranchTargetConfig.branch_targets_for(command, member_config.release_target_branches).each do |branch|
             memo << runner.call(
               member: member,
               phase: "release_checkout",
@@ -411,25 +411,12 @@ module Kettle
       def member_release_target_branches(command:, members:, config:)
         members.each_with_object({}) do |member, memo|
           member_config = member_local_release_config(member: member, config: config)
-          memo[member.name] = branch_targets_for(command, member_config.release_target_branches) if member_config
+          memo[member.name] = BranchTargetConfig.branch_targets_for(command, member_config.release_target_branches) if member_config
         end
       end
 
-      def branch_targets_for(command, branches)
-        return branches unless MAIN_BRANCH_SKIPPING_COMMANDS.include?(command)
-
-        branches.reject { |branch| branch == "main" }
-      end
-
       def member_local_release_config(member:, config:)
-        member_config = Config.load(root: member.root)
-        return unless member_config.path
-        return if config.path && File.realpath(member_config.path) == File.realpath(config.path)
-        return if member_config.release_target_branches.empty?
-
-        member_config
-      rescue Errno::ENOENT
-        nil
+        BranchTargetConfig.member_local_release_config(member: member, config: config)
       end
 
       def install_order(members, config)

data/lib/kettle/family/release_state_check.rb

@@ -4,6 +4,7 @@ require "json"
 require "fileutils"
 require "open3"
 require "rbconfig"
+require "rubygems"
 require "securerandom"
 
 module Kettle
@@ -57,6 +58,7 @@ module Kettle
         elapsed = Process.clock_gettime(Process::CLOCK_MONOTONIC) - started
         success = status.success?
         state = success ? JSON.parse(stdout) : {}
+        state = branch_filtered_state(member, state, branch) if success && branch
         result(member: member, command: command, stdout: stdout, stderr: stderr, status: status.exitstatus, elapsed: elapsed, success: success, state: state, branch: branch)
       rescue JSON::ParserError => error
         result(member: member, command: command || release_state_command, stdout: stdout, stderr: stderr, status: 1, elapsed: elapsed || 0.0, success: false, state: {}, reason: "invalid release-state JSON: #{error.message}", branch: branch)
@@ -119,6 +121,43 @@ module Kettle
         config ? config.changelog_env : {}
       end
 
+      def branch_filtered_state(member, state, _branch)
+        latest_released = branch_latest_released(member, state["latest_changelog_version"])
+        return state unless latest_released
+
+        state.merge("latest_released" => latest_released)
+      rescue ArgumentError
+        state
+      end
+
+      def branch_latest_released(member, line_version)
+        target_major = gem_version(line_version).segments.first
+        versions = release_tag_versions(member.root).select do |version|
+          version.segments.first == target_major
+        end
+        versions.max&.to_s
+      end
+
+      def release_tag_versions(root)
+        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|
+          tag = line.strip
+          next unless tag.start_with?("v")
+
+          gem_version(tag.delete_prefix("v"))
+        rescue ArgumentError
+          nil
+        end
+      end
+
+      def gem_version(value)
+        raise ArgumentError, "missing version" if value.to_s.empty?
+
+        Gem::Version.new(value)
+      end
+
       def family_changelog_state(root)
         changelog = File.expand_path(config.changelog_path, root)
         raise Error, "missing root changelog #{config.changelog_path}" unless File.file?(changelog)
@@ -249,14 +288,7 @@ module Kettle
       end
 
       def member_local_release_config(member)
-        member_config = Config.load(root: member.root)
-        return unless member_config.path
-        return if config&.path && File.realpath(member_config.path) == File.realpath(config.path)
-        return if member_config.release_target_branches.empty?
-
-        member_config
-      rescue Errno::ENOENT
-        nil
+        BranchTargetConfig.member_local_release_config(member: member, config: config)
       end
 
       def shared_changelog?

data/lib/kettle/family/report.rb

@@ -45,7 +45,7 @@ module Kettle
       end
 
       def to_text
-        lines = ["family: #{family_name}"]
+        lines = ["kettle-family: #{Kettle::Family::VERSION}", "family: #{family_name}"]
         lines << "mode: #{family_mode}" if family_mode
         lines << "config: #{config_path || "none"}"
         lines << "order: #{order_mode}"

data/lib/kettle/family/version.rb

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

data/lib/kettle/family/workflow.rb

@@ -20,7 +20,6 @@ module Kettle
         "pull" => [["pull", %w[git pull --rebase]]],
         "up" => [["pull", %w[git pull --rebase]], ["push", %w[git push]]]
       }.freeze
-      MAIN_BRANCH_SKIPPING_COMMANDS = %w[release].freeze
 
       def initialize(command:, config:, members:, execute: false, commit: true, allow_dirty: false, publish: false, push: false, tag: false, start_step: nil, local_ci: false, continue_ci_failures: false, gha_sha_pins_upgrade: "patch", gha_sha_pins_check: false, env_overrides: {}, gem_signing_password: nil)
         @command = command
@@ -80,7 +79,10 @@ module Kettle
       end
 
       def check_results(workflow_members)
-        workflow_members.map { |member| ReadinessCheck.call(member: member, config: config) }
+        results = []
+        results.concat(BranchLaneAudit.new(config: config, members: workflow_members).results) unless config.branch_lanes.empty?
+        results.concat(workflow_members.map { |member| ReadinessCheck.call(member: member, config: config) })
+        results
       end
 
       def branch_target_results
@@ -215,20 +217,11 @@ module Kettle
       end
 
       def branch_targets
-        return config.release_target_branches unless MAIN_BRANCH_SKIPPING_COMMANDS.include?(command)
-
-        config.release_target_branches.reject { |branch| branch == "main" }
+        BranchTargetConfig.branch_targets_for(command, config.release_target_branches)
       end
 
       def member_local_release_config(member)
-        member_config = Config.load(root: member.root)
-        return unless member_config.path
-        return if config.path && File.realpath(member_config.path) == File.realpath(config.path)
-        return if member_config.release_target_branches.empty?
-
-        member_config
-      rescue Errno::ENOENT
-        nil
+        BranchTargetConfig.member_local_release_config(member: member, config: config)
       end
 
       def checkout_branch_result(branch:, runner:)

data/lib/kettle/family.rb

@@ -12,10 +12,11 @@ require_relative "family/changelog_check"
 require_relative "family/git_status"
 require_relative "family/version_bump"
 require_relative "family/branch_lane_audit"
+require_relative "family/config"
+require_relative "family/branch_target_config"
 require_relative "family/release_state_check"
 require_relative "family/local_install"
 require_relative "family/workflow"
-require_relative "family/config"
 require_relative "family/discovery"
 require_relative "family/orderer"
 require_relative "family/selection"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kettle-family
 version: !ruby/object:Gem::Version
-  version: 0.1.16
+  version: 0.1.17
 platform: ruby
 authors:
 - Peter H. Boling
@@ -80,7 +80,7 @@ dependencies:
         version: '2.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.15
+        version: 2.2.18
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
         version: '2.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.15
+        version: 2.2.18
 - !ruby/object:Gem::Dependency
   name: bundler-audit
   requirement: !ruby/object:Gem::Requirement
@@ -168,7 +168,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.6
+        version: 2.0.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -178,7 +178,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.6
+        version: 2.0.7
 - !ruby/object:Gem::Dependency
   name: turbo_tests2
   requirement: !ruby/object:Gem::Requirement
@@ -284,6 +284,7 @@ files:
 - exe/kettle-family
 - lib/kettle/family.rb
 - lib/kettle/family/branch_lane_audit.rb
+- lib/kettle/family/branch_target_config.rb
 - lib/kettle/family/changelog_check.rb
 - lib/kettle/family/cli.rb
 - lib/kettle/family/command_result.rb
@@ -309,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.16
-  changelog_uri: https://github.com/kettle-dev/kettle-family/blob/v0.1.16/CHANGELOG.md
+  source_code_uri: https://github.com/kettle-dev/kettle-family/tree/v0.1.17
+  changelog_uri: https://github.com/kettle-dev/kettle-family/blob/v0.1.17/CHANGELOG.md
   bug_tracker_uri: https://github.com/kettle-dev/kettle-family/issues
-  documentation_uri: https://www.rubydoc.info/gems/kettle-family/0.1.16
+  documentation_uri: https://www.rubydoc.info/gems/kettle-family/0.1.17
   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

metadata.gz.sig

@@ -1,2 +1,2 @@
-d�	.�;����dΜ��V�L���\㑤;��yIN��Q*�!��Pze���%�Xqf�u��KrLU�3��)�v�g���׌[���6�<h�+�!I��D��%B�mm@xv���*o5�����&}�#؛���*؟�Y�H�4�ʳ�z����H=1�ľ_T�/a/�r�ҥ@ "}�ݹ,�lʱ�8w���u	���vS�W�E*�.�m������`�&{����F�==��1F�p���i�\~+h\Q����q���u'ӴA(�ŭH�)-.�������
-�@s�8�gT��!J�7�c��	��Y���Ozٓ�}�����,dˠ�e���5�;`2j��fX-�iKD`�
Z��s�L���
+f�h�!�����R@�K[���+>���M�C�伡
$qְ�E�M�·6([����1<$(�m��Q���fuOV�]��P���ux
🪴nE�W�u�U��-�0}b>�r����i���Rދg~���+~b0������˶G�iy|@�#�Ƹ3��\T:�@�?�6��k� ��gdi�0���Oq�����MI��U�2�y��X��d��)��HC����*���O�ED�
+����S���t���7= 4*æ|�P��2N�&�"X�#Z.�7��>q�B��i҂�eF!* ��{o�s��AT�s�Au��v��/9��m��<YR�y7-��I6���-DlLT�)nō��Rlٛ�ٺ��	�'?0W(�ڷX��A�0)��@