kettle-dev 2.2.8 → 2.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20e42b5ed4a5e7b52a046fa7cfdfe63c08963947c2414aa4cf22251419ffb853
-  data.tar.gz: e578b54456e497e115ccdb9bb54efc4d32be13e2b294d2b0857964b75bc5c7ff
+  metadata.gz: 9216115bc5448b3e08cfcd393c22029d70e7b6d31bcb80617b44b7d97644b649
+  data.tar.gz: e86c38ac97fbac63e1258bf15d6454f408e62ffe927af628bc5f7090472f98fd
 SHA512:
-  metadata.gz: 676baf6a4ecffe8745d94c3016b402e8c002f98ca61f9ea478b9e629d42c7c57a82795682d49c853c19fff74982e8c70af5cf75b1e0eb6b28ce2fb904995762e
-  data.tar.gz: a000e3b43e2ea900fcdb03cb2471db4a8c312113c753524ca7be658119c81bba1cfb7113e0ccb576a2cf6b471c472fc01c6b71afc4eebf7322b3760e3a848c4c
+  metadata.gz: 52d369f7c70a48bf3c2fde5898cc7f99ac9eda0b6e09319d7166976e20057d95360a56f29bf00dbd226976a853dd212e915fd31026b7c647df1f68bee6331cd4
+  data.tar.gz: 7ab61300d6f489ddc25636e10dcea667998a20c5ef3755a9b7773e2ccb0fde69871c8ba5607303a618501a55c2c05289dc3585905c6243e1ca524a7de1cb7c8a

data/CHANGELOG.md

@@ -30,6 +30,36 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Security
 
+## [2.2.10] - 2026-06-16
+
+- TAG: [v2.2.10][2.2.10t]
+- COVERAGE: 92.24% -- 3911/4240 lines in 28 files
+- BRANCH COVERAGE: 73.87% -- 1552/2101 branches in 28 files
+- 64.35% documented
+
+### Changed
+
+- `kettle-pre-release` now caches successful Markdown image URL validations in
+  the global kettle-dev state cache for seven days to avoid repeated network
+  HEAD requests during release readiness checks.
+
+## [2.2.9] - 2026-06-14
+
+- TAG: [v2.2.9][2.2.9t]
+- COVERAGE: 92.57% -- 3863/4173 lines in 28 files
+- BRANCH COVERAGE: 74.00% -- 1534/2073 branches in 28 files
+- 65.38% documented
+
+### Fixed
+
+- `kettle-gha-sha-pins --check` no longer fails solely because releases outside
+  the selected `--upgrade` policy exist, and `kettle-pre-release` now validates
+  workflow pins with the inclusive `major` policy used for release readiness.
+
+- `kettle-gha-sha-pins --write` now handles major-line adjacent version comments
+  such as `# v7` idempotently instead of repeatedly planning the same
+  `update_version_comment` change.
+
 ## [2.2.8] - 2026-06-13
 
 - TAG: [v2.2.8][2.2.8t]
@@ -2109,7 +2139,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.8...HEAD
+[Unreleased]: https://github.com/kettle-dev/kettle-dev/compare/v2.2.10...HEAD
+[2.2.10]: https://github.com/kettle-dev/kettle-dev/compare/v2.2.9...v2.2.10
+[2.2.10t]: https://github.com/kettle-dev/kettle-dev/releases/tag/v2.2.10
+[2.2.9]: https://github.com/kettle-dev/kettle-dev/compare/v2.2.8...v2.2.9
+[2.2.9t]: https://github.com/kettle-dev/kettle-dev/releases/tag/v2.2.9
 [2.2.8]: https://github.com/kettle-dev/kettle-dev/compare/v2.2.7...v2.2.8
 [2.2.8t]: https://github.com/kettle-dev/kettle-dev/releases/tag/v2.2.8
 [2.2.7]: https://github.com/kettle-dev/kettle-dev/compare/v2.2.6...v2.2.7

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

@@ -33,6 +33,8 @@ module Kettle
       DEFAULT_UPGRADE_LEVEL = "patch"
       DEFAULT_CACHE_TTL_SECONDS = 24 * 60 * 60
       VALID_UPGRADE_LEVELS = %w[major minor patch].freeze
+      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 initialize(argv, err: $stderr)
         @argv = argv
@@ -215,7 +217,7 @@ module Kettle
 
         print_report(state)
         return 2 unless state[:failures].zero?
-        return 3 if @options[:check] && (state[:updates].positive? || state[:outdated_pins].any?)
+        return 3 if @options[:check] && state[:updates].positive?
 
         0
       end
@@ -745,8 +747,8 @@ module Kettle
         return nil unless token_info[:token] == old_token
 
         suffix = raw[token_info[:span]..-1].to_s
-        match = suffix.match(/\A\s+#\s*v?(\d+\.\d+\.\d+(?:[-.]?[0-9A-Za-z.-]+)?)/)
-        match && match[1]
+        match = suffix.match(VERSION_COMMENT_SUFFIX_RE)
+        match && match[:version]
       end
 
       def build_replacement_from_line(text, line, col, old_token, new_ref, new_version = nil)
@@ -767,7 +769,7 @@ module Kettle
         new_scalar = rendered[:quoted]
         if new_version && token_info[:quote] == :plain
           suffix = raw[span..-1].to_s
-          comment = suffix.match(/\A(?<prefix>\s+#\s*)v?\d+\.\d+\.\d+(?:[-.]?[0-9A-Za-z.-]+)?/)
+          comment = suffix.match(VERSION_COMMENT_REPLACEMENT_RE)
           if comment
             span += comment[0].length
             new_scalar += "#{comment[:prefix]}v#{new_version}"
@@ -902,7 +904,7 @@ module Kettle
             lines << "- #{change[:path]}:#{change[:line]} #{from} -> #{to} #{change[:reason]}"
           end
         end
-        if @options[:check] && (state[:planned_changes].any? || state[:outdated_pins].any?)
+        if @options[:check] && state[:planned_changes].any?
           lines << ""
           lines << "Recommended fix: kettle-gha-sha-pins --write --upgrade #{@options[:upgrade]}"
         end

data/lib/kettle/dev/pre_release_cli.rb

@@ -2,9 +2,12 @@
 
 require "optparse"
 require "English"
+require "json"
+require "fileutils"
 require "uri"
 require "net/http"
 require "openssl"
+require "time"
 begin
   require "addressable/uri"
 rescue LoadError
@@ -21,6 +24,8 @@ module Kettle
     #
     # Usage: Kettle::Dev::PreReleaseCLI.new(check_num: 1).run
     class PreReleaseCLI
+      IMAGE_URL_CACHE_TTL_SECONDS = 7 * 24 * 60 * 60
+
       # Simple HTTP helpers for link validation
       module HTTP
         module_function
@@ -93,6 +98,85 @@ module Kettle
         end
       end
 
+      # Persistent cache of successfully validated Markdown image URLs.
+      class ImageUrlCache
+        VERSION = 1
+
+        def self.default_path
+          state_home = ENV["XDG_STATE_HOME"]
+          state_home = File.join(Dir.home, ".local", "state") if state_home.to_s.empty?
+          File.join(state_home, "kettle-dev", "image-url-cache.json")
+        rescue ArgumentError
+          nil
+        end
+
+        def initialize(path:, ttl_seconds: IMAGE_URL_CACHE_TTL_SECONDS, clock: -> { Time.now })
+          @path = path
+          @ttl_seconds = ttl_seconds
+          @clock = clock
+          @data = nil
+        end
+
+        def fresh_success?(url)
+          entry = data.fetch("images")[url.to_s]
+          return false unless entry.is_a?(Hash)
+          return false unless entry["ok"] == true
+
+          fresh_entry?(entry)
+        end
+
+        def write_success(url)
+          return if @path.to_s.empty?
+          return if url.to_s.empty?
+
+          data.fetch("images")[url.to_s] = {
+            "ok" => true,
+            "cached_at" => @clock.call.utc.iso8601
+          }
+          save!
+        end
+
+        def to_h
+          data
+        end
+
+        private
+
+        def data
+          @data ||= load_data
+        end
+
+        def load_data
+          parsed = if @path && File.file?(@path)
+            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["images"] = {} unless parsed["images"].is_a?(Hash)
+          parsed
+        rescue JSON::ParserError, Errno::EACCES
+          empty_data
+        end
+
+        def empty_data
+          {"version" => VERSION, "images" => {}}
+        end
+
+        def save!
+          FileUtils.mkdir_p(File.dirname(@path))
+          File.write(@path, JSON.pretty_generate(data) + "\n")
+        end
+
+        def fresh_entry?(entry)
+          cached_at = Time.iso8601(entry["cached_at"].to_s)
+          cached_at >= @clock.call - @ttl_seconds
+        rescue ArgumentError
+          false
+        end
+      end
+
       # Markdown parsing helpers
       module Markdown
         module_function
@@ -184,6 +268,8 @@ module Kettle
       def initialize(check_num: 1)
         @check_num = (check_num || 1).to_i
         @check_num = 1 if @check_num < 1
+        @image_url_cache_path = configured_image_url_cache_path
+        @refresh_image_url_cache = env_truthy?(ENV["KETTLE_IMAGE_URL_CACHE_REFRESH"])
       end
 
       # Execute configured checks starting from @check_num.
@@ -210,7 +296,7 @@ module Kettle
       # @return [void]
       def check_github_actions_sha_pins!
         puts "[kettle-pre-release] Check 1: Validate GitHub Actions SHA pins"
-        status = Kettle::Dev::GhaShaPinsCLI.new(["--root", Dir.pwd, "--check"]).run!
+        status = Kettle::Dev::GhaShaPinsCLI.new(["--root", Dir.pwd, "--check", "--upgrade", "major"]).run!
         return nil if status.zero?
 
         Kettle::Dev::ExitAdapter.abort("GitHub Actions SHA pin validation failed")
@@ -272,12 +358,19 @@ module Kettle
         puts "[kettle-pre-release] Check 3: Validate Markdown image links (HTTP HEAD)"
         urls = Markdown.extract_image_urls_from_files
         puts "[kettle-pre-release] Found #{urls.size} unique image URL(s)."
+        cache = image_url_cache
         failures = []
         urls.each do |url|
           print("  -> #{url} … ")
+          if cache && !@refresh_image_url_cache && cache.fresh_success?(url)
+            puts "OK (cached)"
+            next
+          end
+
           ok = HTTP.head_ok?(url)
           if ok
             puts "OK"
+            cache&.write_success(url)
           else
             puts "FAIL"
             failures << url
@@ -292,6 +385,26 @@ module Kettle
         end
         nil
       end
+
+      private
+
+      def image_url_cache
+        return nil if @image_url_cache_path.to_s.empty?
+
+        @image_url_cache ||= ImageUrlCache.new(path: @image_url_cache_path)
+      end
+
+      def configured_image_url_cache_path
+        value = ENV.fetch("KETTLE_IMAGE_URL_CACHE", nil)
+        return ImageUrlCache.default_path if value.nil? || value.to_s.strip.empty?
+        return nil if value.to_s.strip.match?(Kettle::Dev::ENV_FALSE_RE)
+
+        value
+      end
+
+      def env_truthy?(value)
+        !!value.to_s.strip.match?(/\A(true|y|yes|1|on)\z/i)
+      end
     end
   end
 end

data/lib/kettle/dev/version.rb

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

data/sig/kettle/dev/pre_release_cli.rbs

@@ -11,6 +11,16 @@ module Kettle
         def self.extract_image_urls_from_files: (?String glob_pattern) -> Array[String]
       end
 
+      class ImageUrlCache
+        VERSION: Integer
+
+        def self.default_path: () -> String?
+        def initialize: (path: String?, ?ttl_seconds: Integer, ?clock: ^() -> Time) -> void
+        def fresh_success?: (String url) -> bool
+        def write_success: (String url) -> void
+        def to_h: () -> Hash[String, untyped]
+      end
+
       def initialize: (?check_num: Integer) -> void
       def run: () -> void
       def check_markdown_uri_normalization!: () -> void

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kettle-dev
 version: !ruby/object:Gem::Version
-  version: 2.2.8
+  version: 2.2.10
 platform: ruby
 authors:
 - Peter H. Boling
@@ -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.8
-  changelog_uri: https://github.com/kettle-dev/kettle-dev/blob/v2.2.8/CHANGELOG.md
+  source_code_uri: https://github.com/kettle-dev/kettle-dev/tree/v2.2.10
+  changelog_uri: https://github.com/kettle-dev/kettle-dev/blob/v2.2.10/CHANGELOG.md
   bug_tracker_uri: https://github.com/kettle-dev/kettle-dev/issues
-  documentation_uri: https://www.rubydoc.info/gems/kettle-dev/2.2.8
+  documentation_uri: https://www.rubydoc.info/gems/kettle-dev/2.2.10
   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