simp-rake-helpers 6.0.1 → 6.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c2d53a38c2de737dc4cdb29dab1a6d362fb826d338553f4885769d68e6c4a51
-  data.tar.gz: 0c58a8d0201d7769eb87d6e850f577c265417816e2642821e0a536df0479f2db
+  metadata.gz: 187143b51a314e79b65f0e1392213c5569ea67f776d1f84e75382f3424d43ce2
+  data.tar.gz: a75929e673723f7ce4a9a36398a98fad8994c0e94e69f0dd9aebc30bb62bd230
 SHA512:
-  metadata.gz: fc790074c35b763dcc443c802f3bd6fdd5feec39bf6875e1450ac0393b42b10cadf38264c651c509da4703956b2f276695c161e16eef26000067789042573c9e
-  data.tar.gz: 8821a81110d60f0c28a689cc9e2e35ef4c32b5c5fbd57e48b56a491dc40e90fc49843c9d510ae6e1fa23eaac46649d10b1d1d8bca5b39752615e5be051fd4d68
+  metadata.gz: 5a703c78bca2339cfef781ee2b253fb4e03cd1333e1fd38bffe610ad63c94148b21a2c257051ece7f3d19eb241a49834df0b9fa73661cc6d7dd582d14d1eafe1
+  data.tar.gz: 5870971485f38854c577f41cfd086a20ac72065a460f48a65041c7cb195eca8ee1d71f796792f871bc4c90ab36b1387430aead64afe2834fd138c1a7e46e3378

data/CHANGELOG.md

@@ -1,3 +1,40 @@
+### 6.1.0 / 2026-09-03
+- Added
+  - Absorbed `Simp::Build::ReleaseMapper` from the unmaintained
+    `simp-build-helpers` gem into `lib/simp/build/release_mapper.rb`, along with
+    its unit tests. `simp/rake/build/auto.rb` has always hard-required this
+    class, but it was never declared as a runtime dependency -- only as a
+    `Gemfile` entry -- so `gem install simp-rake-helpers` produced a `LoadError`
+    for the entire `Simp::Rake::Build::*` task tree.
+    - The last release of `simp-build-helpers` was 0.1.1 (2016-09-28), which
+      calls `File.exists?`. That method no longer exists in current Rubies, so
+      `rake build:auto` raised `NoMethodError` on its first ISO path check.
+      The fix had been committed to that project's `master` but never released.
+- Changed
+  - `Simp::Build::SIMPBuildException` now inherits from `StandardError` rather
+    than `Exception`, matching the other `SIMPBuildException` classes in this
+    project. `build:auto` wraps each distro/version/arch build in
+    `rescue StandardError`, so ISO mapping failures are now recorded per-ISO and
+    reported in the "Failed ISOs" summary (exit 1) instead of aborting the whole
+    run on the first failure.
+  - Dropped the `simp-build-helpers` `Gemfile` entry and removed it from the
+    acceptance-test build project scaffold.
+- Fixed
+  - `Simp::Build::ReleaseMapper#get_flavor` no longer reports a flavor match with
+    an empty ISO list when checksum verification fails. When the checksum branch
+    was taken (`SIMP_BUILD_checksum=true`, or a flavor with non-unique ISO sizes)
+    and verification failed, control fell through to an unconditional
+    `result = flavor` instead of moving on to the next flavor, so a corrupt or
+    unrecognized ISO was accepted as a valid match. `build:auto` iterates
+    `target_data['isos']` to drive `unpack`, so the empty list silently skipped
+    unpacking and the build continued against an empty or stale staging
+    directory -- making `SIMP_BUILD_checksum=true` worse than useless. It now
+    keeps searching and raises `No flavors for target release` when nothing
+    verifies. Inherited from `simp-build-helpers`, where the `else` appears to
+    have been lost long ago.
+  - Added the missing closing quote in the "Recognized SIMP ISOs for '<release>'"
+    error message header.
+
 ### 6.0.1 / 2026-08-26
 - Fixed
   - `pkg:check_version` no longer misreads CHANGELOG versions with a two-digit

data/Gemfile

@@ -11,7 +11,6 @@ gem_sources.each { |gem_source| source gem_source }
 
 gemspec
 
-gem 'simp-build-helpers'
 # renovate: datasource=rubygems versioning=ruby
 gem 'simp-beaker-helpers', ENV.fetch('SIMP_BEAKER_HELPERS_VERSION', '~> 3.0')
 gem 'beaker_puppet_helpers'

data/lib/simp/build/release_mapper.rb

@@ -0,0 +1,153 @@
+# frozen_string_literal: true
+
+require 'yaml'
+
+module Simp; end
+
+module Simp::Build
+  class SIMPBuildException < StandardError; end
+
+  # Maps a target SIMP release to the base OS ISOs required to build it.
+  #
+  # Reads a `release_mappings.yaml` (from simp-core's
+  # `build/distributions/<distro>/<version>/<arch>/`) and matches a set of
+  # candidate ISO files against the flavors known for the target release.
+  #
+  # Absorbed from the `simp-build-helpers` gem, which is no longer maintained
+  # as a separate project.
+  class ReleaseMapper
+    attr_accessor :do_checksums, :verbose
+
+    def initialize(target_release, mappings_file, do_checksums = false)
+      @target_release   = target_release
+      @mappings_file    = mappings_file
+      @release_mappings = YAML.load_file(mappings_file)
+      @target_data      = get_release_mappings_for_target(@target_release, @release_mappings)
+      @do_checksums     = do_checksums
+      @verbose          = false
+    end
+
+    def get_release_mappings_for_target(target_release, release_mappings)
+      releases    = release_mappings.fetch('simp_releases')
+      target_data = releases.fetch(target_release, false)
+
+      unless target_data
+        known = releases.keys.map { |x| "  - #{x}\n" }.join
+
+        raise SIMPBuildException,
+              "'#{target_release}' is not a recognized SIMP release.\n\n" \
+              "## Recognized SIMP releases:\n#{known}\n\n"
+      end
+
+      target_data
+    end
+
+    # Given a path string of files or directories, return a list of .iso files
+    #   - if all paths are bad, the result is an empty array
+    #   - directories are scanned for .iso files
+    def sanitize_iso_list(paths_string)
+      paths_string.split(':').flat_map { |path|
+        if File.directory?(path)
+          Dir[File.join(path, '*.iso')]
+        elsif File.file?(path)
+          path
+        else
+          []
+        end
+      }.sort.uniq
+    end
+
+    # Given a list of isos: see if any match the complete set of ISOs for one
+    # of the target_release's flavors.  If it matches, return a Hash containing
+    # the flavor and the matched ISOs.  If they didn't match any known distros,
+    # return nil
+    #
+    # Some of the `isos` lists might be superfluous
+    def get_flavor(isos)
+      iso_sizes   = isos.map { |iso| [iso, File.size(iso)] }.sort.to_h
+      result      = false
+      result_isos = []
+
+      @target_data['flavors'].each do |flavor, data|
+        sizes = data['isos'].map { |x| x['size'] }.sort
+        next unless sizes.uniq == sizes & iso_sizes.values
+
+        matched_isos = iso_sizes.select { |_iso, size| sizes.include?(size) }.keys
+        result_isos  = matched_isos
+
+        if @do_checksums || (sizes.uniq.size != sizes.size)
+          checksums = data['isos'].map { |x| x['checksum'] }
+
+          iso_checksums = matched_isos.to_h do |iso|
+            puts "=== getting checksum of '#{iso}'" if @verbose
+
+            [iso, `sha256sum "#{iso}"`.split(%r{ +}).first]
+          end
+
+          matched_isos = iso_checksums.select { |_iso, sum| checksums.include?(sum) }
+
+          # The checksums did not account for every ISO this flavor expects, so
+          # it is not a match.  Keep looking rather than falling through and
+          # reporting the flavor with an empty ISO list.
+          next unless matched_isos.values.uniq.size == checksums.uniq.size
+
+          result      = flavor
+          result_isos = matched_isos.keys.dup
+          break
+        end
+
+        result = flavor
+        break
+      end
+
+      return nil unless result
+
+      @target_data['flavors'][result].merge({ 'flavor' => result, 'isos' => result_isos })
+    end
+
+    def autoscan_unpack_list(paths_string)
+      iso_paths = sanitize_iso_list(paths_string)
+
+      if iso_paths.empty?
+        raise SIMPBuildException,
+              "ERROR: No suitable ISOs found for target release '#{@target_release}' in '#{paths_string}'.\n\n" \
+              "## Recognized SIMP ISOs for '#{@target_release}':\n\n#{recognized_isos}\n\n"
+      end
+
+      unpack_files = get_flavor(iso_paths)
+
+      if unpack_files.nil?
+        raise SIMPBuildException,
+              "ERROR: No flavors for target release '#{@target_release}' found in '#{paths_string}'.\n\n" \
+              "## Recognized SIMP ISOs for '#{@target_release}':\n\n#{recognized_isos(detailed: true)}\n\n"
+      end
+
+      unpack_files
+    end
+
+    private
+
+    # Formatted list of the ISOs known for the target release, for use in error
+    # messages.  When `detailed` is set, each ISO's expected size and checksum
+    # are listed along with its name.
+    def recognized_isos(detailed: false)
+      max_iso_name_size = @target_data['flavors'].values.flat_map { |x| x['isos'] }.map { |x| x['name'].size }.max
+
+      @target_data.fetch('flavors').map { |flavor, data|
+        isos = data['isos'].map { |x|
+          if detailed
+            [
+              "    - #{x['name'].ljust(max_iso_name_size)}",
+              "       - size:     #{x['size']}",
+              "       - checksum: #{x['checksum']}",
+            ].join("\n")
+          else
+            "    - #{x['name']}"
+          end
+        }.join("\n")
+
+        "  ### #{flavor}\n\n#{isos}\n\n"
+      }.join
+    end
+  end
+end

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.1'
+  VERSION = '6.1.0'
 end

data/spec/acceptance/suites/default/support/build_project_helpers.rb

@@ -17,7 +17,6 @@ module Simp::BeakerHelpers::SimpRakeHelpers::BuildProjectHelpers
       gem_sources = ENV.fetch('GEM_SERVERS','https://rubygems.org').split(/[, ]+/)
       gem_sources.each { |gem_source| source gem_source }
       gem 'simp-rake-helpers', :path => '#{build_user_host_files}'
-      gem 'simp-build-helpers', ENV.fetch('SIMP_BUILD_HELPERS_VERSION', '>= 0.1.0')
     GEMFILE
     create_remote_file(hosts, "#{test_dir}/Gemfile", gemfile, opts)
     on(hosts, "chown build_user:build_user #{test_dir}/Gemfile", opts)

data/spec/lib/simp/build/release_mapper_spec.rb

@@ -0,0 +1,184 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require 'simp/build/release_mapper'
+
+describe Simp::Build::ReleaseMapper do
+  let(:files_dir) { File.expand_path('../files/release_mapper', File.dirname(__FILE__)) }
+  let(:mappings_path) { File.join(files_dir, 'release_mappings.yaml') }
+  let(:empty_iso_dir) { File.join(files_dir, 'fake_isos_empty') }
+
+  let(:iso_paths) do
+    pwd = File.join(files_dir, 'fake_isos')
+
+    {
+      'c7-64' => File.join(pwd, 'CentOS-7-x86_64-DVD-1511.iso'),
+      'r7-64' => File.join(pwd, 'RedHat-7.2-x86_64-DVD.iso'),
+      'c7-64-1503-1' => File.join(pwd, 'CentOS-7-x86_64-DVD-1503-01.iso'),
+      'c67-64-1' => File.join(pwd, 'CentOS-6.7-x86_64-bin-DVD1.iso'),
+      'c67-64-2' => File.join(pwd, 'CentOS-6.7-x86_64-bin-DVD2.iso'),
+      'bad' => File.join(pwd, 'this', 'path', 'should', 'fail'),
+      'c67-false-positive' => File.join(pwd, 'CentOS-6.7-false-positive.iso')
+    }
+  end
+
+  let(:mapper) { described_class.new('5.1.X', mappings_path) }
+
+  describe '#initialize' do
+    it 'runs without errors' do
+      expect { described_class.new('5.1.X', mappings_path) }.not_to raise_error
+    end
+
+    it 'raises an error for an unrecognized release' do
+      expect { described_class.new('0.0.X', mappings_path) }.to raise_error(Simp::Build::SIMPBuildException, %r{is not a recognized SIMP release})
+    end
+  end
+
+  describe '#sanitize_iso_list' do
+    it 'returns a 1-element list given a valid file' do
+      list = mapper.sanitize_iso_list(iso_paths['c7-64'])
+
+      expect(list).to be_a(Array)
+      expect(list.size).to eq 1
+    end
+
+    it 'returns a 2-element list given two valid files (delimited by ":")' do
+      list = mapper.sanitize_iso_list([iso_paths['c67-64-1'], iso_paths['c67-64-2']].join(':'))
+
+      expect(list).to be_a(Array)
+      expect(list.size).to eq 2
+    end
+
+    it 'returns a list with one iso given the file' do
+      list = mapper.sanitize_iso_list(iso_paths['c7-64'])
+
+      expect(list).to be_a(Array)
+      expect(list).to all(include('.iso'))
+    end
+
+    it 'returns a list of isos in a directory' do
+      list = mapper.sanitize_iso_list(File.dirname(iso_paths['c7-64']))
+
+      expect(list).to be_a(Array)
+      expect(list).to all(include('.iso'))
+    end
+
+    it 'returns an empty list for a non-existent path' do
+      list = mapper.sanitize_iso_list(iso_paths['bad'])
+
+      expect(list).to be_a(Array)
+      expect(list).to be_empty
+    end
+
+    it 'returns an empty list for an empty directory' do
+      list = mapper.sanitize_iso_list(empty_iso_dir)
+
+      expect(list).to be_a(Array)
+      expect(list).to be_empty
+    end
+  end
+
+  describe '#get_flavor' do
+    it 'detects CentOS flavor for known file' do
+      list = [iso_paths['c7-64']]
+      data = mapper.get_flavor(list)
+
+      expect(data['flavor']).to eq('CentOS')
+      expect(data['isos']).to eq(list)
+    end
+
+    it 'detects RedHat flavor for known file' do
+      list = [iso_paths['r7-64']]
+      data = mapper.get_flavor(list)
+
+      expect(data['flavor']).to eq('RedHat')
+      expect(data['isos']).to eq(list)
+    end
+
+    it 'detects RedHat flavor and correct ISO from multiple files' do
+      list = [iso_paths['c67-64-1'], iso_paths['c67-64-2'], iso_paths['r7-64']]
+      data = mapper.get_flavor(list)
+
+      expect(data['flavor']).to eq('RedHat')
+      expect(data['isos']).to eq([iso_paths['r7-64']])
+    end
+
+    it 'detects CentOS flavor and correct ISOs from multiple files' do
+      mapper = described_class.new('4.2.X', mappings_path)
+      list   = [iso_paths['c67-64-1'], iso_paths['c67-64-2'], iso_paths['r7-64']]
+      data   = mapper.get_flavor(list)
+
+      expect(data['flavor']).to eq('CentOS')
+      expect(data['isos']).to eq([iso_paths['c67-64-1'], iso_paths['c67-64-2']])
+    end
+
+    it 'returns nil when unable to detect a known flavor' do
+      list = [iso_paths['c67-64-1'], iso_paths['c67-64-2']]
+
+      expect(mapper.get_flavor(list)).to be_nil
+    end
+
+    it 'detects CentOS flavor when checksums are enabled' do
+      mapper = described_class.new('4.2.X', mappings_path, true)
+      list   = [iso_paths['c67-64-1'], iso_paths['c67-64-2'], iso_paths['c67-false-positive']]
+
+      expect(mapper.get_flavor(list)['flavor']).to eq('CentOS')
+    end
+
+    # The sizes match, so the flavor is a size-level candidate, but the
+    # checksums do not account for every ISO the flavor expects.  This used to
+    # fall through and report the flavor with an empty ISO list, which
+    # `build:auto` then silently skipped unpacking.
+    it 'returns nil when checksums are enabled and verification fails' do
+      mapper = described_class.new('4.2.X', mappings_path, true)
+      list   = [iso_paths['c67-false-positive']]
+
+      expect(mapper.get_flavor(list)).to be_nil
+    end
+
+    it 'does not report a flavor with an empty ISO list' do
+      mapper = described_class.new('4.2.X', mappings_path, true)
+      list   = [iso_paths['c67-false-positive']]
+      data   = mapper.get_flavor(list)
+
+      expect(data && data['isos']).not_to eq([])
+    end
+  end
+
+  describe '#autoscan_unpack_list' do
+    it 'autodetects 5.1.X unpack ISO from multiple directories' do
+      path_string = [File.dirname(iso_paths['c7-64']), empty_iso_dir].join(':')
+      data        = mapper.autoscan_unpack_list(path_string)
+
+      expect(data).not_to be_nil
+      expect(data['flavor']).to eq('CentOS')
+      expect(data['isos']).to eq [iso_paths['c7-64']]
+    end
+
+    it 'autodetects 4.2.X unpack ISOs from multiple directories' do
+      path_string = [File.dirname(iso_paths['c67-64-1']), empty_iso_dir].join(':')
+      mapper      = described_class.new('4.2.X', mappings_path, true)
+      data        = mapper.autoscan_unpack_list(path_string)
+
+      expect(data).not_to be_nil
+      expect(data['flavor']).to eq('CentOS')
+      expect(data['isos'].sort).to eq [iso_paths['c67-64-1'], iso_paths['c67-64-2']]
+    end
+
+    it 'raises an error when no disks are found' do
+      expect { mapper.autoscan_unpack_list(iso_paths['bad']) }.to raise_error(Simp::Build::SIMPBuildException, %r{No suitable ISOs found})
+    end
+
+    it "raises an error when no disks match the target's flavors" do
+      path_string = [iso_paths['c67-64-1'], iso_paths['c67-64-2']].join(':')
+
+      expect { mapper.autoscan_unpack_list(path_string) }.to raise_error(Simp::Build::SIMPBuildException, %r{No flavors for target release})
+    end
+
+    it 'raises an error when checksums are enabled and verification fails' do
+      mapper = described_class.new('4.2.X', mappings_path, true)
+
+      expect { mapper.autoscan_unpack_list(iso_paths['c67-false-positive']) }.to raise_error(Simp::Build::SIMPBuildException, %r{No flavors for target release})
+    end
+  end
+end

data/spec/lib/simp/files/release_mapper/fake_isos/CentOS-6.7-false-positive.iso

@@ -0,0 +1 @@
+matches byte size but not csum

data/spec/lib/simp/files/release_mapper/fake_isos/CentOS-6.7-x86_64-bin-DVD1.iso

@@ -0,0 +1 @@
+CentOS-6.7-x86_64-bin-DVD1.iso

data/spec/lib/simp/files/release_mapper/fake_isos/CentOS-6.7-x86_64-bin-DVD2.iso

@@ -0,0 +1 @@
+CentOS-6.7-x86_64-bin-DVD2.iso

data/spec/lib/simp/files/release_mapper/fake_isos/CentOS-7-x86_64-DVD-1503-01.iso

@@ -0,0 +1 @@
+CentOS-7-x86_64-DVD-1503-01.iso

data/spec/lib/simp/files/release_mapper/fake_isos/CentOS-7-x86_64-DVD-1511.iso

@@ -0,0 +1 @@
+CentOS-7-x86_64-DVD-1511.iso

data/spec/lib/simp/files/release_mapper/fake_isos/RedHat-7.2-x86_64-DVD.iso

@@ -0,0 +1 @@
+RedHat-7.2-x86_64-DVD.iso

data/spec/lib/simp/files/release_mapper/release_mappings.yaml

@@ -0,0 +1,35 @@
+---
+simp_releases:
+  5.1.X:
+    flavors:
+      CentOS:
+        isos:
+          - name:     'CentOS-7-x86_64-DVD-1511.iso'
+            size:     29
+            checksum: 'a6525d9649326ff1d10958caa35b7e07cb454ee2419401a0e2ec03914a5c0e29'
+      RedHat:
+        isos:
+          - name:     'RedHat-7.2-x86_64-DVD.iso'
+            size:     26
+            checksum: '3ddcc08ba4cb90c1ef285aad2bce5bda2fd333fc0645e1db48a9c45b655c8a37'
+        build_command: 'bundle exec rake build:from_iso[RedHdat-7-x86_64-DVD-1511.iso]'
+        mock_cfg:      'epel-7-x86_64.cfg'
+  5.1.0-2:
+    flavors:
+      CentOS:
+        isos:
+          - name:     'CentOS-7-x86_64-DVD-1503-01.iso'
+            size:     32
+            checksum: '698352c6b47a8a3cab47f2e1ee73722e25797511357787461a2b9e43dbb84ac2'
+        build_command: 'bundle exec rake <something-or-other>[CentOS-7-x86_64-DVD-1503-01.iso]'
+        mock_cfg:      'epel-7-x86_64.cfg'
+  4.2.X:
+    flavors:
+      CentOS:
+        isos:
+          - name:     'CentOS-6.7-x86_64-bin-DVD1.iso'
+            size:     31
+            checksum: '1de19e772386fa08e82ddbcd00399159945a012ad1536dec76b260f9ef6036c3'
+          - name:     'CentOS-6.7-x86_64-bin-DVD1.iso'
+            size:     31
+            checksum: '8aa797a6d39f7496f1ef97e8b6a959941ee8e20e48bae545e5a96850fca98549'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simp-rake-helpers
 version: !ruby/object:Gem::Version
-  version: 6.0.1
+  version: 6.1.0
 platform: ruby
 authors:
 - Chris Tessmer
 - Trevor Vaughan
 bindir: bin
 cert_chain: []
-date: 2026-08-26 00:00:00.000000000 Z
+date: 2026-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simp-beaker-helpers
@@ -376,6 +376,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- lib/simp/build/release_mapper.rb
 - lib/simp/command_utils.rb
 - lib/simp/componentinfo.rb
 - lib/simp/local_gpg_signing_key.rb
@@ -499,6 +500,7 @@ files:
 - spec/acceptance/suites/default/support/build_user_helpers.rb
 - spec/acceptance/suites/default/support/pkg_rpm_helpers.rb
 - spec/acceptance/support/simp_rake_helpers.rb
+- spec/lib/simp/build/release_mapper_spec.rb
 - spec/lib/simp/command_utils_spec.rb
 - spec/lib/simp/componentinfo_changelog_regex_spec.rb
 - spec/lib/simp/componentinfo_spec.rb
@@ -553,6 +555,13 @@ files:
 - spec/lib/simp/files/relchecks_create_tag_changelog_spec/module_with_single_entry/CHANGELOG
 - spec/lib/simp/files/relchecks_create_tag_changelog_spec/module_with_single_entry/metadata.json
 - spec/lib/simp/files/relchecks_create_tag_changelog_spec/module_without_changelog/metadata.json
+- spec/lib/simp/files/release_mapper/fake_isos/CentOS-6.7-false-positive.iso
+- spec/lib/simp/files/release_mapper/fake_isos/CentOS-6.7-x86_64-bin-DVD1.iso
+- spec/lib/simp/files/release_mapper/fake_isos/CentOS-6.7-x86_64-bin-DVD2.iso
+- spec/lib/simp/files/release_mapper/fake_isos/CentOS-7-x86_64-DVD-1503-01.iso
+- spec/lib/simp/files/release_mapper/fake_isos/CentOS-7-x86_64-DVD-1511.iso
+- spec/lib/simp/files/release_mapper/fake_isos/RedHat-7.2-x86_64-DVD.iso
+- spec/lib/simp/files/release_mapper/release_mappings.yaml
 - spec/lib/simp/files/simp_build/src/assets/simp/build/simp.spec
 - spec/lib/simp/files/testpackage-1-0.el7.noarch.rpm
 - spec/lib/simp/files/testpackage-1-0.noarch.rpm