simp-rake-helpers 5.25.0 → 6.0.0

data/lib/simp/rpm_signer.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+
+require 'English'
 require 'find'
 require 'parallel'
 require 'simp/rpm'
@@ -12,7 +15,7 @@ class Simp::RpmSigner
 
   extend Simp::CommandUtils
 
-  @@gpg_keys = Hash.new
+  @@gpg_keys = {}
 
   # Kill the GPG agent operating with the specified key dir, if
   # rpm version 4.13.0 or later.
@@ -22,19 +25,19 @@ class Simp::RpmSigner
   def self.kill_gpg_agent(gpg_keydir)
     return if Gem::Version.new(Simp::RPM.version) < Gem::Version.new('4.13.0')
 
-    %x(gpg-agent --homedir #{gpg_keydir} -q >& /dev/null)
-    if $? && ($?.exitstatus == 0)
-      # gpg-agent is running for specified keydir, so query it for its pid
-      output = %x{echo 'GETINFO pid' | gpg-connect-agent --homedir=#{gpg_keydir}}
-      if $? && ($?.exitstatus == 0)
-        pid = output.lines.first[1..-1].strip.to_i
-        begin
-          Process.kill(0, pid)
-          Process.kill(15, pid)
-        rescue Errno::ESRCH
-          # No longer running, so nothing to do!
-        end
-      end
+    `gpg-agent --homedir #{gpg_keydir} -q >& /dev/null`
+    return unless $CHILD_STATUS&.exitstatus&.zero?
+
+    # gpg-agent is running for specified keydir, so query it for its pid
+    output = `echo 'GETINFO pid' | gpg-connect-agent --homedir=#{gpg_keydir}`
+    return unless $CHILD_STATUS&.exitstatus&.zero?
+
+    pid = output.lines.first[1..].strip.to_i
+    begin
+      Process.kill(0, pid)
+      Process.kill(15, pid)
+    rescue Errno::ESRCH
+      # No longer running, so nothing to do!
     end
   end
 
@@ -64,12 +67,12 @@ class Simp::RpmSigner
     gpg_password = nil
     begin
       File.read("#{gpg_keydir}/gengpgkey").each_line do |ln|
-        name_line = ln.split(/^\s*Name-Email:/)
+        name_line = ln.split(%r{^\s*Name-Email:})
         if name_line.length > 1
           gpg_name = name_line.last.strip
         end
 
-        passwd_line = ln.split(/^\s*Passphrase:/)
+        passwd_line = ln.split(%r{^\s*Passphrase:})
         if passwd_line.length > 1
           gpg_password = passwd_line.last.strip
         end
@@ -78,8 +81,8 @@ class Simp::RpmSigner
     end
 
     if gpg_name.nil?
-      puts "Warning: Could not find valid e-mail address for use with GPG."
-      puts "Please enter e-mail address to use:"
+      puts 'Warning: Could not find valid e-mail address for use with GPG.'
+      puts 'Please enter e-mail address to use:'
       gpg_name = $stdin.gets.strip
     end
 
@@ -90,7 +93,7 @@ class Simp::RpmSigner
 
       if gpg_password.nil?
         puts "Warning: Could not find a password in '#{gpg_keydir}/password'!"
-        puts "Please enter your GPG key password:"
+        puts 'Please enter your GPG key password:'
         system 'stty -echo'
         gpg_password = $stdin.gets.strip
         system 'stty echo'
@@ -101,18 +104,18 @@ class Simp::RpmSigner
     gpg_key_id = nil
     cmd = "gpg --with-colons --homedir=#{gpg_keydir} --list-keys '<#{gpg_name}>' 2>&1"
     puts "Executing: #{cmd}" if verbose
-    %x(#{cmd}).each_line do |line|
+    `#{cmd}`.each_line do |line|
       # See https://github.com/CSNW/gnupg/blob/master/doc/DETAILS
       # Index  Content
       #   0    record type
       #   2    key length
       #   4    keyID
       fields = line.split(':')
-      if fields[0] && (fields[0] == 'pub')
-        gpg_key_size = fields[2].to_i
-        gpg_key_id = fields[4]
-        break
-      end
+      next unless fields[0] && (fields[0] == 'pub')
+
+      gpg_key_size = fields[2].to_i
+      gpg_key_id = fields[4]
+      break
     end
 
     if !gpg_key_size || !gpg_key_id
@@ -120,9 +123,9 @@ class Simp::RpmSigner
     end
 
     @@gpg_keys[gpg_key] = {
-      :dir      => gpg_keydir,
-      :name     => gpg_name,
-      :key_id   => gpg_key_id,
+      :dir => gpg_keydir,
+      :name => gpg_name,
+      :key_id => gpg_key_id,
       :key_size => gpg_key_size,
       :password => gpg_password
     }
@@ -145,16 +148,16 @@ class Simp::RpmSigner
   # @raise RuntimeError if 'rpmsign' executable cannot be found, the 'gpg
   #   'executable cannot be found, the GPG key directory does not exist or
   #   the GPG key metadata cannot be determined via 'gpg'
-  def self.sign_rpm(rpm, gpg_keydir, options={})
+  def self.sign_rpm(rpm, gpg_keydir, options = {})
     # This may be a little confusing...Although we're using 'rpm --resign'
     # in lieu of 'rpmsign --addsign', they are equivalent and the presence
     # of 'rpmsign' is a legitimate check that the 'rpm --resign' capability
     # is available (i.e., rpm-sign package has been installed).
     which('rpmsign') || raise("ERROR: Cannot sign RPMs without 'rpmsign'.")
 
-    digest_algo = options.key?(:digest_algo) ?  options[:digest_algo] : 'sha256'
-    timeout_seconds = options.key?(:timeout_seconds) ?  options[:timeout_seconds] : 60
-    verbose = options.key?(:verbose) ?  options[:verbose] : false
+    digest_algo = options.key?(:digest_algo) ? options[:digest_algo] : 'sha256'
+    timeout_seconds = options.key?(:timeout_seconds) ? options[:timeout_seconds] : 60
+    verbose = options.key?(:verbose) ? options[:verbose] : false
 
     gpgkey = load_key(gpg_keydir, verbose)
 
@@ -171,7 +174,7 @@ class Simp::RpmSigner
       "--define '%_gpg_path #{gpgkey[:dir]}'",
       "--define '%_gpg_digest_algo #{digest_algo}'",
       gpg_sign_cmd_extra_args,
-      "--resign #{rpm}"
+      "--resign #{rpm}",
     ].compact.join(' ')
 
     success = false
@@ -184,18 +187,17 @@ class Simp::RpmSigner
       # With rpm-sign-4.14.2-11.el8_0 (EL 8.0), if rpm cannot start the
       # gpg-agent daemon, it will just hang. We need to be able to detect
       # the problem and report the failure.
-      Timeout::timeout(timeout_seconds) do
-
+      Timeout.timeout(timeout_seconds) do
         status = nil
         PTY.spawn(signcommand) do |read, write, pid|
           begin
-            while !read.eof? do
+            until read.eof?
               # rpm version >= 4.13.0 will stand up a gpg-agent and so the
               # prompt for the passphrase will only actually happen if this is
               # 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:|verwrite).*/) do |text|
+              read.expect(%r{(pass\s?phrase:|verwrite).*}) do |text|
                 if text.last.include?('verwrite')
                   write.puts('y')
                 else
@@ -212,7 +214,7 @@ class Simp::RpmSigner
           end
 
           Process.wait(pid)
-          status = $?
+          status = $CHILD_STATUS
         end
 
         if status && !status.success?
@@ -222,12 +224,11 @@ class Simp::RpmSigner
 
       puts "Successfully signed #{rpm}" if verbose
       success = true
-
     rescue Timeout::Error
-      $stderr.puts "Failed to sign #{rpm} in #{timeout_seconds} seconds."
+      warn "Failed to sign #{rpm} in #{timeout_seconds} seconds."
     rescue Exception => e
-      $stderr.puts "Error occurred while attempting to sign #{rpm}:"
-      $stderr.puts e
+      warn "Error occurred while attempting to sign #{rpm}:"
+      warn e
     end
 
     success
@@ -267,13 +268,13 @@ class Simp::RpmSigner
   #   operation failed
   #
   def self.sign_rpms(rpm_dir, gpg_keydir, options = {})
-   opts = {
-     :digest_algo        => 'sha256',
-     :force              => false,
-     :max_concurrent     => 1,
-     :progress_bar_title => 'sign_rpms',
-     :timeout_seconds    => 60,
-     :verbose            => false
+    opts = {
+      :digest_algo => 'sha256',
+      :force => false,
+      :max_concurrent => 1,
+      :progress_bar_title => 'sign_rpms',
+      :timeout_seconds => 60,
+      :verbose => false
     }.merge(options)
 
     rpm_dirs = Dir.glob(rpm_dir)
@@ -282,7 +283,8 @@ class Simp::RpmSigner
     rpm_dirs.each do |rpm_dir|
       Find.find(rpm_dir) do |rpm|
         next unless File.readable?(rpm)
-        to_sign << rpm if rpm =~ /\.rpm$/
+
+        to_sign << rpm if %r{\.rpm$}.match?(rpm)
       end
     end
 
@@ -293,22 +295,22 @@ class Simp::RpmSigner
       results = Parallel.map(
         to_sign,
         :in_processes => 1,
-        :progress => opts[:progress_bar_title]
+        :progress => opts[:progress_bar_title],
       ) do |rpm|
         _result = nil
 
         begin
           if opts[:force] || !Simp::RPM.new(rpm).signature
-            _result = [ rpm, sign_rpm(rpm, gpg_keydir, opts) ]
+            _result = [rpm, sign_rpm(rpm, gpg_keydir, opts)]
             _result[1] = _result[1] ? :signed : :unsigned
           else
             puts "Skipping signed package #{rpm}" if opts[:verbose]
-            _result = [ rpm, :skipped_already_signed ]
+            _result = [rpm, :skipped_already_signed]
           end
         rescue Exception => e
           # can get here if rpm is malformed and Simp::RPM.new fails
-          $stderr.puts "Failed to sign #{rpm}:\n#{e.message}"
-          _result = [ rpm, :unsigned ]
+          warn "Failed to sign #{rpm}:\n#{e.message}"
+          _result = [rpm, :unsigned]
         end
 
         _result

data/lib/simp/yum.rb

@@ -1,7 +1,10 @@
+# frozen_string_literal: true
+
+require 'English'
+
 module Simp
   # Various utilities for dealing with YUM repos
   class Simp::YUM
-
     class Error < StandardError
     end
 
@@ -12,14 +15,12 @@ module Simp
     attr_reader :yum_conf
 
     def initialize(yum_conf, initialize_cache = false)
-      if File.exist?(yum_conf)
-        @yum_conf = File.absolute_path(yum_conf)
-      else
-        raise(Error, "Could not find yum configuration at '#{yum_conf}'")
-      end
+      raise(Error, "Could not find yum configuration at '#{yum_conf}'") unless File.exist?(yum_conf)
+
+      @yum_conf = File.absolute_path(yum_conf)
 
       # Only need to look these up once!
-      @@yum_cmd ||= %x(which yum).strip
+      @@yum_cmd ||= `which yum`.strip
       raise(Error, "Error: Could not find 'yum'. Please install and try again.") if @@yum_cmd.empty?
 
       tmp_dir = ENV['TMPDIR'] || '/tmp'
@@ -34,15 +35,15 @@ module Simp
 
       @@yum ||= "TMPDIR=#{@@yum_cache} #{@@yum_cmd} -c #{@yum_conf}"
 
-      @@yumdownloader_cmd ||= %x(which yumdownloader).strip
+      @@yumdownloader_cmd ||= `which yumdownloader`.strip
       raise(Error, "Error: Could not find 'yumdownloader'. Please install and try again.") if @@yumdownloader_cmd.empty?
 
       @@yumdownloader ||= "TMPDIR=#{@@yum_cache} #{@@yumdownloader_cmd} -c #{@yum_conf}"
 
-      @@curl ||= %x(which curl).strip
+      @@curl ||= `which curl`.strip
       raise(Error, "Error: Could not find 'curl'. Please install and try again.") if @@curl.empty?
 
-      @@file ||= %x(which file).strip
+      @@file ||= `which file`.strip
       raise(Error, "Error: Could not find 'file'. Please install and try again.") if @@file.empty?
 
       generate_cache if initialize_cache
@@ -50,27 +51,27 @@ module Simp
 
     def clean_yum_cache_dir
       # Make this as safe as we can
-      if @@yum_cache =~ /yum_cache/
-        FileUtils.remove_entry(@@yum_cache)
-      end
+      return unless @@yum_cache.include?('yum_cache')
+
+      FileUtils.remove_entry(@@yum_cache)
     end
 
     def generate_cache
       puts "Attempting to generate build-specific YUM cache from\n  #{@yum_conf}"
 
-      %x(#{@@yum} clean all 2>/dev/null)
-      %x(#{@@yum} makecache 2>/dev/null)
+      `#{@@yum} clean all 2>/dev/null`
+      `#{@@yum} makecache 2>/dev/null`
 
-      unless $?.success?
-        puts "WARNING: Unable to generate build-specific YUM cache from #{@yum_conf}"
-      end
+      return if $CHILD_STATUS.success?
+
+      puts "WARNING: Unable to generate build-specific YUM cache from #{@yum_conf}"
     end
 
     # Create a reasonable YUM config file
     # * yum_tmp => The directory in which to store the YUM DB and any other temporary files
     #
     # Returns the location of the YUM configuration
-    def self.generate_yum_conf(yum_dir=nil)
+    def self.generate_yum_conf(yum_dir = nil)
       yum_dir ||= Dir.pwd
 
       raise(Error, "Could not find YUM data dir at '#{yum_dir}'") unless File.directory?(yum_dir)
@@ -78,7 +79,7 @@ module Simp
       yum_conf = nil
       Dir.chdir(yum_dir) do
         # Create the target directory
-        yum_tmp = File.join('packages','yum_tmp')
+        yum_tmp = File.join('packages', 'yum_tmp')
 
         FileUtils.mkdir_p(yum_tmp) unless File.directory?(yum_tmp)
 
@@ -92,19 +93,19 @@ module Simp
         # Add the global directory
         repo_dirs << File.expand_path('../my_repos')
 
-        if File.directory?('my_repos')
-          # Add the local user repos if they exist
-          repo_dirs << File.expand_path('my_repos')
-        else
-          # Add the default Internet repos otherwise
-          repo_dirs << File.expand_path('repos')
-        end
+        repo_dirs << if File.directory?('my_repos')
+                       # Add the local user repos if they exist
+                       File.expand_path('my_repos')
+                     else
+                       # Add the default Internet repos otherwise
+                       File.expand_path('repos')
+                     end
 
         # Create our YUM config file
         yum_conf = File.expand_path('yum.conf', yum_tmp)
 
         File.open(yum_conf, 'w') do |fh|
-          fh.puts <<-EOM.gsub(/^\s+/,'')
+          fh.puts <<-EOM.gsub(%r{^\s+}, '')
           [main]
           keepcache = 0
           persistdir = #{yum_cache}
@@ -119,32 +120,32 @@ module Simp
         end
       end
 
-      return yum_conf
+      yum_conf
     end
 
     # Returns the full name of the latest package of the given name
     #
     # Returns nil if nothing found
     def available_package(rpm)
-      yum_output = %x(#{@@yum} list #{rpm} 2>/dev/null)
+      yum_output = `#{@@yum} list #{rpm} 2>/dev/null`
 
       found_rpm = nil
-      if $?.success?
-        pkg_name, pkg_version = yum_output.lines.last.strip.split(/\s+/)
+      if $CHILD_STATUS.success?
+        pkg_name, pkg_version = yum_output.lines.last.strip.split(%r{\s+})
         pkg_name, pkg_arch = pkg_name.split('.')
 
         found_rpm = %(#{pkg_name}-#{pkg_version}.#{pkg_arch}.rpm)
       end
 
-      return found_rpm
+      found_rpm
     end
 
     def get_sources(rpm)
-      Dir.mktmpdir do |dir|
-        output = %x(#{@@yumdownloader} --urls #{File.basename(rpm,'.rpm')} 2>/dev/null).lines
-        sources = output.grep(%r(\.rpm$))
+      Dir.mktmpdir do |_dir|
+        output = `#{@@yumdownloader} --urls #{File.basename(rpm, '.rpm')} 2>/dev/null`.lines
+        sources = output.grep(%r{\.rpm$})
 
-        unless (output.grep(/Error/).empty? || sources.empty?)
+        unless output.grep(%r{Error}).empty? || sources.empty?
           err_msg = "\n-- YUMDOWNLOADER ERROR --\n" + output.join("\n")
           raise(Error, "No sources found for '#{rpm}'" + err_msg)
         end
@@ -153,11 +154,11 @@ module Simp
       end
     end
 
-    def get_source(rpm, arch=nil)
+    def get_source(rpm, arch = nil)
       sources = get_sources(rpm)
 
       if arch
-        native_sources = sources.grep(%r((#{arch}|noarch)\.rpm$))
+        native_sources = sources.grep(%r{(#{arch}|noarch)\.rpm$})
 
         if native_sources.size > 1
           # We can't have more than one native source
@@ -165,10 +166,10 @@ module Simp
         end
       end
 
-      return sources.first
+      sources.first
     end
 
-    def download(rpm, opts={:target_dir => nil})
+    def download(rpm, opts = { :target_dir => nil })
       rpm.strip!
 
       downloaded_rpm_name = nil
@@ -182,25 +183,18 @@ module Simp
       Dir.mktmpdir do |dir|
         Dir.chdir(dir) do
           # If just passed an RPM name, use yumdownloader
-          if rpm !~ %r(://)
-            # In case someone passed a path
-            rpm_name = rpm.split(File::SEPARATOR).last
-
-            err_msg = %x(#{@@yumdownloader} #{File.basename(rpm_name, '.rpm')} 2>/dev/null)
-
-            downloaded_rpm_name = rpm_name
-          else
+          if rpm.include?('://')
             # If passed a URL, curl it and fall back to yumdownloader
             rpm_name = rpm.split('/').last
 
-            %x(#{@@curl} -L --max-redirs 10 -s -o #{rpm_name} -k #{rpm})
+            `#{@@curl} -L --max-redirs 10 -s -o #{rpm_name} -k #{rpm}`
 
             # Check what we've just downloaded
-            if !(File.exist?(rpm_name) && %x(#{@@file} #{rpm_name}).include?('RPM'))
+            unless File.exist?(rpm_name) && `#{@@file} #{rpm_name}`.include?('RPM')
               # Fall back on yumdownloader
               FileUtils.rm_f(rpm_name)
 
-              err_msg = %x(#{@@yumdownloader} #{File.basename(rpm_name, '.rpm')} 2>/dev/null)
+              `#{@@yumdownloader} #{File.basename(rpm_name, '.rpm')} 2>/dev/null`
             end
 
             # We might get a filename that doesn't make sense so we need to
@@ -212,6 +206,13 @@ module Simp
             end
 
             downloaded_rpm_name = rpm_info.rpm_name
+          else
+            # In case someone passed a path
+            rpm_name = rpm.split(File::SEPARATOR).last
+
+            `#{@@yumdownloader} #{File.basename(rpm_name, '.rpm')} 2>/dev/null`
+
+            downloaded_rpm_name = rpm_name
           end
 
           rpms = Dir.glob('*.rpm')
@@ -228,7 +229,7 @@ module Simp
         end
       end
 
-      return downloaded_rpm_name
+      downloaded_rpm_name
     end
   end
 end

data/spec/acceptance/nodesets/{default_ruby3_1.yml → almalinux10.yml}

@@ -1,19 +1,19 @@
 ---
 HOSTS:
-  el8-build-server:
+  el10-build-server:
     roles:
       - default
       - build_server
-    platform: el-8-x86_64
+    platform: el-10-x86_64
     hypervisor: docker
-    image: simpproject/simp_build_centos8_ruby3_1
+    image: ghcr.io/simp/simp-el10-build:latest
     docker_cmd: '["/sbin/init"]'
     docker_preserve_image: true
 
 CONFIG:
   log_level: verbose
   type: aio
-  puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'puppet8') %>"
+  puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'openvox8') %>"
   ssh:
     password: root
     auth_methods:

data/spec/acceptance/nodesets/{default.yml → almalinux8.yml}

@@ -6,14 +6,14 @@ HOSTS:
       - build_server
     platform: el-8-x86_64
     hypervisor: docker
-    image: simpproject/simp_build_centos8
+    image: ghcr.io/simp/simp-el8-build:latest
     docker_cmd: '["/sbin/init"]'
     docker_preserve_image: true
 
 CONFIG:
   log_level: verbose
   type: aio
-  puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'puppet8') %>"
+  puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'openvox8') %>"
   ssh:
     password: root
     auth_methods:

data/spec/acceptance/nodesets/almalinux9.yml

@@ -0,0 +1,25 @@
+---
+HOSTS:
+  el9-build-server:
+    roles:
+      - default
+      - build_server
+    platform: el-9-x86_64
+    hypervisor: docker
+    image: ghcr.io/simp/simp-el9-build:latest
+    docker_cmd: '["/sbin/init"]'
+    docker_preserve_image: true
+
+CONFIG:
+  log_level: verbose
+  type: aio
+  puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'openvox8') %>"
+  ssh:
+    password: root
+    auth_methods:
+      - password
+  docker_preserve_image: true
+  mount_folders:
+    host_files:
+      host_path: ./
+      container_path: /host_files