kettle-dev 2.2.2 → 2.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 95ca53a704f80768d0bc13fd9eb4603bb4823638fd66f0a427139ee28a1b6835
-  data.tar.gz: aea475e448ac97b3992474cf3d13b8912bcdf38d5dd5a4472256ce5dc7b4ecce
+  metadata.gz: e1c6a0d6e39d7d8fe607a9b19f147ef63a32a24bae13abfe0fe29e1d63d5850b
+  data.tar.gz: 6fbe922eb16885678ce44cbb55c6caef1c71cc3053a6e7d7624fa0b6c3ecd72a
 SHA512:
-  metadata.gz: 9862a2300bfcf03533a4f8bc48e58081f8676de927de77fe5623c2192e9b9a9c5a5909b02a264317cacfc313e25f1b60e9e34ddcf87450837f56cf1ee3afe244
-  data.tar.gz: 23f33da7772e128ba221b35fecf4f2e0e110343c4087dc9572c3841496c617d04c040f761c29f1ae4816acf17e3837aa9478beb6c245d5a3419c0a0ce1cabe11
+  metadata.gz: 31f868d8ea6bf2b83cc8aab8b56f52726dd96cea08ddf49d38aacab0ac6e7712e69a7d3f9944946ed575a9246c3e0c4b00756ed512dd5d124a0abfdff342f4de
+  data.tar.gz: a7a5d8b99c80b173e97f014029f1972ee74190d7fa4ae97a8bc468606e80d0e87625838312b62fa8a69f2d16ff373c11bb4bc10e73a5cf0872da3287bba69ad7

data/CHANGELOG.md

@@ -30,6 +30,38 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Security
 
+## [2.2.4] - 2026-06-12
+
+- TAG: [v2.2.4][2.2.4t]
+- COVERAGE: 92.18% -- 3806/4129 lines in 28 files
+- BRANCH COVERAGE: 73.26% -- 1507/2057 branches in 28 files
+- 67.00% documented
+
+### Changed
+
+- Retemplated generated project files with the current `kettle-jem` template,
+  refreshing development dependency floors, binstubs, README metadata, and RBS
+  validation workflow output.
+
+### Fixed
+
+- `kettle-gha-sha-pins --upgrade` no longer downgrades action pins when the
+  current SHA matches a newer version-like tag that is a prerelease or lacks a
+  GitHub Release, including transferred action repositories that require GitHub
+  API redirects.
+
+## [2.2.3] - 2026-06-09
+
+- TAG: [v2.2.3][2.2.3t]
+- COVERAGE: 91.76% -- 3762/4100 lines in 28 files
+- BRANCH COVERAGE: 72.91% -- 1483/2034 branches in 28 files
+- 67.00% documented
+
+### Fixed
+
+- `kettle-pre-release` Markdown image checks now inspect project Markdown files
+  instead of recursive scratch output such as `tmp/template_test`.
+
 ## [2.2.2] - 2026-06-09
 
 - TAG: [v2.2.2][2.2.2t]
@@ -2010,7 +2042,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.2.2...HEAD
+[Unreleased]: https://github.com/kettle-dev/kettle-dev/compare/v2.2.4...HEAD
+[2.2.4]: https://github.com/kettle-dev/kettle-dev/compare/v2.2.3...v2.2.4
+[2.2.4t]: https://github.com/kettle-dev/kettle-dev/releases/tag/v2.2.4
+[2.2.3]: https://github.com/kettle-dev/kettle-dev/compare/v2.2.2...v2.2.3
+[2.2.3t]: https://github.com/kettle-dev/kettle-dev/releases/tag/v2.2.3
 [2.2.2]: https://github.com/kettle-dev/kettle-dev/compare/v2.2.1...v2.2.2
 [2.2.2t]: https://github.com/kettle-dev/kettle-dev/releases/tag/v2.2.2
 [2.2.1]: https://github.com/kettle-dev/kettle-dev/compare/v2.2.0...v2.2.1

data/README.md

@@ -854,7 +854,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.083-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
+[🧮kloc-img]: https://img.shields.io/badge/KLOC-4.129-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
@@ -882,7 +882,7 @@ Thanks for RTFM. ☺️
 | 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 |
 | Homepage | https://github.com/kettle-dev/kettle-dev |
-| Source | https://github.com/kettle-dev/kettle-dev/tree/v2.2.1 |
+| Source | https://github.com/kettle-dev/kettle-dev/tree/v2.2.3 |
 | License | `AGPL-3.0-only` |
 | Funding | https://github.com/sponsors/pboling, https://issuehunt.io/u/pboling, https://ko-fi.com/pboling, https://liberapay.com/pboling/donate, https://opencollective.com/kettle-dev, https://opencollective.com/kettle-rb, https://patreon.com/galtzo, https://polar.sh/pboling, https://thanks.dev/u/gh/pboling, https://tidelift.com/funding/github/rubygems/kettle-dev, https://www.buymeacoffee.com/pboling |
 <!-- kettle-jem:metadata:end -->

data/lib/kettle/dev/gha_sha_pins_cli.rb

@@ -508,6 +508,7 @@ module Kettle
         candidates = versions.select do |entry|
           next false unless entry[:version_obj].is_a?(Gem::Version)
           next false unless entry[:version_obj] > current
+          next false if entry[:version_obj].prerelease? && !current.prerelease?
 
           case level
           when "patch"
@@ -527,7 +528,11 @@ module Kettle
         return nil if current.nil?
 
         versions
-          .select { |entry| entry[:version_obj].is_a?(Gem::Version) && entry[:version_obj] > current }
+          .select do |entry|
+            entry[:version_obj].is_a?(Gem::Version) &&
+              entry[:version_obj] > current &&
+              (!entry[:version_obj].prerelease? || current.prerelease?)
+          end
           .max_by { |entry| entry[:version_obj] }
       end
 
@@ -902,7 +907,7 @@ module Kettle
 
       # Persistent cache of GitHub Action release versions and target SHAs.
       class PersistentActionCache
-        VERSION = 1
+        VERSION = 2
 
         def self.default_path
           state_home = ENV["XDG_STATE_HOME"]
@@ -1008,6 +1013,7 @@ module Kettle
             JSON.parse(File.read(@path))
           end
           return empty_data unless parsed.is_a?(Hash)
+          return empty_data unless parsed["version"].to_i == VERSION
 
           parsed["version"] ||= VERSION
           parsed["actions"] = {} unless parsed["actions"].is_a?(Hash)
@@ -1113,7 +1119,6 @@ module Kettle
           tag_shas = tag_ref_shas(repo_ref)
           releases = data.filter_map do |release|
             next unless release.is_a?(Hash)
-            next if release["prerelease"] == true
 
             tag = release["tag_name"].to_s
             parsed = parse_release_version_text(tag)
@@ -1126,6 +1131,21 @@ module Kettle
               sha: tag_shas[tag]
             }
           end
+          released_tags = releases.each_with_object({}) { |release, memo| memo[release[:tag]] = true }
+          tag_versions = tag_shas.filter_map do |tag, sha|
+            next if released_tags[tag]
+
+            parsed = parse_release_version_text(tag)
+            next unless parsed
+
+            {
+              tag: tag,
+              version_obj: parsed,
+              version: parsed.to_s,
+              sha: sha
+            }
+          end
+          releases.concat(tag_versions)
 
           releases.sort_by! { |release| release[:version_obj] }
           releases.reverse!
@@ -1190,20 +1210,53 @@ module Kettle
             object = entry["object"]
             next unless object.is_a?(Hash)
 
-            memo[tag] = object["sha"].to_s[0, 40] if object["type"] == "commit"
+            sha = object["sha"].to_s[0, 40]
+            case object["type"]
+            when "commit"
+              memo[tag] = sha
+            when "tag"
+              dereferenced_sha = annotated_tag_commit_sha(repo_ref, sha)
+              memo[tag] = dereferenced_sha if dereferenced_sha
+            end
           end
         end
 
-        def request_json(path)
+        def annotated_tag_commit_sha(repo_ref, tag_sha)
+          return nil if tag_sha.to_s.empty?
+
+          data = request_json("/repos/#{repo_ref}/git/tags/#{tag_sha}")
+          return nil unless data.is_a?(Hash)
+
+          object = data["object"]
+          return nil unless object.is_a?(Hash)
+          return nil unless object["type"] == "commit"
+
+          object["sha"].to_s[0, 40]
+        end
+
+        def request_json(path, redirects: 3)
           uri = URI.join(@api_base + "/", path)
-          request = Net::HTTP::Get.new(uri)
-          request["Accept"] = "application/vnd.github+json"
-          request["User-Agent"] = @user_agent
-          request["X-GitHub-Api-Version"] = "2022-11-28"
-          request["Authorization"] = "Bearer #{@token}" if @token && !@token.empty?
-
-          response = Net::HTTP.start(uri.host, uri.port, use_ssl: uri.scheme == "https") do |http|
-            http.request(request)
+
+          response = nil
+          loop do
+            request = Net::HTTP::Get.new(uri)
+            request["Accept"] = "application/vnd.github+json"
+            request["User-Agent"] = @user_agent
+            request["X-GitHub-Api-Version"] = "2022-11-28"
+            request["Authorization"] = "Bearer #{@token}" if @token && !@token.empty?
+
+            response = Net::HTTP.start(uri.host, uri.port, use_ssl: uri.scheme == "https") do |http|
+              http.request(request)
+            end
+
+            break unless response.code.to_i.between?(300, 399)
+            redirects -= 1
+            return nil if redirects.negative?
+
+            location = response["location"].to_s
+            return nil if location.empty?
+
+            uri = URI.join(uri.to_s, location)
           end
 
           return nil unless response.code.to_i == 200

data/lib/kettle/dev/pre_release_cli.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "optparse"
+require "English"
 require "uri"
 require "net/http"
 require "openssl"
@@ -96,6 +97,11 @@ module Kettle
       module Markdown
         module_function
 
+        SCRATCH_PATH_PREFIXES = %w[
+          tmp/
+          .git/
+        ].freeze
+
         # Extract unique remote HTTP(S) image URLs from markdown or HTML images.
         # @param text [String]
         # @return [Array<String>]
@@ -125,11 +131,43 @@ module Kettle
           urls.uniq
         end
 
+        # Find Markdown files that are part of the releasable project.
+        # @return [Array<String>]
+        def project_markdown_files
+          files = tracked_markdown_files
+          return files unless files.empty?
+
+          Dir.glob(["**/*.md", "**/*.md.example"], File::FNM_DOTMATCH).reject { |path| scratch_path?(path) }.sort
+        end
+
+        # @return [Array<String>]
+        def tracked_markdown_files
+          output = IO.popen(["git", "ls-files", "-z", "--", "*.md", "*.md.example"], err: File::NULL, &:read)
+          return [] unless $CHILD_STATUS.success?
+
+          output.split("\0").reject { |path| scratch_path?(path) }.sort
+        rescue Errno::ENOENT
+          []
+        end
+
+        # @param path [String]
+        # @return [Boolean]
+        def scratch_path?(path)
+          SCRATCH_PATH_PREFIXES.any? { |prefix| path.start_with?(prefix) }
+        end
+
         # Extract from files matching glob.
-        # @param glob_pattern [String]
+        # @param glob_pattern [String, Array<String>]
         # @return [Array<String>]
-        def extract_image_urls_from_files(glob_pattern = "*.md")
-          files = Dir.glob(glob_pattern)
+        def extract_image_urls_from_files(glob_pattern = nil)
+          files =
+            if glob_pattern.nil?
+              project_markdown_files
+            elsif glob_pattern.is_a?(String)
+              Dir.glob(glob_pattern)
+            else
+              Array(glob_pattern)
+            end
           urls = files.flat_map do |f|
             begin
               extract_image_urls_from_text(File.read(f))
@@ -183,7 +221,7 @@ module Kettle
       # @return [void]
       def check_markdown_uri_normalization!
         puts "[kettle-pre-release] Check 2: Normalize Markdown image URLs"
-        files = Dir.glob(["**/*.md", "**/*.md.example"])
+        files = Markdown.project_markdown_files
         changed = []
         total_candidates = 0
 
@@ -232,10 +270,7 @@ module Kettle
       # @return [void]
       def check_markdown_images_http!
         puts "[kettle-pre-release] Check 3: Validate Markdown image links (HTTP HEAD)"
-        urls = [
-          Markdown.extract_image_urls_from_files("**/*.md"),
-          Markdown.extract_image_urls_from_files("**/*.md.example")
-        ].flatten.uniq
+        urls = Markdown.extract_image_urls_from_files
         puts "[kettle-pre-release] Found #{urls.size} unique image URL(s)."
         failures = []
         urls.each do |url|

data/lib/kettle/dev/version.rb

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

data/sig/kettle/dev.rbs

@@ -1,7 +1,6 @@
 module Kettle
   module Dev
     module Version
-      VERSION: String
     end
 
     class Error < ::StandardError

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kettle-dev
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.2.4
 platform: ruby
 authors:
 - Peter H. Boling
@@ -134,7 +134,7 @@ dependencies:
         version: '3.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.1
+        version: 3.1.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -144,7 +144,7 @@ dependencies:
         version: '3.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.1
+        version: 3.1.2
 - !ruby/object:Gem::Dependency
   name: turbo_tests2
   requirement: !ruby/object:Gem::Requirement
@@ -338,10 +338,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.2
-  changelog_uri: https://github.com/kettle-dev/kettle-dev/blob/v2.2.2/CHANGELOG.md
+  source_code_uri: https://github.com/kettle-dev/kettle-dev/tree/v2.2.4
+  changelog_uri: https://github.com/kettle-dev/kettle-dev/blob/v2.2.4/CHANGELOG.md
   bug_tracker_uri: https://github.com/kettle-dev/kettle-dev/issues
-  documentation_uri: https://www.rubydoc.info/gems/kettle-dev/2.2.2
+  documentation_uri: https://www.rubydoc.info/gems/kettle-dev/2.2.4
   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