beaker 4.38.1 → 4.39.0

data/lib/beaker/host_prebuilt_steps.rb

@@ -54,11 +54,11 @@ module Beaker
           logger.notify "NTP date succeeded on #{host}"
         else
           case
-          when host['platform'] =~ /el-[89]|fedora/
+          when /el-[89]|fedora/.match?(host['platform'])
             ntp_command = "chronyc add server #{ntp_server} prefer trust;chronyc makestep;chronyc burst 1/2"
-          when host['platform'] =~ /opensuse-|sles-/
+          when /opensuse-|sles-/.match?(host['platform'])
             ntp_command = "sntp #{ntp_server}"
-          when host['platform'] =~ /cisco_nexus/
+          when host['platform'].include?('cisco_nexus')
             ntp_server = host.exec(Command.new("getent hosts #{NTPSERVER} | head -n1 |cut -d \" \" -f1"), :acceptable_exit_codes => [0]).stdout
             ntp_command = "sudo -E sh -c 'export DCOS_CONTEXT=2;/isan/bin/ntpdate -u -t 20 #{ntp_server}'"
           else
@@ -146,7 +146,7 @@ module Beaker
       when /fedora/
         FEDORA_PACKAGES
       else
-        if host['platform'] !~ /aix|solaris|osx-|f5-|netscaler|cisco_/
+        if !/aix|solaris|osx-|f5-|netscaler|cisco_/.match?(host['platform'])
           UNIX_PACKAGES
         else
           []
@@ -197,9 +197,9 @@ module Beaker
       block_on host do |host|
       logger.notify "Sync root authorized_keys from github on #{host.name}"
         # Allow all exit code, as this operation is unlikely to cause problems if it fails.
-        if host['platform'] =~ /solaris|eos/
+        if /solaris|eos/.match?(host['platform'])
           host.exec(Command.new(ROOT_KEYS_SYNC_CMD % "bash"), :accept_all_exit_codes => true)
-        elsif host['platform'] =~ /aix/
+        elsif host['platform'].include?('aix')
           host.exec(Command.new(ROOT_KEYS_SYNC_CMD_AIX % "env PATH=/usr/gnu/bin:$PATH bash"), :accept_all_exit_codes => true)
         else
           host.exec(Command.new(ROOT_KEYS_SYNC_CMD % "env PATH=\"/usr/gnu/bin:$PATH\" bash"), :accept_all_exit_codes => true)
@@ -215,7 +215,7 @@ module Beaker
     # @param [Host, Array<Host>] hosts One or more hosts to act upon
     def apt_get_update hosts
       block_on hosts do |host|
-        if host[:platform] =~ /ubuntu|debian|cumulus/
+        if /ubuntu|debian|cumulus/.match?(host[:platform])
           host.exec(Command.new("apt-get update"))
         end
       end
@@ -249,11 +249,11 @@ module Beaker
       logger = opts[:logger]
       block_on host do |host|
         case
-        when host['platform'] =~ /ubuntu|debian|cumulus/
+        when /ubuntu|debian|cumulus/.match?(host['platform'])
           host.exec(Command.new("if test -f /etc/apt/apt.conf; then mv /etc/apt/apt.conf /etc/apt/apt.conf.bk; fi"))
           copy_file_to_remote(host, '/etc/apt/apt.conf', APT_CFG)
           apt_get_update(host)
-        when host['platform'] =~ /solaris-11/
+        when host['platform'].include?('solaris-11')
           host.exec(Command.new("/usr/bin/pkg unset-publisher solaris || :"))
           host.exec(Command.new("/usr/bin/pkg set-publisher -g %s solaris" % IPS_PKG_REPO))
         else
@@ -275,7 +275,6 @@ module Beaker
       #add_el_extras
       #only supports el-* platforms
       logger = opts[:logger]
-      debug_opt = opts[:debug] ? 'vh' : ''
       block_on host do |host|
         case
         when el_based?(host) && ['6','7'].include?(host['platform'].version)
@@ -302,7 +301,7 @@ module Beaker
     def get_domain_name(host)
       domain = nil
       search = nil
-      if host['platform'] =~ /windows/
+      if host['platform'].include?('windows')
         if host.is_cygwin?
           resolv_conf = host.exec(Command.new("cat /cygdrive/c/Windows/System32/drivers/etc/hosts")).stdout
         else
@@ -337,15 +336,15 @@ module Beaker
     # @param [Host] host the host to act upon
     # @param [String] etc_hosts The string to append to the /etc/hosts file
     def set_etc_hosts(host, etc_hosts)
-      if host['platform'] =~ /freebsd/
+      if host['platform'].include?('freebsd')
         host.echo_to_file(etc_hosts, '/etc/hosts')
-      elsif ((host['platform'] =~ /windows/) and not host.is_cygwin?)
+      elsif ((host['platform'].include?('windows')) and not host.is_cygwin?)
         host.exec(Command.new("echo '#{etc_hosts}' >> C:\\Windows\\System32\\drivers\\etc\\hosts"))
       else
         host.exec(Command.new("echo '#{etc_hosts}' >> /etc/hosts"))
       end
       # AIX must be configured to prefer local DNS over external
-      if host['platform'] =~ /aix/
+      if host['platform'].include?('aix')
         aix_netsvc = '/etc/netsvc.conf'
         aix_local_resolv = 'hosts = local, bind'
         unless host.exec(Command.new("grep '#{aix_local_resolv}' #{aix_netsvc}"), :accept_all_exit_codes => true).exit_code == 0
@@ -362,10 +361,10 @@ module Beaker
       logger = opts[:logger]
       block_on host do |host|
         logger.debug "Give root a copy of current user's keys, on #{host.name}"
-        if host['platform'] =~ /windows/ and host.is_cygwin?
+        if host['platform'].include?('windows') and host.is_cygwin?
           host.exec(Command.new('cp -r .ssh /cygdrive/c/Users/Administrator/.'))
           host.exec(Command.new('chown -R Administrator /cygdrive/c/Users/Administrator/.ssh'))
-        elsif host['platform'] =~ /windows/ and not host.is_cygwin?
+        elsif host['platform'].include?('windows') and not host.is_cygwin?
           # from https://www.microsoft.com/resources/documentation/windows/xp/all/proddocs/en-us/xcopy.mspx?mfr=true:
           #    /i : If Source is a directory or contains wildcards and Destination
           #      does not exist, xcopy assumes destination specifies a directory
@@ -376,16 +375,12 @@ module Beaker
           #    /y : Suppresses prompting to confirm that you want to overwrite an
           #      existing destination file.
           host.exec(Command.new("if exist .ssh (xcopy .ssh C:\\Users\\Administrator\\.ssh /s /e /y /i)"))
-        elsif host['platform'] =~ /osx/
+        elsif host['platform'].include?('osx')
           host.exec(Command.new('sudo cp -r .ssh /var/root/.'), {:pty => true})
-        elsif host['platform'] =~ /freebsd/
+        elsif /(free|open)bsd/.match?(host['platform']) || host['platform'].include?('solaris-11')
           host.exec(Command.new('sudo cp -r .ssh /root/.'), {:pty => true})
-        elsif host['platform'] =~ /openbsd/
-          host.exec(Command.new('sudo cp -r .ssh /root/.'), {:pty => true})
-        elsif host['platform'] =~ /solaris-10/
+        elsif host['platform'].include?('solaris-10')
           host.exec(Command.new('sudo cp -r .ssh /.'), {:pty => true})
-        elsif host['platform'] =~ /solaris-11/
-          host.exec(Command.new('sudo cp -r .ssh /root/.'), {:pty => true})
         else
           host.exec(Command.new('sudo su -c "cp -r .ssh /root/."'), {:pty => true})
         end
@@ -404,7 +399,7 @@ module Beaker
     # @param [Host, Array<Host>] hosts An array of hosts to act upon
     # @param [Hash{Symbol=>String}] opts Options to alter execution.
     # @option opts [Beaker::Logger] :logger A {Beaker::Logger} object
-    def hack_etc_hosts hosts, opts
+    def hack_etc_hosts hosts, _opts
       etc_hosts = "127.0.0.1\tlocalhost localhost.localdomain\n"
       hosts.each do |host|
         ip = host['vm_ip'] || host['ip'].to_s
@@ -423,7 +418,7 @@ module Beaker
     def disable_updates hosts, opts
       logger = opts[:logger]
       hosts.each do |host|
-        next if host['platform'] =~ /netscaler/
+        next if host['platform'].include?('netscaler')
         logger.notify "Disabling updates.puppetlabs.com by modifying hosts file to resolve updates to 127.0.0.1 on #{host}"
         set_etc_hosts(host, "127.0.0.1\tupdates.puppetlabs.com\n")
       end
@@ -440,42 +435,40 @@ module Beaker
       logger = opts[:logger]
       block_on host do |host|
         logger.debug "Update sshd_config to allow root login"
-        if host['platform'] =~ /osx/
+        if host['platform'].include?('osx')
           # If osx > 10.10 use '/private/etc/ssh/sshd_config', else use '/etc/sshd_config'
           ssh_config_file = '/private/etc/ssh/sshd_config'
-          ssh_config_file = '/etc/sshd_config' if host['platform'] =~ /^osx-10\.(9|10)/i
+          ssh_config_file = '/etc/sshd_config' if /^osx-10\.(9|10)/i.match?(host['platform'])
 
           host.exec(Command.new("sudo sed -i '' 's/#PermitRootLogin no/PermitRootLogin Yes/g' #{ssh_config_file}"))
           host.exec(Command.new("sudo sed -i '' 's/#PermitRootLogin yes/PermitRootLogin Yes/g' #{ssh_config_file}"))
-        elsif host['platform'] =~ /freebsd/
+        elsif host['platform'].include?('freebsd')
           host.exec(Command.new("sudo sed -i -e 's/#PermitRootLogin no/PermitRootLogin yes/g' /etc/ssh/sshd_config"), {:pty => true} )
-        elsif host['platform'] =~ /openbsd/
+        elsif host['platform'].include?('openbsd')
           host.exec(Command.new("sudo perl -pi -e 's/^PermitRootLogin no/PermitRootLogin yes/' /etc/ssh/sshd_config"), {:pty => true} )
-        elsif host['platform'] =~ /solaris-10/
+        elsif host['platform'].include?('solaris-10')
           host.exec(Command.new("sudo gsed -i -e 's/#PermitRootLogin no/PermitRootLogin yes/g' /etc/ssh/sshd_config"), {:pty => true} )
-        elsif host['platform'] =~ /solaris-11/
+        elsif host['platform'].include?('solaris-11')
           host.exec(Command.new("if grep \"root::::type=role\" /etc/user_attr; then sudo rolemod -K type=normal root; else echo \"root user already type=normal\"; fi"), {:pty => true} )
           host.exec(Command.new("sudo gsed -i -e 's/PermitRootLogin no/PermitRootLogin yes/g' /etc/ssh/sshd_config"), {:pty => true} )
-        elsif host['platform'] =~ /f5/
+        elsif host['platform'].include?('f5') || host.is_powershell?
           #interacting with f5 should using tmsh
           logger.warn("Attempting to enable root login non-supported platform: #{host.name}: #{host['platform']}")
         elsif host.is_cygwin?
           host.exec(Command.new("sed -ri 's/^#?PermitRootLogin /PermitRootLogin yes/' /etc/sshd_config"), {:pty => true})
-        elsif host.is_powershell?
-          logger.warn("Attempting to enable root login non-supported platform: #{host.name}: #{host['platform']}")
         else
           host.exec(Command.new("sudo su -c \"sed -ri 's/^#?PermitRootLogin no|^#?PermitRootLogin yes/PermitRootLogin yes/' /etc/ssh/sshd_config\""), {:pty => true})
         end
         #restart sshd
-        if host['platform'] =~ /debian|ubuntu|cumulus/
+        if /debian|ubuntu|cumulus/.match?(host['platform'])
           host.exec(Command.new("sudo su -c \"service ssh restart\""), {:pty => true})
-        elsif host['platform'] =~ /arch|(centos|el|redhat)-[789]|fedora-(1[4-9]|2[0-9]|3[0-9])/
+        elsif /arch|(centos|el|redhat)-[789]|fedora-(1[4-9]|2[0-9]|3[0-9])/.match?(host['platform'])
           host.exec(Command.new("sudo -E systemctl restart sshd.service"), {:pty => true})
-        elsif host['platform'] =~ /centos|el-|redhat|fedora|eos/
+        elsif /centos|el-|redhat|fedora|eos/.match?(host['platform'])
           host.exec(Command.new("sudo -E /sbin/service sshd reload"), {:pty => true})
-        elsif host['platform'] =~ /(free|open)bsd/
+        elsif /(free|open)bsd/.match?(host['platform'])
           host.exec(Command.new("sudo /etc/rc.d/sshd restart"))
-        elsif host['platform'] =~ /solaris/
+        elsif host['platform'].include?('solaris')
           host.exec(Command.new("sudo -E svcadm restart network/ssh"), {:pty => true} )
         else
           logger.warn("Attempting to update ssh on non-supported platform: #{host.name}: #{host['platform']}")
@@ -490,11 +483,11 @@ module Beaker
     def disable_se_linux host, opts
       logger = opts[:logger]
       block_on host do |host|
-        if host['platform'] =~ /centos|el-|redhat|fedora|eos/
-          @logger.debug("Disabling se_linux on #{host.name}")
+        if /centos|el-|redhat|fedora|eos/.match?(host['platform'])
+          logger.debug("Disabling se_linux on #{host.name}")
           host.exec(Command.new("sudo su -c \"setenforce 0\""), {:pty => true})
         else
-          @logger.warn("Attempting to disable SELinux on non-supported platform: #{host.name}: #{host['platform']}")
+          logger.warn("Attempting to disable SELinux on non-supported platform: #{host.name}: #{host['platform']}")
         end
       end
     end
@@ -506,7 +499,7 @@ module Beaker
     def disable_iptables host, opts
       logger = opts[:logger]
       block_on host do |host|
-        if host['platform'] =~ /centos|el-|redhat|fedora|eos/
+        if /centos|el-|redhat|fedora|eos/.match?(host['platform'])
           logger.debug("Disabling iptables on #{host.name}")
           host.exec(Command.new("sudo su -c \"/etc/init.d/iptables stop\""), {:pty => true})
         else
@@ -550,7 +543,7 @@ module Beaker
     def additive_hash_merge h1, h2
       merged_hash = {}
       normalized_h2 = h2.inject({}) { |h, (k, v)| h[k.to_s.upcase] = v; h }
-      h1.each_pair do |key, val|
+      h1.each_pair do |key, _val|
         normalized_key = key.to_s.upcase
         if normalized_h2.has_key?(normalized_key)
           merged_hash[key] = [h1[key], normalized_h2[normalized_key]]
@@ -594,7 +587,7 @@ module Beaker
 
         logger.debug("setting local environment on #{host.name}")
 
-        if host['platform'] =~ /windows/ && host.is_cygwin?
+        if host['platform'].include?('windows') && host.is_cygwin?
          env['CYGWIN'] = 'nodosfilewarning'
         end
 

data/lib/beaker/hypervisor.rb

@@ -56,7 +56,7 @@ module Beaker
 
     DEFAULT_CONNECTION_PREFERENCE = [:ip, :vmhostname, :hostname]
     # SSH connection method preference. Can be overwritten by hypervisor to change the order
-    def connection_preference(host)
+    def connection_preference(_host)
       DEFAULT_CONNECTION_PREFERENCE
     end
 
@@ -105,9 +105,9 @@ module Beaker
         if @options[:disable_updates]
           disable_updates(@hosts, @options)
         end
-      rescue SignalException => ex
-        if ex.signo == 15 #SIGTERM
-          report_and_raise(@logger, ex, "configure")
+      rescue SignalException => e
+        if e.signo == 15 #SIGTERM
+          report_and_raise(@logger, e, "configure")
         end
         raise
       end

data/lib/beaker/local_connection.rb

@@ -19,7 +19,7 @@ module Beaker
       connection
     end
 
-    def connect options = {}
+    def connect _options = {}
       @logger.debug "Local connection, no connection to start"
     end
 
@@ -35,7 +35,7 @@ module Beaker
       ENV.replace(backup)
     end
 
-    def execute command, options = {}, stdout_callback = nil, stderr_callback = stdout_callback
+    def execute command, _options = {}, stdout_callback = nil, _stderr_callback = stdout_callback
       result = Result.new(@hostname, command)
       envs = {}
       if File.readable?(@ssh_env_file)
@@ -46,7 +46,7 @@ module Beaker
       end
 
       begin
-        clean_env = ENV.reject{ |k| k =~ /^BUNDLE|^RUBY|^GEM/ }
+        clean_env = ENV.reject{ |k| /^BUNDLE|^RUBY|^GEM/.match?(k) }
 
         with_env(clean_env) do
           std_out, std_err, status = Open3.capture3(envs, command)

data/lib/beaker/logger.rb

@@ -65,8 +65,6 @@ module Beaker
         @log_level = :trace
       when /debug/i, :debug
         @log_level = :debug
-      when /verbose/i, :verbose
-        @log_level = :verbose
       when /info/i, :info
         @log_level = :info
       when /notify/i, :notify
@@ -132,9 +130,7 @@ module Beaker
     # @param [Array<IO, String>] dest Array of strings (each used as a file path) and IO steams that messages will be printed to
     def add_destination(dest)
       case dest
-      when IO
-        @destinations << dest
-      when StringIO
+      when IO, StringIO
         @destinations << dest
       when String
         @destinations << File.open(dest, 'w')
@@ -147,9 +143,7 @@ module Beaker
     # @param [String, IO] dest String representing a file path or IO stream
     def remove_destination(dest)
       case dest
-      when IO
-        @destinations.delete(dest)
-      when StringIO
+      when IO, StringIO
         @destinations.delete(dest)
       when String
         @destinations.delete_if {|d| d.respond_to?(:path) and d.path == dest}
@@ -220,7 +214,7 @@ module Beaker
           prefix_log_line s
         end
       else
-        line.gsub!(/\r/, '')
+        line.delete!("\r")
         has_ending_newline = line.end_with?("\n")
         actual_lines = line.split("\n")
         actual_lines.map! do |actual_line|
@@ -233,7 +227,7 @@ module Beaker
     end
 
     # Indent the step level for the duration of block.
-    def with_indent(&block)
+    def with_indent()
       old_line_prefix = self.line_prefix.dup
       self.line_prefix << '  '
       yield
@@ -444,7 +438,7 @@ module Beaker
       end
 
       # And remove lines that contain our program name in them
-      completely_purged = mostly_purged.reject {|line| line.include? $0 }
+      mostly_purged.reject {|line| line.include? $0 }
     end
 
     # Utility method that takes a path as input, checks each component

data/lib/beaker/logger_junit.rb

@@ -21,7 +21,7 @@ module Beaker
     def self.write_xml(xml_file, stylesheet, &block)
       doc, suites = self.get_xml_contents(xml_file, name, stylesheet)
 
-      if block_given?
+      if block
         case block.arity
         when 2
           yield doc, suites
@@ -86,7 +86,7 @@ module Beaker
         suites = REXML::XPath.first(doc, "testsuites")
         #remove old data
         suites.elements.each("testsuite") do |e|
-          if e.name =~ /#{name}/
+          if /#{name}/.match?(e.name)
             suites.delete_element e
           end
         end

data/lib/beaker/network_manager.rb

@@ -17,7 +17,7 @@ module Beaker
     def provision? options, host
       command_line_says = options[:provision]
       host_says = host['hypervisor'] && (host.has_key?('provision') ? host['provision'] : true)
-      (command_line_says && host_says) or (host['hypervisor'] =~/(vagrant)/)
+      (command_line_says && host_says) or host['hypervisor'].include?('vagrant')
     end
 
     attr_accessor :hosts, :hypervisors
@@ -53,7 +53,7 @@ module Beaker
       end
       @hypervisors = {}
       #sort hosts by their hypervisor, use hypervisor 'none' if no hypervisor is specified
-      hostless_options = Beaker::Options::OptionsHash.new.merge(@options.select{ |k,v| k.to_s !~ /HOSTS/})
+      hostless_options = Beaker::Options::OptionsHash.new.merge(@options.select{ |k,_v| !k.to_s.include?('HOSTS')})
       @options['HOSTS'].each_key do |name|
         host_hash = @options['HOSTS'][name]
         hypervisor = host_hash['hypervisor']

data/lib/beaker/options/command_line_parser.rb

@@ -191,7 +191,7 @@ module Beaker
                   'slow (attempt to continue run post test failure)',
                   'stop (DEPRECATED, please use fast)',
                   '(default: slow)'  do |mode|
-            @cmd_options[:fail_mode] = mode =~ /stop/ ? 'fast' :  mode
+            @cmd_options[:fail_mode] = mode.include?('stop') ? 'fast' :  mode
           end
 
           opts.on '--test-results-file /FILE/TO/SAVE/TO.rb',

data/lib/beaker/options/hosts_file_parser.rb

@@ -2,7 +2,24 @@ module Beaker
   module Options
     #A set of functions to parse hosts files
     module HostsFileParser
-      PERMITTED_YAML_CLASSES = [Beaker::Options::OptionsHash, Beaker::Platform, Symbol, Time]
+      PERMITTED_YAML_CLASSES = [
+        'Beaker',
+        'Beaker::Logger',
+        'Beaker::Options::OptionsHash',
+        'Beaker::Platform',
+        'Beaker::Result',
+        'File',
+        'IO',
+        'Logger',
+        'Logger::Formatter',
+        'Logger::LogDevice',
+        'Monitor',
+        'Net::SSH::Prompt',
+        'StringifyHash',
+        'StringIO',
+        'Symbol',
+        'Time',
+      ]
 
       # Read the contents of the hosts.cfg into an OptionsHash, merge the 'CONFIG' section into the OptionsHash, return OptionsHash
       # @param [String] hosts_file_path The path to the hosts file
@@ -75,7 +92,7 @@ module Beaker
       # @param [String] error_message Message to print if {::Psych::SyntaxError}
       #   is raised during block execution
       # @return [OptionsHash] Updated host_options with host info merged
-      def self.merge_hosts_yaml( host_options, error_message, &block )
+      def self.merge_hosts_yaml( host_options, error_message )
         begin
           loaded_host_options = yield
         rescue Psych::SyntaxError => e
@@ -98,9 +115,9 @@ module Beaker
                      ERB.new(template, nil, '-')
                    end
         if RUBY_VERSION >= '2.6'
-          YAML.safe_load(erb_obj.result(b), permitted_classes: PERMITTED_YAML_CLASSES)
+          YAML.safe_load(erb_obj.result(b), permitted_classes: PERMITTED_YAML_CLASSES, aliases: true)
         else
-          YAML.load(erb_obj.result(b))
+          YAML.load(erb_obj.result(b)) # rubocop:disable Security/YAMLLoad
         end
       end
     end

data/lib/beaker/options/options_file_parser.rb

@@ -28,7 +28,7 @@ module Beaker
         result = Beaker::Options::OptionsHash.new
         if options_file_path
           options_file_path = File.expand_path(options_file_path)
-          unless File.exists?(options_file_path)
+          unless File.exist?(options_file_path)
             raise ArgumentError, "Specified options file '#{options_file_path}' does not exist!"
           end
           # This eval will allow the specified options file to have access to our

data/lib/beaker/options/options_hash.rb

@@ -15,7 +15,7 @@ module Beaker
       #
       # @return [Boolean]
       def is_pe?
-        self[:type] ? self[:type] =~ /pe/ : true
+        self[:type] ? self[:type].include?('pe') : true
       end
 
       # Determine the puppet type of the ObjectHash
@@ -31,8 +31,6 @@ module Beaker
         case self[:type]
         when /pe/
           :pe
-        when /foss/
-          :foss
         else
           :foss
         end

data/lib/beaker/options/parser.rb

@@ -43,7 +43,7 @@ module Beaker
         arry = []
         if arg.is_a?(Array)
           arry += arg
-        elsif arg =~ /,/
+        elsif arg.include?(',')
           arry += arg.split(',')
         else
           arry << arg
@@ -281,7 +281,7 @@ module Beaker
       # @raise [ArgumentError] if a hosts file is generated, but it can't
       #   be read by the HostsFileParser
       def parse_hosts_options
-        if @options[:hosts_file].nil? || File.exists?(@options[:hosts_file])
+        if @options[:hosts_file].nil? || File.exist?(@options[:hosts_file])
           #read the hosts file that contains the node configuration and hypervisor info
           return Beaker::Options::HostsFileParser.parse_hosts_file(@options[:hosts_file])
         end
@@ -298,11 +298,11 @@ module Beaker
           bhg_cli = BeakerHostGenerator::CLI.new(host_generator_options)
           bhg_cli.execute
         rescue BeakerHostGenerator::Exceptions::Error,
-          BeakerHostGenerator::Exceptions::InvalidNodeSpecError => error
+          BeakerHostGenerator::Exceptions::InvalidNodeSpecError => e
           error_message = "\nbeaker-hostgenerator was not able to use this value as input."
           error_message << "\nExiting with an Error.\n\n"
           $stderr.puts error_message
-          raise error
+          raise e
         end
 
         @options[:hosts_file_generated] = true
@@ -375,7 +375,7 @@ module Beaker
         #check that windows/el-4 boxes are only agents (solaris can be a master in foss cases)
         @options[:HOSTS].each_key do |name|
           host = @options[:HOSTS][name]
-          if host[:platform] =~ /windows|el-4/
+          if /windows|el-4/.match?(host[:platform])
             test_host_roles(name, host)
           end
 
@@ -461,7 +461,7 @@ module Beaker
         exclude_roles = %w(master database dashboard)
         host_roles    = host_hash[:roles]
         unless (host_roles & exclude_roles).empty?
-          @validator.parser_error "#{host_hash[:platform].to_s} box '#{host_name}' may not have roles: #{exclude_roles.join(', ')}."
+          @validator.parser_error "#{host_hash[:platform]} box '#{host_name}' may not have roles: #{exclude_roles.join(', ')}."
         end
       end
 

data/lib/beaker/options/presets.rb

@@ -45,7 +45,7 @@ module Beaker
       def select_env_by_regex regex
         envs = Beaker::Options::OptionsHash.new
         ENV.each_pair do | k, v |
-          if k.to_s =~ /#{regex}/
+          if /#{regex}/.match?(k.to_s)
             envs[k] = v
           end
         end
@@ -105,7 +105,7 @@ module Beaker
         found = found.merge(format_found_env_vars( collect_env_vars( ENVIRONMENT_SPEC )))
         found[:answers] = select_env_by_regex('\\Aq_')
 
-        found.delete_if {|key, value| value.nil? or value.empty? }
+        found.delete_if {|_key, value| value.nil? or value.empty? }
         found
       end
 

data/lib/beaker/options/validator.rb

@@ -52,7 +52,7 @@ module Beaker
       # @return [nil] Does not return anything
       def validate_fail_mode(fail_mode)
         #check for valid fail mode
-        if fail_mode !~ VALID_FAIL_MODES
+        unless fail_mode.is_a?(String) && VALID_FAIL_MODES.match?(fail_mode)
           validator_error "--fail-mode must be one of fast or slow, not '#{fail_mode}'"
         end
       end
@@ -63,7 +63,7 @@ module Beaker
       # @return [nil] Does not return anything
       def validate_preserve_hosts(hosts_setting)
         #check for valid preserve_hosts option
-        if hosts_setting !~ VALID_PRESERVE_HOSTS
+        unless hosts_setting.is_a?(String) && VALID_PRESERVE_HOSTS.match?(hosts_setting)
           validator_error("--preserve_hosts must be one of always, onfail, onpass or never, not '#{hosts_setting}'")
         end
       end

data/lib/beaker/perf.rb

@@ -29,7 +29,7 @@ module Beaker
     def setup_perf_on_host(host)
       @logger.perf_output("Setup perf on host: " + host)
       # Install sysstat if required
-      if host['platform'] =~ PERF_SUPPORTED_PLATFORMS
+      if PERF_SUPPORTED_PLATFORMS.match?(host['platform'])
         PERF_PACKAGES.each do |pkg|
           if not host.check_for_package pkg
             host.install_package pkg
@@ -39,22 +39,22 @@ module Beaker
         @logger.perf_output("Perf (sysstat) not supported on host: " + host)
       end
 
-      if host['platform'] =~ /debian|ubuntu|cumulus/
+      if /debian|ubuntu|cumulus/.match?(host['platform'])
         @logger.perf_output("Modify /etc/default/sysstat on Debian and Ubuntu platforms")
         host.exec(Command.new('sed -i s/ENABLED=\"false\"/ENABLED=\"true\"/ /etc/default/sysstat'))
-      elsif host['platform'] =~ /opensuse|sles/
+      elsif /opensuse|sles/.match?(host['platform'])
         @logger.perf_output("Creating symlink from /etc/sysstat/sysstat.cron to /etc/cron.d")
         host.exec(Command.new('ln -s /etc/sysstat/sysstat.cron /etc/cron.d'),:acceptable_exit_codes => [0,1])
       end
-      if @options[:collect_perf_data] =~ /aggressive/
+      if @options[:collect_perf_data]&.include?('aggressive')
         @logger.perf_output("Enabling aggressive sysstat polling")
-        if host['platform'] =~ /debian|ubuntu/
+        if /debian|ubuntu/.match?(host['platform'])
           host.exec(Command.new('sed -i s/5-55\\\/10/*/ /etc/cron.d/sysstat'))
-        elsif host['platform'] =~ /centos|el|fedora|oracle|redhat|scientific/
+        elsif /centos|el|fedora|oracle|redhat|scientific/.match?(host['platform'])
           host.exec(Command.new('sed -i s/*\\\/10/*/ /etc/cron.d/sysstat'))
         end
       end
-      if host['platform'] =~ PERF_START_PLATFORMS # SLES doesn't need this step
+      if PERF_START_PLATFORMS.match?(host['platform']) # SLES doesn't need this step
         host.exec(Command.new('service sysstat start'))
       end
     end
@@ -73,8 +73,8 @@ module Beaker
     # @return [void]  The report is sent to the logging output
     def get_perf_data(host, perf_start, perf_end)
       @logger.perf_output("Getting perf data for host: " + host)
-      if host['platform'] =~ PERF_SUPPORTED_PLATFORMS # All flavours of Linux
-        if not @options[:collect_perf_data] =~ /aggressive/
+      if PERF_SUPPORTED_PLATFORMS.match?(host['platform']) # All flavours of Linux
+        if not @options[:collect_perf_data]&.include?('aggressive')
           host.exec(Command.new("sar -A -s #{perf_start.strftime("%H:%M:%S")} -e #{perf_end.strftime("%H:%M:%S")}"),:acceptable_exit_codes => [0,1,2])
         end
         if (defined? @options[:graphite_server] and not @options[:graphite_server].nil?) and

data/lib/beaker/platform.rb

@@ -82,7 +82,7 @@ module Beaker
     # * netscaler
     # * archlinux
     def initialize(name)
-      if name !~ PLATFORMS
+      if !PLATFORMS.match?(name)
         raise ArgumentError, "Unsupported platform name #{name}"
       end