kettle-dev 2.2.20 → 2.2.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22a0bb59de4bca05c100302f2050a300c2a60a90a2124f2f5aa07c215c6b6919
-  data.tar.gz: 6b314236d27b59baa482317413c5b5c95303b9530b33693ee03841491ed00bc6
+  metadata.gz: 5c84739dfdebb3ae9c5c6fd438c7cc1db6e5707d9cecfe7a3e2e754e41390301
+  data.tar.gz: 9e1f2b9e2f3c842c218977027c6cf69c1a753072f2d281e39239dc3e7097e9ee
 SHA512:
-  metadata.gz: 1f8a2d831b26d101a1ea8e381ff3cfc7bbce6d88682e70ec43c22a37b3ba047da5376247b5f32b1184f088514da8a1377f54ffcbe4def383b249515c70c3c518
-  data.tar.gz: 1aa2b1ceb5886238f9034491256e3c7fbdd5cbba121c27393288bced653f92051e43fec7f242a35b4cab7e316731e422a46c73c054548c96ee4b1537c6b371ac
+  metadata.gz: 287be3949983f25366e89ec2de3058bc63cf14dee7ff5b45a5da6a49a09d524493e91318788a370bb6ff92d4bed313771596368638f5026802850523be74f4df
+  data.tar.gz: 20bf852b21d4fa605b151e9ee4fe91b50921fa7320ded4ec937951e3cfcc4177ae653246448139ede0188d4741d70f0b5d1b7afce04ed042442d31cbbbb4f98b

data/CHANGELOG.md

@@ -30,6 +30,19 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Security
 
+## [2.2.21] - 2026-06-28
+
+- TAG: [v2.2.21][2.2.21t]
+- COVERAGE: 92.34% -- 4182/4529 lines in 33 files
+- BRANCH COVERAGE: 73.34% -- 1659/2262 branches in 33 files
+- 61.04% documented
+
+### Fixed
+
+- `kettle-release` now detects local `.kettle-family.yml` branch-stack release
+  targets and skips trunk sync, trunk merge, and trunk checkout for those release
+  branches.
+
 ## [2.2.20] - 2026-06-27
 
 - TAG: [v2.2.20][2.2.20t]
@@ -2321,7 +2334,9 @@ Please file a bug if you notice a violation of semantic versioning.
   - Selecting will run the selected workflow via `act`
   - This may move to its own gem in the future.
 
-[Unreleased]: https://github.com/kettle-dev/kettle-dev/compare/v2.2.20...HEAD
+[Unreleased]: https://github.com/kettle-dev/kettle-dev/compare/v2.2.21...HEAD
+[2.2.21]: https://github.com/kettle-dev/kettle-dev/compare/v2.2.20...v2.2.21
+[2.2.21t]: https://github.com/kettle-dev/kettle-dev/releases/tag/v2.2.21
 [2.2.20]: https://github.com/kettle-dev/kettle-dev/compare/v2.2.19...v2.2.20
 [2.2.20t]: https://github.com/kettle-dev/kettle-dev/releases/tag/v2.2.20
 [2.2.19]: https://github.com/kettle-dev/kettle-dev/compare/v2.2.18...v2.2.19

data/README.md

@@ -874,7 +874,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-4.499-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
+[🧮kloc-img]: https://img.shields.io/badge/KLOC-4.529-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
 [🔐security]: https://github.com/kettle-dev/kettle-dev/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/dev/gem_spec_reader.rb

@@ -196,7 +196,7 @@ module Kettle
         end
 
         def declared_version_file_path(root)
-          gemspec_path = Dir.glob(File.join(root.to_s, "*.gemspec")).sort.first
+          gemspec_path = Dir.glob(File.join(root.to_s, "*.gemspec")).min
           return unless gemspec_path && File.file?(gemspec_path)
 
           gemspec_source = File.read(gemspec_path)

data/lib/kettle/dev/release_cli.rb

@@ -9,6 +9,7 @@ require "fileutils"
 require "net/http"
 require "json"
 require "uri"
+require "yaml"
 
 # External gems
 require "kettle/rb/compat_matrix"
@@ -128,6 +129,7 @@ module Kettle
         committed = nil
         trunk = nil
         feature = nil
+        branch_stack_release = false
 
         # 2. Version detection and sanity checks + prompt
         if run_step?(2)
@@ -257,8 +259,12 @@ module Kettle
         if run_step?(8) && !local_ci?
           trunk = detect_trunk_branch
           feature = current_branch
+          branch_stack_release = branch_stack_release_branch?(feature, trunk)
+          if branch_stack_release
+            puts "Kettle-family branch stack release branch detected: #{feature}; skipping trunk sync/rebase."
+          end
           puts "Trunk branch detected: #{trunk}"
-          ensure_trunk_synced_before_push!(trunk, feature)
+          ensure_trunk_synced_before_push!(trunk, feature) unless branch_stack_release
         elsif run_step?(8)
           puts "Local CI release mode: skipping remote trunk sync before publishing."
         end
@@ -273,14 +279,25 @@ module Kettle
         if run_step?(11) && !local_ci?
           trunk ||= detect_trunk_branch
           feature ||= current_branch
-          merge_feature_into_trunk_and_push!(trunk, feature)
+          branch_stack_release ||= branch_stack_release_branch?(feature, trunk)
+          if branch_stack_release
+            puts "Kettle-family branch stack release branch detected: #{feature}; skipping merge into #{trunk}."
+          else
+            merge_feature_into_trunk_and_push!(trunk, feature)
+          end
         end
 
         # 12. checkout trunk and pull
         if run_step?(12) && !local_ci?
           trunk ||= detect_trunk_branch
-          checkout!(trunk)
-          pull!(trunk)
+          feature ||= current_branch
+          branch_stack_release ||= branch_stack_release_branch?(feature, trunk)
+          if branch_stack_release
+            puts "Kettle-family branch stack release branch detected: #{feature}; staying on release branch."
+          else
+            checkout!(trunk)
+            pull!(trunk)
+          end
         end
 
         # 13. signing guidance and checks
@@ -1086,6 +1103,44 @@ module Kettle
         puts "Merged #{feature} into #{trunk} and pushed. The PR (if any) should auto-close."
       end
 
+      def branch_stack_release_branch?(branch, trunk = nil)
+        return false if branch.to_s.empty?
+        return false if trunk && branch == trunk
+
+        local_kettle_family_release_target_branches.include?(branch)
+      end
+
+      def local_kettle_family_release_target_branches
+        local_kettle_family_config_paths.each do |path|
+          next unless File.file?(path)
+
+          begin
+            data = YAML.safe_load(File.read(path), permitted_classes: [], aliases: false) || {}
+            branches = Array(dig_string_keys(data, "release", "target_branches")) +
+              Array(dig_string_keys(data, "branches", "release_targets"))
+            return branches.map(&:to_s).reject(&:empty?) unless branches.empty?
+          rescue Psych::Exception => e
+            warn("Ignoring invalid kettle-family config #{Kettle::Dev.display_path(path)}: #{e.message}")
+          end
+        end
+        []
+      end
+
+      def local_kettle_family_config_paths
+        [
+          File.join(@root, ".kettle-family.yml"),
+          File.join(@root, ".structuredmerge", "kettle-family.yml")
+        ]
+      end
+
+      def dig_string_keys(data, *keys)
+        keys.reduce(data) do |memo, key|
+          break nil unless memo.is_a?(Hash)
+
+          memo[key] || memo[key.to_sym]
+        end
+      end
+
       def ensure_signing_setup_or_skip!
         # Treat any non-/true/i value as an explicit skip signal
         return if ENV.fetch("SKIP_GEM_SIGNING", "").casecmp("true").zero?

data/lib/kettle/dev/version.rb

@@ -3,7 +3,7 @@
 module Kettle
   module Dev
     module Version
-      VERSION = "2.2.20"
+      VERSION = "2.2.21"
     end
     VERSION = Version::VERSION # Traditional Constant Location
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kettle-dev
 version: !ruby/object:Gem::Version
-  version: 2.2.20
+  version: 2.2.21
 platform: ruby
 authors:
 - Peter H. Boling
@@ -359,10 +359,10 @@ licenses:
 - AGPL-3.0-only
 metadata:
   homepage_uri: https://kettle-dev.galtzo.com
-  source_code_uri: https://github.com/kettle-dev/kettle-dev/tree/v2.2.20
-  changelog_uri: https://github.com/kettle-dev/kettle-dev/blob/v2.2.20/CHANGELOG.md
+  source_code_uri: https://github.com/kettle-dev/kettle-dev/tree/v2.2.21
+  changelog_uri: https://github.com/kettle-dev/kettle-dev/blob/v2.2.21/CHANGELOG.md
   bug_tracker_uri: https://github.com/kettle-dev/kettle-dev/issues
-  documentation_uri: https://www.rubydoc.info/gems/kettle-dev/2.2.20
+  documentation_uri: https://www.rubydoc.info/gems/kettle-dev/2.2.21
   funding_uri: https://github.com/sponsors/pboling
   wiki_uri: https://github.com/kettle-dev/kettle-dev/wiki
   news_uri: https://www.railsbling.com/tags/kettle-dev