kettle-gha-pins 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ee4e694080aa9ce9e860fdd085015793830efc399a8ff295dd3fb6fa9dcf4dc
-  data.tar.gz: d9b39c2192b77c942ffcf055abc30efd7a6ae6a78c8baf274776c1473bab179f
+  metadata.gz: 133a74b904371a5a48a6fe9bc0483ae4c3925b99167f394b452386b0a69664fd
+  data.tar.gz: d43ede8e0f4a3f3a1400b489e46d077d5744a6c4b0b5231b46b2de4c60951814
 SHA512:
-  metadata.gz: 90f1f8ccee7b91f7fb72d4459577f0e145565a8897463ac64afa765213fb90e90af4ba2b945148e61a3a4f67e0c4718fb5a2c751ddbfa8d74d13a8b5b0082f61
-  data.tar.gz: a8a087d884e121de676bb70eff44f5524368fe2890afab896ff18fcd775f78887d64b482a3e395cf576e4d39023f7daef93a02412012da8788669492f16c01d9
+  metadata.gz: c59c539a7107ea0b9f69464c06656ad317c1515099861e995c022036af1c6cf0c3e0e4227c58f97262f32d2b1b4fd2f4a536eec305c0f5ca93623116ad56eceb
+  data.tar.gz: 278b5a77866045c05a677a5e426359a7c34afe2556523a92ae042680a27e6e013e928124e42b0b26a8acc55d446370020e445114eb145c6bc77084cef1045a42

data/CHANGELOG.md

@@ -30,6 +30,21 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Security
 
+## [0.2.1] - 2026-07-22
+
+- TAG: [v0.2.1][0.2.1t]
+- COVERAGE: 99.08% -- 858/866 lines in 8 files
+- BRANCH COVERAGE: 92.11% -- 350/380 branches in 8 files
+- 22.22% documented
+
+### Fixed
+
+- Lowered the generated gemspec Ruby requirement to `>= 2.4.0` to match
+  `kettle-dev`, restored Ruby 2.4-compatible runtime syntax, and explicitly
+  required the `set` stdlib used by the CLI.
+- Made CLI line rewrites tolerate Psych scalar column differences across Ruby
+  versions.
+
 ## [0.2.0] - 2026-07-22
 
 - TAG: [v0.2.0][0.2.0t]
@@ -76,7 +91,9 @@ Please file a bug if you notice a violation of semantic versioning.
 - kettle-jem-template-20260720-005 - Generated README Support & Community rows
   now include a RubyForum help badge.
 
-[Unreleased]: https://github.com/kettle-dev/kettle-gha-pins/compare/v0.2.0...HEAD
+[Unreleased]: https://github.com/kettle-dev/kettle-gha-pins/compare/v0.2.1...HEAD
+[0.2.1]: https://github.com/kettle-dev/kettle-gha-pins/compare/v0.2.0...v0.2.1
+[0.2.1t]: https://github.com/kettle-dev/kettle-gha-pins/releases/tag/v0.2.1
 [0.2.0]: https://github.com/kettle-dev/kettle-gha-pins/compare/v0.1.0...v0.2.0
 [0.2.0t]: https://github.com/kettle-dev/kettle-gha-pins/releases/tag/v0.2.0
 [0.1.0]: https://github.com/kettle-dev/kettle-gha-pins/compare/c633526495c7db0a8721a94a71c3def0f3cc71bb...v0.1.0

data/README.md

@@ -56,8 +56,8 @@ kettle-gha-pins --write --upgrade patch
 
 ### Compatibility
 
-Compatible with MRI Ruby 3.2.0+, and concordant releases of JRuby, and TruffleRuby.
-CI workflows and Appraisals are generated for MRI Ruby 3.2.0+.
+Compatible with MRI Ruby 2.4.0+, and concordant releases of JRuby, and TruffleRuby.
+CI workflows and Appraisals are generated for MRI Ruby 2.4.0+.
 This test floor is configured by `ruby.test_minimum` in `.kettle-jem.yml` and
 may be higher than the gem's runtime compatibility floor when legacy Rubies are
 not practical for the current toolchain.
@@ -532,7 +532,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-0.857-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
+[🧮kloc-img]: https://img.shields.io/badge/KLOC-0.866-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
 [🔐security]: https://github.com/kettle-dev/kettle-gha-pins/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
@@ -558,7 +558,7 @@ Thanks for RTFM. ☺️
 | Field | Value |
 |---|---|
 | Package | kettle-gha-pins |
-| Description | 📌 Shared, deterministic GitHub Actions release-tag parsing, canonicalization, and upgrade selection logic for kettle-dev and kettle-jem workflow pin maintenance. |
+| Description | 📌 GitHub Actions workflow SHA pin maintenance, including deterministic release-tag parsing, canonicalization, cache-backed GitHub ref resolution, and upgrade planning. |
 | Homepage | https://github.com/kettle-dev/kettle-gha-pins |
 | Source | https://github.com/kettle-dev/kettle-gha-pins |
 | License | `MIT` |

data/lib/kettle/gha/pins/action_resolver.rb

@@ -167,32 +167,32 @@ module Kettle
       end
 
       class << self
-        def resolve_action_plan(...)
-          ActionResolver.resolve_action_plan(...)
+        def resolve_action_plan(**kwargs)
+          ActionResolver.resolve_action_plan(**kwargs)
         end
 
-        def determine_upgrade_plan(...)
-          ActionResolver.determine_upgrade_plan(...)
+        def determine_upgrade_plan(**kwargs)
+          ActionResolver.determine_upgrade_plan(**kwargs)
         end
 
-        def matching_version_entry(...)
-          ActionResolver.matching_version_entry(...)
+        def matching_version_entry(versions, current_ref, current_sha, client, repo_ref)
+          ActionResolver.matching_version_entry(versions, current_ref, current_sha, client, repo_ref)
         end
 
-        def version_entry_sha(...)
-          ActionResolver.version_entry_sha(...)
+        def version_entry_sha(entry, client, repo_ref)
+          ActionResolver.version_entry_sha(entry, client, repo_ref)
         end
 
-        def short_sha?(...)
-          ActionResolver.short_sha?(...)
+        def short_sha?(candidate)
+          ActionResolver.short_sha?(candidate)
         end
 
-        def non_sha?(...)
-          ActionResolver.non_sha?(...)
+        def non_sha?(candidate)
+          ActionResolver.non_sha?(candidate)
         end
 
-        def stale_sha?(...)
-          ActionResolver.stale_sha?(...)
+        def stale_sha?(current, latest)
+          ActionResolver.stale_sha?(current, latest)
         end
       end
     end

data/lib/kettle/gha/pins/cli.rb

@@ -4,6 +4,7 @@ require "json"
 require "open3"
 require "optparse"
 require "pathname"
+require "set"
 
 require "psych"
 require "kettle/gha/pins"
@@ -273,9 +274,11 @@ module Kettle
               @options[:progress] = bool
             end
             opt.on("--skip-pattern PATTERN", "Skip workflow paths matching pattern (repeatable)") do |pattern|
-              @options[:reject_patterns] << Regexp.new(pattern)
-            rescue RegexpError => e
-              Kernel.abort("Invalid --skip-pattern #{pattern.inspect}: #{e.message}")
+              begin
+                @options[:reject_patterns] << Regexp.new(pattern)
+              rescue RegexpError => e
+                Kernel.abort("Invalid --skip-pattern #{pattern.inspect}: #{e.message}")
+              end
             end
             opt.on("--[no-]validate", "Validate YAML after editing") do |bool|
               @options[:validate] = bool
@@ -297,25 +300,27 @@ module Kettle
         def load_workflows(paths, state)
           file_progress = progress_bar(title: "Files", total: paths.length)
           paths.each_with_object([]) do |path, workflows|
-            state[:files_scanned] += 1
-            text = begin
-              File.read(path)
-            rescue Errno::EACCES => e
-              record_failure(state, path: path, error: "read_error: #{e.message}")
-              next
-            end
+            begin
+              state[:files_scanned] += 1
+              begin
+                text = File.read(path)
+              rescue Errno::EACCES => e
+                record_failure(state, path: path, error: "read_error: #{e.message}")
+                next
+              end
 
-            parsed = begin
-              Psych.parse_stream(text)
-            rescue Psych::Exception => e
-              record_failure(state, path: path, error: "yaml_parse_error: #{e.message}")
-              next
-            end
+              begin
+                parsed = Psych.parse_stream(text)
+              rescue Psych::Exception => e
+                record_failure(state, path: path, error: "yaml_parse_error: #{e.message}")
+                next
+              end
 
-            uses_nodes = extract_uses_nodes(parsed, text)
-            workflows << {path: path, text: text, uses_nodes: uses_nodes} unless uses_nodes.empty?
-          ensure
-            file_progress&.increment
+              uses_nodes = extract_uses_nodes(parsed, text)
+              workflows << {path: path, text: text, uses_nodes: uses_nodes} unless uses_nodes.empty?
+            ensure
+              file_progress&.increment
+            end
           end
         end
 
@@ -469,7 +474,7 @@ module Kettle
             action: {
               owner: parts[0],
               repo: parts[1],
-              path: (parts.length > 2) ? parts[2..].join("/") : nil,
+              path: (parts.length > 2) ? parts[2..-1].join("/") : nil,
               ref: ref
             }
           }
@@ -594,14 +599,10 @@ module Kettle
           line_text = text.lines[line]
           return nil if line_text.nil?
 
-          raw = line_text[col..]
-          return nil if raw.nil?
-
-          token_info = extract_scalar_token(raw)
+          token_info = locate_scalar_token(line_text, col, old_token)
           return nil unless token_info
-          return nil unless token_info[:token] == old_token
 
-          suffix = raw[token_info[:span]..].to_s
+          suffix = line_text[token_info[:end]..-1].to_s
           match = suffix.match(VERSION_COMMENT_SUFFIX_RE)
           match && match[:version]
         end
@@ -610,20 +611,16 @@ module Kettle
           line_text = text.lines[line]
           return nil if line_text.nil?
 
-          raw = line_text[col..]
-          return nil if raw.nil?
-
-          token_info = extract_scalar_token(raw)
+          token_info = locate_scalar_token(line_text, col, old_token)
           return nil unless token_info
-          return nil unless token_info[:token] == old_token
 
           rendered = render_replacement(old_token, new_ref, token_info[:quote])
           return nil unless rendered
 
-          span = token_info[:span]
+          span = token_info[:end] - token_info[:start]
           new_scalar = rendered[:quoted]
           if new_version && token_info[:quote] == :plain
-            suffix = raw[span..].to_s
+            suffix = line_text[token_info[:end]..-1].to_s
             comment = suffix.match(VERSION_COMMENT_REPLACEMENT_RE)
             if comment
               span += comment[0].length
@@ -632,14 +629,31 @@ module Kettle
           end
 
           {
-            start: col,
-            end: col + span,
+            start: token_info[:start],
+            end: token_info[:start] + span,
             new_scalar: new_scalar,
             new_ref: new_ref,
             old_token: old_token
           }
         end
 
+        def locate_scalar_token(line_text, col, old_token)
+          return nil if col.nil? || col.negative? || col >= line_text.length
+
+          matches = []
+          0.upto(line_text.length - 1) do |index|
+            token_info = extract_scalar_token(line_text[index..-1])
+            next unless token_info
+            next unless token_info[:token] == old_token
+
+            matches << token_info.merge(
+              start: index,
+              end: index + token_info[:span]
+            )
+          end
+          matches.min_by { |match| [(match[:start] - col).abs, match[:start]] }
+        end
+
         def apply_edits(original_text, edits)
           lines = original_text.lines
           grouped = edits.group_by { |entry| entry[:line] }
@@ -652,7 +666,7 @@ module Kettle
             next if line.nil?
 
             entries.each do |entry|
-              line = line[0...entry[:start]].to_s + entry[:new_scalar] + line[entry[:end]..].to_s
+              line = line[0...entry[:start]].to_s + entry[:new_scalar] + line[entry[:end]..-1].to_s
             end
             updated[line_num] = line
           end

data/lib/kettle/gha/pins/github_client.rb

@@ -96,13 +96,13 @@ module Kettle
         end
 
         def build_release_versions(data, tag_shas)
-          release_tags = data.filter_map do |release|
+          release_tags = data.each_with_object([]) do |release, memo|
             next unless release.is_a?(Hash)
 
             tag = release["tag_name"].to_s
             next unless VersionRubric.parse(tag)
 
-            tag
+            memo << tag
           end
 
           VersionRubric.build_release_versions(

data/lib/kettle/gha/pins/persistent_action_cache.rb

@@ -41,7 +41,10 @@ module Kettle
           return nil if entries.empty?
           return nil if fresh && entries.length != versions.length
 
-          entries.filter_map { |entry| deserialize_version_entry(entry) }
+          entries.each_with_object([]) do |entry, memo|
+            deserialized = deserialize_version_entry(entry)
+            memo << deserialized if deserialized
+          end
             .sort_by { |entry| entry[:version_obj] }
             .reverse
         end
@@ -147,11 +150,11 @@ module Kettle
         end
 
         def target_cache(version_entries)
-          entries = version_entries.filter_map do |entry|
+          entries = version_entries.each_with_object([]) do |entry, memo|
             deserialized = deserialize_version_entry(entry)
             next unless deserialized
 
-            deserialized.merge(cached_at: entry["cached_at"].to_s)
+            memo << deserialized.merge(cached_at: entry["cached_at"].to_s)
           end
           return {} if entries.empty?
 

data/lib/kettle/gha/pins/version.rb

@@ -4,7 +4,7 @@ module Kettle
   module Gha
     module Pins
       module Version
-        VERSION = "0.2.0"
+        VERSION = "0.2.1"
       end
       VERSION = Version::VERSION # Traditional Constant Location
     end

data/lib/kettle/gha/pins/version_rubric.rb

@@ -38,11 +38,15 @@ module Kettle
 
         def build_release_versions(release_tags:, tag_shas:)
           released_tags = release_tags.each_with_object({}) { |tag, memo| memo[tag.to_s] = true }
-          releases = release_tags.filter_map { |tag| entry(tag: tag, sha: tag_shas[tag.to_s]) }
-          tag_versions = tag_shas.filter_map do |tag, sha|
+          releases = release_tags.each_with_object([]) do |tag, memo|
+            release_entry = entry(tag: tag, sha: tag_shas[tag.to_s])
+            memo << release_entry if release_entry
+          end
+          tag_versions = tag_shas.each_with_object([]) do |(tag, sha), memo|
             next if released_tags[tag.to_s]
 
-            entry(tag: tag, sha: sha)
+            tag_entry = entry(tag: tag, sha: sha)
+            memo << tag_entry if tag_entry
           end
 
           sort_versions(canonicalize_equivalent_release_versions(releases + tag_versions)).reverse

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kettle-gha-pins
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Peter H. Boling
@@ -199,20 +199,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.0
-- !ruby/object:Gem::Dependency
-  name: ruby-progressbar
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.13'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.13'
 - !ruby/object:Gem::Dependency
   name: stone_checksums
   requirement: !ruby/object:Gem::Requirement
@@ -281,10 +267,10 @@ licenses:
 - MIT
 metadata:
   homepage_uri: https://github.com/kettle-dev/kettle-gha-pins
-  source_code_uri: https://github.com/kettle-dev/kettle-gha-pins/tree/v0.2.0
-  changelog_uri: https://github.com/kettle-dev/kettle-gha-pins/blob/v0.2.0/CHANGELOG.md
+  source_code_uri: https://github.com/kettle-dev/kettle-gha-pins/tree/v0.2.1
+  changelog_uri: https://github.com/kettle-dev/kettle-gha-pins/blob/v0.2.1/CHANGELOG.md
   bug_tracker_uri: https://github.com/kettle-dev/kettle-gha-pins/issues
-  documentation_uri: https://www.rubydoc.info/gems/kettle-gha-pins/0.2.0
+  documentation_uri: https://www.rubydoc.info/gems/kettle-gha-pins/0.2.1
   funding_uri: https://github.com/sponsors/pboling
   wiki_uri: https://github.com/kettle-dev/kettle-gha-pins/wiki
   news_uri: https://www.railsbling.com/tags/kettle-gha-pins
@@ -307,7 +293,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.2.0
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="