simp-rake-helpers 7.0.0 → 7.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17a61d8752d73045b67c31db5865a27333eb179929cbe3547077293196212f9a
-  data.tar.gz: 3a207e85eb8c285d67cf1f013db9da5f9ce4bef508eea997d796cd3b08632e99
+  metadata.gz: b01629a09d8aed1d3738c94e6eb15100a00872932b6912c53ea6727fea783ca7
+  data.tar.gz: 913def27f8d722694ce7754839a82d87fb6afd648039a777454edadab5683cd0
 SHA512:
-  metadata.gz: cd50a6943242009704ebb20410c4ed70b14af882268b648d6dd5ffbaf206c2394e2244b93bee220e6b40d96baeb86048dd8b8b0cd026afdc1b6c369d0a6f0f89
-  data.tar.gz: 891d1280e437f99c3a8fdba93b20d7931bfb6e3eaa86887a1eb9e5567f241505436a569eb057f805d979d188b84d92d2a312256fd8f43d5f01df4e2900d51ff1
+  metadata.gz: 8aa589802f53f4e5c357918b6391a067e6aeadf8b2ea93d75f62324bcefe399dee35f5012862e6f84f773f2a6748e9eac5c74a078716703a8ff0cbf4d42604cc
+  data.tar.gz: a3efa5462279daaa95f1afc17557bd2f828928052262379451b423a697c4537e1f24befac8a5e740ed18717e89c307888acba6139f41d9434ce461716a85af5d

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+### 7.0.1 / 2026-10-14
+- Fixed
+  - RPM builds for SIMP 7 failed with `Could not find template for SIMP
+    version 7.0.0-...`, because the RPM spec template was looked up only
+    for the exact SIMP major. A SIMP major without its own template now uses
+    the newest older one (`simp6.spec` for SIMP 7)
+
 ### 7.0.0 / 2026-10-05
 - Changed
   - **BREAKING:** `pkg:compare_latest_tag` decides whether a Puppet module

data/Gemfile

@@ -27,6 +27,6 @@ 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'
+  gem 'rubocop-performance', '~> 1.27.0'
 end
 

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', '~> 6.0'
+gem 'simp-rake-helpers', '~> 7.0'

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

@@ -9,18 +9,26 @@ class Simp::Rake::Helpers
 
     include Simp::Rake::Build::Constants
 
+    TEMPLATE_DIR = File.join(File.dirname(__FILE__), 'assets', 'rpm_spec')
+
+    # The RPM spec template for a SIMP version: simp<N>.spec for the newest N
+    # that does not exceed the version's major, so a new SIMP major keeps
+    # using the previous template until it needs a different one. Without a
+    # version, simpdefault.spec.
     def rpm_template(simp_version = nil)
       simp_version = ENV.fetch('SIMP_BUILD_version', simp_version)
 
-      simp_main_version = if simp_version
-                            simp_version.split('.').first
-                          else
-                            'default'
-                          end
-
-      template_file = File.join(File.dirname(__FILE__), 'assets', 'rpm_spec', "simp#{simp_main_version}.spec")
-
-      raise "Error: Could not find template for SIMP version #{simp_version}" unless File.exist?(template_file)
+      template_file = if simp_version
+                        simp_main_version = simp_version.split('.').first.to_i
+                        versioned = Dir.glob(File.join(TEMPLATE_DIR, 'simp[0-9]*.spec')).map do |file|
+                          [File.basename(file)[%r{\d+}].to_i, file]
+                        end
+                        versioned.select { |major, _| major <= simp_main_version }.max_by(&:first)&.last
+                      else
+                        File.join(TEMPLATE_DIR, 'simpdefault.spec')
+                      end
+
+      raise "Error: Could not find template for SIMP version #{simp_version}" unless template_file && File.exist?(template_file)
 
       File.read(template_file)
     end

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

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

data/spec/lib/simp/rake/helpers/rpm_spec_spec.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require 'simp/rake/helpers/rpm_spec'
+require 'spec_helper'
+
+describe Simp::Rake::Helpers::RPMSpec do
+  subject(:helper) { Class.new { include Simp::Rake::Helpers::RPMSpec }.new }
+
+  let(:template_dir) { Simp::Rake::Helpers::RPMSpec::TEMPLATE_DIR }
+  let(:simp6_template) { File.read(File.join(template_dir, 'simp6.spec')) }
+  let(:default_template) { File.read(File.join(template_dir, 'simpdefault.spec')) }
+
+  around(:each) do |example|
+    saved = ENV.delete('SIMP_BUILD_version')
+    example.run
+  ensure
+    saved.nil? ? ENV.delete('SIMP_BUILD_version') : ENV['SIMP_BUILD_version'] = saved
+  end
+
+  it 'uses the template for the exact SIMP major' do
+    expect(helper.rpm_template('6.6.0-2')).to eq(simp6_template)
+  end
+
+  it 'falls back to the newest older template for a newer SIMP major' do
+    expect(helper.rpm_template('7.0.0-Alpha.el8')).to eq(simp6_template)
+  end
+
+  it 'prefers SIMP_BUILD_version over the argument' do
+    ENV['SIMP_BUILD_version'] = '7.0.0-Alpha.el10'
+    expect(helper.rpm_template('5.0.0')).to eq(simp6_template)
+  end
+
+  it 'uses the default template without a SIMP version' do
+    expect(helper.rpm_template).to eq(default_template)
+  end
+
+  it 'fails for a SIMP major older than every template' do
+    expect { helper.rpm_template('5.4.0') }.to raise_error(%r{Could not find template for SIMP version 5\.4\.0})
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simp-rake-helpers
 version: !ruby/object:Gem::Version
-  version: 7.0.0
+  version: 7.0.1
 platform: ruby
 authors:
 - Chris Tessmer
 - Trevor Vaughan
 bindir: bin
 cert_chain: []
-date: 2026-10-07 00:00:00.000000000 Z
+date: 2026-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simp-beaker-helpers
@@ -602,6 +602,7 @@ files:
 - spec/lib/simp/rake/build/files/unmanaged_mod/metadata.json
 - spec/lib/simp/rake/build/helpers_spec.rb
 - spec/lib/simp/rake/build/rpmdeps_spec.rb
+- spec/lib/simp/rake/helpers/rpm_spec_spec.rb
 - spec/lib/simp/rake/helpers_spec.rb
 - spec/lib/simp/rake/pkg_spec.rb
 - spec/lib/simp/rake/pupmod/fixtures/othermod/Gemfile