simp-rake-helpers 5.25.0 → 6.0.0

data/spec/acceptance/suites/default/55_build_pkg_signing_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper_acceptance'
 require_relative 'support/build_user_helpers'
 require_relative 'support/build_project_helpers'
@@ -17,7 +19,6 @@ def run_opts
 end
 
 describe 'rake pkg:signrpms and pkg:checksig' do
-
   # Clean out RPMs dir and copy in a fresh dummy RPM
   def prep_rpms_dir(rpms_dir, src_rpms, opts = {})
     copy_cmds = src_rpms.map { |_rpm| "cp -a '#{_rpm}' '#{rpms_dir}'" }.join('; ')
@@ -28,17 +29,16 @@ describe 'rake pkg:signrpms and pkg:checksig' do
   shared_context 'a freshly-scaffolded test project' do |dir, opts = {}|
     test__dir     = "#{build_user_homedir}/test-#{dir}"
     rpms__dir     = "#{test__dir}/test.rpms"
-    src__rpm      =  "#{build_user_host_files}/spec/lib/simp/files/testpackage-1-0.noarch.rpm"
+    src__rpm = "#{build_user_host_files}/spec/lib/simp/files/testpackage-1-0.noarch.rpm"
     host__dirs    = {}
-    gpg__keysdir  = opts[:gpg_keysdir] ? opts[:gpg_keysdir] : "#{test__dir}/.dev_gpgkeys"
+    gpg__keysdir  = opts[:gpg_keysdir] || "#{test__dir}/.dev_gpgkeys"
     extra__env    = opts[:gpg_keysdir] ? "SIMP_PKG_build_keys_dir=#{gpg__keysdir}" : ''
-    digest__algo  = opts[:digest_algo] ? opts[:digest_algo] : nil
-
+    digest__algo  = opts[:digest_algo] || nil
 
     hosts.each do |host|
-      dist_dir = distribution_dir(host, test__dir, run_opts)
+      dist_dir = distribution_dir(host, test__dir)
       host__dirs[host] = {
-        test_dir:  test__dir,
+        test_dir: test__dir,
         dvd_dir: "#{dist_dir}/DVD"
       }
       host__dirs[host.name] = host__dirs[host]
@@ -65,14 +65,19 @@ describe 'rake pkg:signrpms and pkg:checksig' do
     let(:dev_keydir) { "#{gpg__keysdir}/dev" }
     let(:extra_env) { extra__env }
     let(:digest_algo_param) { digest__algo }
-    let(:digest_algo_result) { digest__algo ? digest__algo.upcase : 'SHA256'  }
-    let(:signrpm_cmd) {
+    let(:digest_algo_result) { digest__algo ? digest__algo.upcase : 'SHA256' }
+    let(:signrpm_cmd) do
       extra_args = digest_algo_param ? ",false,#{digest_algo_param}" : ''
       "SIMP_PKG_verbose=yes #{extra_env} bundle exec rake pkg:signrpms[dev,'#{rpms_dir}'#{extra_args}]"
-    }
+    end
     let(:checksig_cmd) { "#{extra_env} bundle exec rake pkg:checksig[#{rpms_dir}]" }
   end
 
+  # The signature is read with `rpm -qp --qf 'Signature   : %{RSAHEADER:pgpsig}'`
+  # rather than `rpm -qi`.  rpm >= 4.19 (EL10) signs the package header only, so
+  # the legacy SIGPGP/SIGGPG tags backing the `rpm -qi` "Signature" field are
+  # empty there; RSAHEADER holds the header signature and renders the same
+  # "<algo>, <date>, Key ID <id>" string (or "(none)") on EL8/9/10.
   let(:rpm_unsigned_regex) do
     %r{^Signature\s+:\s+\(none\)$}
   end
@@ -98,6 +103,7 @@ describe 'rake pkg:signrpms and pkg:checksig' do
 
   shared_examples 'it verifies RPM signatures' do
     let(:public_gpgkeys_dir) { 'src/assets/gpgkeys/GPGKEYS' }
+
     it 'verifies RPM signatures' do
       hosts.each do |host|
         # mock out the simp-gpgkeys project checkout so that the pkg:checksig
@@ -113,18 +119,18 @@ describe 'rake pkg:signrpms and pkg:checksig' do
     it 'creates a new GPG dev signing key' do
       on(hosts, %(#{run_cmd} "cd '#{test_dir}'; #{signrpm_cmd}"), run_opts)
       hosts.each do |host|
-        expect(dev_signing_key_id(host, dev_keydir, run_opts)).to_not be_empty
-        expect(file_exists_on(host,"#{dirs[host][:dvd_dir]}/RPM-GPG-KEY-SIMP-Dev")).to be true
+        expect(dev_signing_key_id(host, dev_keydir, run_opts)).not_to be_empty
+        expect(file_exists_on(host, "#{dirs[host][:dvd_dir]}/RPM-GPG-KEY-SIMP-Dev")).to be true
       end
     end
 
-    include_examples('it does not leave the gpg-agent daemon running')
+    it_behaves_like('it does not leave the gpg-agent daemon running')
   end
 
   shared_examples 'it begins with unsigned RPMs' do
     it 'begins with unsigned RPMs' do
       prep_rpms_dir(rpms_dir, [src_rpm], run_opts)
-      rpms_before_signing = on(hosts, "rpm -qip '#{test_rpm}' | grep ^Signature", run_opts)
+      rpms_before_signing = on(hosts, "rpm -qp --qf 'Signature   : %{RSAHEADER:pgpsig}\\n' '#{test_rpm}'", run_opts)
       rpms_before_signing.each do |result|
         expect(result.stdout).to match rpm_unsigned_regex
       end
@@ -136,9 +142,9 @@ describe 'rake pkg:signrpms and pkg:checksig' do
       hosts.each do |host|
         # NOTE: pkg:signrpms will not actually fail if it can't sign a RPM
         on(hosts, %(#{run_cmd} "cd '#{test_dir}'; SIMP_PKG_verbose=yes #{signrpm_cmd}"), run_opts)
-        expect(file_exists_on(host,"#{dirs[host][:dvd_dir]}/RPM-GPG-KEY-SIMP-Dev")).to be true
+        expect(file_exists_on(host, "#{dirs[host][:dvd_dir]}/RPM-GPG-KEY-SIMP-Dev")).to be true
 
-        result = on(host, "rpm -qip '#{test_rpm}' | grep ^Signature", run_opts)
+        result = on(host, "rpm -qp --qf 'Signature   : %{RSAHEADER:pgpsig}\\n' '#{test_rpm}'", run_opts)
         expect(result.stdout).to match rpm_signed_regex
         signed_rpm_data = rpm_signed_regex.match(result.stdout)
         expect(signed_rpm_data[:key_id]).to eql dev_signing_key_id(host, dev_keydir, run_opts)
@@ -146,7 +152,7 @@ describe 'rake pkg:signrpms and pkg:checksig' do
       end
     end
 
-    include_examples('it does not leave the gpg-agent daemon running')
+    it_behaves_like('it does not leave the gpg-agent daemon running')
   end
 
   shared_examples 'it signs RPM packages using existing GPG dev signing key' do
@@ -156,7 +162,7 @@ describe 'rake pkg:signrpms and pkg:checksig' do
 
         on(hosts, %(#{run_cmd} "cd '#{test_dir}'; #{signrpm_cmd}"), run_opts)
 
-        result = on(host, "rpm -qip '#{test_rpm}' | grep ^Signature", run_opts)
+        result = on(host, "rpm -qp --qf 'Signature   : %{RSAHEADER:pgpsig}\\n' '#{test_rpm}'", run_opts)
         expect(result.stdout).to match rpm_signed_regex
         signed_rpm_data = rpm_signed_regex.match(result.stdout)
         expect(signed_rpm_data[:key_id]).to eql existing_key_id
@@ -164,25 +170,24 @@ describe 'rake pkg:signrpms and pkg:checksig' do
       end
     end
 
-    include_examples('it does not leave the gpg-agent daemon running')
+    it_behaves_like('it does not leave the gpg-agent daemon running')
   end
 
-
   describe 'when starting without a dev key and no RPMs to sign' do
     include_context('a freshly-scaffolded test project', 'create-key')
-    include_examples('it creates a new GPG dev signing key')
+    it_behaves_like('it creates a new GPG dev signing key')
   end
 
   describe 'when starting without a dev key and RPMs to sign' do
     include_context('a freshly-scaffolded test project', 'signrpms')
-    include_examples('it begins with unsigned RPMs')
-    include_examples('it creates GPG dev signing key and signs packages')
-    include_examples('it verifies RPM signatures')
+    it_behaves_like('it begins with unsigned RPMs')
+    it_behaves_like('it creates GPG dev signing key and signs packages')
+    it_behaves_like('it verifies RPM signatures')
 
     context 'when there is an unexpired GPG dev signing key and the packages are unsigned' do
-      include_examples('it begins with unsigned RPMs')
-      include_examples('it signs RPM packages using existing GPG dev signing key')
-      include_examples('it verifies RPM signatures')
+      it_behaves_like('it begins with unsigned RPMs')
+      it_behaves_like('it signs RPM packages using existing GPG dev signing key')
+      it_behaves_like('it verifies RPM signatures')
     end
   end
 
@@ -195,27 +200,27 @@ describe 'rake pkg:signrpms and pkg:checksig' do
         copy_expired_keydir_to_dev_cmds = [
           "mkdir -p '$(dirname '#{dev_keydir}')'",
           "cp -aT '#{expired_keydir}' '#{dev_keydir}'",
-          "ls -lart '#{expired_keydir}'"
+          "ls -lart '#{expired_keydir}'",
         ].join(' && ')
         on(host, %(#{run_cmd} "#{copy_expired_keydir_to_dev_cmds}"), run_opts)
         result = on(host, %(#{run_cmd} "gpg --list-keys --homedir='#{dev_keydir}'"), run_opts)
-        expect(result.stdout).to match(/expired: 2018-04-06/)
+        expect(result.stdout).to include('expired: 2018-04-06')
       end
     end
 
-    include_examples('it begins with unsigned RPMs')
-    include_examples('it creates GPG dev signing key and signs packages')
-    include_examples('it verifies RPM signatures')
+    it_behaves_like('it begins with unsigned RPMs')
+    it_behaves_like('it creates GPG dev signing key and signs packages')
+    it_behaves_like('it verifies RPM signatures')
   end
 
   describe 'when packages are already signed' do
-    let(:keysdir)  { "#{test_dir}/.dev_gpgkeys" }
+    let(:keysdir) { "#{test_dir}/.dev_gpgkeys" }
 
     include_context('a freshly-scaffolded test project', 'force')
 
     context 'initial package signing' do
-      include_examples('it begins with unsigned RPMs')
-      include_examples('it creates GPG dev signing key and signs packages')
+      it_behaves_like('it begins with unsigned RPMs')
+      it_behaves_like('it creates GPG dev signing key and signs packages')
     end
 
     context 'when force is disabled' do
@@ -229,12 +234,12 @@ describe 'rake pkg:signrpms and pkg:checksig' do
           # force defaults to false
           on(host, %(#{run_cmd} "cd '#{test_dir}'; bundle exec rake pkg:signrpms[dev,'#{rpms_dir}']"), run_opts)
 
-          result = on(host, "rpm -qip '#{test_rpm}' | grep ^Signature", run_opts)
+          result = on(host, "rpm -qp --qf 'Signature   : %{RSAHEADER:pgpsig}\\n' '#{test_rpm}'", run_opts)
           expect(result.stdout).to match rpm_signed_regex
           signed_rpm_data = rpm_signed_regex.match(result.stdout)
 
           # verify RPM is not signed with the new signing key
-          expect(signed_rpm_data[:key_id]).to_not eql dev_signing_key_id(host, dev_keydir, run_opts)
+          expect(signed_rpm_data[:key_id]).not_to eql dev_signing_key_id(host, dev_keydir, run_opts)
         end
       end
 
@@ -246,8 +251,7 @@ describe 'rake pkg:signrpms and pkg:checksig' do
           on(host, %(#{run_cmd} "cd '#{test_dir}'; mkdir -p #{public_gpgkeys_dir}"), run_opts)
           on(host, %(#{run_cmd} "cd '#{test_dir}'; touch #{public_gpgkeys_dir}/RPM-GPG-KEY-empty"), run_opts)
           result = on(host, %(#{run_cmd} "cd '#{test_dir}'; #{checksig_cmd}"),
-            :acceptable_exit_codes => [1]
-          )
+                      :acceptable_exit_codes => [1])
 
           expect(result.stderr).to match('ERROR: Untrusted RPMs found in the repository')
         end
@@ -264,7 +268,7 @@ describe 'rake pkg:signrpms and pkg:checksig' do
         hosts.each do |host|
           on(host, %(#{run_cmd} "cd '#{test_dir}'; bundle exec rake pkg:signrpms[dev,'#{rpms_dir}',true]"), run_opts)
 
-          result = on(host, "rpm -qip '#{test_rpm}' | grep ^Signature", run_opts)
+          result = on(host, "rpm -qp --qf 'Signature   : %{RSAHEADER:pgpsig}\\n' '#{test_rpm}'", run_opts)
           expect(result.stdout).to match rpm_signed_regex
           signed_rpm_data = rpm_signed_regex.match(result.stdout)
 
@@ -278,36 +282,39 @@ describe 'rake pkg:signrpms and pkg:checksig' do
   describe 'when SIMP_PKG_build_keys_dir is set' do
     opts = { :gpg_keysdir => '/home/build_user/.dev_gpgpkeys' }
     include_context('a freshly-scaffolded test project', 'custom-keys-dir', opts)
-    include_examples('it begins with unsigned RPMs')
-    include_examples('it creates GPG dev signing key and signs packages')
+    it_behaves_like('it begins with unsigned RPMs')
+    it_behaves_like('it creates GPG dev signing key and signs packages')
   end
 
   describe 'when digest algorithm is specified' do
     opts = { :digest_algo => 'sha384' }
     include_context('a freshly-scaffolded test project', 'custom-digest-algo', opts)
-    include_examples('it begins with unsigned RPMs')
-    include_examples('it creates GPG dev signing key and signs packages')
-    include_examples('it verifies RPM signatures')
+    it_behaves_like('it begins with unsigned RPMs')
+    it_behaves_like('it creates GPG dev signing key and signs packages')
+    it_behaves_like('it verifies RPM signatures')
   end
 
   describe 'when some rpm signing fails' do
     include_context('a freshly-scaffolded test project', 'signing-failure')
-    include_examples('it begins with unsigned RPMs')
+    # NOTE: include_examples (not it_behaves_like) is required here so that
+    # 'begins with unsigned RPMs' runs before the standalone it blocks below.
+    # it_behaves_like creates a nested group that runs *after* all standalone
+    # it blocks in the same describe, which would break test ordering.
+    include_examples('it begins with unsigned RPMs') # rubocop:disable RSpec/IncludeExamples
 
-    it 'should create a malformed RPM' do
+    it 'creates a malformed RPM' do
       on(hosts, %(#{run_cmd} "echo 'OOPS' > #{rpms_dir}/oops-test.rpm"))
     end
 
-    it 'should sign all valid RPMs before failing' do
+    it 'signs all valid RPMs before failing' do
       hosts.each do |host|
         result = on(host,
-          %(#{run_cmd} "cd '#{test_dir}'; SIMP_PKG_verbose="yes" #{signrpm_cmd}"),
-         :acceptable_exit_codes => [1]
-        )
+                    %(#{run_cmd} "cd '#{test_dir}'; SIMP_PKG_verbose="yes" #{signrpm_cmd}"),
+                    :acceptable_exit_codes => [1])
 
         expect(result.stderr).to match('ERROR: Failed to sign some RPMs')
 
-        signature_check = on(host, "rpm -qip '#{test_rpm}' | grep ^Signature", run_opts)
+        signature_check = on(host, "rpm -qp --qf 'Signature   : %{RSAHEADER:pgpsig}\\n' '#{test_rpm}'", run_opts)
         expect(signature_check.stdout).to match rpm_signed_regex
       end
     end
@@ -315,74 +322,75 @@ describe 'rake pkg:signrpms and pkg:checksig' do
 
   describe 'when wrong keyword password is specified' do
     include_context('a freshly-scaffolded test project', 'wrong-password')
-    include_examples('it creates a new GPG dev signing key')
+    # NOTE: include_examples (not it_behaves_like) is required here so that
+    # shared examples run at their insertion point, before the standalone it
+    # blocks that depend on the state they set up.
+    include_examples('it creates a new GPG dev signing key') # rubocop:disable RSpec/IncludeExamples
 
-    it 'should corrupt the password of new key' do
+    it 'corrupts the password of new key' do
       key_gen_file = File.join(dev_keydir, 'gengpgkey')
       on(hosts, "sed -ci -e \"s/^Passphrase: /Passphrase: OOPS/\" #{key_gen_file}")
     end
 
-    include_examples('it begins with unsigned RPMs')
+    include_examples('it begins with unsigned RPMs') # rubocop:disable RSpec/IncludeExamples
 
-    it 'should fail to sign any rpms and notify user of each failure' do
+    it 'fails to sign any rpms and notify user of each failure' do
       hosts.each do |host|
         result = on(host,
-          %(#{run_cmd} "cd '#{test_dir}'; SIMP_PKG_verbose="yes" #{signrpm_cmd}"),
-         :acceptable_exit_codes => [1]
-        )
+                    %(#{run_cmd} "cd '#{test_dir}'; SIMP_PKG_verbose="yes" #{signrpm_cmd}"),
+                    :acceptable_exit_codes => [1])
 
-        err_msg = %r(Error occurred while attempting to sign #{test_rpm})
+        err_msg = %r{Error occurred while attempting to sign #{test_rpm}}
         expect(result.stderr).to match(err_msg)
 
-        signature_check = on(host, "rpm -qip '#{test_rpm}' | grep ^Signature", run_opts)
+        signature_check = on(host, "rpm -qp --qf 'Signature   : %{RSAHEADER:pgpsig}\\n' '#{test_rpm}'", run_opts)
         expect(signature_check.stdout).to match rpm_unsigned_regex
       end
     end
   end
 
   hosts.each do |host|
-    os_major =  fact_on(host,'os.release.major')
-    if os_major > '7'
-      # this problem only happens on EL > 7 in a docker container
-      describe "when gpg-agent's socket path is too long on #{host}" do
-        opts = { :gpg_keysdir => '/home/build_user/this/results/in/a/gpg_agent/socket/path/that/is/longer/than/one/hundred/eight/characters' }
-        include_context('a freshly-scaffolded test project', 'long-socket-path', opts)
-
-        context 'when the gpg key needs to be created ' do
-          it 'should fail to sign any rpms' do
-            on(host,
-               %(#{run_cmd} "cd '#{test_dir}'; SIMP_PKG_verbose="yes" #{signrpm_cmd}"),
-              :acceptable_exit_codes => [1]
-            )
-          end
+    os_major =  fact_on(host, 'os.release.major')
+    next unless os_major > '7'
+
+    # this problem only happens on EL > 7 in a docker container
+    describe "when gpg-agent's socket path is too long on #{host}" do
+      opts = { :gpg_keysdir => '/home/build_user/this/results/in/a/gpg_agent/socket/path/that/is/longer/than/one/hundred/eight/characters' }
+      include_context('a freshly-scaffolded test project', 'long-socket-path', opts)
+
+      context 'when the gpg key needs to be created' do
+        it 'fails to sign any rpms' do
+          on(host,
+             %(#{run_cmd} "cd '#{test_dir}'; SIMP_PKG_verbose="yes" #{signrpm_cmd}"),
+             :acceptable_exit_codes => [1])
         end
+      end
+
+      context 'when the gpg key already exists' do
+        # This would be when a GPG key dir was populated with keys generated elsewhere.
+        # Reuse the keys from an earlier test.
+        it 'copies existing key files into the gpg key dir' do
+          source_dir = '/home/build_user/test-create-key/.dev_gpgkeys/dev'
+          on(host, %(#{run_cmd} "cp -r #{source_dir}/* #{dev_keydir}"))
+        end
+
+        # NOTE: include_examples (not it_behaves_like) required for ordering.
+        include_examples('it begins with unsigned RPMs') # rubocop:disable RSpec/IncludeExamples
+
+        it 'fails to sign any rpms and notify user of each failure' do
+          # For rpm-sign-4.14.2-11.el8_0, 'rpm --resign' hangs instead of failing
+          # when gpg-agent fails to start.
+          # Set the default smaller than the 30 second default, so that we don't
+          # wait so long for the failure.
+          result = on(host,
+                      %(#{run_cmd} "cd '#{test_dir}'; SIMP_PKG_rpmsign_timeout=5 SIMP_PKG_verbose="yes" #{signrpm_cmd}"),
+                      :acceptable_exit_codes => [1])
+
+          err_msg = %r{Failed to sign}
+          expect(result.stderr).to match(err_msg)
 
-        context 'when the gpg key already exists' do
-          # This would be when a GPG key dir was populated with keys generated elsewhere.
-          # Reuse the keys from an earlier test.
-          it 'should copy existing key files into the gpg key dir' do
-            source_dir = '/home/build_user/test-create-key/.dev_gpgkeys/dev'
-            on(host, %(#{run_cmd} "cp -r #{source_dir}/* #{dev_keydir}"))
-          end
-
-          include_examples('it begins with unsigned RPMs')
-
-          it 'should fail to sign any rpms and notify user of each failure' do
-            # For rpm-sign-4.14.2-11.el8_0, 'rpm --resign' hangs instead of failing
-            # when gpg-agent fails to start.
-            # Set the default smaller than the 30 second default, so that we don't
-            # wait so long for the failure.
-            result = on(host,
-              %(#{run_cmd} "cd '#{test_dir}'; SIMP_PKG_rpmsign_timeout=5 SIMP_PKG_verbose="yes" #{signrpm_cmd}"),
-              :acceptable_exit_codes => [1]
-            )
-
-            err_msg = %r(Failed to sign)
-            expect(result.stderr).to match(err_msg)
-
-            signature_check = on(host, "rpm -qip '#{test_rpm}' | grep ^Signature", run_opts)
-            expect(signature_check.stdout).to match rpm_unsigned_regex
-          end
+          signature_check = on(host, "rpm -qp --qf 'Signature   : %{RSAHEADER:pgpsig}\\n' '#{test_rpm}'", run_opts)
+          expect(signature_check.stdout).to match rpm_unsigned_regex
         end
       end
     end

data/spec/acceptance/suites/default/files/testpackage/spec/classes/init_spec.rb

@@ -1 +1,2 @@
 #!/usr/bin/env rspec
+# frozen_string_literal: true

data/spec/acceptance/suites/default/files/testpackage/spec/files/mock_something.rb

@@ -1,3 +1,5 @@
 #!/usr/bin/env ruby
-#This is a mock executable for something
+# frozen_string_literal: true
+
+# This is a mock executable for something
 puts 'hello world'

data/spec/acceptance/suites/default/files/testpackage/utils/convert_v1_to_v2.rb

@@ -1,3 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 # convert from version 1 to version 2
 puts "Running #{File.basename(__FILE__)}"

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Simp::BeakerHelpers::SimpRakeHelpers::BuildProjectHelpers
   # Scaffolds _just_ enough of a super-release project to run `bundle exec rake
   #   -T` using this repository's source code as the simp-rake-helper source
@@ -19,7 +21,7 @@ module Simp::BeakerHelpers::SimpRakeHelpers::BuildProjectHelpers
     GEMFILE
     create_remote_file(hosts, "#{test_dir}/Gemfile", gemfile, opts)
     on(hosts, "chown build_user:build_user #{test_dir}/Gemfile", opts)
-    on(hosts, %(#{run_cmd} "cd '#{test_dir}'; rvm use default; bundle --local || bundle"), opts)
+    on(hosts, %(#{run_cmd} "cd '#{test_dir}'; bundle --local || bundle"), opts)
   end
 
   # Returns the distribution directory path appropriate for a given SUT
@@ -31,24 +33,24 @@ module Simp::BeakerHelpers::SimpRakeHelpers::BuildProjectHelpers
   # @param [Host, String, Symbol] host Beaker host
   # @param [String] proj_dir Absolute path to the parent project directory
   #   If this is set, the returned path will be absolute as well.
-  # @param [Hash{Symbol=>String}] opts Beaker options Hash for `#on` ({})
   # @return [String] distribution directory matching the SUT's properties
   #
-  def distribution_dir(host, proj_dir, opts = {})
-    opts ||= {}
+  def distribution_dir(host, proj_dir)
     @distribution_dirs ||= {}
     return @distribution_dirs[host.to_s] if @distribution_dirs.key?(host.to_s)
 
-    result = on(host, %(#{run_cmd} 'facter --yaml'), opts.merge(silent: true))
-    facts_string = result.stdout.lines[1..-1].join
-    facts = YAML.load(facts_string)
-
-    # This logic should work regardless of the version of facter
-    name = facts['operatingsystem'] || facts['os']['name']
-    maj_rel = facts['operatingsystemmajrelease'] ||
-              facts.fetch('os', {}).fetch('release', {})['major'] ||
-              facts['operatingsystemrelease'].split('.').first
-    architecture = facts['architecture'] || facts.dig('os','architecture')
+    # Pull the OS facts straight from the SUT via Beaker rather than scraping
+    # `facter --yaml` through build_user's RVM login shell.  That login shell
+    # can prepend warnings to (or otherwise empty out) the captured stdout,
+    # which made `result.stdout.lines[1..]` return nil and blow up parsing.
+    #
+    # NOTE: `fact_on` takes no Beaker `#on` opts here on purpose -- it renders
+    # unrecognized opts (e.g. run_in_parallel) into the `puppet facts show`
+    # command line, which puppet then rejects as an invalid option.
+    os = fact_on(host, 'os')
+    name         = os['name']
+    maj_rel      = os.dig('release', 'major')
+    architecture = os['architecture']
 
     dir = "#{proj_dir}/build/distributions/#{name}/#{maj_rel}/#{architecture}"
     @distribution_dirs[host.to_s] = dir
@@ -66,6 +68,7 @@ module Simp::BeakerHelpers::SimpRakeHelpers::BuildProjectHelpers
     res = on(host, %(#{run_cmd} "gpg --with-colons --fingerprint --homedir='#{key_dir}' 'SIMP Development'"), opts)
     pub_lines = res.stdout.lines.select { |x| x.start_with?('pub') }
     raise "No 'SIMP Development' GPG keys found in '#{key_dir}'" if pub_lines.empty?
+
     pub_lines.first.split(':')[4].downcase
   end
 
@@ -75,7 +78,6 @@ module Simp::BeakerHelpers::SimpRakeHelpers::BuildProjectHelpers
   # @param [Host, String, Symbol] host Beaker host
   # @param [String] gpg_homedir Absolute path to GPG home dir
   def gpg_agent_running?(host, gpg_homedir)
-
     # This check is being used in tests to verify no gpg-agent for gpg_homedir
     # is running.  On slow VMs, the gpg-agent can take some time to shutdown.
     # So wait up to 20 seconds for gpg-agent to shutdown before finalizing
@@ -83,10 +85,11 @@ module Simp::BeakerHelpers::SimpRakeHelpers::BuildProjectHelpers
 
     retries = 20
     agent_exists = true
-    while (agent_exists || (retries > 0))
+    while agent_exists || (retries > 0)
       result = on(host, "pgrep -c -f 'gpg-agent.*homedir.*#{gpg_homedir}'", :accept_all_exit_codes => true)
-      agent_exists  = (result.stdout.strip != '0')
+      agent_exists = (result.stdout.strip != '0')
       break unless agent_exists
+
       sleep 1
       retries -= 1
     end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Simp::BeakerHelpers::SimpRakeHelpers::BuildUserHelpers
   def build_user_homedir
     '/home/build_user'
@@ -8,13 +10,13 @@ module Simp::BeakerHelpers::SimpRakeHelpers::BuildUserHelpers
   end
 
   def copy_host_files_into_build_user_homedir(hosts, opts = {})
-    commands = <<-COMMANDS.gsub(/^ {6}/,'')
+    commands = <<-COMMANDS.gsub(%r{^ {6}}, '')
       cp -aT /host_files #{build_user_host_files} ;
       find #{build_user_host_files} \\
         -type d -a \\( -name dist -o -name junit -o -name log \\) \\
         -exec chmod -R go=u-w {} \\; ;
       chown -R build_user:build_user #{build_user_host_files}
     COMMANDS
-    on(hosts,commands,opts)
+    on(hosts, commands, opts)
   end
 end

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

@@ -1,5 +1,7 @@
-module Simp::BeakerHelpers::SimpRakeHelpers::PkgRpmHelpers
+# frozen_string_literal: true
 
+require 'English'
+module Simp::BeakerHelpers::SimpRakeHelpers::PkgRpmHelpers
   require_relative 'build_user_helpers'
   include Simp::BeakerHelpers::SimpRakeHelpers::BuildUserHelpers
 
@@ -7,66 +9,63 @@ module Simp::BeakerHelpers::SimpRakeHelpers::PkgRpmHelpers
   # passes on useful troubleshooting env vars
   def rake_cmd
     cmd = 'bundle exec rake'
-    %w(
-      SIMP_RPM_LUA_debug
-      SIMP_RAKE_PKG_verbose
-      SIMP_RPM_verbose
-    ).each do |env_var|
-      if value = ENV[env_var]
-         cmd = "#{env_var}=#{value} #{cmd}"
+    [
+      'SIMP_RPM_LUA_debug',
+      'SIMP_RAKE_PKG_verbose',
+      'SIMP_RPM_verbose',
+    ].each do |env_var|
+      if (value = ENV.fetch(env_var, nil))
+        cmd = "#{env_var}=#{value} #{cmd}"
       end
     end
     cmd
   end
 
-
   # key   = what `rpm -q --scripts` calls each scriptlet
   # value = the label passed to `simp_rpm_helper`
   def scriptlet_label_map
     {
-      'pretrans'      => nil,
-      'preinstall'    => 'pre',
-      'postinstall'   => 'post',
-      'preuninstall'  => 'preun',
+      'pretrans' => nil,
+      'preinstall' => 'pre',
+      'postinstall' => 'post',
+      'preuninstall' => 'preun',
       'postuninstall' => 'postun',
-      'posttrans'     => 'posttrans',
+      'posttrans' => 'posttrans'
     }
   end
 
-
   # returns a Hash of information about an RPM file's scriptlets
-  def rpm_scriptlets_for( host, rpm_file )
-    _labels  = scriptlet_label_map.keys.join('|')
-    rx_scriptlet_blocks = /^(?<block>(?<scriptlet>#{_labels}) scriptlet.*?(\r|\n)(?<content>.*?))(?=\n(#{_labels}) scriptlet|\Z)/m
+  def rpm_scriptlets_for(host, rpm_file)
+    _labels = scriptlet_label_map.keys.join('|')
+    rx_scriptlet_blocks = %r{^(?<block>(?<scriptlet>#{_labels}) scriptlet.*?(\r|\n)(?<content>.*?))(?=\n(#{_labels}) scriptlet|\Z)}m
 
-    result = on host, %Q(rpm -qp --scripts #{rpm_file})
+    result = on host, %(rpm -qp --scripts #{rpm_file})
 
     scriptlets = {}
     result.stdout.to_s.scan(rx_scriptlet_blocks) do
-      scriptlet = scriptlets[$~[:scriptlet]] ||= { :count => 0 }
+      scriptlet = scriptlets[$LAST_MATCH_INFO[:scriptlet]] ||= { :count => 0 }
       scriptlet[:count]       += 1
-      scriptlet[:content]      = $~[:content].strip
-      scriptlet[:full_block]   = $~[:block]
-      scriptlet[:bare_content] = scriptlet[:content].gsub(/^((--|#).*?[\r\n]+)/,'')
+      scriptlet[:content]      = $LAST_MATCH_INFO[:content].strip
+      scriptlet[:full_block]   = $LAST_MATCH_INFO[:block]
+      scriptlet[:bare_content] = scriptlet[:content].gsub(%r{^((--|#).*?[\r\n]+)}, '')
     end
     scriptlets
   end
 
-
   # returns a Hash of information about an RPM file's triggers
-  def rpm_triggers_for( host, rpm_file )
+  def rpm_triggers_for(host, rpm_file)
     _trigger          = 'trigger\\w+ scriptlet \\(using [\\/a-z0-9]+\\) --(!?\\p{Graph}|\\s)*?'
-    rx_trigger_blocks = /^(?<block>(?<trigger>#{_trigger})[\r\n](?<content>.*?)(?=\n#{_trigger}|\Z))/m
+    rx_trigger_blocks = %r{^(?<block>(?<trigger>#{_trigger})[\r\n](?<content>.*?)(?=\n#{_trigger}|\Z))}m
 
-    result = on host, %Q(rpm -qp --triggers #{rpm_file})
+    result = on host, %(rpm -qp --triggers #{rpm_file})
 
     triggers = {}
     result.stdout.to_s.scan(rx_trigger_blocks) do
-      trigger=  triggers[$~[:trigger]] ||= { :count => 0 }
+      trigger = triggers[$LAST_MATCH_INFO[:trigger]] ||= { :count => 0 }
       trigger[:count]       += 1
-      trigger[:content]      = $~[:content].strip
-      trigger[:full_block]   = $~[:block]
-      trigger[:bare_content] = trigger[:content].gsub(/^((--|#).*?[\r\n]+)/,'')
+      trigger[:content]      = $LAST_MATCH_INFO[:content].strip
+      trigger[:full_block]   = $LAST_MATCH_INFO[:block]
+      trigger[:bare_content] = trigger[:content].gsub(%r{^((--|#).*?[\r\n]+)}, '')
     end
     triggers
   end

data/spec/acceptance/support/simp_rake_helpers.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 module Simp::BeakerHelpers::SimpRakeHelpers
   # Add RSpec log comments within examples ("it blocks")
   def comment(msg, indent = 10)
-    logger.optionally_color(Beaker::Logger::MAGENTA, ' ' * indent + msg)
+    logger.optionally_color(Beaker::Logger::MAGENTA, (' ' * indent) + msg)
   end
 
   # basic command + arguments for executing `runuser` within an SUT