beaker 4.38.1 → 4.39.0

data/acceptance/tests/base/dsl/helpers/host_helpers/scp_from_test.rb

@@ -4,7 +4,7 @@ test_name "dsl::helpers::host_helpers #scp_from" do
   if test_scp_error_on_close?
     step "#scp_from fails if the local path cannot be found" do
       remote_tmpdir = default.tmpdir()
-      remote_filename, contents = create_remote_file_from_fixture("simple_text_file", default, remote_tmpdir, "testfile.txt")
+      remote_filename, _contents = create_remote_file_from_fixture("simple_text_file", default, remote_tmpdir, "testfile.txt")
 
       assert_raises Beaker::Host::CommandFailure do
         scp_from default, remote_filename, "/non/existent/file.txt"
@@ -40,7 +40,7 @@ test_name "dsl::helpers::host_helpers #scp_from" do
       remote_tmpdir = default.tmpdir()
       remote_filename = File.join(remote_tmpdir, "testfile.txt")
       on hosts, "mkdir -p #{remote_tmpdir}"
-      results = on hosts, %Q{echo "${RANDOM}:${RANDOM}:${RANDOM}" > #{remote_filename}}
+      on hosts, %Q{echo "${RANDOM}:${RANDOM}:${RANDOM}" > #{remote_filename}}
 
       scp_from hosts, remote_filename, local_dir
       remote_contents = on(hosts.last, "cat #{remote_filename}").stdout

data/acceptance/tests/base/dsl/helpers/host_helpers/scp_to_test.rb

@@ -11,7 +11,7 @@ test_name "dsl::helpers::host_helpers #scp_to" do
   if test_scp_error_on_close?
     step "#scp_to fails if the remote path cannot be found" do
       Dir.mktmpdir do |local_dir|
-        local_filename, contents = create_local_file_from_fixture("simple_text_file", local_dir, "testfile.txt")
+        local_filename, _contents = create_local_file_from_fixture("simple_text_file", local_dir, "testfile.txt")
 
         # assert_raises Beaker::Host::CommandFailure do
         assert_raises RuntimeError do

data/acceptance/tests/base/dsl/helpers/host_helpers/shell_test.rb

@@ -14,7 +14,7 @@ test_name "dsl::helpers::host_helpers #shell" do
 
   step "#shell makes command error output available via `.stderr` on success" do
     output = shell("/bin/nonexistent-command", :acceptable_exit_codes => [0, 127]).stderr
-    assert_match /No such file/, output
+    assert_match(/No such file/, output)
   end
 
   step "#shell makes exit status available via `.exit_code`" do
@@ -25,7 +25,7 @@ test_name "dsl::helpers::host_helpers #shell" do
   step "#shell with :acceptable_exit_codes will not fail for named exit codes" do
     result = shell "/bin/nonexistent-command", :acceptable_exit_codes => [0, 127]
     output = result.stderr
-    assert_match /No such file/, output
+    assert_match(/No such file/, output)
     status = result.exit_code
     assert_equal 127, status
   end
@@ -40,12 +40,12 @@ test_name "dsl::helpers::host_helpers #shell" do
     result = shell "env", { :environment => { 'FOO' => 'bar' } }
     output = result.stdout
 
-    assert_match /\bFOO=bar\b/, output
+    assert_match(/\bFOO=bar\b/, output)
   end
 
   step "#shell allows assertions to be used in the optional block" do
     shell %Q{echo "${RANDOM}:${RANDOM}"} do
-      assert_match /\d+:\d+/, stdout
+      assert_match(/\d+:\d+/, stdout)
     end
   end
 end

data/acceptance/tests/base/dsl/helpers/host_helpers/upgrade_package_test.rb

@@ -43,7 +43,7 @@ test_name "dsl::helpers::host_helpers #upgrade_package" do
         #       > No Packages marked for Update
 
         result = upgrade_package default, "non-existent-package-name"
-        assert_match /No Packages marked for Update/i, result
+        assert_match(/No Packages marked for Update/i, result)
       end
     end
 

data/acceptance/tests/base/dsl/platform_tag_confiner_test.rb

@@ -26,7 +26,7 @@ test_name "DSL::Structure::PlatformTagConfiner" do
     begin
       tag( 'tag1' )
     rescue Beaker::DSL::Outcomes::SkipTest => e
-      if e.message =~ /^No\ suitable\ hosts\ found/
+      if /^No\ suitable\ hosts\ found/.match?(e.message)
         # SkipTest is raised in the case when there are no hosts leftover for a test
         # after confining. It's a very common acceptance test case where all of the
         # hosts involved are of the same platform, and are thus all confined

data/acceptance/tests/base/dsl/structure_test.rb

@@ -15,8 +15,6 @@ test_name "dsl::structure" do
 
   step "#confine_block leaves hosts array intact after running block on matching hosts" do
     begin
-      previous_hosts = hosts.dup
-
       @in_confine = 0
       confine_block :to, :platform => default["platform"] do
         @in_confine +=1
@@ -46,8 +44,6 @@ test_name "dsl::structure" do
 
   step "#confine_block leaves hosts array intact after skipping block on non-matching hosts" do
     begin
-      previous_hosts = hosts.dup
-
       @in_confine = 0
       confine_block :except, :platform => default["platform"] do
         @in_confine +=1
@@ -62,8 +58,6 @@ test_name "dsl::structure" do
   end
 
   step "#confine_block allows blocks to raise skip_test" do
-    previous_hosts = hosts.dup
-
     begin
       @in_confine = 0
       confine_block :to, :platform => default["platform"] do
@@ -71,7 +65,7 @@ test_name "dsl::structure" do
         skip_test "this block raises a skip"
       end
     rescue Beaker::DSL::Outcomes::SkipTest => e
-      assert_match /this block raises a skip/, e.message, "#confine_block raised an unexpected skip_test"
+      assert_match(/this block raises a skip/, e.message, "#confine_block raised an unexpected skip_test")
       assert_equal 1, @in_confine, "#confine_block did not execute supplied block"
       assert_equal hosts.dup, hosts, "#confine_block did not preserve the hosts array"
     end
@@ -84,7 +78,7 @@ test_name "dsl::structure" do
       fail "#confine did not skip test but should have."
 
     rescue Beaker::DSL::Outcomes::SkipTest => e
-      assert_match /No suitable hosts found with {:platform=>"test"}/, e.message, "#confine raised an unexpected skip_test"
+      assert_match(/No suitable hosts found with {:platform=>"test"}/, e.message, "#confine raised an unexpected skip_test")
     end
   end
 
@@ -95,8 +89,8 @@ test_name "dsl::structure" do
       fail "#confine did not skip test but should have."
 
     rescue Beaker::DSL::Outcomes::SkipTest => e
-      assert_match /No suitable hosts found without {:platform=>"#{default['platform']}"}/, e.message, "#confine raised an unexpected
-      # skip_test"
+      assert_match(/No suitable hosts found without {:platform=>"#{default['platform']}"}/, e.message, "#confine raised an unexpected
+      # skip_test")
     end
   end
 end

data/acceptance/tests/base/host/file_test.rb

@@ -11,7 +11,7 @@ test_name 'File Test' do
       tmpfile = host.tmpfile('beaker')
       # ensure we have a user to chown to
       host.chown('testuser', tmpfile)
-      assert_match /testuser/, host.ls_ld(tmpfile), "Should have found testuser in `ls -ld` output"
+      assert_match(/testuser/, host.ls_ld(tmpfile), "Should have found testuser in `ls -ld` output")
     end
   end
 
@@ -21,7 +21,7 @@ test_name 'File Test' do
       tmpdir = host.tmpdir('beaker')
       # ensure we have a user to chown to
       host.chgrp('testgroup', tmpdir)
-      assert_match /testgroup/, host.ls_ld(tmpdir), "Should have found testgroup in `ls -ld` output: #{stdout}"
+      assert_match(/testgroup/, host.ls_ld(tmpdir), "Should have found testgroup in `ls -ld` output: #{stdout}")
     end
   end
 
@@ -31,7 +31,7 @@ test_name 'File Test' do
       tmpdir = host.tmpdir('beaker')
       on host, host.touch("#{tmpdir}/somefile.txt", false)
       host.chown('testuser', tmpdir, true)
-      assert_match /testuser/, host.ls_ld("#{tmpdir}/somefile.txt"), "Should have found testuser in `ls -ld` output for sub-file"
+      assert_match(/testuser/, host.ls_ld("#{tmpdir}/somefile.txt"), "Should have found testuser in `ls -ld` output for sub-file")
     end
   end
 
@@ -41,7 +41,7 @@ test_name 'File Test' do
       tmpfile = host.tmpfile('beaker')
       # ensure we have a group to chgrp to
       host.chgrp('testgroup', tmpfile)
-      assert_match /testgroup/, host.ls_ld(tmpfile), "Should have found testgroup in `ls -ld` output"
+      assert_match(/testgroup/, host.ls_ld(tmpfile), "Should have found testgroup in `ls -ld` output")
     end
   end
 
@@ -51,7 +51,7 @@ test_name 'File Test' do
       tmpdir = host.tmpdir('beaker')
       # ensure we have a group to chgrp to
       host.chgrp('testgroup', tmpdir)
-      assert_match /testgroup/, host.ls_ld(tmpdir), "Should have found testgroup in `ls -ld` output"
+      assert_match(/testgroup/, host.ls_ld(tmpdir), "Should have found testgroup in `ls -ld` output")
     end
   end
 
@@ -61,7 +61,7 @@ test_name 'File Test' do
       tmpdir = host.tmpdir('beaker')
       on host, host.touch("#{tmpdir}/somefile.txt", false)
       host.chgrp('testgroup', tmpdir, true)
-      assert_match /testgroup/, host.ls_ld("#{tmpdir}/somefile.txt"), "Should have found testgroup in `ls -ld` output for sub-file"
+      assert_match(/testgroup/, host.ls_ld("#{tmpdir}/somefile.txt"), "Should have found testgroup in `ls -ld` output for sub-file")
     end
   end
 
@@ -69,7 +69,7 @@ test_name 'File Test' do
     hosts.each do |host|
       # create a tmp file to mangle
       tmpdir = host.tmpdir('beaker')
-      assert_match /beaker/, host.ls_ld(tmpdir), "Should have found beaker in `ls -ld` output"
+      assert_match(/beaker/, host.ls_ld(tmpdir), "Should have found beaker in `ls -ld` output")
     end
   end
 

data/acceptance/tests/base/host/group_test.rb

@@ -1,6 +1,6 @@
 test_name 'Group Test' do
   step "#group_get: has an Administrators group on Windows" do
-    hosts.select { |h| h['platform'] =~ /windows/ }.each do |host|
+    hosts.select { |h| h['platform'].include?('windows') }.each do |host|
       host.group_get('Administrators') do |result|
         refute_match(result.stdout, '1376', 'Output indicates Administrators not found')
       end
@@ -8,7 +8,7 @@ test_name 'Group Test' do
   end
 
   step "#group_get: should not have CroMags group on Windows" do
-    hosts.select { |h| h['platform'] =~ /windows/ }.each do |host|
+    hosts.select { |h| h['platform'].include?('windows') }.each do |host|
       assert_raises Beaker::Host::CommandFailure do
         host.group_get('CroMags') { |result| }
       end

data/acceptance/tests/base/host/host_test.rb

@@ -20,7 +20,7 @@ end
 
 step "#is_x86_64? : can determine arch on hosts"
 hosts.each do |host|
-  if host['platform'] =~ /x86_64|_64|amd64|-64/
+  if /x86_64|_64|amd64|-64/.match?(host['platform'])
     assert_equal(true, host.is_x86_64?, "is_x86_64? should be true on #{host}: #{host['platform']}")
   else
     assert_equal(false, host.is_x86_64?, "is_x86_64? should be false on #{host}: #{host['platform']}")
@@ -213,7 +213,7 @@ hosts.each do |host|
     #each local file should have a single match on the host
     local_paths.each do |path|
       search_name = path.gsub(/^.*fixtures\//, '') #reduce down to the path that should match
-      matched = host_paths.select{ |check| check =~ /#{Regexp.escape(search_name)}$/ }
+      matched = host_paths.select{ |check| /#{Regexp.escape(search_name)}$/.match?(check) }
       assert_equal(1, matched.length, "should have found a single instance of path #{search_name}, found #{matched.length}: \n #{matched}")
       host_paths = host_paths - matched
     end
@@ -238,9 +238,9 @@ hosts.each do |host|
     #each local file should have a single match on the host
     local_paths.each do |path|
       search_name = path.gsub(/^.*fixtures\//, '') #reduce down to the path that should match
-      matched = host_paths.select{ |check| check =~ /#{Regexp.escape(search_name)}$/ }
+      matched = host_paths.select{ |check| /#{Regexp.escape(search_name)}$/.match?(check) }
       re =  /((\/|\A)tests(\/|\z))|((\/|\A)Gemfile(\/|\z))/
-      if path !~ re
+      if !path&.match?(re)
         assert_equal(1, matched.length, "should have found a single instance of path #{search_name}, found #{matched.length}: \n #{matched}")
       else
         assert_equal(0, matched.length, "should have found no instances of path #{search_name}, found #{matched.length}: \n #{matched}")
@@ -270,7 +270,7 @@ hosts.each do |host|
       search_name = path.gsub(/^.*fixtures\/module\//, '') #reduce down to the path that should match
       matched = host_paths.select{ |check| check =~ /#{Regexp.escape(search_name)}$/ }
       re =  /((\/|\A)module(\/|\z))|((\/|\A)Gemfile(\/|\z))/
-      if path.gsub(/^.*module\//, '') !~ re
+      if !path.gsub(/^.*module\//, '')&.match?(re)
         assert_equal(1, matched.length, "should have found a single instance of path #{search_name}, found #{matched.length}: \n #{matched}")
       else
         assert_equal(0, matched.length, "should have found no instances of path #{search_name}, found #{matched.length}: \n #{matched}")

data/acceptance/tests/base/host/packages.rb

@@ -2,27 +2,25 @@ test_name 'confirm packages on hosts behave correctly'
 confine :except, :platform => %w(osx)
 
 def get_host_pkg(host)
-  case
-    when host['platform'] =~ /sles-10/
-      Beaker::HostPrebuiltSteps::SLES10_PACKAGES
-    when host['platform'] =~ /opensuse|sles-/
-      Beaker::HostPrebuiltSteps::SLES_PACKAGES
-    when host['platform'] =~ /debian/
-      Beaker::HostPrebuiltSteps::DEBIAN_PACKAGES
-    when host['platform'] =~ /cumulus/
-      Beaker::HostPrebuiltSteps::CUMULUS_PACKAGES
-    when (host['platform'] =~ /windows/ and host.is_cygwin?)
-      Beaker::HostPrebuiltSteps::WINDOWS_PACKAGES
-    when (host['platform'] =~ /windows/ and not host.is_cygwin?)
-      Beaker::HostPrebuiltSteps::PSWINDOWS_PACKAGES
-    when host['platform'] =~ /freebsd/
-      Beaker::HostPrebuiltSteps::FREEBSD_PACKAGES
-    when host['platform'] =~ /openbsd/
-      Beaker::HostPrebuiltSteps::OPENBSD_PACKAGES
-    when host['platform'] =~ /solaris-10/
-      Beaker::HostPrebuiltSteps::SOLARIS10_PACKAGES
-    else
-      Beaker::HostPrebuiltSteps::UNIX_PACKAGES
+  case host['platform']
+  when /sles-10/
+    Beaker::HostPrebuiltSteps::SLES10_PACKAGES
+  when /opensuse|sles-/
+    Beaker::HostPrebuiltSteps::SLES_PACKAGES
+  when /debian/
+    Beaker::HostPrebuiltSteps::DEBIAN_PACKAGES
+  when /cumulus/
+    Beaker::HostPrebuiltSteps::CUMULUS_PACKAGES
+  when /windows/
+    host.is_cygwin? ? Beaker::HostPrebuiltSteps::WINDOWS_PACKAGES : Beaker::HostPrebuiltSteps::PSWINDOWS_PACKAGES
+  when /freebsd/
+    Beaker::HostPrebuiltSteps::FREEBSD_PACKAGES
+  when /openbsd/
+    Beaker::HostPrebuiltSteps::OPENBSD_PACKAGES
+  when /solaris-10/
+    Beaker::HostPrebuiltSteps::SOLARIS10_PACKAGES
+  else
+    Beaker::HostPrebuiltSteps::UNIX_PACKAGES
   end
 
 end
@@ -50,12 +48,12 @@ hosts.each do |host|
   # this works on Windows as well, althought it pulls in
   # a lot of dependencies.
   # skipping this test for windows since it requires a restart
-  next if host['platform'] =~ /windows/
+  next if host['platform'].include?('windows')
   package = 'zsh'
-  package = 'CSWzsh' if host['platform'] =~ /solaris-10/
-  package = 'git' if host['platform'] =~ /opensuse|sles/
+  package = 'CSWzsh' if host['platform'].include?('solaris-10')
+  package = 'git' if /opensuse|sles/.match?(host['platform'])
 
-  if host['platform'] =~ /solaris-11/
+  if host['platform'].include?('solaris-11')
     logger.debug("#{package} should be uninstalled on #{host}")
     host.uninstall_package(package)
     assert_equal(false, host.check_for_package(package), "'#{package}' should not be installed")
@@ -66,15 +64,15 @@ hosts.each do |host|
   cmdline_args = ''
   # Newer vmpooler hosts created by Packer templates, and running Cygwin 2.4,
   # must have these switches passed
-  cmdline_args = '--local-install --download' if (host['platform'] =~ /windows/ and host.is_cygwin?)
+  cmdline_args = '--local-install --download' if (host['platform'].include?('windows') and host.is_cygwin?)
   host.install_package(package, cmdline_args)
   assert(host.check_for_package(package), "'#{package}' should be installed")
 
   # windows does not support uninstall_package
-  unless host['platform'] =~ /windows/
+  unless host['platform'].include?('windows')
     logger.debug("#{package} should be uninstalled on #{host}")
     host.uninstall_package(package)
-    if host['platform'] =~ /debian/
+    if host['platform'].include?('debian')
       assert_equal(false, host.check_for_command(package), "'#{package}' should not be installed or available")
     else
       assert_equal(false, host.check_for_package(package), "'#{package}' should not be installed")

data/acceptance/tests/base/host/packages_unix.rb

@@ -16,9 +16,9 @@ def clean_file(host, file)
 end
 
 def pkg_file(host, pkg_name)
-  if host['platform'] =~ /debian|ubuntu/
+  if /debian|ubuntu/.match?(host['platform'])
     "/etc/apt/sources.list.d/#{pkg_name}.list"
-  elsif host['platform'] =~ /el/
+  elsif host['platform'].include?('el')
     "/etc/yum.repos.d/#{pkg_name}.repo"
   else
     nil
@@ -33,7 +33,7 @@ end
 step '#deploy_apt_repo : deploy puppet-server nightly repo'
 hosts.each do |host|
 
-  if host['platform'] =~ /debian|ubuntu/
+  if /debian|ubuntu/.match?(host['platform'])
     clean_file(host, pkg_name)
     host.deploy_apt_repo(pkg_fixtures, pkg_name, 'latest')
     assert(host.file_exist?(pkg_file(host, pkg_name)), 'apt file should exist')
@@ -45,7 +45,7 @@ end
 step '#deploy_yum_repo : deploy puppet-server nightly repo'
 hosts.each do |host|
 
-  if host['platform'] =~ /el/
+  if host['platform'].include?('el')
     clean_file(host, pkg_name)
     host.deploy_yum_repo(pkg_fixtures, pkg_name, 'latest')
     assert(host.file_exist?(pkg_file(host, pkg_name)), 'yum file should exist')

data/acceptance/tests/base/host/user_test.rb

@@ -1,6 +1,6 @@
 test_name 'User Test' do
   step "#user_get: has an Administrator user on Windows" do
-    hosts.select { |h| h['platform'] =~ /windows/ }.each do |host|
+    hosts.select { |h| h['platform'].include?('windows') }.each do |host|
       host.user_get('Administrator') do |result|
         refute_match(result.stdout, 'NET HELPMSG', 'Output indicates Administrator not found')
       end
@@ -8,7 +8,7 @@ test_name 'User Test' do
   end
 
   step "#user_get: should not have CaptainCaveman user on Windows" do
-    hosts.select { |h| h['platform'] =~ /windows/ }.each do |host|
+    hosts.select { |h| h['platform'].include?('windows') }.each do |host|
       assert_raises Beaker::Host::CommandFailure do
         host.user_get('CaptainCaveman') { |result| }
       end

data/acceptance/tests/install/from_file.rb

@@ -4,7 +4,7 @@ confine :except, :platform => /^windows|osx/
 
 step 'install arbitrary msi via url' do
   hosts.each do |host|
-    if host['platform'] =~ /win/
+    if host['platform'].include?('win')
       # this should be implemented at the host/win/pkg.rb level someday
       generic_install_msi_on(host, 'https://releases.hashicorp.com/vagrant/1.8.4/vagrant_1.8.4.msi', {}, {:debug => true})
     end
@@ -13,7 +13,7 @@ end
 
 step 'install arbitrary dmg via url' do
   hosts.each do |host|
-    if host['platform'] =~ /osx/
+    if host['platform'].include?('osx')
       host.generic_install_dmg('https://releases.hashicorp.com/vagrant/1.8.4/vagrant_1.8.4.dmg', 'Vagrant', 'Vagrant.pkg')
     end
   end

data/beaker.gemspec

@@ -21,31 +21,31 @@ Gem::Specification.new do |s|
   s.required_ruby_version = Gem::Requirement.new('>= 2.4')
 
   # Testing dependencies
-  s.add_development_dependency 'rspec', '~> 3.0'
-  s.add_development_dependency 'rspec-its'
   s.add_development_dependency 'fakefs', '~> 1.0'
   s.add_development_dependency 'rake', '~> 13.0'
+  s.add_development_dependency 'rspec', '~> 3.0'
+  s.add_development_dependency 'rspec-its'
 
   # Documentation dependencies
   s.add_development_dependency 'yard', '~> 0.9.11'
 
   # Run time dependencies
-  s.add_runtime_dependency 'minitest', '~> 5.4'
   s.add_runtime_dependency 'minitar', '~> 0.6'
+  s.add_runtime_dependency 'minitest', '~> 5.4'
   s.add_runtime_dependency 'rexml'
 
-  s.add_runtime_dependency 'hocon', '~> 1.0'
-  s.add_runtime_dependency 'net-ssh', '>= 5.0'
   s.add_runtime_dependency 'ed25519', '~> 1.0' # net-ssh compatibility with ed25519 keys
-  s.add_runtime_dependency 'net-scp', '>= 1.2', '< 4.0'
+  s.add_runtime_dependency 'hocon', '~> 1.0'
   s.add_runtime_dependency 'inifile', '~> 3.0'
+  s.add_runtime_dependency 'net-scp', '>= 1.2', '< 5.0'
+  s.add_runtime_dependency 'net-ssh', '>= 5.0'
 
-  s.add_runtime_dependency 'rsync', '~> 1.0.9'
-  s.add_runtime_dependency 'open_uri_redirections', '~> 0.2.1'
   s.add_runtime_dependency 'in-parallel', '~> 0.1'
+  s.add_runtime_dependency 'open_uri_redirections', '~> 0.2.1'
+  s.add_runtime_dependency 'rsync', '~> 1.0.9'
   s.add_runtime_dependency 'thor', ['>= 1.0.1', '< 2.0']
 
   # Run time dependencies that are Beaker libraries
-  s.add_runtime_dependency 'stringify-hash', '~> 0.0'
   s.add_runtime_dependency 'beaker-hostgenerator'
+  s.add_runtime_dependency 'stringify-hash', '~> 0.0'
 end

data/docs/concepts/style_guide.md

@@ -57,7 +57,7 @@ test_name 'The source attribute' do
   target_file_on_nix = '/tmp/source_attr_test'
   teardown do
     hosts.each do |host|
-      on(host, "rm #{target_file_on_nix}", :accept_all_exit_codes => true) unless host['platform'] =~ /^win/
+      on(host, "rm #{target_file_on_nix}", :accept_all_exit_codes => true) unless host['platform'].start_with('win')
     end
   end
   ...

data/docs/how_to/debug_beaker_tests.md

@@ -33,7 +33,7 @@ Here's a test file that exercises different ways of running commands on Beaker h
 ```
 hosts.each do |h|
   on h, "echo hello"
-  if h['platform'] =~ /windows/
+  if h['platform'].include?('windows')
     scp_to h, "beaker.gemspec", "/cygdrive/c/Documents\ and\ Settings/All\ Users/Application\ Data/"
   end
   on(h, "echo test block") do |result|

data/docs/how_to/test_arbitrary_beaker_versions.md

@@ -4,9 +4,9 @@ In order to adjust the beaker version used without commiting a change to a Gemfi
 
 ```ruby
 def location_for(place, fake_version = nil)
-  if place =~ /^(git[:@][^#]*)#(.*)/
+  if /^(git[:@][^#]*)#(.*)/.match?(place)
     [fake_version, { :git => $1, :branch => $2, :require => false }].compact
-  elsif place =~ /^file:\/\/(.*)/
+  elsif /^file:\/\/(.*)/.match?(place)
     ['>= 0', { :path => File.expand_path($1), :require => false }]
   else
     [place, { :require => false }]

data/lib/beaker/cli.rb

@@ -104,12 +104,10 @@ module Beaker
         end
 
         # Setup perf monitoring if needed
-        if @options[:collect_perf_data].to_s =~ /(aggressive)|(normal)/
+        if /(aggressive)|(normal)/.match?(@options[:collect_perf_data].to_s)
           @perf = Beaker::Perf.new( @hosts, @options )
         end
 
-        errored = false
-
         #pre acceptance  phase
         run_suite(:pre_suite, :fast)
 
@@ -120,7 +118,7 @@ module Beaker
         rescue => e
           #post acceptance on failure
           #run post-suite if we are in fail-slow mode
-          if @options[:fail_mode].to_s =~ /slow/
+          if @options[:fail_mode].to_s.include?('slow')
             run_suite(:post_suite)
             @perf.print_perf_info if defined? @perf
           end
@@ -140,7 +138,7 @@ module Beaker
         end
 
         #cleanup on error
-        if @options[:preserve_hosts].to_s =~ /(never)|(onpass)/
+        if /(never)|(onpass)/.match?(@options[:preserve_hosts].to_s)
           @logger.notify "Cleanup: cleaning up after failed run"
           if @network_manager
             @network_manager.cleanup
@@ -163,7 +161,7 @@ module Beaker
         end
 
         #cleanup on success
-        if @options[:preserve_hosts].to_s =~ /(never)|(onfail)/
+        if /(never)|(onfail)/.match?(@options[:preserve_hosts].to_s)
           @logger.notify "Cleanup: cleaning up after successful run"
           if @network_manager
             @network_manager.cleanup
@@ -184,7 +182,7 @@ module Beaker
     #                                 continue to execute tests.
     def run_suite(suite_name, failure_strategy = nil)
       if (@options[suite_name].empty?)
-        @logger.notify("No tests to run for suite '#{suite_name.to_s}'")
+        @logger.notify("No tests to run for suite '#{suite_name}'")
         return
       end
       Beaker::TestSuite.new(
@@ -225,7 +223,7 @@ module Beaker
       hosts_yaml['HOSTS'] = combined_instance_and_options_hosts
       hosts_yaml['CONFIG'] = Beaker::Options::OptionsHash.new.merge(hosts_yaml['CONFIG'] || {})
       # save the rest of the options, excepting the HOSTS that we have already processed
-      hosts_yaml['CONFIG'] = hosts_yaml['CONFIG'].merge(@options.reject{ |k,v| k =~ dontpreserve })
+      hosts_yaml['CONFIG'] = hosts_yaml['CONFIG'].merge(@options.reject{ |k,_v| dontpreserve.match?(k) })
       # remove copy of HOSTS information
       hosts_yaml['CONFIG']['provision'] = false
       File.open(preserved_hosts_filename, 'w') do |file|

data/lib/beaker/command.rb

@@ -76,7 +76,7 @@ module Beaker
       append_commands = host.append_commands( cmd, ac, :cmd_exe => @cmdexe )
 
       # This will cause things like `puppet -t -v agent` which is maybe bad.
-      if host[:platform] =~ /cisco_ios_xr/
+      if host[:platform]&.include?('cisco_ios_xr')
         cmd_line_array = [prepend_commands, env_string, cmd, options_string, args_string, append_commands]
       else
         cmd_line_array = [env_string, prepend_commands, cmd, options_string, args_string, append_commands]
@@ -141,7 +141,7 @@ module Beaker
   end
 
   class HostCommand < Command
-    def cmd_line host
+    def cmd_line _host
       eval "\"#{@command}\""
     end
   end
@@ -162,7 +162,7 @@ module Beaker
     # @return a new {SedCommand} object
     def initialize platform, expression, filename, opts = {}
       command = "sed -i -e \"#{expression}\" #{filename}"
-      if platform =~ /solaris|aix|osx|openbsd/
+      if /solaris|aix|osx|openbsd/.match?(platform)
         command.slice! '-i '
         temp_file = opts[:temp_file] ? opts[:temp_file] : "#{filename}.tmp"
         command << " > #{temp_file} && mv #{temp_file} #{filename} && rm -f #{temp_file}"

data/lib/beaker/command_factory.rb

@@ -10,7 +10,7 @@ module Beaker
     # +assertions+. This is not provided by Assertions and must be
     # provided by the thing including Assertions. See Minitest::Runnable
     # for an example.
-    attr_accessor :assertions
+    attr_writer :assertions
     def assertions
       @assertions || 0
     end
@@ -27,7 +27,7 @@ module Beaker
     #
     # @api private
     # @return [String] Stdout from command execution
-    def execute(command, options={}, &block)
+    def execute(command, options={})
       cmd_create_options = {}
       exec_opts = options.dup
       cmd_create_options[:prepend_cmds] = exec_opts.delete(:prepend_cmds) || nil

data/lib/beaker/dsl/assertions.rb

@@ -24,7 +24,7 @@ module Beaker
       # +assertions+. This is not provided by Assertions and must be
       # provided by the thing including Assertions. See Minitest::Runnable
       # for an example.
-      attr_accessor :assertions
+      attr_writer :assertions
       def assertions
         @assertions || 0
       end

data/lib/beaker/dsl/helpers/hocon_helpers.rb

@@ -53,7 +53,7 @@ module Beaker
         #
         # @raise ArgumentError if arguments are missing or incorrect.
         # @return nil
-        def hocon_file_edit_on(hosts, filename, &block)
+        def hocon_file_edit_on(hosts, filename)
           if not block_given?
             msg = 'DSL method `hocon_file_edit_on` provides a given block'
             msg << ' a hocon file to edit. No block was provided.'
@@ -80,7 +80,7 @@ module Beaker
         #     doc.set_value('c.d', '[6, 2, 73, 4, 45]')
         #   end
         #
-        def hocon_file_edit_in_place_on(hosts, filename, &block)
+        def hocon_file_edit_in_place_on(hosts, filename)
           hocon_file_edit_on(hosts, filename) do |host, doc|
             content_doc = yield host, doc
             create_remote_file(host, filename, content_doc.render)