kettle-dev 2.3.5 → 2.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d92e30cac83dbcad9d7d975f1daf19bb98eb61e57753c0e2816e2176d810a326
-  data.tar.gz: 1dd743a5f4e788f2564de31c57a143f2a6df4bdd1198013d8f340cce4e829fce
+  metadata.gz: 4e582c50d05608c5e338caeac74f7c339fb2d66010b58c8cce836a78d8e4ded5
+  data.tar.gz: e9ce2e0857dbf506017c8ddab46c5049ffc5003af5778a2e2954dd759cee8183
 SHA512:
-  metadata.gz: 434c23b1f327e1707a49d461485a99699e4102e4a067289c5e490ed4df076eb5477827a369cad2c09190f88158255bbaf3b76decaa2114f5f239d7cd92bcfa47
-  data.tar.gz: fed2def55fc0799c88a14ba0b6bf8d095ca53b7d1d76718676557f4a3560be7e2643e66f9b2a0d047ea969f5c0dfa52e3c2b2d91393560308e44d2d7a361c04b
+  metadata.gz: cea8e2be14321cc1e70534197cd2b01dea382a62f6de651ebfb35ccf1025acdfb0a11ee74c31e7c5c78dfe216ec51fdbe21a02f4f1358b6e8b526365b9a5f5af
+  data.tar.gz: 47dada022728fd8414d252df3d01ecb992f18ccea69ed20ed8670dbd87ab3cf7f205bb488a48ab95039a4548a0b278c5e8aaf7099b7d94248539db5e7630c26b

data/CHANGELOG.md

@@ -30,6 +30,46 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Security
 
+## [2.3.7] - 2026-07-18
+
+- TAG: [v2.3.7][2.3.7t]
+- COVERAGE: 91.84% -- 4311/4694 lines in 36 files
+- BRANCH COVERAGE: 74.20% -- 1694/2283 branches in 36 files
+- 56.25% documented
+
+### Fixed
+
+- `kettle-gha-sha-pins` now canonicalizes duplicate equivalent action tags,
+  preferring explicit release tags such as `v7.0.0` over major-line aliases
+  such as `v7`, so adjacent version comments do not flip between spellings.
+
+## [2.3.6] - 2026-07-17
+
+- TAG: [v2.3.6][2.3.6t]
+- COVERAGE: 91.85% -- 4292/4673 lines in 36 files
+- BRANCH COVERAGE: 73.94% -- 1685/2279 branches in 36 files
+- 56.67% documented
+
+### Added
+
+- `kettle-release` now accepts `--ci-workflows` and
+  `K_RELEASE_CI_WORKFLOWS` to monitor an explicit workflow subset at the CI
+  wait step while retaining the default behavior of waiting for all applicable
+  workflows.
+
+### Changed
+
+- kettle-jem-template-20260716-001 - Shim gemspec manifests now include
+  `LICENSE.md` instead of nonexistent `LICENSE.txt`.
+- kettle-jem-template-20260716-002 - Generated gemspec manifests now ship fewer
+  repository-only files by default to reduce downstream distro packaging churn.
+
+### Fixed
+
+- `kettle-release --ci-workflows` now rejects a missing value when the next
+  token is another flag, and the release CI workflow subset APIs now have
+  matching RBS signatures.
+
 ## [2.3.5] - 2026-07-16
 
 - TAG: [v2.3.5][2.3.5t]
@@ -2496,7 +2536,11 @@ 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.3.5...HEAD
+[Unreleased]: https://github.com/kettle-dev/kettle-dev/compare/v2.3.7...HEAD
+[2.3.7]: https://github.com/kettle-dev/kettle-dev/compare/v2.3.6...v2.3.7
+[2.3.7t]: https://github.com/kettle-dev/kettle-dev/releases/tag/v2.3.7
+[2.3.6]: https://github.com/kettle-dev/kettle-dev/compare/v2.3.5...v2.3.6
+[2.3.6t]: https://github.com/kettle-dev/kettle-dev/releases/tag/v2.3.6
 [2.3.5]: https://github.com/kettle-dev/kettle-dev/compare/v2.3.4...v2.3.5
 [2.3.5t]: https://github.com/kettle-dev/kettle-dev/releases/tag/v2.3.5
 [2.3.4]: https://github.com/kettle-dev/kettle-dev/compare/v2.3.3...v2.3.4
@@ -2749,25 +2793,25 @@ Please file a bug if you notice a violation of semantic versioning.
 [1.0.12t]: https://github.com/kettle-dev/kettle-dev/releases/tag/v1.0.12
 [1.0.11]: https://github.com/kettle-dev/kettle-dev/compare/v1.0.10...v1.0.11
 [1.0.11t]: https://github.com/kettle-dev/kettle-dev/releases/tag/v1.0.11
-[1.0.10]: https://gitlab.com/kettle-rb/kettle-dev/-/compare/v1.0.9...v1.0.10
+[1.0.10]: https://gitlab.com/kettle-dev/kettle-dev/-/compare/v1.0.9...v1.0.10
 [1.0.10t]: https://github.com/kettle-dev/kettle-dev/releases/tag/v1.0.10
-[1.0.9]: https://gitlab.com/kettle-rb/kettle-dev/-/compare/v1.0.8...v1.0.9
+[1.0.9]: https://gitlab.com/kettle-dev/kettle-dev/-/compare/v1.0.8...v1.0.9
 [1.0.9t]: https://github.com/kettle-dev/kettle-dev/releases/tag/v1.0.9
-[1.0.8]: https://gitlab.com/kettle-rb/kettle-dev/-/compare/v1.0.7...v1.0.8
+[1.0.8]: https://gitlab.com/kettle-dev/kettle-dev/-/compare/v1.0.7...v1.0.8
 [1.0.8t]: https://github.com/kettle-dev/kettle-dev/releases/tag/v1.0.8
-[1.0.7]: https://gitlab.com/kettle-rb/kettle-dev/-/compare/v1.0.6...v1.0.7
+[1.0.7]: https://gitlab.com/kettle-dev/kettle-dev/-/compare/v1.0.6...v1.0.7
 [1.0.7t]: https://github.com/kettle-dev/kettle-dev/releases/tag/v1.0.7
-[1.0.6]: https://gitlab.com/kettle-rb/kettle-dev/-/compare/v1.0.5...v1.0.6
+[1.0.6]: https://gitlab.com/kettle-dev/kettle-dev/-/compare/v1.0.5...v1.0.6
 [1.0.6t]: https://github.com/kettle-dev/kettle-dev/releases/tag/v1.0.6
-[1.0.5]: https://gitlab.com/kettle-rb/kettle-dev/-/compare/v1.0.4...v1.0.5
+[1.0.5]: https://gitlab.com/kettle-dev/kettle-dev/-/compare/v1.0.4...v1.0.5
 [1.0.5t]: https://github.com/kettle-dev/kettle-dev/releases/tag/v1.0.5
-[1.0.4]: https://gitlab.com/kettle-rb/kettle-dev/-/compare/v1.0.3...v1.0.4
+[1.0.4]: https://gitlab.com/kettle-dev/kettle-dev/-/compare/v1.0.3...v1.0.4
 [1.0.4t]: https://github.com/kettle-dev/kettle-dev/releases/tag/v1.0.4
-[1.0.3]: https://gitlab.com/kettle-rb/kettle-dev/-/compare/v1.0.2...v1.0.3
+[1.0.3]: https://gitlab.com/kettle-dev/kettle-dev/-/compare/v1.0.2...v1.0.3
 [1.0.3t]: https://github.com/kettle-dev/kettle-dev/releases/tag/v1.0.3
-[1.0.2]: https://gitlab.com/kettle-rb/kettle-dev/-/compare/v1.0.1...v1.0.2
+[1.0.2]: https://gitlab.com/kettle-dev/kettle-dev/-/compare/v1.0.1...v1.0.2
 [1.0.2t]: https://github.com/kettle-dev/kettle-dev/releases/tag/v1.0.2
-[1.0.1]: https://gitlab.com/kettle-rb/kettle-dev/-/compare/v1.0.0...v1.0.1
+[1.0.1]: https://gitlab.com/kettle-dev/kettle-dev/-/compare/v1.0.0...v1.0.1
 [1.0.1t]: https://github.com/kettle-dev/kettle-dev/releases/tag/v1.0.1
 [1.0.0]: https://github.com/kettle-dev/kettle-dev/compare/a427c302df09cfe4253a7c8d400333f9a4c1a208...v1.0.0
 [1.0.0t]: https://github.com/kettle-dev/kettle-dev/releases/tag/v1.0.0

data/README.md

@@ -887,7 +887,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.669-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
+[🧮kloc-img]: https://img.shields.io/badge/KLOC-4.694-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
@@ -913,7 +913,7 @@ Thanks for RTFM. ☺️
 | Field | Value |
 |---|---|
 | Package | kettle-dev |
-| Description | 🍲 Kettle::Dev is a meta tool from kettle-rb to streamline development and testing. Acts as a shim dependency, pulling in many other dependencies, to give you OOTB productivity with a RubyGem, or Ruby app project. Configures a complete set of Rake tasks, for all the libraries is brings in, so they arrive ready to go. Fund overlooked open source projects - bottom of stack, dev/test dependencies: floss-funding.dev |
+| Description | 🍲 Kettle::Dev is a meta tool from kettle-dev to streamline development and testing. Acts as a shim dependency, pulling in many other dependencies, to give you OOTB productivity with a RubyGem, or Ruby app project. Configures a complete set of Rake tasks, for all the libraries is brings in, so they arrive ready to go. Fund overlooked open source projects - bottom of stack, dev/test dependencies: floss-funding.dev |
 | Homepage | https://github.com/kettle-dev/kettle-dev |
 | Source | https://github.com/kettle-dev/kettle-dev |
 | License | `AGPL-3.0-only` |

data/exe/kettle-release

@@ -43,7 +43,7 @@ end
 # Do not guard with __FILE__ == $PROGRAM_NAME because binstubs use Kernel.load.
 if ARGV.include?("-h") || ARGV.include?("--help")
   puts <<~USAGE
-    Usage: kettle-release [--version VERSION] [--local-ci] [--appraisal-update] [--skip-bundle-audit] [--skip-steps STEPS] [start_step=<0-19>]
+    Usage: kettle-release [--version VERSION] [--local-ci] [--appraisal-update] [--skip-bundle-audit] [--skip-steps STEPS] [--ci-workflows WORKFLOWS] [start_step=<0-19>]
 
     Automates the release flow for a Ruby gem in the host project.
 
@@ -81,6 +81,7 @@ if ARGV.include?("-h") || ARGV.include?("--help")
       --version VERSION           # Use this version instead of detecting VERSION from lib/**/version.rb
       --appraisal-update          # Use slower appraisal:update instead of default appraisal:generate
       --skip-bundle-audit         # Skip bundle:audit/update during release rake checks
+      --ci-workflows WORKFLOWS    # Comma-separated workflow files or stems to monitor at CI step 10
       --local-ci                  # Sensitive release mode: run act locally, publish before any git push,
                                   # create the git tag locally, then push commits and tags after publish
 
@@ -89,6 +90,7 @@ if ARGV.include?("-h") || ARGV.include?("--help")
       GEM_CERT_USER=<user>        # Select certs/<user>.pem for signing
       K_RELEASE_LOCAL_CI=ask|1|0  # Use 'act' locally before push; 'ask' prompts, '1' forces, default off
       K_RELEASE_LOCAL_CI_WORKFLOW # Name of workflow (without .yml) for local CI; defaults to locked_deps or first
+      K_RELEASE_CI_WORKFLOWS      # Comma-separated workflow files or stems to monitor at CI step 10
       KETTLE_RELEASE_APPRAISAL_TASK=appraisal:update
                                   # Use slower appraisal:update instead of default appraisal:generate
       KETTLE_DEV_SKIP_BUNDLE_AUDIT=true
@@ -145,6 +147,27 @@ def extract_skip_steps_arg!(argv)
   skip_steps
 end
 
+def extract_ci_workflows_arg!(argv)
+  workflows = nil
+  if (idx = argv.index("--ci-workflows"))
+    workflows = argv[idx + 1]
+    if workflows.to_s.empty? || workflows.to_s.start_with?("-")
+      Kettle::Dev::ExitAdapter.abort("--ci-workflows requires a comma-separated workflow list")
+    end
+    argv.slice!(idx, 2)
+  end
+  argv.delete_if do |arg|
+    if arg.start_with?("--ci-workflows=", "ci_workflows=")
+      workflows = arg.split("=", 2)[1]
+      Kettle::Dev::ExitAdapter.abort("--ci-workflows requires a comma-separated workflow list") if workflows.to_s.empty?
+      true
+    else
+      false
+    end
+  end
+  workflows
+end
+
 local_ci = ARGV.include?("--local-ci")
 appraisal_task = ARGV.delete("--appraisal-update") ? "appraisal:update" : nil
 skip_bundle_audit = !!ARGV.delete("--skip-bundle-audit")
@@ -152,9 +175,10 @@ start_step_arg = ARGV.find { |a| a.start_with?("start_step=") }
 start_step = start_step_arg ? start_step_arg.split("=", 2)[1].to_i : 0
 version_override = extract_version_arg!(ARGV)
 skip_steps = extract_skip_steps_arg!(ARGV)
+ci_workflows = extract_ci_workflows_arg!(ARGV)
 
 begin
-  Kettle::Dev::ReleaseCLI.new(start_step: start_step, local_ci: local_ci, version: version_override, appraisal_task: appraisal_task, skip_steps: skip_steps, skip_bundle_audit: skip_bundle_audit).run
+  Kettle::Dev::ReleaseCLI.new(start_step: start_step, local_ci: local_ci, version: version_override, appraisal_task: appraisal_task, skip_steps: skip_steps, skip_bundle_audit: skip_bundle_audit, ci_workflows: ci_workflows).run
 rescue LoadError => e
   warn("#{script_basename}: could not load dependency: #{e.class}: #{e.message}")
   warn(Array(e.backtrace).join("\n")) if ENV["DEBUG"]

data/lib/kettle/dev/ci_monitor.rb

@@ -47,9 +47,9 @@ module Kettle
       #
       # @param restart_hint [String] guidance command shown on failure
       # @return [void]
-      def monitor_all!(restart_hint: "bundle exec kettle-release start_step=10")
+      def monitor_all!(restart_hint: "bundle exec kettle-release start_step=10", workflows: nil, **options)
         checks_any = false
-        checks_any |= monitor_github_internal!(restart_hint: restart_hint)
+        checks_any |= monitor_github_internal!(restart_hint: restart_hint, workflows: workflows)
         checks_any |= monitor_gitlab_internal!(restart_hint: restart_hint)
         abort("CI configuration not detected (GitHub or GitLab). Ensure CI is configured and remotes point to the correct hosts.") unless checks_any
       end
@@ -269,9 +269,9 @@ module Kettle
 
       # -- internals (abort-on-failure legacy paths used elsewhere) --
 
-      def monitor_github_internal!(restart_hint:)
+      def monitor_github_internal!(restart_hint:, workflows: nil)
         root = Kettle::Dev::CIHelpers.project_root
-        workflows = Kettle::Dev::CIHelpers.workflows_list(root)
+        workflows = Array(workflows).empty? ? Kettle::Dev::CIHelpers.workflows_list(root) : Array(workflows)
         gh_remote = preferred_github_remote
         return false unless gh_remote && !workflows.empty?
 

data/lib/kettle/dev/gha_sha_pins_cli.rb

@@ -35,6 +35,23 @@ module Kettle
       VERSION_COMMENT_SUFFIX_RE = /\A\s+#\s*v?(?<version>\d+(?:\.\d+\.\d+(?:[-.]?[0-9A-Za-z.-]+)?)?)/
       VERSION_COMMENT_REPLACEMENT_RE = /\A(?<prefix>\s+#\s*)v?\d+(?:\.\d+\.\d+(?:[-.]?[0-9A-Za-z.-]+)?)?/
 
+      def self.release_version_sort_key(entry)
+        [entry.fetch(:version_obj), *release_version_specificity(entry)]
+      end
+
+      def self.release_version_specificity(entry)
+        text = entry.fetch(:tag).to_s.sub(/\A[vV]/, "")
+        release_text, suffix = text.split(/[-.](?=[A-Za-z])/, 2)
+        numeric_segments = release_text.to_s.split(".").take_while { |part| part.match?(/\A\d+\z/) }
+
+        [
+          numeric_segments.length,
+          suffix ? 0 : 1,
+          text.length,
+          entry.fetch(:tag).to_s
+        ]
+      end
+
       def initialize(argv, err: $stderr)
         @argv = argv
         @err = err
@@ -521,7 +538,7 @@ module Kettle
           end
         end
 
-        candidates.max_by { |entry| entry[:version_obj] }
+        candidates.max_by { |entry| release_version_sort_key(entry) }
       end
 
       def major_line_version?(value)
@@ -538,7 +555,7 @@ module Kettle
               entry[:version_obj] > current &&
               (!entry[:version_obj].prerelease? || current.prerelease?)
           end
-          .max_by { |entry| entry[:version_obj] }
+          .max_by { |entry| release_version_sort_key(entry) }
       end
 
       def determine_upgrade_plan(old_ref:, repo_ref:, versions:, upgrade_level:, client:)
@@ -645,6 +662,10 @@ module Kettle
         sha
       end
 
+      def release_version_sort_key(entry)
+        self.class.release_version_sort_key(entry)
+      end
+
       def short_sha?(candidate)
         return false unless candidate
         WEAK_SHA_RE.match?(candidate)
@@ -1061,10 +1082,10 @@ module Kettle
           full_semver_entries = entries.reject { |entry| major_line_version?(entry[:version]) }
           {
             "patch" => full_semver_entries.group_by { |entry| entry[:version_obj].segments[0, 2].join(".") }
-              .transform_values { |group| serialize_target(group.max_by { |entry| entry[:version_obj] }) },
+              .transform_values { |group| serialize_target(group.max_by { |entry| GhaShaPinsCLI.release_version_sort_key(entry) }) },
             "minor" => full_semver_entries.group_by { |entry| entry[:version_obj].segments[0].to_s }
-              .transform_values { |group| serialize_target(group.max_by { |entry| entry[:version_obj] }) },
-            "major" => {"*" => serialize_target(entries.max_by { |entry| entry[:version_obj] })}
+              .transform_values { |group| serialize_target(group.max_by { |entry| GhaShaPinsCLI.release_version_sort_key(entry) }) },
+            "major" => {"*" => serialize_target(entries.max_by { |entry| GhaShaPinsCLI.release_version_sort_key(entry) })}
           }
         end
 
@@ -1212,12 +1233,34 @@ module Kettle
             }
           end
           releases.concat(tag_versions)
+          releases = canonicalize_equivalent_release_versions(releases)
 
-          releases.sort_by! { |release| release[:version_obj] }
+          releases.sort_by! { |release| GhaShaPinsCLI.release_version_sort_key(release) }
           releases.reverse!
           releases
         end
 
+        def canonicalize_equivalent_release_versions(releases)
+          groups = []
+          releases.each do |release|
+            group = groups.find { |entries| equivalent_release_tag?(entries.first, release) }
+            if group
+              group << release
+            else
+              groups << [release]
+            end
+          end
+
+          groups.map { |entries| entries.max_by { |entry| GhaShaPinsCLI.release_version_sort_key(entry) } }
+        end
+
+        def equivalent_release_tag?(left, right)
+          left[:version_obj] == right[:version_obj] &&
+            left[:sha] &&
+            right[:sha] &&
+            left[:sha] == right[:sha]
+        end
+
         def parse_release_version_text(value)
           normalized = value.to_s.sub(/\A[vV]/, "")
           return nil unless normalized.match?(/\A(?:\d+|\d+\.\d+\.\d+(?:[-.]?[0-9A-Za-z.-]+)?)\z/)

data/lib/kettle/dev/release_cli.rb

@@ -108,12 +108,13 @@ module Kettle
 
       public
 
-      def initialize(start_step: 0, local_ci: false, version: nil, appraisal_task: nil, skip_steps: nil, skip_bundle_audit: nil)
+      def initialize(start_step: 0, local_ci: false, version: nil, appraisal_task: nil, skip_steps: nil, skip_bundle_audit: nil, ci_workflows: nil, **options)
         @root = Kettle::Dev::CIHelpers.project_root
         @git = Kettle::Dev::GitAdapter.new
         @start_step = (start_step || 0).to_i
         @start_step = 0 if @start_step < 0
         @skip_steps = normalize_skip_steps(skip_steps)
+        @ci_workflows = normalize_ci_workflows(ci_workflows || ENV["K_RELEASE_CI_WORKFLOWS"])
         @local_ci = !!local_ci
         @skip_bundle_audit = truthy_value?(skip_bundle_audit) || truthy_value?(ENV["KETTLE_DEV_SKIP_BUNDLE_AUDIT"])
         @version_override = Kettle::Dev::Versioning.normalize_explicit_version(version)
@@ -405,6 +406,11 @@ module Kettle
         end.uniq
       end
 
+      def normalize_ci_workflows(value)
+        workflows = Array(value).flat_map { |part| part.to_s.split(",") }.map(&:strip).reject(&:empty?)
+        workflows.map { |workflow| workflow.match?(/\.ya?ml\z/) ? workflow : "#{workflow}.yml" }.uniq
+      end
+
       private
 
       def local_ci?
@@ -714,7 +720,7 @@ module Kettle
 
       def monitor_workflows_after_push!
         # Use abort-on-failure CI monitor to match historical behavior and specs
-        Kettle::Dev::CIMonitor.monitor_all!(restart_hint: "bundle exec kettle-release start_step=10")
+        Kettle::Dev::CIMonitor.monitor_all!(restart_hint: "bundle exec kettle-release start_step=10", workflows: @ci_workflows)
       end
 
       def run_cmd!(cmd)

data/lib/kettle/dev/version.rb

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