kettle-gha-pins 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a8ee3ba1a8f40ec496c5f63b4448f30fbcd488259eb6cb1dc6d3f8d81dbf455
-  data.tar.gz: c87718cf11dd6dfb85cb5991cab292420fecfe1fd01ef5e4717d927382ea3fad
+  metadata.gz: ace9741a6103bddad79df3803ccc35153af81161b7c21c1615f08a10604e6c92
+  data.tar.gz: 8f212c66b4cbb24a32491dfb8c9ede3477492daa20449e9eaa2d3278a2859818
 SHA512:
-  metadata.gz: 42fdfdda525a87c5bc54de0fbe1fa99572a8dbdc72b02d7ac33452aa19c5330284c2e71ddbc4b67ae184d0de486ba14de0adee021f7a2b682f164dda48d15eb8
-  data.tar.gz: 3c6cb2f458a769a48cfb4b31c58b116027fccd889349fbfabeebeec8409f655cff8b9fb3ca91f68c0cc3289ecd43028089aa2ef85f41cbb06fec46cf4c6a9ffb
+  metadata.gz: e411ca542ea1db8da7c50018698d07958d06da43ec83259ae9b98d5bec7c3417c3d5b42ef49bf58fc48ab082088277bc63832e633038720304e59a18a0c6bece
+  data.tar.gz: e9ee10f5a5a2d517b1579c14dc7f6369c043d74ba568bf3d4cff79996cec4386b032c0c9d1d442362be66fa89cf072524daf83157ad2272a746e54b68375747a

data/CHANGELOG.md

@@ -30,6 +30,21 @@ Please file a bug if you notice a violation of semantic versioning.
 
 ### Security
 
+## [0.3.3] - 2026-07-28
+
+- TAG: [v0.3.3][0.3.3t]
+- COVERAGE: 98.94% -- 935/945 lines in 8 files
+- BRANCH COVERAGE: 90.91% -- 380/418 branches in 8 files
+- 24.04% documented
+
+### Fixed
+
+- Version comment normalization now rewrites equivalent comments to a real
+  action tag, preferring the most specific version spelling when both equivalent
+  tags exist.
+- Two-segment version comments like `v2.0` are now parsed when deciding whether
+  an adjacent SHA-pin comment needs normalization.
+
 ## [0.3.2] - 2026-07-27
 
 - TAG: [v0.3.2][0.3.2t]
@@ -181,7 +196,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.3.2...HEAD
+[Unreleased]: https://github.com/kettle-dev/kettle-gha-pins/compare/v0.3.3...HEAD
+[0.3.3]: https://github.com/kettle-dev/kettle-gha-pins/compare/v0.3.2...v0.3.3
+[0.3.3t]: https://github.com/kettle-dev/kettle-gha-pins/releases/tag/v0.3.3
 [0.3.2]: https://github.com/kettle-dev/kettle-gha-pins/compare/v0.3.1...v0.3.2
 [0.3.2t]: https://github.com/kettle-dev/kettle-gha-pins/releases/tag/v0.3.2
 [0.3.1]: https://github.com/kettle-dev/kettle-gha-pins/compare/v0.3.0...v0.3.1

data/README.md

@@ -563,7 +563,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.925-FFDD67.svg?style=for-the-badge&logo=YouTube&logoColor=blue
+[🧮kloc-img]: https://img.shields.io/badge/KLOC-0.945-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

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

@@ -27,9 +27,9 @@ module Kettle
           level = VersionRubric.normalize_upgrade_level(upgrade_level)
 
           current_ref = old_ref.to_s.strip
-          return {is_outdated: false, updates: nil, reason: nil, current_version: nil} if current_ref.empty?
-
           available_versions = versions || []
+          return {is_outdated: false, updates: nil, reason: nil, current_version: nil, versions: available_versions} if current_ref.empty?
+
           latest = available_versions.first
 
           current_sha = if SHA_RE.match?(current_ref) || WEAK_SHA_RE.match?(current_ref)
@@ -114,6 +114,7 @@ module Kettle
             updates: updates,
             reason: reason,
             current_version: current_version,
+            versions: available_versions,
             latest_outdated: latest_outdated
           }
         end

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

@@ -34,8 +34,8 @@ module Kettle
         VALID_UPGRADE_LEVELS = Kettle::Gha::Pins::VALID_UPGRADE_LEVELS
         PersistentActionCache = Kettle::Gha::Pins::PersistentActionCache
         GitHubClient = Kettle::Gha::Pins::GitHubClient
-        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.-]+)?)?/
+        VERSION_COMMENT_SUFFIX_RE = /\A\s+#\s*v?(?<version>\d+(?:\.\d+){0,2}(?:[-.]?[0-9A-Za-z.-]+)?)/
+        VERSION_COMMENT_REPLACEMENT_RE = /\A(?<prefix>\s+#\s*)v?\d+(?:\.\d+){0,2}(?:[-.]?[0-9A-Za-z.-]+)?/
 
         def self.release_version_sort_key(entry)
           Kettle::Gha::Pins::VersionRubric.sort_key(entry)
@@ -151,10 +151,15 @@ module Kettle
                 end
                 if updates.nil? && upgrade_plan[:current_version]
                   comment_version = version_comment_from_line(text, node[:line], node[:col], parsed_ref[:value])
-                  if comment_version && comment_version != upgrade_plan[:current_version]
+                  comment_update_version = VersionRubric.comment_update_version(
+                    comment_version,
+                    upgrade_plan[:current_version],
+                    known_versions: upgrade_plan.fetch(:versions, [])
+                  )
+                  if comment_update_version
                     updates = {
                       new_ref: old_ref,
-                      new_version: upgrade_plan[:current_version],
+                      new_version: comment_update_version,
                       old_version: comment_version,
                       reason: COMMENT_REASON,
                       action: repo_ref

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

@@ -6,7 +6,7 @@ module Kettle
       # Version namespace for this gem.
       module Version
         # Current gem version.
-        VERSION = "0.3.2"
+        VERSION = "0.3.3"
       end
       # Current gem version exposed at the traditional constant location.
       VERSION = Version::VERSION # Traditional Constant Location

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

@@ -106,6 +106,39 @@ module Kettle
           end.max_by { |entry| sort_key(entry) }
         end
 
+        def comment_update_version(comment_version, resolved_version, known_versions: [])
+          comment = parse(comment_version)
+          resolved = parse(resolved_version)
+          return nil unless comment && resolved
+
+          resolved_entry = exact_entry_for_version(known_versions, resolved_version)
+          comment_entry = exact_entry_for_version(known_versions, comment_version)
+
+          if comment == resolved && resolved_entry && comment_entry
+            preferred = entries_for_semantic_version(known_versions, comment).max_by { |known_entry| sort_key(known_entry) }
+            preferred_version = preferred.fetch(:version)
+            (preferred_version == comment_version.to_s) ? nil : preferred_version
+          else
+            return nil if comment_version.to_s == resolved_version.to_s
+
+            resolved_version
+          end
+        end
+
+        def exact_entry_for_version(versions, version)
+          parsed = parse(version)
+          return nil unless parsed
+
+          versions.find do |entry|
+            entry.fetch(:version_obj, nil) == parsed &&
+              entry.fetch(:version, nil).to_s == parsed.to_s
+          end
+        end
+
+        def entries_for_semantic_version(versions, version_obj)
+          versions.select { |entry| entry.fetch(:version_obj, nil) == version_obj }
+        end
+
         def normalize_upgrade_level(level)
           normalized = level.to_s.downcase
           VALID_UPGRADE_LEVELS.include?(normalized) ? normalized : DEFAULT_UPGRADE_LEVEL

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kettle-gha-pins
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Peter H. Boling
@@ -301,10 +301,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.3.2
-  changelog_uri: https://github.com/kettle-dev/kettle-gha-pins/blob/v0.3.2/CHANGELOG.md
+  source_code_uri: https://github.com/kettle-dev/kettle-gha-pins/tree/v0.3.3
+  changelog_uri: https://github.com/kettle-dev/kettle-gha-pins/blob/v0.3.3/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.3.2
+  documentation_uri: https://www.rubydoc.info/gems/kettle-gha-pins/0.3.3
   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