kettle-family 0.2.2 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4cb4c502493482718d093219b202a58d6b4eef4d99890bdd300a18646fd87448
-  data.tar.gz: 396fa2013f8ebb7ae7a3f84f2c74a12d38af9443311f5da5629154d7cb730023
+  metadata.gz: 77de418bfa9adc07c6500af0e4231f28909e6480fb96b730e34ebb215add0f04
+  data.tar.gz: 3667086145e554a4d4d89e68a2c4b5b2b1b00f59c799040f69a918c236c725ec
 SHA512:
-  metadata.gz: e81e3a9cfba607441cbd5ae8dce13002c92cd9a2744dce24a1928b03d607360bec111d1314fec7570a3365e1631b86ae62af6fe00498084eabc2d74d07bde916
-  data.tar.gz: af9e4962ed8bcad15481eca3e38139ad610ab7ce470009ea6aa815e7c46c396efe382d1a520a24c3411d47d127b9311cc9f8137c6691fcaca226ddd046311d3b
+  metadata.gz: 30f2a3b90e0fc17022b97a384277dc004b78e4cee2a4a6d1bdf515425db3f2173a846ac00f7614031fda678ceacf6dcd7e7d75fbcb6bfc582ed29ea4debeddb7
+  data.tar.gz: c1569420377c2692180d7f04a8312de902efac20b84d390514e9599a6d7a5025761abe9a9e2b647ccb713f2dbdc8fa02ee142e52a9df0389f54c7393a0a726ef

data/CHANGELOG.md

@@ -30,6 +30,32 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Security
 
+## [0.2.4] - 2026-07-04
+
+- TAG: [v0.2.4][0.2.4t]
+- COVERAGE: 95.33% -- 2288/2400 lines in 22 files
+- BRANCH COVERAGE: 76.42% -- 752/984 branches in 22 files
+- 30.04% documented
+
+### Added
+
+- Family releases now raise downstream family dependency floors after each
+  member release by default, with `--no-auto-floors` and
+  `release.auto_dependency_floors: false` opt-outs.
+
+## [0.2.3] - 2026-07-03
+
+- TAG: [v0.2.3][0.2.3t]
+- COVERAGE: 95.51% -- 2210/2314 lines in 21 files
+- BRANCH COVERAGE: 76.41% -- 716/937 branches in 21 files
+- 29.82% documented
+
+### Fixed
+
+- Root-configured member branch target commands now rediscover the checked-out
+  member repository before version bumping, preventing old release lines from
+  being bumped to the current branch's version.
+
 ## [0.2.2] - 2026-07-02
 
 - TAG: [v0.2.2][0.2.2t]
@@ -617,7 +643,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/v0.2.2...HEAD
+[Unreleased]: https://github.com/kettle-dev/kettle-family/compare/v0.2.4...HEAD
+[0.2.4]: https://github.com/kettle-dev/kettle-family/compare/v0.2.3...v0.2.4
+[0.2.4t]: https://github.com/kettle-dev/kettle-family/releases/tag/v0.2.4
+[0.2.3]: https://github.com/kettle-dev/kettle-family/compare/v0.2.2...v0.2.3
+[0.2.3t]: https://github.com/kettle-dev/kettle-family/releases/tag/v0.2.3
 [0.2.2]: https://github.com/kettle-dev/kettle-family/compare/v0.2.1...v0.2.2
 [0.2.2t]: https://github.com/kettle-dev/kettle-family/releases/tag/v0.2.2
 [0.2.1]: https://github.com/kettle-dev/kettle-family/compare/v0.2.0...v0.2.1

data/README.md

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

@@ -28,6 +28,7 @@ module Kettle
         return if branches.nil? || branches.empty?
 
         data = config.data.merge(
+          "members" => config.data.fetch("members", {}).merge("roots" => ["."]),
           "release" => config.data.fetch("release", {}).merge("target_branches" => branches)
         )
         Config.new(root: member.root, path: config.path, data: data)

data/lib/kettle/family/cli.rb

@@ -403,6 +403,9 @@ module Kettle
         option :skip_steps, long: "--skip-steps", value: {type: String, usage: "LIST"}, desc: "Pass skip_steps=LIST through to kettle-release commands"
         option :local_ci, long: "--local-ci", desc: "Pass --local-ci through to kettle-release commands"
         option :continue_ci_failures, long: "--continue-ci-failures", desc: "Set K_RELEASE_CI_CONTINUE=true for release commands"
+        option :no_auto_floors, long: "--no-auto-floors", desc: "Do not raise family dependency floors between member releases" do
+          options[:no_auto_floors] = true
+        end
         option :accept, desc: "Answer yes to confirmation prompts in interactive commands"
         option :no_accept, long: "--no-accept", desc: "Wait for user input at confirmation prompts" do
           options[:accept] = false
@@ -419,6 +422,7 @@ module Kettle
             release_skip_steps: options[:skip_steps],
             release_local_ci: truthy_option?(:local_ci),
             release_continue_ci_failures: truthy_option?(:continue_ci_failures),
+            release_auto_dependency_floors: !truthy_option?(:no_auto_floors),
             accept: !options.key?(:accept) || options[:accept],
             tag: truthy_option?(:tag),
             push: truthy_option?(:push)
@@ -555,6 +559,7 @@ module Kettle
           skip_steps: options[:release_skip_steps],
           local_ci: options[:release_local_ci],
           continue_ci_failures: options[:release_continue_ci_failures],
+          auto_dependency_floors: options[:release_auto_dependency_floors],
           gha_sha_pins_upgrade: options[:gha_sha_pins_upgrade],
           gha_sha_pins_check: options[:check],
           env_overrides: options[:workflow_env],

data/lib/kettle/family/config.rb

@@ -212,6 +212,10 @@ module Kettle
         fetch_path("release", "jobs")
       end
 
+      def release_auto_dependency_floors?
+        fetch_path("release", "auto_dependency_floors") != false
+      end
+
       def release_family_changelog?
         fetch_path("release", "family_changelog", "enabled") == true
       end

data/lib/kettle/family/dependency_floor.rb

@@ -0,0 +1,113 @@
+# frozen_string_literal: true
+
+require "kettle/dev"
+
+module Kettle
+  module Family
+    class DependencyFloor
+      DEPENDENCY_METHODS = %i[add_dependency add_runtime_dependency].freeze
+
+      def initialize(released_members:, dependent_members:, mode: :dry_run)
+        @released_members = released_members
+        @dependent_members = dependent_members
+        @mode = mode
+        @released_versions = released_members.to_h { |member| [member.name, Gem::Version.new(member.version.to_s)] }
+      end
+
+      def results
+        dependent_members.filter_map { |member| result_for(member) }
+      end
+
+      private
+
+      attr_reader :released_members, :dependent_members, :mode, :released_versions
+
+      def result_for(member)
+        edits = collect_edits(member)
+        return if edits.empty?
+
+        write_edits(edits) if mode == :execute
+        CommandResult.new(
+          member_name: member.name,
+          phase: "dependency_floor",
+          command: ["internal", "dependency-floor", released_versions.keys.join(",")],
+          workdir: member.root,
+          status: 0,
+          success: true,
+          stdout: edit_summary(member: member, edits: edits),
+          stderr: "",
+          elapsed_seconds: 0.0,
+          skipped: mode != :execute,
+          reason: (mode == :execute) ? nil : "dry-run; pass --execute to write"
+        )
+      end
+
+      def collect_edits(member)
+        return [] unless member.gemspec_path && File.file?(member.gemspec_path)
+
+        source = File.read(member.gemspec_path)
+        parse_result = with_dev_errors { Kettle::Dev::VersionBump.parse_source(source, member.gemspec_path) }
+        Kettle::Dev::VersionBump.each_node(parse_result.value).filter_map do |node|
+          dependency_edit_for(member.gemspec_path, source, node)
+        end
+      end
+
+      def dependency_edit_for(path, source, node)
+        return unless node.is_a?(Prism::CallNode) && DEPENDENCY_METHODS.include?(node.name)
+
+        args = node.arguments&.arguments || []
+        name_node = args.first
+        return unless name_node.is_a?(Prism::StringNode)
+
+        dependency_name = name_node.unescaped
+        released_version = released_versions[dependency_name]
+        return unless released_version
+
+        floor_node = requirement_nodes(args.drop(1)).find do |requirement_node|
+          requirement_node.unescaped.start_with?(">= ")
+        end
+        return unless floor_node
+
+        current_floor = floor_node.unescaped.delete_prefix(">= ").strip
+        return unless floor_lower_than?(current_floor, released_version)
+
+        replacement = Kettle::Dev::VersionBump.quote_like(floor_node.location.slice, ">= #{released_version}")
+        Kettle::Dev::VersionBump.file_edit(path, source, floor_node.location.start_offset, floor_node.location.end_offset, replacement)
+      end
+
+      def requirement_nodes(nodes)
+        nodes.flat_map do |node|
+          case node
+          when Prism::StringNode
+            [node]
+          when Prism::ArrayNode
+            requirement_nodes(node.elements)
+          else
+            []
+          end
+        end
+      end
+
+      def floor_lower_than?(current_floor, released_version)
+        Gem::Version.new(current_floor) < released_version
+      rescue ArgumentError
+        false
+      end
+
+      def write_edits(edits)
+        Kettle::Dev::VersionBump.write_edits(edits)
+      end
+
+      def edit_summary(member:, edits:)
+        verb = (mode == :execute) ? "updated" : "would update"
+        ["#{verb} #{edits.length} family dependency floor(s) for #{member.name}", *edits.map { |edit| "#{verb} #{edit.fetch(:path)}" }.uniq].join("\n")
+      end
+
+      def with_dev_errors
+        yield
+      rescue Kettle::Dev::Error => error
+        raise Error, error.message
+      end
+    end
+  end
+end

data/lib/kettle/family/discovery.rb

@@ -96,8 +96,10 @@ module Kettle
       def load_gemspec(path)
         # Some legacy gemspecs use root-relative Kernel.load calls, and RubyGems
         # evaluates gemspecs relative to the current process directory.
+        # Gem::Specification.load caches by path, which is wrong for branch-stack
+        # workflows that checkout different contents at the same path.
         # rubocop:disable ThreadSafety/DirChdir
-        spec = Dir.chdir(File.dirname(path)) { Gem::Specification.load(path) }
+        spec = Dir.chdir(File.dirname(path)) { eval_gemspec(path) }
         # rubocop:enable ThreadSafety/DirChdir
         raise Error, "could not load gemspec #{path}" unless spec
 
@@ -106,6 +108,16 @@ module Kettle
         raise Error, "could not load gemspec #{path}: #{error.message}"
       end
 
+      def eval_gemspec(path)
+        return unless File.file?(path)
+
+        code = Gem.open_file(path, "r:UTF-8:-", &:read)
+        spec = eval(code, binding, path) # rubocop:disable Security/Eval -- Mirrors RubyGems gemspec loading without its path cache.
+        return spec if spec.is_a?(Gem::Specification)
+
+        raise Error, "#{path} is not a Gem::Specification"
+      end
+
       def excluded_gemspec?(path)
         ignored_by_git?(path) || excluded_by_pattern?(path)
       end

data/lib/kettle/family/version.rb

@@ -3,7 +3,7 @@
 module Kettle
   module Family
     module Version
-      VERSION = "0.2.2"
+      VERSION = "0.2.4"
     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: [], bex_args: [], start_member: nil, start_branch: 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, auto_dependency_floors: nil, 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: [], bex_args: [], start_member: nil, start_branch: nil)
         @command = command
         @config = config
         @members = members
@@ -59,6 +59,7 @@ module Kettle
         @skip_steps = skip_steps
         @local_ci = local_ci
         @continue_ci_failures = continue_ci_failures
+        @auto_dependency_floors = auto_dependency_floors.nil? ? config.release_auto_dependency_floors? : auto_dependency_floors
         @gha_sha_pins_upgrade = gha_sha_pins_upgrade
         @gha_sha_pins_check = gha_sha_pins_check
         @env_overrides = env_overrides
@@ -85,7 +86,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, :bex_args, :start_member, :start_branch
+      attr_reader :command, :config, :members, :execute, :accept, :commit, :allow_dirty, :publish, :push, :tag, :start_step, :skip_steps, :local_ci, :continue_ci_failures, :auto_dependency_floors, :gha_sha_pins_upgrade, :gha_sha_pins_check, :env_overrides, :debug, :jobs, :progress_io, :bup_args, :bex_args, :start_member, :start_branch
 
       def current_branch_results(workflow_members)
         return check_results(workflow_members) if command == "check"
@@ -286,6 +287,7 @@ module Kettle
           skip_steps: skip_steps,
           local_ci: local_ci,
           continue_ci_failures: continue_ci_failures,
+          auto_dependency_floors: auto_dependency_floors,
           gha_sha_pins_upgrade: gha_sha_pins_upgrade,
           gha_sha_pins_check: gha_sha_pins_check,
           env_overrides: env_overrides,
@@ -315,17 +317,27 @@ module Kettle
         release_members.each_with_object(results) do |member, memo|
           memo.concat(release_results_for_member(member, runner: runner))
           break memo unless memo.last.ok?
+
+          remaining_members = release_members.drop(release_members.index(member) + 1)
+          append_dependency_floor_results(released_members: [member], dependent_members: remaining_members, runner: runner, memo: memo)
+          break memo unless memo.last&.ok?
         end
       end
 
       def parallel_release_member_results(release_members, initial_results)
         results = initial_results.dup
         waves = release_waves(release_members)
+        completed_members = []
         waves.each_with_index do |wave, index|
           results << release_wave_result(wave, index: index, total: waves.length)
           wave_results = run_release_wave(wave)
           results.concat(wave_results.flatten)
           break unless wave_results.all? { |member_results| member_results.all?(&:ok?) }
+
+          completed_members.concat(wave)
+          remaining_members = release_members - completed_members
+          append_dependency_floor_results(released_members: wave, dependent_members: remaining_members, runner: release_command_runner, memo: results)
+          break unless results.last&.ok?
         end
         results
       end
@@ -477,6 +489,38 @@ module Kettle
         Array(member.dependencies).map(&:to_s).select { |dependency| by_name.key?(dependency) }
       end
 
+      def append_dependency_floor_results(released_members:, dependent_members:, runner:, memo:)
+        return unless auto_dependency_floors
+        return if dependent_members.empty?
+
+        floor_results = DependencyFloor.new(
+          released_members: released_members,
+          dependent_members: dependent_members,
+          mode: execute ? :execute : :dry_run
+        ).results
+        memo.concat(floor_results)
+        return unless floor_results.any? && floor_results.all?(&:ok?)
+
+        commit_dependency_floor_changes(dependent_members: floor_results.map(&:member_name), runner: runner, memo: memo) if execute && commit
+      end
+
+      def commit_dependency_floor_changes(dependent_members:, runner:, memo:)
+        by_name = members.to_h { |member| [member.name, member] }
+        dependent_members.each do |member_name|
+          member = by_name.fetch(member_name)
+          memo << runner.call(
+            member: member,
+            phase: "commit_dependency_floor",
+            command: [
+              "sh",
+              "-lc",
+              "if ! git diff --quiet -- '*.gemspec'; then git add -- '*.gemspec' && git commit -m '⬆️ Raise family dependency floors'; fi"
+            ]
+          )
+          break unless memo.last.ok?
+        end
+      end
+
       def distinct_git_roots?(release_members)
         roots = release_members.map { |member| git_root_for(member) }
         roots.uniq.length == roots.length

data/lib/kettle/family.rb

@@ -11,6 +11,7 @@ require_relative "family/readiness_check"
 require_relative "family/changelog_check"
 require_relative "family/git_status"
 require_relative "family/version_bump"
+require_relative "family/dependency_floor"
 require_relative "family/branch_lane_audit"
 require_relative "family/config"
 require_relative "family/branch_target_config"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kettle-family
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
 platform: ruby
 authors:
 - Peter H. Boling
@@ -319,6 +319,7 @@ files:
 - lib/kettle/family/command_result.rb
 - lib/kettle/family/command_runner.rb
 - lib/kettle/family/config.rb
+- lib/kettle/family/dependency_floor.rb
 - lib/kettle/family/discovery.rb
 - lib/kettle/family/git_status.rb
 - lib/kettle/family/local_install.rb
@@ -339,10 +340,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.2.2
-  changelog_uri: https://github.com/kettle-dev/kettle-family/blob/v0.2.2/CHANGELOG.md
+  source_code_uri: https://github.com/kettle-dev/kettle-family/tree/v0.2.4
+  changelog_uri: https://github.com/kettle-dev/kettle-family/blob/v0.2.4/CHANGELOG.md
   bug_tracker_uri: https://github.com/kettle-dev/kettle-family/issues
-  documentation_uri: https://www.rubydoc.info/gems/kettle-family/0.2.2
+  documentation_uri: https://www.rubydoc.info/gems/kettle-family/0.2.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