simp-rake-helpers 5.25.0 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dfe5774d3445491e35db369b7092009e4a881163c3e11df1e44b8fea8107eac8
-  data.tar.gz: 94d3f27688a0de146e2c037d8cb0ba11d1239cfe89fe4c4f17fd2010b1ff1f3a
+  metadata.gz: a5c6dcd39818c575a5e55c997ea3425895952a3913e743f8472f1368c86324c5
+  data.tar.gz: 562f3641c404e562a1d64cec2fa4b11f4e3206d9a0c4c1605c2f60651f87a0b0
 SHA512:
-  metadata.gz: '03962848ae115c2a0f1d25cefa2e09718572fe15a3b0f84b85492b68dc18901aca299fd5bb4c770c15c7b3134bd2741defb3a1861f3955a8c0b1034624743967'
-  data.tar.gz: faaf35c0bb4131d15275b81480cc5787b73df58d71d8728963ce583a33745241631c3af598b9e2ffc130eafa50d4dabba0db4908c7b543f7adc07d2d7f032591
+  metadata.gz: 365f2731d24ee8ea5d830a6d055ecd024bf2a1bf448bfffdb259a88126244ae81ea3fbd4704d2b92241380a7ba45ce3962beb2d58bc2213a3dd537820604b5eb
+  data.tar.gz: c2f1258d8ee380d03667c852f48222e4f4b2de2865d49abf9ee5a95d523c3c4a36f972e1edf8562a590c254e493e0d6edb798213e2f21914f3b90017eb919764

data/CHANGELOG.md

@@ -1,3 +1,29 @@
+### 6.0.0 / 2026-06-25
+- Added
+  - `pupmod:build` rake task using `puppet-modulebuilder`, replacing `pdk build`
+    - Honours `.pdkignore` (dropped by puppet-modulebuilder 2.x)
+  - `puppet-modulebuilder` runtime dependency
+- Changed (**Breaking**)
+  - Dropped support for Puppet/OpenVox 7
+    - Narrowed `openvox` dependency to `>= 8.0, < 9.0`
+    - Raised the default `puppet`/`openvox` gem floor to `>= 8, < 9`
+  - Replaced `puppetlabs_spec_helper` with `voxpupuli-test`, enabling Ruby 4.0
+    support. `puppetlabs_spec_helper` caps `puppet-syntax` at < 5, which depends
+    on the `puppet` gem and its Ruby-4-incompatible `facter` dependency;
+    `voxpupuli-test` uses `puppet-syntax` >= 6 (which depends on `openvox`) and
+    `puppet_fixtures`/`openfact`, all of which support Ruby 4.0.
+  - Require `simp-beaker-helpers` ~> 3.0 (for its `puppet_fixtures` migration)
+- Changed
+  - `helpers.rb` now loads rake tasks via `voxpupuli/test/rake` +
+    `puppet_fixtures`. The puppetlabs_spec_helper task names are preserved as
+    aliases (`spec_prep` -> `fixtures:prep`, `spec_clean` -> `fixtures:clean`,
+    `spec_standalone` -> `spec:standalone`) for backwards compatibility.
+  - `voxpupuli-test` manages the `rubocop`, `rubocop-rake`, and `rubocop-rspec`
+    versions instead of pinning them in the Gemfile (its constraints would
+    otherwise conflict); `rubocop-performance` stays explicit
+  - CI now tests OpenVox 8 on Ruby 3.2 and 3.4, plus a Ruby 4.0 / OpenVox 9
+    preview (OpenVox 8 gem on Ruby 4.0)
+
 ### 5.25.0 / 2026-04-23
 - Fixed
   - Update bundler dependency constraint to allow < 5.0 (latest: 4.x)

data/Gemfile

@@ -1,9 +1,11 @@
 # Variables:
 #
 # SIMP_GEM_SERVERS | a space/comma delimited list of rubygem servers
-# PUPPET_VERSION   | specifies the version of the puppet gem to load
-puppetversion = ENV.key?('PUPPET_VERSION') ? "#{ENV['PUPPET_VERSION']}" : ['>= 7.0.0', '< 9.0.0']
-gem_sources   = ENV.key?('SIMP_GEM_SERVERS') ? ENV['SIMP_GEM_SERVERS'].split(/[, ]+/) : ['https://rubygems.org']
+# PUPPET_VERSION   | specifies the version of the puppet/openvox gems to load
+# OPENVOX_VERSION  | overrides the openvox gem version (defaults to PUPPET_VERSION)
+puppet_version  = ENV.fetch('PUPPET_VERSION', ['>= 8', '< 9'])
+openvox_version = ENV.fetch('OPENVOX_VERSION', puppet_version)
+gem_sources     = ENV.key?('SIMP_GEM_SERVERS') ? ENV['SIMP_GEM_SERVERS'].split(/[, ]+/) : ['https://rubygems.org']
 
 gem_sources.each { |gem_source| source gem_source }
 
@@ -11,12 +13,17 @@ gemspec
 
 gem 'simp-build-helpers'
 # renovate: datasource=rubygems versioning=ruby
-gem 'simp-beaker-helpers', ENV.fetch('SIMP_BEAKER_HELPERS_VERSION', '~> 2.0.0')
+gem 'simp-beaker-helpers', ENV.fetch('SIMP_BEAKER_HELPERS_VERSION', '~> 3.0')
 gem 'beaker_puppet_helpers'
 gem 'rake', '>= 12.3.3'
 gem 'beaker-docker'
 
-if puppetversion
-  gem 'puppet', puppetversion
+gem 'openvox', openvox_version
+
+group :test do
+  # rubocop, rubocop-rake, and rubocop-rspec are pulled in and version-pinned by
+  # voxpupuli-test; pinning them here conflicts with its constraints.
+  # rubocop-performance is not a voxpupuli-test dependency, so it stays explicit.
+  gem 'rubocop-performance', '~> 1.26.0'
 end
 

data/lib/simp/command_utils.rb

@@ -1,11 +1,14 @@
+# frozen_string_literal: true
+
 module Simp; end
+
 module Simp::CommandUtils
   require 'facter'
 
-  def which(cmd, fail=false)
+  def which(cmd, fail = false)
     @which_cache ||= {}
 
-    if @which_cache.has_key?(cmd)
+    if @which_cache.key?(cmd)
       command = @which_cache[cmd]
     else
       command = Facter::Core::Execution.which(cmd)
@@ -14,7 +17,7 @@ module Simp::CommandUtils
 
     msg = "Warning: Command #{cmd} not found on the system."
 
-    ( fail ? raise(msg) : warn(msg) ) unless command
+    (fail ? raise(msg) : warn(msg)) unless command
 
     command
   end

data/lib/simp/componentinfo.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+
+require 'English'
 require 'date'
 
 module Simp; end
@@ -8,7 +11,7 @@ class Simp::ComponentInfo
   attr_accessor :component_dir, :type, :version, :release, :changelog
 
   # A helpful method for ensuring that the errors can be easily seen
-  ERR_MARKER = "WARNING: !!! "
+  ERR_MARKER = 'WARNING: !!! '
 
   # See https://fedoraproject.org/wiki/Packaging:Guidelines?rd=Packaging/Guidelines#Changelogs
   # When matched against this regex
@@ -16,7 +19,7 @@ class Simp::ComponentInfo
   #   match 2 = author of the form {name} <{email}>
   #   match 3 = version
   #   match 4 = optional release qualifier; nil when absent
-  CHANGELOG_ENTRY_REGEX = /^\*\s+((?:Mon|Tue|Wed|Thu|Fri|Sat|Sun) (?:Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec) [0-3]{1}[0-9]{1} \d{4})\s+(.+<.+>)(?:\s+|\s*-\s*)(\d+\.\d+\.\d+)(?:-(\S+))?\s*$/
+  CHANGELOG_ENTRY_REGEX = %r{^\*\s+((?:Mon|Tue|Wed|Thu|Fri|Sat|Sun) (?:Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec) [0-3]{1}[0-9]{1} \d{4})\s+(.+<.+>)(?:\s+|\s*-\s*)(\d+\.\d+\.\d+)(?:-(\S+))?\s*$}.freeze # rubocop:disable Layout/LineLength
 
   # Load component information from appropriate component files
   #
@@ -95,50 +98,52 @@ class Simp::ComponentInfo
   end
 
   private
+
   def load_module_info(latest_version_only, verbose)
     require 'json'
     metadata_file = File.join(@component_dir, 'metadata.json')
     metadata = JSON.parse(File.read(metadata_file))
-    fail("ERROR: Version missing from #{metadata_file}") if metadata['version'].nil?
+    raise("ERROR: Version missing from #{metadata_file}") if metadata['version'].nil?
 
     @version = metadata['version'].split('-').first
-    rel_bits = metadata['version'].split('-')[1..-1]
+    rel_bits = metadata['version'].split('-')[1..]
     @release = rel_bits.empty? ? nil : rel_bits.join('-')
 
-
     changelog_file = File.join(component_dir, 'CHANGELOG')
     unless File.exist?(changelog_file)
-      fail("ERROR: No CHANGELOG file found in #{component_dir}")
+      raise("ERROR: No CHANGELOG file found in #{component_dir}")
     end
-    @changelog = parse_changelog(IO.read(changelog_file), latest_version_only, verbose)
+
+    @changelog = parse_changelog(File.read(changelog_file), latest_version_only, verbose)
   end
 
   def load_asset_info(latest_version_only, verbose)
     rpm_spec_files = Dir.glob(File.join(@component_dir, 'build', '*.spec'))
     if rpm_spec_files.empty?
-      fail("No RPM spec file found in #{File.join(@component_dir, 'build')}")
+      raise("No RPM spec file found in #{File.join(@component_dir, 'build')}")
     elsif rpm_spec_files.size > 1
-      fail("More than 1 RPM spec file found: #{rpm_spec_files.join(' ')}")
+      raise("More than 1 RPM spec file found: #{rpm_spec_files.join(' ')}")
     end
 
     # Determine asset version, which we will ASSUME to be the main
     # package version.  The RPM query, below, will return the main
     # package followed by subpackages.
-    version_query = "rpm -q --queryformat '%{VERSION} %{RELEASE}\\n'" +
-      " --specfile #{rpm_spec_files[0]}"
+    version_query = "rpm -q --queryformat '%{VERSION} %{RELEASE}\\n' " \
+                    "--specfile #{rpm_spec_files[0]}"
 
     rpm_version_list = `#{version_query} 2> /dev/null`
-    if $?.exitstatus != 0
-      fail("Could not extract version and release from #{rpm_spec_files[0]}." +
-        " To debug, execute:\n   #{version_query}")
+    if $CHILD_STATUS.exitstatus != 0
+      raise("Could not extract version and release from #{rpm_spec_files[0]}. " \
+            "To debug, execute:\n   #{version_query}")
     end
+    num_packages = rpm_version_list.strip.split("\n").length
     @version, @release = rpm_version_list.split("\n")[0].split
 
     changelog_query = "rpm -q --changelog --specfile #{rpm_spec_files[0]}"
     raw_changelog = `#{changelog_query} 2> /dev/null`
-    if $?.exitstatus != 0
-      fail("Could not extract changelog from #{rpm_spec_files[0]}." +
-        " To debug, execute:\n   #{changelog_query}")
+    if $CHILD_STATUS.exitstatus != 0
+      raise("Could not extract changelog from #{rpm_spec_files[0]}. " \
+            "To debug, execute:\n   #{changelog_query}")
     elsif raw_changelog.strip.empty?
       changelog_lines = []
 
@@ -146,17 +151,27 @@ class Simp::ComponentInfo
       File.read(rpm_spec_files[0]).lines.each do |line|
         changelog_lines << line if in_changelog
 
-        if line.start_with?('%')
-          if line.start_with?('%changelog')
-            in_changelog = true
-          else
-            in_changelog = false
-          end
-        end
+        next unless line.start_with?('%')
+
+        in_changelog = line.start_with?('%changelog') || false
       end
 
       raw_changelog = changelog_lines.join
     end
+
+    # RPM 6+ outputs the changelog once per subpackage when querying a spec
+    # file. Strip the duplicate sections so only the first copy is parsed.
+    if num_packages > 1 && !raw_changelog.strip.empty?
+      first_entry = raw_changelog.match(%r{^\*.+$})
+      if first_entry
+        second_start = raw_changelog.index(
+          %r{^#{Regexp.escape(first_entry[0])}$},
+          first_entry.begin(0) + 1,
+        )
+        raw_changelog = raw_changelog[0, second_start].rstrip + "\n" if second_start
+      end
+    end
+
     @changelog = parse_changelog(raw_changelog, latest_version_only, verbose)
   end
 
@@ -169,7 +184,7 @@ class Simp::ComponentInfo
   #
   def parse_changelog(changelog, latest_version_only, verbose)
     # split on the entry-separating lines
-    changelog_entries = changelog.split(/\n\n+/)
+    changelog_entries = changelog.split(%r{\n\n+})
     latest_version = nil # 1st version found is latest version
     prev_entry_date = nil
     changelogs = []
@@ -191,21 +206,21 @@ class Simp::ComponentInfo
         current_version = Gem::Version.new(full_version)
         latest_version = current_version if latest_version.nil?
         if current_version > latest_version
-          fail("ERROR:  Changelog entries are not properly version ordered")
+          raise('ERROR:  Changelog entries are not properly version ordered')
         end
 
-        break if latest_version_only and (current_version < latest_version)
+        break if latest_version_only && (current_version < latest_version)
 
         # verify dates are appropriately ordered (newest to oldest)
         current_entry_date = Date.strptime(match[1], '%a %b %d %Y')
         prev_entry_date = current_entry_date if prev_entry_date.nil?
         if current_entry_date > prev_entry_date
-          fail("ERROR:  Changelog entries are not properly date ordered")
+          raise('ERROR:  Changelog entries are not properly date ordered')
         end
 
         if valid_date_weekday?(match[1], verbose)
           entry = {
-            :date    => match[1],
+            :date => match[1],
             :version => match[3],
             :release => match[4],
             :content => changelog_lines
@@ -235,12 +250,11 @@ class Simp::ComponentInfo
 
     valid = true
     if actual_weekday != expected_weekday
-      err_msg = ERR_MARKER + "'#{actual_weekday}' should be '#{expected_weekday}' for" +
-        " changelog timestamp '#{changelog_date}'"
+      err_msg = ERR_MARKER + "'#{actual_weekday}' should be '#{expected_weekday}' for " \
+                             "changelog timestamp '#{changelog_date}'"
       warn err_msg if verbose
       valid = false
     end
-    return valid
+    valid
   end
-
 end