simp-rake-helpers 5.12.2 → 5.12.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4da7d0cf624209586f4a159cd06bf86cc61da199ddecc3d2730e53a267225316
-  data.tar.gz: 44fcb7049d7a6a39b433e88de24894db6817fc06620fddc6ac7f67d3481c6a42
+  metadata.gz: 51d1aeb754d81247df05b01fce650e64c4b03fdab941f955e3180e79edcc2964
+  data.tar.gz: e8d8c2ef11a657dfce5bd7755d94f024bd2466fbad243f930f6624bc7e699955
 SHA512:
-  metadata.gz: 6f4a80dd4864f3ade29b60932b83d87b8d2fd56384fd03bc5df9de9a03f70f54445333e3654b3d2225d67e0ffdc5f1f772c5a23908a0ea40378c648043c00fb2
-  data.tar.gz: 862aaaac472efde1959b314d66ddb254379be34f2ecbfa1f4715fc58882010fcfc14c5caf41a090947b2d3955b2c27eb146bec1b2236a817caebc95ada01f857
+  metadata.gz: ff5da7ac89c5cf55ae28d69be89992a904e0341c33534e3e301eee6a409d7f801d2df49a2de8dc889e46eb1defb42233c5e707bf8d67c215972998f2a483272a
+  data.tar.gz: 9a3bc2da54cc811be5c3129665124c90761f0c7a962ab54a1c8b11722e506b0691a7d429492e1d30d29930d082af942472dd7984b1bb674d5fe7c0c34928179a

data/CHANGELOG.md

@@ -1,3 +1,28 @@
+### 5.12.6 / 2021-10-19
+- Ensure that the `Updates` directory does not link to files in itself
+
+### 5.12.5 / 2021-10-07
+- Fixed a bug where `build:auto` failed when building the SIMP ISO for EL7,
+  because the code attempted to move a directory onto itself.
+- Ensured GPG keys in simp-gpgkeys are available in the DVD overlay tar file
+
+### 5.12.4 / 2021-10-05
+- Ensure that the DIST qualifier is added to all built RPMs
+- Use the new SimpRepos directory layout when building an ISO using externally
+  copied repos.
+
+### 5.12.3 / 2021-09-15
+- Handle multiple options for required applications in build:auto
+- Allow users to populate a `reposync` directory in the YUM build space that
+  will overwrite any target directories on the ISO.
+  - The SIMP tarball is unpacked after the copy so you always get the latest
+    built artifacts.
+  - Pruning will not occur if this technique is used since it is presumed that
+    you are overwriting the data with authoritative content.
+- Added a helpful tip about updating vermap.yaml
+- Fixed the call to repoclosure if on a system with DNF
+- Added support for EL8 to vermap.yaml
+
 ### 5.12.2 / 2021-06-22
 - Change to '-1' from '-0' as the default RPM release
 

data/lib/simp/rake/build/auto.rb

@@ -18,6 +18,8 @@ module Simp::Rake::Build
   class Auto < ::Rake::TaskLib
 
     # Commands that are required by some part of the rake stack
+    #
+    # Use an array for commands that may have multiple valid options
     BUILD_REQUIRED_COMMANDS = [
       'basename',
       'cat',
@@ -42,7 +44,7 @@ module Simp::Rake::Build
       'make',
       'mkdir',
       'mktemp',
-      'python',
+      ['python','python2','python3'],
       'readlink',
       'repoclosure',
       'rm',
@@ -62,7 +64,7 @@ module Simp::Rake::Build
       'wc',
       'which',
       'xargs',
-      'yum',
+      ['dnf','yum'],
       'yumdownloader'
     ]
 

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

@@ -204,7 +204,8 @@ module Simp::Rake::Build
 
             Dir.chdir(target_dir) do
               if File.exist?('packages.yaml')
-                known_package_hash = YAML::load_file('packages.yaml')
+                # The empty YAML file returns 'false'
+                known_package_hash = YAML::load_file('packages.yaml') || {}
               end
             end
 
@@ -276,12 +277,12 @@ module Simp::Rake::Build
                 pkg = downloaded_package_hash[pkg][:rpm_name]
               }.compact
 
-              if known_packages.empty? && downloaded_packages.empty?
+              if known_packages.empty? && downloaded_packages.empty? && Dir.glob('reposync/**/repomd.xml').empty?
                 fail <<-EOM
         Error: Could not find anything to do!
 
         In #{target_dir}:
-            No packages in either packages.yaml or the packages/ directory
+            No packages in either packages.yaml or the packages/ directory and no repos found in the reposync/ directory
                 EOM
               end
 

data/lib/simp/rake/build/iso.rb

@@ -120,6 +120,9 @@ module Simp::Rake::Build
             end
           end
 
+          reposync_location = File.join(@build_dir,'yum_data','reposync')
+          reposync_active = !Dir.glob(File.join(reposync_location, '**', 'repomd.xml')).empty?
+
           tarfiles = File.directory?(tarball) ?
             Dir.glob("#{tarball}/*.tar.gz") : [tarball]
           vermap = YAML::load_file( File.join( File.dirname(__FILE__), 'vermap.yaml'))
@@ -171,6 +174,7 @@ module Simp::Rake::Build
               unless Array(vermap[simpver.split('.').first]).include?(baseosver.split('.').first)
                 if verbose
                   warn("Could not find SIMP version mapping for #{simpver} for Base OS #{baseosver}")
+                  warn("Do you need to update vermap.yaml in the Gem?")
                 end
 
                 next
@@ -186,40 +190,83 @@ module Simp::Rake::Build
                 end
               end
 
-              # Prune unwanted packages
-              begin
-                system("tar --no-same-permissions -C #{dir} -xzf #{tball} *simp_pkglist.txt")
-              rescue
-                # Does not matter if the command fails
-              end
 
-              pkglist_file = ENV.fetch(
-                'SIMP_PKGLIST_FILE',
-                File.join(dir,"#{baseosver.split('.').first}-simp_pkglist.txt")
-              )
-
-              puts
-              puts '-'*80
-              puts "### Pruning packages not in file '#{pkglist_file}'"
-              puts
-              puts '   (override this with `SIMP_PKGLIST_FILE=<file>`)'
-              puts
-              puts '-'*80
-              puts
-
-              if (args.prune.casecmp("false") != 0) && File.exist?(pkglist_file)
-                exclude_pkgs = Array.new
-                File.read(pkglist_file).each_line do |line|
-                  next if line =~ /^(\s+|#.*)$/
-                  exclude_pkgs.push(line.chomp)
+              repo_target_dir = dir
+
+              # If we've pulled in reposync directories, we expect them to
+              # completely overwrite the directory of the same name in the
+              # target ISO so no pruning is required
+              #
+              # Note: CASE MATTERS on the directory names
+              if reposync_active
+                # We're working with the new EL8+ layout, so we need to target
+                # the SimpRepos subdirectory
+                repo_target_dir = File.join(dir,'SimpRepos')
+                mkdir_p(repo_target_dir, :verbose => verbose)
+
+                repos_to_overwrite = Dir.glob(File.join(reposync_location, '*'))
+                  .delete_if{|x| !File.directory?(x)}
+                  .map{|x| File.basename(x)}
+
+                repos_to_overwrite.each do |repo|
+                  src = File.join(reposync_location, repo)
+                  target = File.join(dir, repo)
+
+                  if File.directory?(target)
+                    rm_rf(target, :verbose => verbose) if File.directory?(target)
+                  else
+                    target = File.join(repo_target_dir, repo)
+                  end
+
+                  cp_r(src, target, :verbose => verbose)
+                end
+              else
+                # Prune unwanted packages
+                begin
+                  system("tar --no-same-permissions -C #{repo_target_dir} -xzf #{tball} *simp_pkglist.txt")
+                rescue
+                  # Does not matter if the command fails
+                end
+
+                pkglist_file = ENV.fetch(
+                  'SIMP_PKGLIST_FILE',
+                  File.join(dir,"#{baseosver.split('.').first}-simp_pkglist.txt")
+                )
+
+                puts
+                puts '-'*80
+                puts "### Pruning packages not in file '#{pkglist_file}'"
+                puts
+                puts '   (override this with `SIMP_PKGLIST_FILE=<file>`)'
+                puts
+                puts '-'*80
+                puts
+
+                if (args.prune.casecmp("false") != 0) && File.exist?(pkglist_file)
+                  exclude_pkgs = Array.new
+                  File.read(pkglist_file).each_line do |line|
+                    next if line =~ /^(\s+|#.*)$/
+                    exclude_pkgs.push(line.chomp)
+                  end
+                  prune_packages(dir,['SIMP','SimpRepos'],exclude_pkgs,mkrepo)
                 end
-                prune_packages(dir,['SIMP'],exclude_pkgs,mkrepo)
               end
 
               # Add the SIMP code
               system("tar --no-same-permissions -C #{dir} -xzf #{tball}")
 
-              Dir.chdir("#{dir}/SIMP") do
+              # Pop the SIMP directory from the tarball into the correct spot
+              # FIXME: This is a hack
+              unless dir == repo_target_dir
+                simpdir = File.join(dir,'SIMP')
+
+                if File.directory?(simpdir)
+                   cp_r(simpdir, repo_target_dir, :verbose => verbose)
+                   rm_rf(simpdir, :verbose => verbose)
+                end
+              end
+
+              Dir.chdir("#{repo_target_dir}/SIMP") do
                 # Add the SIMP Dependencies
                 simp_base_ver = simpver.split('-').first
 
@@ -230,13 +277,14 @@ module Simp::Rake::Build
                   yum_dep_location = File.join(@build_dir,'yum_data',simp_dep_src,'packages')
                 end
 
+                yum_dep_rpms = Dir.glob(File.join(yum_dep_location,'*.rpm'))
+
                 unless File.directory?(yum_dep_location)
-                  fail("Could not find dependency directory at #{yum_dep_location}")
+                  fail("Could not find dependency directory at #{yum_dep_location}") unless reposync_active
                 end
 
-                yum_dep_rpms = Dir.glob(File.join(yum_dep_location,'*.rpm'))
                 if yum_dep_rpms.empty?
-                  fail("Could not find any dependency RPMs at #{yum_dep_location}")
+                  fail("Could not find any dependency RPMs at #{yum_dep_location}") unless reposync_active
                 end
 
                 # Add any one-off RPMs that you might want to add to your own build
@@ -261,24 +309,81 @@ module Simp::Rake::Build
                   cp(rpm,rpm_arch, :verbose => verbose)
                 end
 
-                fail("Could not find architecture '#{arch}' in the SIMP distribution") unless File.directory?(arch)
-                # Get everything set up properly...
-                Dir.chdir(arch) do
-                  Dir.glob('../*') do |rpm_dir|
-                    # Don't dive into ourselves
-                    next if File.basename(rpm_dir) == arch
-
-                    Dir.glob(%(#{rpm_dir}/*.rpm)) do |source_rpm|
-                      link_target = File.basename(source_rpm)
-                      if File.exist?(source_rpm) && File.exist?(link_target)
-                        next if Pathname.new(source_rpm).realpath == Pathname.new(link_target).realpath
+                if reposync_active
+                    fail("Error: Could not run createrepo in #{Dir.pwd}") unless system(%(#{mkrepo} .))
+                else
+                  ln_sf('noarch', arch, :verbose => verbose) if (!File.directory?(arch) && File.directory?('noarch'))
+                  fail("Could not find architecture '#{arch}' in the SIMP distribution") unless (File.directory?(arch) || File.symlink?(arch))
+
+                  # Get everything set up properly...
+                  Dir.chdir(arch) do
+                    Dir.glob('../*') do |rpm_dir|
+                      # Don't dive into ourselves
+                      next if File.basename(rpm_dir) == arch
+
+                      Dir.glob(%(#{rpm_dir}/*.rpm)) do |source_rpm|
+                        link_target = File.basename(source_rpm)
+                        if File.exist?(source_rpm) && File.exist?(link_target)
+                          next if Pathname.new(source_rpm).realpath == Pathname.new(link_target).realpath
+                        end
+
+                        ln_sf(source_rpm,link_target, :verbose => verbose)
                       end
+                    end
+
+                    fail("Error: Could not run createrepo in #{Dir.pwd}") unless system(%(#{mkrepo} .))
+                  end
+                end
+              end
+
+              ### Munge the Repos
+
+              # Create an Updates directory that is properly populated
+              updates_readme = <<~README
+                This directory houses updates to NON-MODULAR RPMs.
+
+                DO NOT put modular RPMs in this directory or you will break your
+                system updates!
+                README
 
-                      ln_sf(source_rpm,link_target, :verbose => verbose)
+              updates_dir = File.join(dir, 'Updates')
+              mkdir_p(updates_dir)
+
+              Dir.chdir(updates_dir) do
+                File.open('README','w'){|fh| fh.puts(updates_readme) }
+
+                repos = Dir.glob(File.join('..','**','repodata'))
+                modular_repos = Dir.glob(File.join('..','**','repodata','*-modules.*'))
+                non_modular_repos = repos.select{|x| modular_repos.grep(%r{^#{Regexp.escape(x)}}).empty? }
+                non_modular_repos.map!{|x| File.split(x).first}
+                non_modular_repos.delete_if{|x| x.match(%r{/SimpRepos|/SIMP}) }
+                non_modular_repos.each do |non_modular_repo|
+                  Dir.glob(File.join(non_modular_repo, '**', '*.rpm')).each do |rpm|
+                    # when non_modular_repo is '..', can still find RPMs we need
+                    # to exclude
+                    next if rpm.match(%r{/SimpRepos|/SIMP})
+
+                    rpm_dest = File.basename(rpm)
+                    if File.exist?(rpm) && File.exist?(rpm_dest)
+                      next if (File.realpath(rpm) == File.realpath(rpm_dest))
                     end
+
+                    ln_sf(rpm, rpm_dest, :verbose => verbose)
                   end
+                end
 
-                  fail("Error: Could not run createrepo in #{Dir.pwd}") unless system(%(#{mkrepo} .))
+                fail("Error: Could not run createrepo in #{Dir.pwd}") unless system(%(#{mkrepo} .))
+              end
+
+              # New ISO Layout
+              if reposync_active
+                Dir.chdir(repo_target_dir) do
+                  gpgkeysdir = File.join('SIMP','GPGKEYS')
+
+                  if File.directory?(gpgkeysdir)
+                    cp_r(gpgkeysdir, '.', :verbose => verbose)
+                    rm_rf(gpgkeysdir, :verbose => verbose)
+                  end
                 end
               end
 

data/lib/simp/rake/build/pkg.rb

@@ -606,23 +606,19 @@ protect=1
               mkdir_p('repos/lookaside')
               mkdir_p('repodata')
 
-              Dir.glob(args[:target_dir]).each do |base_dir|
-                Find.find(base_dir) do |path|
-                  if (path =~ /.*\.rpm$/) and (path !~ /.*.src\.rpm$/)
-                    sym_path = "repos/base/#{File.basename(path)}"
-                    ln_s(path,sym_path, :verbose => @verbose) unless File.exists?(sym_path)
-                  end
-                end
+              Dir.glob(File.join(args[:target_dir], '**', '*.rpm'))
+                .delete_if{|x| x =~ /\.src\.rpm$/}
+                .each do |path|
+                  sym_path = "repos/base/#{File.basename(path)}"
+                  ln_sf(path,sym_path, :verbose => @verbose) unless File.exists?(sym_path)
               end
 
               if args[:aux_dir]
-                Dir.glob(args[:aux_dir]).each do |aux_dir|
-                  Find.find(aux_dir) do |path|
-                    if (path =~ /.*\.rpm$/) and (path !~ /.*.src\.rpm$/)
-                      sym_path = "repos/lookaside/#{File.basename(path)}"
-                      ln_s(path,sym_path, :verbose => @verbose) unless File.exists?(sym_path)
-                    end
-                  end
+                Dir.glob(File.join(args[:aux_dir], '**', '*.rpm'))
+                  .delete_if{|x| x =~ /\.src\.rpm$/}
+                  .each do |path|
+                    sym_path = "repos/lookaside/#{File.basename(path)}"
+                    ln_sf(path,sym_path, :verbose => @verbose) unless File.exists?(sym_path)
                 end
               end
 
@@ -647,7 +643,12 @@ protect=1
                 file.write(ERB.new(yum_conf_template,nil,'-').result(binding))
               end
 
-              cmd = 'repoclosure -c repodata -n -t -r base -l lookaside -c yum.conf'
+              dnf_system = which('dnf')
+              if dnf_system
+                cmd = 'repoclosure -c base.conf --disablerepo=* --enablerepo=base'
+              else
+                cmd = 'repoclosure -c repodata -n -t -r base -l lookaside -c yum.conf'
+              end
 
               if ENV['SIMP_BUILD_verbose'] == 'yes'
                 puts
@@ -661,7 +662,16 @@ protect=1
               if (!$?.success? || (repoclosure_output =~ /nresolved/))
                 errmsg = ['Error: REPOCLOSURE FAILED:']
                 errmsg << [repoclosure_output]
-                fail(errmsg.join("\n"))
+                puts(errmsg.join("\n"))
+
+                if dnf_system
+                  if ENV.fetch('SIMP_BUILD_prompt', 'yes') != 'no'
+                    puts('- Press any key to continue or ^C to abort -')
+                    $stdin.gets
+                  end
+                else
+                  fail('Repoclosure Failed')
+                end
               end
             end
           end

data/lib/simp/rake/build/tar.rb

@@ -126,10 +126,16 @@ module Simp::Rake::Build
 
             Simp::RPM.copy_wo_vcs(@dvd_src,".",base_dir)
 
-            # Copy in the GPG Public Keys
+            # Copy in the GPG Public Keys from @build_dir
             mkdir_p("#{destdir}/GPGKEYS")
             ln(Dir.glob("#{@build_dir}/GPGKEYS/RPM-GPG-KEY*"), "#{destdir}/GPGKEYS", { :force => true })
 
+            # Copy in the GPG Public Keys packaged by simp-gpgkeys
+            simp_gpgkeys = File.join(@src_dir, 'assets', 'gpgkeys', 'GPGKEYS')
+            if Dir.exist?(simp_gpgkeys)
+              ln(Dir.glob("#{simp_gpgkeys}/RPM-GPG-KEY*"), "#{destdir}/GPGKEYS", { :force => true })
+            end
+
             # Copy in the auto-build RPMs
             Dir.chdir("#{@build_dir}/SIMP/RPMS") do
               Dir.glob('*').each do |type|

data/lib/simp/rake/build/vermap.yaml

@@ -1,5 +1,5 @@
 ---
-"6": ["6","7"]
+"6": ["6","7","8"]
 "5": "7"
 "4": "6"
 "2": "5"

data/lib/simp/rake/helpers/assets/rpm_spec/simp6.spec

@@ -301,7 +301,7 @@ end
 
 if req_file then
   for line in req_file:lines() do
-    valid_line = (line:match("^Requires: ") or line:match("^Obsoletes: ") or line:match("^Provides: "))
+    valid_line = (line:match("^Requires: ") or line:match("^Obsoletes: ") or line:match("^Provides: ") or line:match("^Recommends: "))
 
     if valid_line then
       module_requires = (module_requires .. "\n" .. line)
@@ -319,7 +319,7 @@ Summary:   %{module_name} Puppet Module
 Name:      %{package_name}
 
 Version:   %{lua: print(package_version)}
-Release:   %{lua: print(package_release)}
+Release:   %{lua: print(package_release)}%{?dist}
 License:   %{lua: print(module_license)}
 Group:     Applications/System
 Source0:   %{package_name}-%{version}-%{release}.tar.gz

data/lib/simp/rake/helpers/assets/rpm_spec/simpdefault.spec

@@ -301,7 +301,7 @@ end
 
 if req_file then
   for line in req_file:lines() do
-    valid_line = (line:match("^Requires: ") or line:match("^Obsoletes: ") or line:match("^Provides: "))
+    valid_line = (line:match("^Requires: ") or line:match("^Obsoletes: ") or line:match("^Provides: ") or line:match("^Recommends: "))
 
     if valid_line then
       module_requires = (module_requires .. "\n" .. line)
@@ -319,7 +319,7 @@ Summary:   %{module_name} Puppet Module
 Name:      %{package_name}
 
 Version:   %{lua: print(package_version)}
-Release:   %{lua: print(package_release)}
+Release:   %{lua: print(package_release)}%{?dist}
 License:   %{lua: print(module_license)}
 Group:     Applications/System
 Source0:   %{package_name}-%{version}-%{release}.tar.gz

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

@@ -2,5 +2,5 @@ module Simp; end
 module Simp::Rake; end
 
 class Simp::Rake::Helpers
-  VERSION = '5.12.2'
+  VERSION = '5.12.6'
 end

data/lib/simp/rake/helpers.rb

@@ -20,8 +20,8 @@ class Simp::Rake::Helpers
     invalid_commands = Array.new
 
     Array(required_commands).each do |command|
-      unless Facter::Core::Execution.which(command)
-        invalid_commands << command
+      unless Array(command).find { |x| Facter::Core::Execution.which(x) }
+        invalid_commands << Array(command).join(' or ')
       end
     end
 

data/lib/simp/rpm_signer.rb

@@ -195,8 +195,13 @@ class Simp::RpmSigner
               # the first RPM to be signed with the key after the gpg-agent is
               # started and the key's passphrase has not been cleared from the
               # agent's cache.
-              read.expect(/pass\s?phrase:.*/) do |text|
-                write.puts(gpgkey[:password])
+              read.expect(/(pass\s?phrase:|verwrite).*/) do |text|
+                if text.last.include?('verwrite')
+                  write.puts('y')
+                else
+                  write.puts(gpgkey[:password])
+                end
+
                 write.flush
               end
             end
@@ -287,7 +292,7 @@ class Simp::RpmSigner
     begin
       results = Parallel.map(
         to_sign,
-        :in_processes => opts[:max_concurrent],
+        :in_processes => 1,
         :progress => opts[:progress_bar_title]
       ) do |rpm|
         _result = nil

data/spec/acceptance/suites/default/00_pkg_rpm_custom_scriptlets_spec.rb

@@ -11,7 +11,7 @@ shared_examples_for 'an RPM generator with customized scriptlets' do
     scriptlets = rpm_scriptlets_for(
       host,
       "#{pkg_root_dir}/testpackage_custom_scriptlet/dist/" +
-      'pupmod-simp-testpackage-0.0.1-1.noarch.rpm'
+      "pupmod-simp-testpackage-0.0.1-1#{rpm_dist}.noarch.rpm"
     )
 
     comment '...the expected scriptlet types are present'
@@ -69,7 +69,7 @@ shared_examples_for 'an RPM generator with customized triggers' do
     triggers = rpm_triggers_for(
       host,
       "#{pkg_root_dir}/testpackage_custom_scriptlet/dist/" +
-      'pupmod-simp-testpackage-0.0.1-1.noarch.rpm'
+      "pupmod-simp-testpackage-0.0.1-1#{rpm_dist}.noarch.rpm"
     )
 
 
@@ -107,6 +107,7 @@ describe 'rake pkg:rpm with customized content' do
   hosts.each do |_host|
     context "on #{_host}" do
       let!(:host){ _host }
+      let(:rpm_dist){ on(host, %{rpm --eval '%{dist}'}).output.strip.gsub(/\.centos$/, '') }
 
       it 'can prep the package directories' do
         testpackages = [

data/spec/acceptance/suites/default/10_pkg_rpm_spec.rb

@@ -10,7 +10,7 @@ shared_examples_for 'an RPM generator with edge cases' do
   it 'should use specified release number for the RPM' do
     on host, %(#{run_cmd} "cd #{pkg_root_dir}/testpackage_with_release; #{rake_cmd} pkg:rpm")
     release_test_rpm = File.join(pkg_root_dir, 'testpackage_with_release',
-      'dist', 'pupmod-simp-testpackage-0.0.1-42.noarch.rpm')
+      'dist', "pupmod-simp-testpackage-0.0.1-42#{rpm_dist}.noarch.rpm")
     on host, %(test -f #{release_test_rpm})
   end
 
@@ -73,10 +73,10 @@ describe 'rake pkg:rpm' do
     copy_host_files_into_build_user_homedir(hosts)
   end
 
-
   hosts.each do |_host|
     context "on #{_host}" do
       let!(:host){ _host }
+      let(:rpm_dist){ on(host, %{rpm --eval '%{dist}'}).output.strip.gsub(/\.centos$/, '') }
 
       context 'rpm building' do
 
@@ -107,7 +107,7 @@ describe 'rake pkg:rpm' do
         context 'using simpdefault.spec' do
 
           let(:build_type) {:default}
-          let(:testpackage_rpm) { File.join(testpackage_dir, 'dist/pupmod-simp-testpackage-0.0.1-1.noarch.rpm') }
+          let(:testpackage_rpm) { File.join(testpackage_dir, "dist/pupmod-simp-testpackage-0.0.1-1#{rpm_dist}.noarch.rpm") }
 
           it 'should create an RPM' do
             comment "produces RPM on #{host}"

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

@@ -320,7 +320,7 @@ describe 'rake pkg:signrpms and pkg:checksig' do
 
     it 'should corrupt the password of new key' do
       key_gen_file = File.join(dev_keydir, 'gengpgkey')
-      on(hosts, "sed -i -e \"s/^Passphrase: /Passphrase: OOPS/\" #{key_gen_file}")
+      on(hosts, "sed -ci -e \"s/^Passphrase: /Passphrase: OOPS/\" #{key_gen_file}")
     end
 
     include_examples('it begins with unsigned RPMs')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-rake-helpers
 version: !ruby/object:Gem::Version
-  version: 5.12.2
+  version: 5.12.6
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-28 00:00:00.000000000 Z
+date: 2021-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simp-beaker-helpers