simp-rake-helpers 6.0.0 → 6.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5c6dcd39818c575a5e55c997ea3425895952a3913e743f8472f1368c86324c5
-  data.tar.gz: 562f3641c404e562a1d64cec2fa4b11f4e3206d9a0c4c1605c2f60651f87a0b0
+  metadata.gz: 6c2d53a38c2de737dc4cdb29dab1a6d362fb826d338553f4885769d68e6c4a51
+  data.tar.gz: 0c58a8d0201d7769eb87d6e850f577c265417816e2642821e0a536df0479f2db
 SHA512:
-  metadata.gz: 365f2731d24ee8ea5d830a6d055ecd024bf2a1bf448bfffdb259a88126244ae81ea3fbd4704d2b92241380a7ba45ce3962beb2d58bc2213a3dd537820604b5eb
-  data.tar.gz: c2f1258d8ee380d03667c852f48222e4f4b2de2865d49abf9ee5a95d523c3c4a36f972e1edf8562a590c254e493e0d6edb798213e2f21914f3b90017eb919764
+  metadata.gz: fc790074c35b763dcc443c802f3bd6fdd5feec39bf6875e1450ac0393b42b10cadf38264c651c509da4703956b2f276695c161e16eef26000067789042573c9e
+  data.tar.gz: 8821a81110d60f0c28a689cc9e2e35ef4c32b5c5fbd57e48b56a491dc40e90fc49843c9d510ae6e1fa23eaac46649d10b1d1d8bca5b39752615e5be051fd4d68

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+### 6.0.1 / 2026-08-26
+- Fixed
+  - `pkg:check_version` no longer misreads CHANGELOG versions with a two-digit
+    major. It parsed the entry with its own regex whose greedy leading match
+    consumed the first digit of the major, so `12.2.1` was read as `2.2.1` and
+    reported as out of date. It now uses
+    `Simp::ComponentInfo::CHANGELOG_ENTRY_REGEX`, the same entry regex used by
+    `Simp::ComponentInfo` and `Simp::RelChecks`. Affected every component
+    released since `10.0.0`; single-digit majors were unaffected.
+  - `pkg:check_version` now reports a malformed newest CHANGELOG entry instead
+    of skipping it. Skipping fell through to an older entry and reported that
+    entry's stale version as out of date, pointing at the wrong problem.
+  - The deprecated top-level `compare_latest_tag` task now uses the
+    `CHANGELOG_ENTRY_REGEX` constant already defined in its own class instead of
+    an inline copy that had drifted (it required a zero-padded day).
+
 ### 6.0.0 / 2026-06-25
 - Added
   - `pupmod:build` rake task using `puppet-modulebuilder`, replacing `pdk build`

data/lib/simp/rake/helpers/assets/Gemfile

@@ -8,4 +8,4 @@ gem_sources   = ENV.key?('SIMP_GEM_SERVERS') ? ENV['SIMP_GEM_SERVERS'].split(/[,
 
 gem_sources.each { |gem_source| source gem_source }
 
-gem 'simp-rake-helpers', '~> 5.0'
+gem 'simp-rake-helpers', '~> 6.0'

data/lib/simp/rake/helpers/version.rb

@@ -4,5 +4,5 @@ module Simp; end
 module Simp::Rake; end
 
 class Simp::Rake::Helpers
-  VERSION = '6.0.0'
+  VERSION = '6.0.1'
 end

data/lib/simp/rake/pkg.rb

@@ -9,6 +9,7 @@ require 'rake/clean'
 require 'rake/tasklib'
 require 'fileutils'
 require 'find'
+require 'simp/componentinfo'
 require 'simp/relchecks'
 require 'simp/rpm'
 require 'simp/rake/helpers/rpm_spec'
@@ -475,15 +476,35 @@ class Simp::Rake::Pkg < Rake::TaskLib
                 changelog = File.read('CHANGELOG')
                 changelog_version = nil
 
-                # Find the first date line
+                # Only the newest entry is considered; it is the one that
+                # has to agree with metadata.json.
+                #
+                # Use the shared entry regex rather than an ad hoc one: a
+                # greedy leading match swallows the first digit of a
+                # two-digit major version (12.2.1 parsed as 2.2.1).
+                #
+                # Report a malformed newest entry instead of skipping it.
+                # Skipping falls through to an older entry and blames its
+                # stale version, pointing at the wrong problem.
+                malformed_entry = nil
+
                 changelog.each_line do |line|
-                  if line =~ %r{\*.*(\d+\.\d+\.\d+)(-\d+)?\s*$}
-                    changelog_version = ::Regexp.last_match(1)
-                    break
+                  next unless line.start_with?('*')
+
+                  match = Simp::ComponentInfo::CHANGELOG_ENTRY_REGEX.match(line)
+
+                  if match
+                    changelog_version = match[3]
+                  else
+                    malformed_entry = line.strip
                   end
+
+                  break
                 end
 
-                if changelog_version
+                if malformed_entry
+                  puts "#{@pkg_name}: Error: Malformed CHANGELOG entry: '#{malformed_entry}'"
+                elsif changelog_version
                   if changelog_version == mod_version
                     puts success_msg
                   else

data/lib/simp/rake/pupmod/helpers.rb

@@ -367,7 +367,7 @@ class Simp::Rake::Pupmod::Helpers < Rake::TaskLib
               # determine latest version from CHANGELOG, which will present
               # for all SIMP Puppet modules
               line = File.readlines('CHANGELOG')[0]
-              match = line.match(%r{^\*\s+((?:Mon|Tue|Wed|Thu|Fri|Sat|Sun) (?:Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec) \d{2} \d{4})\s+(.+<.+>)(?:\s+|\s*-\s*)?(\d+\.\d+\.\d+)})
+              match = line.match(CHANGELOG_ENTRY_REGEX)
               unless match
                 raise("ERROR: Invalid CHANGELOG entry. Unable to extract version from '#{line}'")
               end

data/spec/lib/simp/componentinfo_changelog_regex_spec.rb

@@ -34,6 +34,17 @@ describe 'Simp::ComponentInfo changelog regex' do
       expect(result[3]).to eq '3.8.0'
       expect(result[4]).to be_nil
     end
+
+    # A greedy leading match consumes the first digit of the major version,
+    # yielding '2.2.1' here. Guards the ad hoc regex that pkg:check_version
+    # used to carry.
+    it 'captures the full major version of a two-digit major without a release qualifier' do
+      line = '* Mon Aug 24 2026 Tom Smith <tom.smith@simp-project.com> - 12.2.1'
+      result = line.match(Simp::ComponentInfo::CHANGELOG_ENTRY_REGEX)
+      expect(result).not_to be_nil
+      expect(result[3]).to eq '12.2.1'
+      expect(result[4]).to be_nil
+    end
   end
 
   context 'invalid initial changelog lines' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simp-rake-helpers
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 6.0.1
 platform: ruby
 authors:
 - Chris Tessmer
 - Trevor Vaughan
 bindir: bin
 cert_chain: []
-date: 2026-06-25 00:00:00.000000000 Z
+date: 2026-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simp-beaker-helpers
@@ -637,7 +637,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.10
+rubygems_version: 4.0.16
 specification_version: 4
 summary: SIMP rake helpers
 test_files: []