beaker 4.38.1 → 4.39.0

data/lib/beaker/host/pswindows/pkg.rb

@@ -6,19 +6,19 @@ module PSWindows::Pkg
     result.exit_code == 0
   end
 
-  def check_for_package(name)
+  def check_for_package(_name)
     #HACK NOOP
     #raise "Cannot check for package #{name} on #{self}"
     0
   end
 
-  def install_package(name, cmdline_args = '')
+  def install_package(_name, _cmdline_args = '')
     #HACK NOOP
     #raise "Package #{name} cannot be installed on #{self}"
     0
   end
 
-  def uninstall_package(name, cmdline_args = '')
+  def uninstall_package(_name, _cmdline_args = '')
     #HACK NOOP
     #raise "Package #{name} cannot be uninstalled on #{self}"
     0
@@ -27,7 +27,7 @@ module PSWindows::Pkg
   #Examine the host system to determine the architecture, overrides default host determine_if_x86_64 so that wmic is used
   #@return [Boolean] true if x86_64, false otherwise
   def determine_if_x86_64
-    (identify_windows_architecture =~ /64/) == 0
+    identify_windows_architecture.include?('64')
   end
 
   private
@@ -37,7 +37,7 @@ module PSWindows::Pkg
     arch = nil
     execute("wmic os get osarchitecture", :accept_all_exit_codes => true) do |result|
       arch = if result.exit_code == 0
-        result.stdout =~ /64/ ? '64' : '32'
+        result.stdout.include?('64') ? '64' : '32'
       else
         identify_windows_architecture_from_os_name_for_win2003
       end
@@ -49,7 +49,7 @@ module PSWindows::Pkg
   def identify_windows_architecture_from_os_name_for_win2003
     arch = nil
     execute("wmic os get name", :accept_all_exit_codes => true) do |result|
-      arch = result.stdout =~ /64/ ? '64' : '32'
+      arch = result.stdout.include?('64') ? '64' : '32'
     end
     arch
   end

data/lib/beaker/host/pswindows/user.rb

@@ -1,7 +1,7 @@
 module PSWindows::User
   include Beaker::CommandFactory
 
-  def user_list(&block)
+  def user_list()
     execute('cmd /c echo "" | wmic useraccount where localaccount="true" get name /format:value') do |result|
       users = []
       result.stdout.each_line do |line|
@@ -14,7 +14,7 @@ module PSWindows::User
     end
   end
 
-  def user_get(name, &block)
+  def user_get(name)
     execute("net user \"#{name}\"") do |result|
       fail_test "failed to get user #{name}" if result.exit_code != 0
 

data/lib/beaker/host/unix/exec.rb

@@ -188,7 +188,7 @@ module Unix::Exec
   # This is for sles based hosts.
   # @param [String] env_file The ssh environment file to read from
   def mirror_env_to_profile_d env_file
-    if self[:platform] =~ /opensuse|sles-/
+    if /opensuse|sles-/.match?(self[:platform])
       @logger.debug("mirroring environment to /etc/profile.d on opensuse/sles platform host")
       cur_env = exec(Beaker::Command.new("cat #{env_file}")).stdout
       shell_env = ''
@@ -306,7 +306,7 @@ module Unix::Exec
       directory = tmpdir()
       exec(Beaker::Command.new("echo 'PermitUserEnvironment yes' | cat - /etc/ssh/sshd_config > #{directory}/sshd_config.permit"))
       exec(Beaker::Command.new("mv #{directory}/sshd_config.permit /etc/ssh/sshd_config"))
-      exec(Beaker::Command.new("echo '' >/etc/environment")) if self['platform'] =~ /ubuntu-2(0|2).04/
+      exec(Beaker::Command.new("echo '' >/etc/environment")) if /ubuntu-2(0|2).04/.match?(self['platform'])
     when /(free|open)bsd/
       exec(Beaker::Command.new("sudo perl -pi -e 's/^#?PermitUserEnvironment no/PermitUserEnvironment yes/' /etc/ssh/sshd_config"), {:pty => true} )
     else
@@ -363,7 +363,7 @@ module Unix::Exec
   # @param [Hash] opts optional parameters
   #
   # @return [String] Command string as needed for this host
-  def prepend_commands(command = '', user_pc = '', opts = {})
+  def prepend_commands(_command = '', user_pc = '', _opts = {})
     user_pc
   end
 
@@ -374,7 +374,7 @@ module Unix::Exec
   # @param [Hash] opts optional parameters
   #
   # @return [String] Command string as needed for this host
-  def append_commands(command = '', user_ac = '', opts = {})
+  def append_commands(_command = '', user_ac = '', _opts = {})
     user_ac
   end
 
@@ -400,7 +400,7 @@ module Unix::Exec
       arch = $3
       arch = 'amd64' if ['x64', 'x86_64'].include?(arch)
       add_env_var('PKG_PATH', "http://ftp.openbsd.org/pub/OpenBSD/#{version}/packages/#{arch}/")
-    elsif self['platform'] =~ /solaris-10/
+    elsif self['platform'].include?('solaris-10')
       add_env_var('PATH', '/opt/csw/bin')
     end
 
@@ -418,7 +418,7 @@ module Unix::Exec
   end
 
   def enable_remote_rsyslog(server = 'rsyslog.ops.puppetlabs.net', port = 514)
-    if self['platform'] !~ /ubuntu/
+    if !self['platform'].include?('ubuntu')
       @logger.warn "Enabling rsyslog is only implemented for ubuntu hosts"
       return
     end

data/lib/beaker/host/unix/file.rb

@@ -116,7 +116,7 @@ module Unix::File
     when /fedora|el|redhat|centos|cisco_nexus|cisco_ios_xr|opensuse|sles/
       variant = 'el' if ['centos', 'redhat'].include?(variant)
 
-      variant = 'redhatfips' if self['packaging_platform'] =~ /redhatfips/
+      variant = 'redhatfips' if self['packaging_platform']&.include?('redhatfips')
 
       if variant == 'cisco_nexus'
         variant = 'cisco-wrlinux'
@@ -170,8 +170,7 @@ module Unix::File
   #
   # @return [String] the text of the noask file
   def noask_file_text
-    variant, version, arch, codename = self['platform'].to_array
-    if variant == 'solaris' && version == '10'
+    if self['platform'].variant == 'solaris' && self['platform'].version == '10'
       noask = <<NOASK
 # Write the noask file to a temporary directory
 # please see man -s 4 admin for details about this file:
@@ -217,7 +216,7 @@ NOASK
   # @param [String] scp_file_target File path to target SCP location on host
   #
   # @return nil
-  def scp_post_operations(scp_file_actual, scp_file_target)
+  def scp_post_operations(_scp_file_actual, _scp_file_target)
     nil
   end
 end

data/lib/beaker/host/unix/group.rb

@@ -1,7 +1,7 @@
 module Unix::Group
   include Beaker::CommandFactory
 
-  def group_list(&block)
+  def group_list()
     execute("getent group") do |result|
       groups = []
       result.stdout.each_line do |line|
@@ -14,9 +14,9 @@ module Unix::Group
     end
   end
 
-  def group_get(name, &block)
+  def group_get(name)
     execute("getent group #{name}") do |result|
-      fail_test "failed to get group #{name}" unless result.stdout =~ /^#{name}:.*:[0-9]+:/
+      fail_test "failed to get group #{name}" unless /^#{name}:.*:[0-9]+:/.match?(result.stdout)
 
       yield result if block_given?
       result

data/lib/beaker/host/unix/pkg.rb

@@ -27,7 +27,7 @@ module Unix::Pkg
     case self['platform']
       when /sles-10/
         result = execute("zypper se -i --match-exact #{name}", opts) { |result| result }
-        result.stdout =~ /No packages found/ ? (return false) : (return result.exit_code == 0)
+        result.stdout.include?('No packages found') ? (return false) : (return result.exit_code == 0)
       when /opensuse|sles-/
         if !self[:sles_rpmkeys_nightly_pl_imported]
           # The `:sles_rpmkeys_nightly_pl_imported` key is only read here at this
@@ -64,7 +64,7 @@ module Unix::Pkg
   # If apt has not been updated since the last repo deployment it is
   # updated. Otherwise this is a noop
   def update_apt_if_needed
-    if self['platform'] =~ /debian|ubuntu|cumulus|huaweios/
+    if /debian|ubuntu|cumulus|huaweios/.match?(self['platform'])
       if @apt_needs_update
         execute("apt-get update")
         @apt_needs_update = false
@@ -76,7 +76,7 @@ module Unix::Pkg
   # Except for the kernel. An upgrade will purge the modules for the currently running kernel
   # Before upgrading packages, we need to ensure we've the latest keyring
   def update_pacman_if_needed
-    if self['platform'] =~ /archlinux/
+    if self['platform'].include?('archlinux')
       if @pacman_needs_update
         execute("pacman --sync --noconfirm --noprogressbar --refresh archlinux-keyring")
         execute("pacman --sync --noconfirm --noprogressbar --refresh --sysupgrade --ignore linux --ignore linux-docs --ignore linux-headers")
@@ -144,7 +144,7 @@ module Unix::Pkg
               raise ArgumentException
             end
             # If the package advises symlinks to be created, do it
-            command.stdout.split(/\n/).select { |x| x =~ /^\s+ln\s/ }.each do |ln|
+            command.stdout.split("\n").select { |x| /^\s+ln\s/.match?(x) }.each do |ln|
               execute(ln, opts)
             end
           end
@@ -171,7 +171,7 @@ module Unix::Pkg
   # @api public
   def install_package_with_rpm(name, cmdline_args = '', opts = {})
     proxy = ''
-    if name =~ /^http/ and opts[:package_proxy]
+    if name&.start_with?('http') and opts[:package_proxy]
       proxy = extract_rpm_proxy_options(opts[:package_proxy])
     end
     execute("rpm #{cmdline_args} -Uvh #{name} #{proxy}")
@@ -292,7 +292,7 @@ module Unix::Pkg
   # @deprecated no longer used in beaker, beaker-puppet, or beaker-pe
   # @visibility private
   def deploy_package_repo(path, name, version)
-    if not File.exists? path
+    if not File.exist? path
       @logger.warn "Was asked to deploy package repository from #{path}, but it doesn't exist!"
       return
     end
@@ -315,7 +315,7 @@ module Unix::Pkg
   #Examine the host system to determine the architecture
   #@return [Boolean] true if x86_64, false otherwise
   def determine_if_x86_64
-    if self[:platform] =~ /solaris/
+    if self[:platform].include?('solaris')
       result = exec(Beaker::Command.new("uname -a | grep x86_64"), :accept_all_exit_codes => true)
         result.exit_code == 0
     else
@@ -361,7 +361,7 @@ module Unix::Pkg
     raise ArgumentError, error_message % "puppet_agent_version" unless puppet_agent_version
     raise ArgumentError, error_message % "opts[:download_url]" unless opts[:download_url]
 
-    variant, version, arch, codename = self['platform'].to_array
+    variant, version, arch, _codename = self['platform'].to_array
 
     version = version.split('.')[0] # packages are only published for major versions
 
@@ -425,14 +425,14 @@ module Unix::Pkg
     raise ArgumentError, error_message % "puppet_collection" unless puppet_collection
     raise ArgumentError, error_message % "puppet_agent_version" unless puppet_agent_version
 
-    variant, version, arch, codename = self['platform'].to_array
+    variant, version, arch, _codename = self['platform'].to_array
 
     case variant
     when /^(solaris)$/
       release_path_end, release_file = solaris_puppet_agent_dev_package_info(
         puppet_collection, puppet_agent_version, opts )
     when /^(opensuse|sles|aix|el|centos|oracle|redhat|scientific)$/
-      variant = 'el' if variant.match(/(?:el|centos|oracle|redhat|scientific)/)
+      variant = 'el' if variant.match?(/(?:el|centos|oracle|redhat|scientific)/)
       variant = 'sles' if variant == 'opensuse'
 
       if variant == 'aix'
@@ -463,7 +463,7 @@ module Unix::Pkg
   #   {Windows::Pkg#pe_puppet_agent_promoted_package_info} to see usage.
   #   2. release_file Path to the file on release build servers
   #   3. download_file Filename for the package itself
-  def pe_puppet_agent_promoted_package_info( puppet_collection = nil, opts = {} )
+  def pe_puppet_agent_promoted_package_info( puppet_collection = nil, _opts = {} )
     error_message = "Must provide %s argument to get puppet agent dev package information"
     raise ArgumentError, error_message % "puppet_collection" unless puppet_collection
 
@@ -477,7 +477,7 @@ module Unix::Pkg
       if arch == 'x86_64'
         arch = 'amd64'
       end
-      version = version[0,2] + '.' + version[2,2] if (variant =~ /ubuntu/ && !version.include?("."))
+      version = version[0,2] + '.' + version[2,2] if (variant.include?('ubuntu') && !version.include?("."))
       release_file = "/repos/apt/#{codename}/pool/#{puppet_collection}/p/puppet-agent/puppet-agent*#{arch}.deb"
       download_file = "puppet-agent-#{variant}-#{version}-#{arch}.tar.gz"
     when /^solaris$/
@@ -502,10 +502,10 @@ module Unix::Pkg
   #
   # @return nil
   def pe_puppet_agent_promoted_package_install(
-    onhost_copy_base, onhost_copied_download, onhost_copied_file, download_file, opts
+    onhost_copy_base, onhost_copied_download, onhost_copied_file, download_file, _opts
   )
     uncompress_local_tarball( onhost_copied_download, onhost_copy_base, download_file )
-    if self['platform'] =~ /^solaris/
+    if /^solaris/.match?(self['platform'])
       # above uncompresses the install from .tar.gz -> .p5p into the
       # onhost_copied_file directory w/a weird name. We have to read that file
       # name from the filesystem, so that we can provide it to install_local...
@@ -525,7 +525,7 @@ module Unix::Pkg
   #
   # @return nil
   def install_local_package(onhost_package_file, onhost_copy_dir = nil)
-    variant, version, arch, codename = self['platform'].to_array
+    variant, version, _arch, _codename = self['platform'].to_array
     case variant
     when /^(fedora|el|redhat|centos)$/
       command_name = 'yum'
@@ -555,7 +555,7 @@ module Unix::Pkg
   #
   # @return nil
   def uncompress_local_tarball(onhost_tar_file, onhost_base_dir, download_file)
-    variant, version, arch, codename = self['platform'].to_array
+    variant, version, _arch, _codename = self['platform'].to_array
     case variant
     when /^(fedora|el|centos|redhat|opensuse|sles|debian|ubuntu|cumulus)$/
       execute("tar -zxvf #{onhost_tar_file} -C #{onhost_base_dir}")
@@ -587,7 +587,7 @@ module Unix::Pkg
   #
   # @return [Beaker::Result] Result of installation command execution
   def solaris_install_local_package(package_path, noask_directory = nil)
-    variant, version, arch, codename = self['platform'].to_array
+    variant, version, _arch, _codename = self['platform'].to_array
 
     version = version.split('.')[0] # packages are only published for major versions
 

data/lib/beaker/host/unix/user.rb

@@ -1,7 +1,7 @@
 module Unix::User
   include Beaker::CommandFactory
 
-  def user_list(&block)
+  def user_list()
     execute("getent passwd") do |result|
       users = []
       result.stdout.each_line do |line|
@@ -14,9 +14,9 @@ module Unix::User
     end
   end
 
-  def user_get(name, &block)
+  def user_get(name)
     execute("getent passwd #{name}") do |result|
-      fail_test "failed to get user #{name}" unless result.stdout =~  /^#{name}:/
+      fail_test "failed to get user #{name}" unless /^#{name}:/.match?(result.stdout)
 
       yield result if block_given?
       result

data/lib/beaker/host/unix.rb

@@ -35,12 +35,14 @@ module Unix
     end
 
     def external_copy_base
-      return @external_copy_base if @external_copy_base
-      @external_copy_base = '/root'
-      variant, version, arch, codename = self['platform'].to_array
-      # Solaris 10 uses / as the root user directory. Solaris 11 uses /root (like most).
-      @external_copy_base = '/' if variant == 'solaris' && version == '10'
-      @external_copy_base
+      @external_copy_base ||= begin
+        if self['platform'].variant == 'solaris' && self['platform'].version == '10'
+          # Solaris 10 uses / as the root user directory. Solaris 11 uses /root (like most).
+          '/'
+        else
+          '/root'
+        end
+      end
     end
 
     # Tells you whether a host platform supports beaker's
@@ -49,10 +51,9 @@ module Unix
     # @return [String,nil] Reason message if set_env should be skipped,
     #   nil if it should run.
     def skip_set_env?
-      variant, version, arch, codename = self['platform'].to_array
-      case variant
+      case self['platform'].variant
       when /^(f5|netscaler)$/
-        "no puppet-agent package for network device platform '#{variant}'"
+        "no puppet-agent package for network device platform '#{self['platform'].variant}'"
       else
         nil
       end

data/lib/beaker/host/windows/exec.rb

@@ -94,7 +94,7 @@ module Windows::Exec
   # @option opts [Boolean] :cmd_exe whether cmd.exe should be used
   #
   # @return [String] Command string as needed for this host
-  def prepend_commands(command = '', user_pc = nil, opts = {})
+  def prepend_commands(_command = '', user_pc = nil, opts = {})
     cygwin_prefix = (self.is_cygwin? and opts[:cmd_exe]) ? 'cmd.exe /c' : ''
     spacing = (user_pc && !cygwin_prefix.empty?) ? ' ' : ''
     "#{cygwin_prefix}#{spacing}#{user_pc}"
@@ -107,7 +107,7 @@ module Windows::Exec
   # @param [Hash] opts optional parameters
   #
   # @return [String] Command string as needed for this host
-  def append_commands(command = '', user_ac = '', opts = {})
+  def append_commands(_command = '', user_ac = '', _opts = {})
     user_ac
   end
 
@@ -150,7 +150,7 @@ module Windows::Exec
   # @return [Boolean]
   def cygwin_installed?
     output = exec(Beaker::Command.new('cygcheck --check-setup cygwin'), :accept_all_exit_codes => true).stdout
-    return true if output.match(/cygwin/) && output.match(/OK/)
+    return true if output.include?('cygwin') && output.include?('OK')
     false
   end
 

data/lib/beaker/host/windows/file.rb

@@ -12,7 +12,7 @@ module Windows::File
   def system_temp_path
     # under CYGWIN %TEMP% may not be set
     tmp_path = execute('ECHO %SYSTEMROOT%', :cmdexe => true)
-    tmp_path.gsub(/\n/, '') + '\\TEMP'
+    tmp_path.delete("\n") + '\\TEMP'
   end
 
   # (see {Beaker::Host::Unix::File#chown})
@@ -63,7 +63,7 @@ module Windows::File
     when :openssh
       path
     when :win32_openssh
-      path.gsub('\\', '/')
+      path.tr('\\', '/')
     else
       raise ArgumentError, "windows/file.rb:scp_path: ssh server not recognized: '#{determine_ssh_server}'"
     end

data/lib/beaker/host/windows/group.rb

@@ -1,7 +1,7 @@
 module Windows::Group
   include Beaker::CommandFactory
 
-  def group_list(&block)
+  def group_list()
     execute('cmd /c echo "" | wmic group where localaccount="true" get name /format:value') do |result|
       groups = []
       result.stdout.each_line do |line|
@@ -14,7 +14,7 @@ module Windows::Group
     end
   end
 
-  def group_get(name, &block)
+  def group_get(name)
     execute("net localgroup \"#{name}\"") do |result|
       fail_test "failed to get group #{name}" if result.exit_code != 0
 
@@ -23,7 +23,7 @@ module Windows::Group
     end
   end
 
-  def group_gid(name)
+  def group_gid(_name)
     raise NotImplementedError, "Can't retrieve group gid on a Windows host"
   end
 

data/lib/beaker/host/windows/pkg.rb

@@ -25,14 +25,14 @@ module Windows::Pkg
     execute("#{cygwin} -q -n -N -d -R #{rootdir} -s http://cygwin.osuosl.org -P #{name} #{cmdline_args}")
   end
 
-  def uninstall_package(name, cmdline_args = '')
+  def uninstall_package(name, _cmdline_args = '')
     raise "Package #{name} cannot be uninstalled on #{self}"
   end
 
   #Examine the host system to determine the architecture, overrides default host determine_if_x86_64 so that wmic is used
   #@return [Boolean] true if x86_64, false otherwise
   def determine_if_x86_64
-    (identify_windows_architecture =~ /64/) == 0
+    identify_windows_architecture.include?('64')
   end
 
   # Gets the path & file name for the puppet agent dev package on Windows
@@ -45,7 +45,7 @@ module Windows::Pkg
   #   time. Note that it will not fail if not provided, however
   #
   # @return [String, String] Path to the directory and filename of the package, respectively
-  def puppet_agent_dev_package_info( puppet_collection = nil, puppet_agent_version = nil, opts = {} )
+  def puppet_agent_dev_package_info( _puppet_collection = nil, puppet_agent_version = nil, opts = {} )
     release_path_end = 'windows'
     is_config_32 = self['ruby_arch'] == 'x86' || self['install_32'] || opts['install_32']
     should_install_64bit = self.is_x86_64? && !is_config_32
@@ -55,7 +55,7 @@ module Windows::Pkg
     arch_suffix = should_install_64bit ? '64' : '86'
     # If a version was specified, use it; otherwise fall back to a default name.
     # Avoid when puppet_agent_version is set to a SHA, which isn't used in package names.
-    if puppet_agent_version =~ /^\d+\.\d+\.\d+/
+    if /^\d+\.\d+\.\d+/.match?(puppet_agent_version)
       release_file = "puppet-agent-#{puppet_agent_version}-x#{arch_suffix}.msi"
     else
       release_file = "puppet-agent-x#{arch_suffix}.msi"
@@ -72,7 +72,7 @@ module Windows::Pkg
   #   1. release_path_end Suffix for the release_path
   #   2. release_file Path to the file on release build servers
   #   3. download_file Filename for the package itself
-  def pe_puppet_agent_promoted_package_info( puppet_collection = nil, opts = {} )
+  def pe_puppet_agent_promoted_package_info( _puppet_collection = nil, _opts = {} )
     is_config_32 = self['ruby_arch'] == 'x86' || self['install_32'] || self['install_32']
     should_install_64bit = self.is_x86_64? && !is_config_32
     # only install 64bit builds if
@@ -89,7 +89,7 @@ module Windows::Pkg
 
   # @api private
   def identify_windows_architecture
-    platform.arch =~ /64/ ? '64' : '32'
+    platform.arch.include?('64') ? '64' : '32'
   end
 
 end

data/lib/beaker/host/windows/user.rb

@@ -1,7 +1,7 @@
 module Windows::User
   include Beaker::CommandFactory
 
-  def user_list(&block)
+  def user_list()
     execute('cmd /c echo "" | wmic useraccount where localaccount="true" get name /format:value') do |result|
       users = []
       result.stdout.each_line do |line|
@@ -14,7 +14,7 @@ module Windows::User
     end
   end
 
-  def user_get(name, &block)
+  def user_get(name)
     execute("net user \"#{name}\"") do |result|
       fail_test "failed to get user #{name}" if result.exit_code != 0
 

data/lib/beaker/host/windows.rb

@@ -38,11 +38,11 @@ module Windows
       return @ssh_server if @ssh_server
       @ssh_server = :openssh
       status = execute('cmd.exe /c sc query BvSshServer', :accept_all_exit_codes => true)
-      if status =~ /4  RUNNING/
+      if status&.include?('4  RUNNING')
         @ssh_server = :bitvise
       else
         status = execute('cmd.exe /c sc qc sshd', :accept_all_exit_codes => true)
-        if status =~ /C:\\Windows\\System32\\OpenSSH\\sshd\.exe/
+        if status&.include?('C:\\Windows\\System32\\OpenSSH\\sshd.exe')
           @ssh_server = :win32_openssh
         end
       end

data/lib/beaker/host.rb

@@ -37,7 +37,7 @@ module Beaker
       end
 
       def [](k)
-        cmd = PuppetCommand.new(@command, "--configprint #{k.to_s}")
+        cmd = PuppetCommand.new(@command, "--configprint #{k}")
         @host.exec(cmd).stdout.strip
       end
     end
@@ -86,7 +86,7 @@ module Beaker
       # TODO: might want to consider caching here; not doing it for now because
       #  I haven't thought through all of the possible scenarios that could
       #  cause the value to change after it had been cached.
-      result = puppet_configprint['node_name_value'].strip
+      puppet_configprint['node_name_value'].strip
     end
 
     def port_open? port
@@ -177,7 +177,7 @@ module Beaker
     end
 
     def is_pe?
-      self['type'] && self['type'].to_s =~ /pe/
+      self['type'] && self['type'].to_s.include?('pe')
     end
 
     def is_cygwin?
@@ -450,7 +450,7 @@ module Beaker
       end
       if File.file?(source) or (File.directory?(source) and not has_ignore)
         source_file = source
-        if has_ignore and (source =~ ignore_re)
+        if has_ignore and ignore_re&.match?(source)
           @logger.trace "After rejecting ignored files/dirs, there is no file to copy"
           source_file = nil
           result.stdout = "No files to copy"
@@ -462,7 +462,7 @@ module Beaker
         end
       else # a directory with ignores
         dir_source = Dir.glob("#{source}/**/*").reject do |f|
-          f.gsub(/\A#{Regexp.escape(source)}/, '') =~ ignore_re #only match against subdirs, not full path
+          ignore_re&.match?(f.gsub(/\A#{Regexp.escape(source)}/, '')) #only match against subdirs, not full path
         end
         @logger.trace "After rejecting ignored files/dirs, going to scp [#{dir_source.join(", ")}]"
 
@@ -551,9 +551,9 @@ module Beaker
       #
       # We still want any user-set SSH config to win though
       filesystem_ssh_config = nil
-      if ssh_opts[:config] && File.exists?(ssh_opts[:config])
+      if ssh_opts[:config] && File.exist?(ssh_opts[:config])
         filesystem_ssh_config = ssh_opts[:config]
-      elsif self[:vagrant_ssh_config] && File.exists?(self[:vagrant_ssh_config])
+      elsif self[:vagrant_ssh_config] && File.exist?(self[:vagrant_ssh_config])
         filesystem_ssh_config = self[:vagrant_ssh_config]
       end