simp-rake-helpers 5.11.2 → 5.12.0

data/spec/lib/simp/rake/build/helpers_spec.rb

@@ -4,7 +4,10 @@ require 'spec_helper'
 describe Simp::Rake::Build::Helpers do
   before :each do
     dir        = File.expand_path( '../../files/simp_build', File.dirname( __FILE__ ) )
+    env = ENV['SIMP_RPM_dist'].dup
+    ENV['SIMP_RPM_dist'] = '.el7'
     @obj = Simp::Rake::Build::Helpers.new( dir )
+    ENV['SIMP_RPM_dist'] = env
   end
 
   describe "#initialize" do

data/spec/lib/simp/rake/build/rpmdeps_spec.rb

@@ -32,8 +32,7 @@ describe 'Simp::Rake::Build::RpmDeps#get_version_requires' do
       }.to raise_error(SIMPRpmDepVersionException)
     end
 
-    # FIXME regex doesn't catch this
-    pending do
+    it( nil, :pending => "FIXME regex doesn't catch this" )  do
       expect{
         Simp::Rake::Build::RpmDeps::get_version_requires(pkg, '<= 3.0.0')
       }.to raise_error(SIMPRpmDepVersionException)

data/spec/lib/simp/rake/pupmod/fixtures/othermod/Gemfile

@@ -1,18 +1,9 @@
 source ENV['GEM_SOURCE'] || 'https://rubygems.org'
 
-puppetversion = ENV.key?('PUPPET_VERSION') ? ENV['PUPPET_VERSION'] : ['>= 3.3']
+puppetversion = ENV.key?('PUPPET_VERSION') ? ENV['PUPPET_VERSION'] : ['>= 5.5']
 gem 'metadata-json-lint'
 gem 'puppet', puppetversion
 gem 'puppetlabs_spec_helper', '>= 1.0.0'
 gem 'puppet-lint', '>= 1.0.0'
 gem 'facter', '>= 1.7.0'
 gem 'rspec-puppet'
-
-# rspec must be v2 for ruby 1.8.7
-if RUBY_VERSION >= '1.8.7' && RUBY_VERSION < '1.9'
-  gem 'rspec', '~> 2.0'
-  gem 'rake', '~> 10.0'
-else
-  # rubocop requires ruby >= 1.9
-  gem 'rubocop'
-end

data/spec/lib/simp/rake/pupmod/fixtures/simpmod/README.md

@@ -21,7 +21,7 @@
 
 Start with a one- or two-sentence summary of what the module does and/or what
 problem it solves. This is your 30-second elevator pitch for your module.
-Consider including OS and Puppet version compatability, and any other
+Consider including OS and Puppet version compatibility, and any other
 information users will need to quickly assess the module's viability within
 their environment.
 
@@ -33,7 +33,7 @@ management, etc.), this is the time to mention it.
 ### This is a SIMP module
 
 This module is a component of the [System Integrity Management
-Platform](https://github.com/NationalSecurityAgency/SIMP), a
+Platform](https://simp-project.com), a
 compliance-management framework built on Puppet.
 
 If you find any issues, they may be submitted to our [bug

data/spec/lib/simp/rake_spec.rb

@@ -8,7 +8,8 @@ describe Simp::Rake do
 
   describe ".get_cpu_limit" do
     it "detects number of CPUs" do
-      expect( get_cpu_limit ).to be > 0
+      expect(Parallel).to receive(:processor_count).and_return(3)
+      expect( get_cpu_limit ).to eq 2
     end
   end
 

data/spec/lib/simp/relchecks_check_rpm_changelog_spec.rb

@@ -1,6 +1,8 @@
 require 'simp/relchecks'
 require 'spec_helper'
 
+rpm_version = Simp::RPM.version
+
 describe 'Simp::RelChecks.check_rpm_changelog' do
   let(:files_dir) {
     File.join( File.dirname(__FILE__), 'files', File.basename(__FILE__, '.rb'))
@@ -31,19 +33,27 @@ describe 'Simp::RelChecks.check_rpm_changelog' do
 
   context 'with changelog errors' do
     it 'fails for a Puppet module' do
-      component_dir = File.join(files_dir, 'module_with_misordered_entries')
-      component_spec = File.join(templates_dir, 'simpdefault.spec')
-
-      expect{ Simp::RelChecks.check_rpm_changelog(component_dir, component_spec) }.
-        to raise_error(/ERROR: Invalid changelog for module_with_misordered_entries/)
+      if Gem::Version.new(rpm_version) > Gem::Version.new('4.15.0')
+        skip("RPM #{rpm_version} does not properly process changelog entries")
+      else
+        component_dir = File.join(files_dir, 'module_with_misordered_entries')
+        component_spec = File.join(templates_dir, 'simpdefault.spec')
+
+        expect{ Simp::RelChecks.check_rpm_changelog(component_dir, component_spec) }.
+          to raise_error(/ERROR: Invalid changelog for module_with_misordered_entries/)
+      end
     end
 
     it 'fails for a non-Puppet asset' do
-      component_dir = File.join(files_dir, 'asset_with_misordered_entries')
-      component_spec = File.join(component_dir, 'build', 'asset_with_misordered_entries.spec')
-
-      expect{ Simp::RelChecks.check_rpm_changelog(component_dir, component_spec) }.
-        to raise_error(/ERROR: Invalid changelog for asset_with_misordered_entries/)
+      if Gem::Version.new(rpm_version) > Gem::Version.new('4.15.0')
+        skip("RPM #{rpm_version} does not properly process changelog entries")
+      else
+        component_dir = File.join(files_dir, 'asset_with_misordered_entries')
+        component_spec = File.join(component_dir, 'build', 'asset_with_misordered_entries.spec')
+
+        expect{ Simp::RelChecks.check_rpm_changelog(component_dir, component_spec) }.
+          to raise_error(/ERROR: Invalid changelog for asset_with_misordered_entries/)
+      end
     end
   end
 end

data/spec/lib/simp/relchecks_compare_latest_tag_spec.rb

@@ -10,17 +10,17 @@ describe 'Simp::RelChecks.compare_latest_tag' do
 
   context 'with no project errors' do
     it 'reports no tags for a project with no tags' do
-      Simp::RelChecks.expects(:`).with('git fetch -t origin 2>/dev/null').returns("\n")
-      Simp::RelChecks.expects(:`).with('git tag -l').returns("\n")
+      expect(Simp::RelChecks).to receive(:`).with('git fetch -t origin 2>/dev/null').and_return("\n")
+      expect(Simp::RelChecks).to receive(:`).with('git tag -l').and_return("\n")
 
       expect{ Simp::RelChecks.compare_latest_tag(component_dir) }.
         to output("  No tags exist from origin\n").to_stdout
     end
 
     it 'reports no new tag required when no files have changed' do
-      Simp::RelChecks.expects(:`).with('git fetch -t origin 2>/dev/null').returns("\n")
-      Simp::RelChecks.expects(:`).with('git tag -l').returns("1.0.0-pre\n1.0.0\n1.1.0\n")
-      Simp::RelChecks.expects(:`).with('git diff tags/1.1.0 --name-only').returns("\n")
+      expect(Simp::RelChecks).to receive(:`).with('git fetch -t origin 2>/dev/null').and_return("\n")
+      expect(Simp::RelChecks).to receive(:`).with('git tag -l').and_return("1.0.0-pre\n1.0.0\n1.1.0\n")
+      expect(Simp::RelChecks).to receive(:`).with('git diff tags/1.1.0 --name-only').and_return("\n")
 
       msg = "  No new tag required: No significant files have changed since '1.1.0' tag\n"
       expect{ Simp::RelChecks.compare_latest_tag(component_dir) }.
@@ -28,10 +28,10 @@ describe 'Simp::RelChecks.compare_latest_tag' do
     end
 
     it 'reports no new tag required when no significant files have changed' do
-      Simp::RelChecks.expects(:`).with('git fetch -t origin 2>/dev/null').returns("\n")
-      Simp::RelChecks.expects(:`).with('git tag -l').returns("1.0.0\nv1.0.1\n1.1.0\n")
-      Simp::RelChecks.expects(:`).with('git diff tags/1.1.0 --name-only').returns(
-        ".travis.yml\nRakefile\nGemfile.lock\nspec/some_spec.rb\ndoc/index.html\nrakelib/mytasks.rake\n")
+      expect(Simp::RelChecks).to receive(:`).with('git fetch -t origin 2>/dev/null').and_return("\n")
+      expect(Simp::RelChecks).to receive(:`).with('git tag -l').and_return("1.0.0\nv1.0.1\n1.1.0\n")
+      expect(Simp::RelChecks).to receive(:`).with('git diff tags/1.1.0 --name-only').and_return(
+        ".travis.yml\nRakefile\nREFERENCE.md\nGemfile.lock\nspec/some_spec.rb\ndoc/index.html\nrakelib/mytasks.rake\n")
 
       msg = "  No new tag required: No significant files have changed since '1.1.0' tag\n"
       expect{ Simp::RelChecks.compare_latest_tag(component_dir) }.
@@ -39,9 +39,9 @@ describe 'Simp::RelChecks.compare_latest_tag' do
     end
 
     it 'reports a new tag is required for significant changes with bumped version' do
-      Simp::RelChecks.expects(:`).with('git fetch -t origin 2>/dev/null').returns("\n")
-      Simp::RelChecks.expects(:`).with('git tag -l').returns("1.0.0\n1.1.0-RC01\n")
-      Simp::RelChecks.expects(:`).with('git diff tags/1.0.0 --name-only').returns(
+      expect(Simp::RelChecks).to receive(:`).with('git fetch -t origin 2>/dev/null').and_return("\n")
+      expect(Simp::RelChecks).to receive(:`).with('git tag -l').and_return("1.0.0\n1.1.0-RC01\n")
+      expect(Simp::RelChecks).to receive(:`).with('git diff tags/1.0.0 --name-only').and_return(
          "CHANGELOG\nmetadata.json\nmanifest/init.pp\n")
 
       msg = <<-EOM
@@ -58,9 +58,9 @@ NOTICE: New tag of version '1.1.0' is required for 3 changed files:
 
   context 'with project errors' do
     it 'fails when latest version < latest tag' do
-      Simp::RelChecks.expects(:`).with('git fetch -t origin 2>/dev/null').returns("\n")
-      Simp::RelChecks.expects(:`).with('git tag -l').returns("1.0.0\n1.2.0\n")
-      Simp::RelChecks.expects(:`).with('git diff tags/1.2.0 --name-only').returns(
+      expect(Simp::RelChecks).to receive(:`).with('git fetch -t origin 2>/dev/null').and_return("\n")
+      expect(Simp::RelChecks).to receive(:`).with('git tag -l').and_return("1.0.0\n1.2.0\n")
+      expect(Simp::RelChecks).to receive(:`).with('git diff tags/1.2.0 --name-only').and_return(
          "CHANGELOG\nmetadata.json\nmanifest/init.pp\n")
 
       expect{ Simp::RelChecks.compare_latest_tag(component_dir) }.
@@ -68,9 +68,9 @@ NOTICE: New tag of version '1.1.0' is required for 3 changed files:
     end
 
     it 'fails when significant file changes need a version bump' do
-      Simp::RelChecks.expects(:`).with('git fetch -t origin 2>/dev/null').returns("\n")
-      Simp::RelChecks.expects(:`).with('git tag -l').returns("1.0.0\n1.1.0\n")
-      Simp::RelChecks.expects(:`).with('git diff tags/1.1.0 --name-only').returns(
+      expect(Simp::RelChecks).to receive(:`).with('git fetch -t origin 2>/dev/null').and_return("\n")
+      expect(Simp::RelChecks).to receive(:`).with('git tag -l').and_return("1.0.0\n1.1.0\n")
+      expect(Simp::RelChecks).to receive(:`).with('git diff tags/1.1.0 --name-only').and_return(
          "manifest/init.pp\n")
 
       expect{ Simp::RelChecks.compare_latest_tag(component_dir) }.

data/spec/lib/simp/rpm_signer_spec.rb

@@ -0,0 +1,98 @@
+require 'simp/rpm_signer'
+require 'spec_helper'
+require 'fileutils'
+require 'tmpdir'
+
+
+describe Simp::RpmSigner do
+
+  before :all do
+    @tmp_dir = Dir.mktmpdir('spec_test__rpm_signer')
+    @gpg_keydir = File.join(@tmp_dir, 'dev')
+  end
+
+  after :all do
+    FileUtils.remove_entry_secure(@tmp_dir)
+  end
+
+  let(:verbose) { ENV['VERBOSE'].to_s =~ /^(yes|true)$/ }
+  let(:gpg_email_name) { 'gatekeeper@simp.development.key' }
+  let(:passphrase) { 'dev_passphrase' }
+  let(:key_id) { '722B97A808E7DAEA' }
+  let(:key_size) { 4096 }
+  let(:key_info) { {
+    :dir      => @gpg_keydir,
+    :name     => gpg_email_name,
+    :key_id   => key_id,
+    :key_size => key_size,
+    :password => passphrase
+  } }
+
+  let(:gpg_cmd) {  "gpg --with-colons --homedir=#{@gpg_keydir} --list-keys '<#{gpg_email_name}>' 2>&1" }
+  let(:key_list_output) { <<~EOM
+        tru::1:1521838828:0:3:1:5
+        pub:e:4096:1:722B97A808E7DAEA:1521838554:1523048154::-:::sc::::::23::0:
+        fpr:::::::::5DD3E8D45C99780DCA7D0B83722B97A808E7DAEA:
+        uid:e::::1521838554::773C55CA511CCE31244D86D4AB70F6499024695F::SIMP Development (Development key 1521838554) <gatekeeper@simp.development.key>::::::::::0:
+      EOM
+  }
+
+  # The bulk of load_key is tested in the acceptance test. These tests are
+  # a few edge cases.
+  context '.load_key' do
+    context 'key info missing from files' do
+      before :each do
+        allow(Simp::RpmSigner).to receive(:which).with('gpg').and_return('/usr/bin/gpg')
+        FileUtils.mkdir_p(@gpg_keydir)
+      end
+
+      after :each do
+        FileUtils.rm_rf(@gpg_keydir)
+        Simp::RpmSigner.clear_gpg_keys_cache
+      end
+
+      it 'should prompt user for key email and passphrase when not in files' do
+        expect($stdin).to receive(:gets).and_return(gpg_email_name, passphrase)
+        expect(Simp::RpmSigner).to receive(:`).with(gpg_cmd).and_return(key_list_output)
+
+        expect(Simp::RpmSigner.load_key(@gpg_keydir, verbose)).to eq (key_info)
+
+        # verifies returning info from the cache, otherwise user would be prompted again
+        # and expectation on $stdin would fail
+        expect(Simp::RpmSigner.load_key(@gpg_keydir, verbose)).to eq (key_info)
+      end
+
+      it "should read the passphrase from the 'password' file" do
+        File.open(File.join(@gpg_keydir, 'password'),'w') { |file| file.puts passphrase }
+        expect($stdin).to receive(:gets).and_return(gpg_email_name)
+        expect(Simp::RpmSigner).to receive(:`).with(gpg_cmd).and_return(key_list_output)
+
+        expect(Simp::RpmSigner.load_key(@gpg_keydir, verbose)).to eq (key_info)
+      end
+    end
+
+    context 'errors' do
+      it 'should fail when gpg does not exist' do
+        expect(Simp::RpmSigner).to receive(:which).with('gpg').and_return(nil)
+        expect { Simp::RpmSigner.load_key(@gpg_keydir, verbose) }.to raise_error(
+          /Cannot sign RPMs without 'gpg'/)
+      end
+
+      it 'should fail when keydir does not exist' do
+        expect(Simp::RpmSigner).to receive(:which).with('gpg').and_return('/usr/bin/gpg')
+        expect { Simp::RpmSigner.load_key(@gpg_keydir, verbose) }.to raise_error(
+          /Could not find GPG keydir/)
+      end
+
+      it 'should fail when key info cannot be retrieved via gpg' do
+        FileUtils.mkdir_p(@gpg_keydir)
+        expect(Simp::RpmSigner).to receive(:which).with('gpg').and_return('/usr/bin/gpg')
+        expect($stdin).to receive(:gets).and_return(gpg_email_name, passphrase)
+        expect(Simp::RpmSigner).to receive(:`).with(gpg_cmd).and_return('')
+
+        expect { Simp::RpmSigner.load_key(@gpg_keydir, verbose) }.to raise_error(
+          /Error getting GPG key ID or Key size metadata/)
+      end
+    end
+  end
+end

data/spec/lib/simp/rpm_spec.rb

@@ -237,7 +237,7 @@ describe Simp::RPM do
         ENV['SIMP_RPM_dist'] = @pre_env
       end
       it 'returns dist' do
-        Simp::RPM.stubs(:system_dist).returns('.testdist')
+        allow(Simp::RPM).to receive(:system_dist).and_return('.testdist')
         rpm_obj    = Simp::RPM.new( @rpm_file )
         d_rpm_obj  = Simp::RPM.new( @d_rpm_file )
         spec_obj   = Simp::RPM.new( @spec_file )
@@ -366,11 +366,5 @@ describe Simp::RPM do
 
   describe '.create_rpm_build_metadata' do
   end
-
-  describe '.load_key' do
-  end
-
-  describe '.signrpm' do
-  end
 =end
 end

data/spec/spec_helper.rb

@@ -10,5 +10,5 @@ RSpec.configure do |config|
   config.filter_run :focus
 
   config.mock_framework = :rspec
-  config.mock_with :mocha
+  #config.mock_with :rspec
 end

data/spec/spec_helper_acceptance.rb

@@ -1,22 +1,35 @@
 require 'beaker-rspec'
+require 'tmpdir'
+require 'yaml'
 require 'simp/beaker_helpers'
 include Simp::BeakerHelpers
-require 'tmpdir'
-require 'pry' if ENV['PRY'] == 'yes'
 
 require 'acceptance/support/simp_rake_helpers'
 $LOAD_PATH.unshift(File.expand_path('../acceptance/support',__FILE__))
 
+unless ENV['BEAKER_provision'] == 'no'
+  hosts.each do |host|
+    # Install Puppet
+    if host.is_pe?
+      install_pe
+    else
+      install_puppet
+    end
+  end
+end
+
 
 RSpec.configure do |c|
   # provide helper methods to individual examples AND example groups
   c.include Simp::BeakerHelpers::SimpRakeHelpers
   c.extend Simp::BeakerHelpers::SimpRakeHelpers
 
+  # ensure that environment OS is ready on each host
+  fix_errata_on hosts
+
   # Readable test descriptions
   c.formatter = :documentation
 
-  # Configure all nodes in nodeset
   c.before :suite do
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-rake-helpers
 version: !ruby/object:Gem::Version
-  version: 5.11.2
+  version: 5.12.0
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-09 00:00:00.000000000 Z
+date: 2021-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simp-beaker-helpers
@@ -74,7 +74,7 @@ dependencies:
         version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '8.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -84,7 +84,7 @@ dependencies:
         version: '3.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '8.0'
 - !ruby/object:Gem::Dependency
   name: puppet-lint
   requirement: !ruby/object:Gem::Requirement
@@ -273,7 +273,6 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
-- ".travis.yml"
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
@@ -282,6 +281,7 @@ files:
 - Rakefile
 - bin/simp_rake_helpers
 - lib/simp/ci/gitlab.rb
+- lib/simp/command_utils.rb
 - lib/simp/componentinfo.rb
 - lib/simp/local_gpg_signing_key.rb
 - lib/simp/packer/iso_vars_json.rb
@@ -316,10 +316,10 @@ files:
 - lib/simp/rake/rubygem.rb
 - lib/simp/relchecks.rb
 - lib/simp/rpm.rb
+- lib/simp/rpm_signer.rb
 - lib/simp/yum.rb
 - spec/acceptance/00_pkg_rpm_custom_scriptlets_spec.rb
 - spec/acceptance/10_pkg_rpm_spec.rb
-- spec/acceptance/20_pkg_rpm_upgrade_spec.rb
 - spec/acceptance/30_pkg_misc_spec.rb
 - spec/acceptance/50_local_gpg_signing_key_spec.rb
 - spec/acceptance/55_build_pkg_signing_spec.rb
@@ -341,66 +341,24 @@ files:
 - spec/acceptance/files/build/project_skeleton/README.md
 - spec/acceptance/files/build/project_skeleton/Rakefile
 - spec/acceptance/files/build/project_skeleton/src/assets/simp/build/simp.spec
-- spec/acceptance/files/custom_scriptlet_triggers/pupmod-new-package-2.1/CHANGELOG
-- spec/acceptance/files/custom_scriptlet_triggers/pupmod-new-package-2.1/Rakefile
-- spec/acceptance/files/custom_scriptlet_triggers/pupmod-new-package-2.1/build/rpm_metadata/custom/overrides
-- spec/acceptance/files/custom_scriptlet_triggers/pupmod-new-package-2.1/build/rpm_metadata/requires
-- spec/acceptance/files/custom_scriptlet_triggers/pupmod-new-package-2.1/metadata.json
-- spec/acceptance/files/custom_scriptlet_triggers/pupmod-new-package-3.0/CHANGELOG
-- spec/acceptance/files/custom_scriptlet_triggers/pupmod-new-package-3.0/Rakefile
-- spec/acceptance/files/custom_scriptlet_triggers/pupmod-new-package-3.0/build/rpm_metadata/custom/overrides
-- spec/acceptance/files/custom_scriptlet_triggers/pupmod-new-package-3.0/build/rpm_metadata/requires
-- spec/acceptance/files/custom_scriptlet_triggers/pupmod-new-package-3.0/metadata.json
-- spec/acceptance/files/custom_scriptlet_triggers/pupmod-old-package-1.0/CHANGELOG
-- spec/acceptance/files/custom_scriptlet_triggers/pupmod-old-package-1.0/Rakefile
-- spec/acceptance/files/custom_scriptlet_triggers/pupmod-old-package-1.0/build/rpm_metadata/requires
-- spec/acceptance/files/custom_scriptlet_triggers/pupmod-old-package-1.0/metadata.json
-- spec/acceptance/files/custom_scriptlet_triggers/pupmod-old-package-2.0/CHANGELOG
-- spec/acceptance/files/custom_scriptlet_triggers/pupmod-old-package-2.0/Rakefile
-- spec/acceptance/files/custom_scriptlet_triggers/pupmod-old-package-2.0/build/rpm_metadata/requires
-- spec/acceptance/files/custom_scriptlet_triggers/pupmod-old-package-2.0/metadata.json
-- spec/acceptance/files/custom_scriptlet_triggers/pupmod-old-package-2.2/CHANGELOG
-- spec/acceptance/files/custom_scriptlet_triggers/pupmod-old-package-2.2/Rakefile
-- spec/acceptance/files/custom_scriptlet_triggers/pupmod-old-package-2.2/build/rpm_metadata/custom/overrides
-- spec/acceptance/files/custom_scriptlet_triggers/pupmod-old-package-2.2/build/rpm_metadata/requires
-- spec/acceptance/files/custom_scriptlet_triggers/pupmod-old-package-2.2/metadata.json
-- spec/acceptance/files/mock_packages/pupmod-puppetlabs-stdlib.spec
-- spec/acceptance/files/mock_packages/pupmod-simp-foo.spec
-- spec/acceptance/files/mock_packages/pupmod-simp-simplib.spec
-- spec/acceptance/files/mock_packages/rpmbuild.sh
-- spec/acceptance/files/mock_packages/simp-adapter.spec
-- spec/acceptance/files/mock_packages/simp-adapter/etc/simp/adapter_config.yaml
-- spec/acceptance/files/mock_packages/simp-adapter/usr/local/sbin/simp_rpm_helper
 - spec/acceptance/files/module/CHANGELOG
 - spec/acceptance/files/module/Rakefile
 - spec/acceptance/files/module/metadata.json
 - spec/acceptance/files/module_with_misordered_entries/CHANGELOG
 - spec/acceptance/files/module_with_misordered_entries/Rakefile
 - spec/acceptance/files/module_with_misordered_entries/metadata.json
-- spec/acceptance/files/package_upgrades/pupmod-simp-testpackage-1.0/CHANGELOG
-- spec/acceptance/files/package_upgrades/pupmod-simp-testpackage-1.0/Rakefile
-- spec/acceptance/files/package_upgrades/pupmod-simp-testpackage-1.0/build/rpm_metadata/requires
-- spec/acceptance/files/package_upgrades/pupmod-simp-testpackage-1.0/data/os/CentOS.yaml
-- spec/acceptance/files/package_upgrades/pupmod-simp-testpackage-1.0/data/os/RedHat.yaml
-- spec/acceptance/files/package_upgrades/pupmod-simp-testpackage-1.0/hiera.yaml
-- spec/acceptance/files/package_upgrades/pupmod-simp-testpackage-1.0/manifests/init.pp
-- spec/acceptance/files/package_upgrades/pupmod-simp-testpackage-1.0/metadata.json
-- spec/acceptance/files/package_upgrades/pupmod-simp-testpackage-2.0/CHANGELOG
-- spec/acceptance/files/package_upgrades/pupmod-simp-testpackage-2.0/Rakefile
-- spec/acceptance/files/package_upgrades/pupmod-simp-testpackage-2.0/build/rpm_metadata/requires
-- spec/acceptance/files/package_upgrades/pupmod-simp-testpackage-2.0/data/os/CentOS.yaml
-- spec/acceptance/files/package_upgrades/pupmod-simp-testpackage-2.0/data/os/RedHat.yaml
-- spec/acceptance/files/package_upgrades/pupmod-simp-testpackage-2.0/hiera.yaml
-- spec/acceptance/files/package_upgrades/pupmod-simp-testpackage-2.0/manifests/init.pp
-- spec/acceptance/files/package_upgrades/pupmod-simp-testpackage-2.0/metadata.json
 - spec/acceptance/files/simplib/CHANGELOG
 - spec/acceptance/files/simplib/Rakefile
 - spec/acceptance/files/simplib/build/rpm_metadata/requires
 - spec/acceptance/files/simplib/metadata.json
 - spec/acceptance/files/testpackage/CHANGELOG
+- spec/acceptance/files/testpackage/README
 - spec/acceptance/files/testpackage/Rakefile
 - spec/acceptance/files/testpackage/build/rpm_metadata/requires
 - spec/acceptance/files/testpackage/metadata.json
+- spec/acceptance/files/testpackage/spec/classes/init_spec.rb
+- spec/acceptance/files/testpackage/spec/files/mock_something.rb
+- spec/acceptance/files/testpackage/utils/convert_v1_to_v2.rb
 - spec/acceptance/files/testpackage_custom_scriptlet/CHANGELOG
 - spec/acceptance/files/testpackage_custom_scriptlet/Rakefile
 - spec/acceptance/files/testpackage_custom_scriptlet/build/rpm_metadata/custom/overrides
@@ -451,27 +409,21 @@ files:
 - spec/lib/simp/ci/files/job_broken_link_nodeset/spec/acceptance/nodesets/centos.yml
 - spec/lib/simp/ci/files/job_broken_link_nodeset/spec/acceptance/nodesets/oel.yml
 - spec/lib/simp/ci/files/job_broken_link_nodeset/spec/acceptance/suites/default/class_spec.rb
-- spec/lib/simp/ci/files/job_broken_link_nodeset/spec/acceptance/suites/default/nodesets
 - spec/lib/simp/ci/files/job_invalid_nodeset/spec/acceptance/nodesets/default.yml
 - spec/lib/simp/ci/files/job_invalid_nodeset/spec/acceptance/nodesets/oel.yml
 - spec/lib/simp/ci/files/job_invalid_nodeset/spec/acceptance/suites/default/class_spec.rb
-- spec/lib/simp/ci/files/job_invalid_nodeset/spec/acceptance/suites/default/nodesets
 - spec/lib/simp/ci/files/job_invalid_suite/spec/acceptance/nodesets/default.yml
 - spec/lib/simp/ci/files/job_invalid_suite/spec/acceptance/nodesets/oel.yml
 - spec/lib/simp/ci/files/job_invalid_suite/spec/acceptance/suites/default/class_spec.rb
-- spec/lib/simp/ci/files/job_invalid_suite/spec/acceptance/suites/default/nodesets
 - spec/lib/simp/ci/files/job_missing_nodeset/spec/acceptance/nodesets/default.yml
 - spec/lib/simp/ci/files/job_missing_nodeset/spec/acceptance/nodesets/oel.yml
 - spec/lib/simp/ci/files/job_missing_nodeset/spec/acceptance/suites/default/class_spec.rb
-- spec/lib/simp/ci/files/job_missing_nodeset/spec/acceptance/suites/default/nodesets
 - spec/lib/simp/ci/files/job_missing_suite_and_nodeset/spec/acceptance/nodesets/default.yml
 - spec/lib/simp/ci/files/job_missing_suite_and_nodeset/spec/acceptance/nodesets/oel.yml
 - spec/lib/simp/ci/files/job_missing_suite_and_nodeset/spec/acceptance/suites/default/class_spec.rb
-- spec/lib/simp/ci/files/job_missing_suite_and_nodeset/spec/acceptance/suites/default/nodesets
 - spec/lib/simp/ci/files/multiple_invalid_jobs/spec/acceptance/nodesets/default.yml
 - spec/lib/simp/ci/files/multiple_invalid_jobs/spec/acceptance/nodesets/oel.yml
 - spec/lib/simp/ci/files/multiple_invalid_jobs/spec/acceptance/suites/default/class_spec.rb
-- spec/lib/simp/ci/files/multiple_invalid_jobs/spec/acceptance/suites/default/nodesets
 - spec/lib/simp/ci/files/multiple_invalid_jobs/spec/acceptance/suites/feature-1/feature-1_spec.rb
 - spec/lib/simp/ci/files/multiple_invalid_jobs/spec/acceptance/suites/feature_2/feature_2_spec.rb
 - spec/lib/simp/ci/files/multiple_invalid_jobs/spec/acceptance/suites/feature_2/nodesets/default.yml
@@ -479,7 +431,6 @@ files:
 - spec/lib/simp/ci/files/multiple_valid_jobs/spec/acceptance/nodesets/default.yml
 - spec/lib/simp/ci/files/multiple_valid_jobs/spec/acceptance/nodesets/oel.yml
 - spec/lib/simp/ci/files/multiple_valid_jobs/spec/acceptance/suites/default/class_spec.rb
-- spec/lib/simp/ci/files/multiple_valid_jobs/spec/acceptance/suites/default/nodesets
 - spec/lib/simp/ci/files/multiple_valid_jobs/spec/acceptance/suites/feature-1/feature-1_spec.rb
 - spec/lib/simp/ci/files/multiple_valid_jobs/spec/acceptance/suites/feature_2/feature_2_spec.rb
 - spec/lib/simp/ci/files/multiple_valid_jobs/spec/acceptance/suites/feature_2/nodesets/default.yml
@@ -488,32 +439,26 @@ files:
 - spec/lib/simp/ci/files/no_gitlab_config_with_tests/spec/acceptance/nodesets/default.yml
 - spec/lib/simp/ci/files/no_gitlab_config_with_tests/spec/acceptance/nodesets/oel.yml
 - spec/lib/simp/ci/files/no_gitlab_config_with_tests/spec/acceptance/suites/default/class_spec.rb
-- spec/lib/simp/ci/files/no_gitlab_config_with_tests/spec/acceptance/suites/default/nodesets
 - spec/lib/simp/ci/files/no_gitlab_config_without_tests/spec/acceptance/nodesets/default.yml
 - spec/lib/simp/ci/files/no_gitlab_config_without_tests/spec/acceptance/nodesets/oel.yml
-- spec/lib/simp/ci/files/no_gitlab_config_without_tests/spec/acceptance/suites/default/nodesets
 - spec/lib/simp/ci/files/suite_skeleton_only/spec/acceptance/nodesets/centos.yml
-- spec/lib/simp/ci/files/suite_skeleton_only/spec/acceptance/nodesets/default.yml
 - spec/lib/simp/ci/files/suite_skeleton_only/spec/acceptance/nodesets/oel.yml
-- spec/lib/simp/ci/files/suite_skeleton_only/spec/acceptance/suites/default/nodesets
 - spec/lib/simp/ci/files/valid_job_global_nodeset/spec/acceptance/nodesets/default.yml
 - spec/lib/simp/ci/files/valid_job_global_nodeset/spec/acceptance/nodesets/oel.yml
 - spec/lib/simp/ci/files/valid_job_global_nodeset/spec/acceptance/suites/default/class_spec.rb
 - spec/lib/simp/ci/files/valid_job_nodeset_dir_link/spec/acceptance/nodesets/default.yml
 - spec/lib/simp/ci/files/valid_job_nodeset_dir_link/spec/acceptance/nodesets/oel.yml
 - spec/lib/simp/ci/files/valid_job_nodeset_dir_link/spec/acceptance/suites/default/class_spec.rb
-- spec/lib/simp/ci/files/valid_job_nodeset_dir_link/spec/acceptance/suites/default/nodesets
 - spec/lib/simp/ci/files/valid_job_nodeset_link/spec/acceptance/suites/default/class_spec.rb
 - spec/lib/simp/ci/files/valid_job_nodeset_link/spec/acceptance/suites/default/nodesets/centos.yml
-- spec/lib/simp/ci/files/valid_job_nodeset_link/spec/acceptance/suites/default/nodesets/default.yml
 - spec/lib/simp/ci/files/valid_job_nodeset_link/spec/acceptance/suites/default/nodesets/oel.yml
 - spec/lib/simp/ci/files/valid_job_suite_nodeset/spec/acceptance/suites/default/class_spec.rb
 - spec/lib/simp/ci/files/valid_job_suite_nodeset/spec/acceptance/suites/default/nodesets/default.yml
 - spec/lib/simp/ci/files/valid_job_suite_nodeset/spec/acceptance/suites/default/nodesets/oel.yml
 - spec/lib/simp/ci/gitlab_spec.rb
+- spec/lib/simp/command_utils_spec.rb
 - spec/lib/simp/componentinfo_changelog_regex_spec.rb
 - spec/lib/simp/componentinfo_spec.rb
-- spec/lib/simp/files/build/testpackage.spec
 - spec/lib/simp/files/componentinfo_spec/asset_missing_release/build/asset_missing_release.spec
 - spec/lib/simp/files/componentinfo_spec/asset_missing_version/build/asset_missing_version.spec
 - spec/lib/simp/files/componentinfo_spec/asset_with_dist_in_release/build/asset_with_dist_in_release.spec
@@ -616,9 +561,7 @@ files:
 - spec/lib/simp/rake/pupmod/fixtures/simpmod/manifests/service.pp
 - spec/lib/simp/rake/pupmod/fixtures/simpmod/metadata.json
 - spec/lib/simp/rake/pupmod/fixtures/simpmod/spec/acceptance/nodesets/centos-combined-x64.yml
-- spec/lib/simp/rake/pupmod/fixtures/simpmod/spec/acceptance/nodesets/default.yml
 - spec/lib/simp/rake/pupmod/fixtures/simpmod/spec/acceptance/suites/default/class_spec.rb
-- spec/lib/simp/rake/pupmod/fixtures/simpmod/spec/acceptance/suites/default/nodesets
 - spec/lib/simp/rake/pupmod/fixtures/simpmod/spec/classes/init_spec.rb
 - spec/lib/simp/rake/pupmod/fixtures/simpmod/spec/spec_helper.rb
 - spec/lib/simp/rake/pupmod/fixtures/simpmod/spec/spec_helper_acceptance.rb
@@ -627,6 +570,7 @@ files:
 - spec/lib/simp/relchecks_check_rpm_changelog_spec.rb
 - spec/lib/simp/relchecks_compare_latest_tag_spec.rb
 - spec/lib/simp/relchecks_create_tag_changelog_spec.rb
+- spec/lib/simp/rpm_signer_spec.rb
 - spec/lib/simp/rpm_spec.rb
 - spec/spec_helper.rb
 - spec/spec_helper_acceptance.rb
@@ -651,7 +595,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.6.3
 signing_key: 
 specification_version: 4
 summary: SIMP rake helpers