kettle-family 0.2.1 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: df75b3cbe214e80033a6e9fec8047061693170cb9b2f1d9876c725651bff13ef
-  data.tar.gz: 42827c84dc46376a3b2eeaf94ff078137fcedce139f2b4ead0a2f2794abaa311
+  metadata.gz: 1321ed38de6cb72dbb54f07eb9d64ad603d534ee0bde3986c69a12aea3209bd7
+  data.tar.gz: fb828bcc85d5a373bfbaa19b9f409e4ccc061840943bb7605337106c346d1531
 SHA512:
-  metadata.gz: d9477dedc39d42723f0c15610838ad4557ebdfcfecd6b1e6a1f9ae79a7bae5bc36114fdb85122134670a9652cc151b5cddaa66436466e36ba272427b09d1f84a
-  data.tar.gz: 1a1b276d934b09a2d65adcba585b7d37f7d8d1bb346c4e2dac2e5fd47b1146722edc980ee06272014037dfb948faed83c2e51216e1098e9e21a5cd414d25889d
+  metadata.gz: 93890dd533ed38d98f53ddf6c6c3a54e2be63e62d115e90e1c87caa3613eaeb0fe73c4fc76baf6de3f92c68591cbb73ac8dc6e869a817ff5ad7a8db200021ddb
+  data.tar.gz: 36fe85d72cc06f7bae910e45161ebc65d4d1f847f9627c18625b402a401be8f2698bffb13562fbbd881b3c63b90cdcc03c412f6e9ea2ce4d35be307dfa25a8d1

data/CHANGELOG.md

@@ -30,6 +30,31 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Security
 
+## [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]
+- COVERAGE: 95.54% -- 2205/2308 lines in 21 files
+- BRANCH COVERAGE: 76.53% -- 714/933 branches in 21 files
+- 29.82% documented
+
+### Fixed
+
+- Branch-target workflows now fail before doing member work when a dirty
+  worktree would block `git checkout` for configured release target branches.
+
 ## [0.2.1] - 2026-07-02
 
 - TAG: [v0.2.1][0.2.1t]
@@ -605,7 +630,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.1...HEAD
+[Unreleased]: https://github.com/kettle-dev/kettle-family/compare/v0.2.3...HEAD
+[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
 [0.2.1t]: https://github.com/kettle-dev/kettle-family/releases/tag/v0.2.1
 [0.2.0]: https://github.com/kettle-dev/kettle-family/compare/v0.1.32...v0.2.0

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

@@ -9,6 +9,13 @@ module Kettle
         stdout, _stderr, status = Open3.capture3("git", "status", "--short", chdir: root)
         status.success? && !stdout.empty?
       end
+
+      def self.dirty_paths(root)
+        stdout, _stderr, status = Open3.capture3("git", "status", "--short", chdir: root)
+        return [] unless status.success?
+
+        stdout.lines.map(&:chomp).reject(&:empty?)
+      end
     end
   end
 end

data/lib/kettle/family/version.rb

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

data/lib/kettle/family/workflow.rb

@@ -73,6 +73,9 @@ module Kettle
       end
 
       def results
+        preflight = branch_checkout_dirty_preflight_results
+        return preflight unless preflight.empty?
+
         prompt_for_gem_signing_password if command == "release" && execute && release_signing_prompt_required?
         return branch_target_results unless config.release_target_branches.empty?
         return member_local_branch_target_results if member_local_branch_targets?
@@ -204,6 +207,52 @@ module Kettle
         end
       end
 
+      def branch_checkout_dirty_preflight_results
+        return [] unless execute
+        return [] if allow_dirty
+        return [] unless branch_checkout_preflight_required?
+
+        branch_checkout_preflight_members.filter_map do |member|
+          dirty_paths = GitStatus.dirty_paths(member.root)
+          next if dirty_paths.empty?
+
+          branch_checkout_dirty_result(member, dirty_paths)
+        end
+      end
+
+      def branch_checkout_preflight_required?
+        !config.release_target_branches.empty? || member_local_branch_targets?
+      end
+
+      def branch_checkout_preflight_members
+        members_with_targets = members.select { |member| member_local_release_config(member) }
+        members_with_targets = [family_member] if !config.release_target_branches.empty?
+        members_with_targets
+      end
+
+      def branch_checkout_dirty_result(member, dirty_paths)
+        CommandResult.new(
+          member_name: member.name,
+          phase: "release_checkout_preflight",
+          command: ["git", "status", "--short"],
+          workdir: member.root,
+          status: 1,
+          success: false,
+          stdout: "",
+          stderr: branch_checkout_dirty_message(dirty_paths),
+          elapsed_seconds: 0.0,
+          skipped: false,
+          reason: "dirty worktree blocks release target branch checkout"
+        )
+      end
+
+      def branch_checkout_dirty_message(dirty_paths)
+        [
+          "local changes would block release target branch checkout; commit or stash them before running kettle-family",
+          *dirty_paths
+        ].join("\n")
+      end
+
       def release_member_local_branch_target_results
         runner = command_runner
         results = []

metadata

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