kettle-family 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f37904c4583ed3dbc1ef2c372c5d4aa7e3ecec95d8aba520e0979065106087f
-  data.tar.gz: ce0b99d87d7a815467428209c2f504ddafc0800890dabf9af5b534e4f8073fc0
+  metadata.gz: 4cb4c502493482718d093219b202a58d6b4eef4d99890bdd300a18646fd87448
+  data.tar.gz: 396fa2013f8ebb7ae7a3f84f2c74a12d38af9443311f5da5629154d7cb730023
 SHA512:
-  metadata.gz: b98994c1f6daa8fd29ec064de3b23a241c3e25c3786b67e67bc765dea795e92dfa6cf3ba510a4782f9a9b5a954ef0f748bb82c0d6f94a5f2a5b1f95da9ac0be9
-  data.tar.gz: '0189a3faba9e70ec5e333eaee9eaf956d4c7151ded78916f63faaf8d1bce1c2a14d10c636fcec54bb7555dff7332cb0ae8adc9f763231d75b94eac0ec0caaf12'
+  metadata.gz: e81e3a9cfba607441cbd5ae8dce13002c92cd9a2744dce24a1928b03d607360bec111d1314fec7570a3365e1631b86ae62af6fe00498084eabc2d74d07bde916
+  data.tar.gz: af9e4962ed8bcad15481eca3e38139ad610ab7ce470009ea6aa815e7c46c396efe382d1a520a24c3411d47d127b9311cc9f8137c6691fcaca226ddd046311d3b

data/CHANGELOG.md

@@ -30,6 +30,25 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Security
 
+## [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]
+- COVERAGE: 95.45% -- 2180/2284 lines in 21 files
+- BRANCH COVERAGE: 76.39% -- 702/919 branches in 21 files
+- 29.96% documented
+
 ## [0.2.0] - 2026-07-02
 
 - TAG: [v0.2.0][0.2.0t]
@@ -49,6 +68,9 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Fixed
 
+- `kettle-family release --execute --publish` now skips already-published
+  members whose release-state reports no pending release, even when current
+  `HEAD` no longer matches the release tag.
 - `kettle-family bump-version` now prefers `lib/<gem_name>/version.rb` over
   alphabetically earlier compatibility namespace version files when discovering
   each member's editable version file.
@@ -595,7 +617,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.0...HEAD
+[Unreleased]: https://github.com/kettle-dev/kettle-family/compare/v0.2.2...HEAD
+[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
 [0.2.0t]: https://github.com/kettle-dev/kettle-family/releases/tag/v0.2.0
 [0.1.32]: https://github.com/kettle-dev/kettle-family/compare/v0.1.31...v0.1.32

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.274-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
+[🧮kloc-img]: https://img.shields.io/badge/KLOC-2.308-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/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.0"
+      VERSION = "0.2.2"
     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 = []
@@ -570,10 +619,16 @@ module Kettle
         if current_release_head
           stdout = "#{member.name} #{member.version} is already published and current HEAD matches #{tag}; skipping release"
           reason = "already released"
-        else
+          skipped = true
+        elsif release_pending?(member)
           stdout = "#{member.name} #{member.version} is already published, but current HEAD is not #{tag}. " \
             "Bump the version with `kettle-family bump-version patch --execute --only #{member.name}` before releasing."
           reason = "published version does not match current HEAD"
+          skipped = false
+        else
+          stdout = "#{member.name} #{member.version} is already published and release-state reports no pending release; skipping release"
+          reason = "already released; no pending release"
+          skipped = true
         end
 
         CommandResult.new(
@@ -581,16 +636,23 @@ module Kettle
           phase: "release_skip",
           command: ["internal", "released-version-check", member.version],
           workdir: member.root,
-          status: current_release_head ? 0 : 1,
-          success: current_release_head,
+          status: skipped ? 0 : 1,
+          success: skipped,
           stdout: stdout,
           stderr: "",
           elapsed_seconds: 0.0,
-          skipped: current_release_head,
+          skipped: skipped,
           reason: reason
         )
       end
 
+      def release_pending?(member)
+        results = ReleaseStateCheck.new(members: [member], config: config).results
+        return true unless results.all?(&:ok?)
+
+        results.any? { |result| result.state.fetch("pending_release", true) }
+      end
+
       def release_tag_name(version)
         "v#{version}"
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kettle-family
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 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.0
-  changelog_uri: https://github.com/kettle-dev/kettle-family/blob/v0.2.0/CHANGELOG.md
+  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
   bug_tracker_uri: https://github.com/kettle-dev/kettle-family/issues
-  documentation_uri: https://www.rubydoc.info/gems/kettle-family/0.2.0
+  documentation_uri: https://www.rubydoc.info/gems/kettle-family/0.2.2
   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