beaker 5.2.0 → 5.3.1

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

@@ -3,11 +3,13 @@ require "helpers/test_helper"
 test_name "dsl::helpers::host_helpers #echo_on" do
   step "#echo_on echoes the supplied string on the remote host" do
     output = echo_on(default, "contents")
-    assert_equal output, "contents"
+
+    assert_equal("contents", output)
   end
 
   step "#echo_on echoes the supplied string on all hosts when given a hosts array" do
     results = echo_on(hosts, "contents")
+
     assert_equal ["contents"] * hosts.size, results
   end
 end

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

@@ -9,24 +9,29 @@ test_name "dsl::helpers::host_helpers #on" do
 
   step "#on makes command output available via `.stdout` on success" do
     output = on(default, %{echo "echo via on"}).stdout
+
     assert_equal "echo via on\n", output
   end
 
   step "#on makes command error output available via `.stderr` on success" do
     output = on(default, "/bin/nonexistent-command", :acceptable_exit_codes => [0, 127]).stderr
+
     assert_match(/No such file/, output)
   end
 
   step "#on makes exit status available via `.exit_code`" do
     status = on(default, %{echo "echo via on"}).exit_code
+
     assert_equal 0, status
   end
 
   step "#on with :acceptable_exit_codes will not fail for named exit codes" do
     result = on default, "/bin/nonexistent-command", :acceptable_exit_codes => [0, 127]
     output = result.stderr
+
     assert_match(/No such file/, output)
     status = result.exit_code
+
     assert_equal 127, status
   end
 
@@ -59,6 +64,7 @@ test_name "dsl::helpers::host_helpers #on" do
 
     # and that we have |hosts| distinct outputs
     unique_outputs = results.map(&:output).uniq
+
     assert_equal hosts.size, unique_outputs.size
   end
 
@@ -78,6 +84,7 @@ test_name "dsl::helpers::host_helpers #on" do
 
     # and that we have |hosts| distinct outputs
     unique_outputs = results.map(&:output).uniq
+
     assert_equal hosts.size, unique_outputs.size
   end
 
@@ -97,6 +104,7 @@ test_name "dsl::helpers::host_helpers #on" do
 
     # and that we have |hosts| distinct outputs
     unique_outputs = results.map(&:output).uniq
+
     assert_equal hosts.size, unique_outputs.size
   end
 
@@ -112,7 +120,7 @@ test_name "dsl::helpers::host_helpers #on" do
 
     parent_pid = Process.pid
     results = on(hosts, %{echo "${RANDOM}:${RANDOM}:${RANDOM}"}, :run_in_parallel => true) do
-      assert(Process.pid != parent_pid)
+      refute_equal(Process.pid, parent_pid)
     end
 
     # assert that we got results back for every host
@@ -125,6 +133,7 @@ test_name "dsl::helpers::host_helpers #on" do
 
     # and that we have |hosts| distinct outputs
     unique_outputs = results.map(&:output).uniq
+
     assert_equal hosts.size, unique_outputs.size
   end
 

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

@@ -19,6 +19,7 @@ test_name "dsl::helpers::host_helpers #retry_on" do
     create_remote_file_from_fixture("retry_script", default, remote_tmpdir, "test.sh")
 
     result = retry_on default, "bash #{remote_script_file} #{remote_tmpdir} 2", { :max_retries => 4, :retry_interval => 0.1 }
+
     assert_equal 0, result.exit_code
     assert_equal "", result.stdout
   end

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

@@ -130,6 +130,7 @@ test_name "dsl::helpers::host_helpers #rsync_to" do
                              "remote_tmdir" => remote_tmpdir,
                              "result" => result.inspect) do
           remote_contents = on(default, "cat #{remote_filename}").stdout
+
           assert_equal contents, remote_contents
         end
       end
@@ -154,6 +155,7 @@ test_name "dsl::helpers::host_helpers #rsync_to" do
                                "remote_tmdir" => remote_tmpdir,
                                "result" => result.inspect) do
             remote_contents = on(host, "cat #{remote_filename}").stdout
+
             assert_equal contents, remote_contents
           end
         end

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

@@ -24,6 +24,7 @@ test_name "dsl::helpers::host_helpers #run_cron_on" do
 
     step "#run_cron_on CURRENTLY does not fail when listing cron jobs for a user with no cron entries" do
       result = run_cron_on default, :list, default['user']
+
       assert_equal 0, result.exit_code
     end
 
@@ -31,23 +32,27 @@ test_name "dsl::helpers::host_helpers #run_cron_on" do
       # this basically requires us to add a cron entry to make this work
       run_cron_on default, :add, default['user'], "* * * * * /bin/ls >/dev/null"
       result = run_cron_on default, :list, default['user']
+
       assert_equal 0, result.exit_code
       assert_match %r{/bin/ls}, result.stdout
     end
 
     step "#run_cron_on CURRENTLY does not fail, but returns nil, when adding cron jobs for an unknown user" do
       result = run_cron_on default, :add, "nonexistentuser", %{* * * * * /bin/echo "hello" >/dev/null}
+
       assert_nil result
     end
 
     step "#run_cron_on CURRENTLY does not fail, but returns nil, when attempting to add a bad cron entry" do
       result = run_cron_on default, :add, default['user'], "* * * * /bin/ls >/dev/null"
+
       assert_nil result
     end
 
     step "#run_cron_on can add a cron job for a user on a host" do
       run_cron_on default, :add, default['user'], %{* * * * * /bin/echo "hello" >/dev/null}
       result = run_cron_on default, :list, default['user']
+
       assert_equal 0, result.exit_code
       assert_match %r{/bin/echo}, result.stdout
     end
@@ -73,6 +78,7 @@ test_name "dsl::helpers::host_helpers #run_cron_on" do
 
       run_cron_on default, :add, default['user'], %{* * * * * /bin/echo "quality: job 1" >/dev/null}
       result = run_cron_on default, :list, default['user']
+
       assert_match %r{quality: job 1}, result.stdout
 
       run_cron_on default, :remove, default['user']
@@ -95,6 +101,7 @@ test_name "dsl::helpers::host_helpers #run_cron_on" do
       end
 
       results = run_cron_on hosts, :list, default['user']
+
       results.each do |result|
         assert_match %r{/bin/ls}, result.stdout
       end
@@ -104,6 +111,7 @@ test_name "dsl::helpers::host_helpers #run_cron_on" do
       run_cron_on hosts, :add, default['user'], "* * * * * /bin/ls >/dev/null"
 
       results = run_cron_on hosts, :list, default['user']
+
       results.each do |result|
         assert_match %r{/bin/ls}, result.stdout
       end
@@ -144,6 +152,7 @@ test_name "dsl::helpers::host_helpers #run_cron_on" do
       # this basically requires us to add a cron entry to make this work
       run_cron_on default, :add, default['user'], "* * * * * /bin/ls >/dev/null"
       result = run_cron_on default, :list, default['user']
+
       assert_equal 0, result.exit_code
       assert_match %r{/bin/ls}, result.stdout
     end
@@ -163,6 +172,7 @@ test_name "dsl::helpers::host_helpers #run_cron_on" do
     step "#run_cron_on can add a cron job for a user on a host" do
       run_cron_on default, :add, default['user'], %{* * * * * /bin/echo "hello" >/dev/null}
       result = run_cron_on default, :list, default['user']
+
       assert_equal 0, result.exit_code
       assert_match %r{/bin/echo}, result.stdout
     end
@@ -188,6 +198,7 @@ test_name "dsl::helpers::host_helpers #run_cron_on" do
 
       run_cron_on default, :add, default['user'], %{* * * * * /bin/echo "quality: job 1" >/dev/null}
       result = run_cron_on default, :list, default['user']
+
       assert_match %r{quality: job 1}, result.stdout
 
       run_cron_on default, :remove, default['user']
@@ -210,6 +221,7 @@ test_name "dsl::helpers::host_helpers #run_cron_on" do
       end
 
       results = run_cron_on hosts, :list, default['user']
+
       results.each do |result|
         assert_match %r{/bin/ls}, result.stdout
       end
@@ -219,6 +231,7 @@ test_name "dsl::helpers::host_helpers #run_cron_on" do
       run_cron_on hosts, :add, default['user'], "* * * * * /bin/ls >/dev/null"
 
       results = run_cron_on hosts, :list, default['user']
+
       results.each do |result|
         assert_match %r{/bin/ls}, result.stdout
       end

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

@@ -22,6 +22,7 @@ test_name "dsl::helpers::host_helpers #run_script_on" do
       local_filename, _contents = create_local_file_from_fixture("failing_shell_script", local_dir, "testfile.sh", "a+x")
 
       result = run_script_on default, local_filename, { :accept_all_exit_codes => true }
+
       assert_equal 1, result.exit_code
     end
   end
@@ -31,6 +32,7 @@ test_name "dsl::helpers::host_helpers #run_script_on" do
       local_filename, _contents = create_local_file_from_fixture("shell_script_with_output", local_dir, "testfile.sh", "a+x")
 
       results = run_script_on default, local_filename
+
       assert_equal 0, results.exit_code
       assert_equal "output\n", results.stdout
     end

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

@@ -22,6 +22,7 @@ test_name "dsl::helpers::host_helpers #run_script" do
       local_filename, _contents = create_local_file_from_fixture("failing_shell_script", local_dir, "testfile.sh", "a+x")
 
       result = run_script local_filename, { :accept_all_exit_codes => true }
+
       assert_equal 1, result.exit_code
     end
   end
@@ -31,6 +32,7 @@ test_name "dsl::helpers::host_helpers #run_script" do
       local_filename, _contents = create_local_file_from_fixture("shell_script_with_output", local_dir, "testfile.sh", "a+x")
 
       results = run_script local_filename
+
       assert_equal 0, results.exit_code
       assert_equal "output\n", results.stdout
     end

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

@@ -28,6 +28,7 @@ test_name "dsl::helpers::host_helpers #scp_from" do
       scp_from default, remote_filename, local_dir
 
       local_filename = File.join(local_dir, "testfile.txt")
+
       assert_equal contents, File.read(local_filename)
     end
   end
@@ -47,6 +48,7 @@ test_name "dsl::helpers::host_helpers #scp_from" do
 
       local_filename = File.join(local_dir, "testfile.txt")
       local_contents = File.read(local_filename)
+
       assert_equal remote_contents, local_contents
     end
   end

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

@@ -30,6 +30,7 @@ test_name "dsl::helpers::host_helpers #scp_to" do
 
       remote_filename = File.join(remote_tmpdir, "testfile.txt")
       remote_contents = on(default, "cat #{remote_filename}").stdout
+
       assert_equal contents, remote_contents
     end
   end
@@ -46,6 +47,7 @@ test_name "dsl::helpers::host_helpers #scp_to" do
 
       hosts.each do |host|
         remote_contents = on(host, "cat #{remote_filename}").stdout
+
         assert_equal contents, remote_contents
       end
     end

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

@@ -9,24 +9,29 @@ test_name "dsl::helpers::host_helpers #shell" do
 
   step "#shell makes command output available via `.stdout` on success" do
     output = shell(%{echo "echo via on"}).stdout
+
     assert_equal "echo via on\n", output
   end
 
   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)
   end
 
   step "#shell makes exit status available via `.exit_code`" do
     status = shell(%{echo "echo via on"}).exit_code
+
     assert_equal 0, status
   end
 
   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)
     status = result.exit_code
+
     assert_equal 127, status
   end
 

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

@@ -42,6 +42,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)
       end
     end
@@ -60,6 +61,7 @@ test_name "dsl::helpers::host_helpers #upgrade_package" do
 
       install_package default, "rsync"
       upgrade_package default, "rsync"
+
       assert check_for_package(default, "rsync"), "package was not successfully installed/upgraded"
     end
 

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

@@ -11,6 +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")
     end
   end
@@ -21,6 +22,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")
     end
   end
@@ -31,6 +33,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")
     end
   end
@@ -41,6 +44,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")
     end
   end
@@ -51,6 +55,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")
     end
   end
@@ -61,6 +66,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")
     end
   end
@@ -69,6 +75,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")
     end
   end

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

@@ -5,8 +5,10 @@ test_name "confirm host object behave correctly"
 step "#port_open? : can determine if a port is open on hosts"
 hosts.each do |host|
   logger.debug "port 22 (ssh) should be open on #{host}"
+
   assert_equal(true, host.port_open?(22), "port 22 on #{host} should be open")
   logger.debug "port 65535 should be closed on #{host}"
+
   assert_equal(false, host.port_open?(65535), "port 65535 on #{host} should be closed")
 end
 
@@ -15,6 +17,7 @@ hosts.each do |host|
   ip = host.ip
   # confirm ip format
   logger.debug("format of #{ip} for #{host} should be correct")
+
   assert_match(/\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}/, ip, "#{ip} on #{host} isn't correct format")
 end
 
@@ -62,7 +65,8 @@ hosts.each do |host|
   host.add_env_var(env_param1, env_value3)
 
   val = host.get_env_var(env_id)
-  assert('' == val, 'get_env_var should not match a partial env key name')
+
+  assert_equal('', val, 'get_env_var should not match a partial env key name')
 end
 
 step "#get_env_var : should not return a match from a key\'s value"
@@ -75,7 +79,8 @@ hosts.each do |host|
   host.add_env_var(env_param1, env_value1)
 
   val = host.get_env_var(env_value1)
-  assert('' == val, 'get_env_var should not return a match from a key\'s value')
+
+  assert_equal('', val, 'get_env_var should not return a match from a key\'s value')
 end
 
 step "#clear_env_var : should only remove the specified key"
@@ -99,11 +104,14 @@ hosts.each do |host|
   host.clear_env_var(env_param3)
 
   val = host.get_env_var(env_param1)
+
   assert_match(/^#{env_param1}=#{env_value1}$/, val, "#{env_param1} should exist after calling clear_env_var")
   val = host.get_env_var(env_param2)
+
   assert_match(/^#{env_param2}=#{env_value2}$/, val, "#{env_param2} should exist after calling clear_env_var")
   val = host.get_env_var(env_param3)
-  assert('' == val, "#{env_param3} should not exist after calling clear_env_var")
+
+  assert_equal('', val, "#{env_param3} should not exist after calling clear_env_var")
 end
 
 step "#add_env_var : can add a unique environment variable"
@@ -126,10 +134,13 @@ hosts.each do |host|
   host.add_env_var(env_param3, env_value3)
 
   val = host.get_env_var(env_param1)
+
   assert_match(/^#{env_param1}=#{env_value1}$/, val, "#{env_param1} should exist")
   val = host.get_env_var(env_param2)
+
   assert_match(/^#{env_param2}=#{env_value2}$/, val, "#{env_param2} should exist")
   val = host.get_env_var(env_param3)
+
   assert_match(/^#{env_param3}=#{env_value3}$/, val, "#{env_param3} should exist")
 end
 
@@ -147,6 +158,7 @@ hosts.each do |host|
   host.add_env_var("TEST", "3")
   logger.debug("ensure that TEST env var has correct setting")
   val = host.get_env_var("TEST")
+
   assert_match(/TEST=3(;|:)2(;|:)1$/, val, "add_env_var can correctly add env vars")
 end
 
@@ -169,6 +181,7 @@ step "#add_env_var : can preserve an environment between ssh connections" do
     host.close
     logger.debug("ensure that TEST env var has correct setting")
     val = host.get_env_var("TEST")
+
     assert_match(/TEST=3(;|:)2(;|:)1$/, val, "can preserve an environment between ssh connections")
   end
 end
@@ -178,14 +191,17 @@ hosts.each do |host|
   logger.debug("remove TEST=3")
   host.delete_env_var("TEST", "3")
   val = host.get_env_var("TEST")
+
   assert_match(/TEST=2(;|:)1$/, val, "delete_env_var can correctly delete part of a chained env var")
   logger.debug("remove TEST=1")
   host.delete_env_var("TEST", "1")
   val = host.get_env_var("TEST")
+
   assert_match(/TEST=2$/, val, "delete_env_var can correctly delete part of a chained env var")
   logger.debug("remove TEST=2")
   host.delete_env_var("TEST", "2")
   val = host.get_env_var("TEST")
+
   assert_equal("", val, "delete_env_var fully removes empty env var")
 end
 
@@ -195,6 +211,7 @@ hosts.each do |host|
   host.rm_rf("test1")
   # test dir construction
   logger.debug("create test1/test2/test3/test4")
+
   assert_equal(true, host.mkdir_p("test1/test2/test3/test4"), "can create directory structure")
   logger.debug("should be able to create a file in the new dir")
   on host, host.touch("test1/test2/test3/test4/test.txt", false)
@@ -218,9 +235,11 @@ hosts.each do |host|
     local_paths.each do |path|
       search_name = path.gsub(/^.*fixtures\//, '') # reduce down to the path that should match
       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
+
     assert_equal(0, host_paths.length, "there are extra paths on #{host} (#{host_paths})")
   end
 end
@@ -251,6 +270,7 @@ hosts.each do |host|
       end
       host_paths = host_paths - matched
     end
+
     assert_equal(0, host_paths.length, "there are extra paths on #{host} (#{host_paths})")
   end
 end
@@ -282,6 +302,7 @@ hosts.each do |host|
       end
       host_paths = host_paths - matched
     end
+
     assert_equal(0, host_paths.length, "there are extra paths on #{host} (#{host_paths})")
   end
 end
@@ -326,10 +347,12 @@ step 'Ensure that a long 128+ character string with UTF-8 characters does not br
   long_string = ('a' * 128) + "\u06FF"
   on(default, "mkdir /tmp/#{long_string}")
   result = on(default, 'ls /tmp')
-  assert(result.stdout.include?(long_string), 'Error in folder creation with long string + UTF-8 characters')
+
+  assert_includes(result.stdout, long_string, 'Error in folder creation with long string + UTF-8 characters')
 
   # remove the folder
   on(default, "rm -rf /tmp/#{long_string}")
   result = on(default, 'ls /tmp')
+
   assert(!result.stdout.include?(long_string), 'Error in folder deletion with long string + UTF-8 characters')
 end

data/acceptance/tests/base/host_prebuilt_steps/ssh_environment_test.rb

@@ -8,7 +8,7 @@ test_name "confirm host prebuilt steps behave correctly" do
 
     step "confirm PATH env variable is set in the ssh environment file" do
       hosts.each do |host|
-        assert(0 == on(host, "grep \"PATH\" #{host[:ssh_env_file]}").exit_code)
+        assert_equal(0, on(host, "grep \"PATH\" #{host[:ssh_env_file]}").exit_code)
       end
     end
   end
@@ -16,7 +16,7 @@ test_name "confirm host prebuilt steps behave correctly" do
   confine_block :to, :platform => /solaris-10/ do
     step "confirm /opt/csw/bin has been added to the path" do
       hosts.each do |host|
-        assert(0 == on(host, "grep \"/opt/csw/bin\" #{host[:ssh_env_file]}").exit_code)
+        assert_equal(0, on(host, "grep \"/opt/csw/bin\" #{host[:ssh_env_file]}").exit_code)
       end
     end
   end
@@ -24,7 +24,7 @@ test_name "confirm host prebuilt steps behave correctly" do
   confine_block :to, :platform => /openbsd/ do
     step "confirm PKG_PATH is set in the ssh environment file" do
       hosts.each do |host|
-        assert(0 == on(host, "grep \"PKG_PATH\" #{host[:ssh_env_file]}").exit_code)
+        assert_equal(0, on(host, "grep \"PKG_PATH\" #{host[:ssh_env_file]}").exit_code)
       end
     end
   end

data/acceptance/tests/hypervisor/communication_test.rb

@@ -2,6 +2,6 @@
 step "hosts can ping each other"
 hosts.each do |one|
   hosts.each do |two|
-    assert_equal(one.ping(two), true)
+    assert_equal(true, one.ping(two))
   end
 end

data/beaker.gemspec

@@ -27,19 +27,22 @@ Gem::Specification.new do |s|
   # Run time dependencies
   s.add_runtime_dependency 'minitar', '~> 0.6'
   s.add_runtime_dependency 'minitest', '~> 5.4'
-  s.add_runtime_dependency 'rexml'
+  s.add_runtime_dependency 'rexml', '~> 3.2', '>= 3.2.5'
+
+  # net-ssh compatibility with ed25519 keys
+  s.add_runtime_dependency 'bcrypt_pbkdf', '>= 1.0', '< 2.0'
+  s.add_runtime_dependency 'ed25519', '>= 1.2', '<2.0'
 
-  s.add_runtime_dependency 'ed25519', '~> 1.0' # net-ssh compatibility with ed25519 keys
   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 'net-ssh', '~> 7.1'
 
   s.add_runtime_dependency 'in-parallel', '>= 0.1', '< 2.0'
   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 'beaker-hostgenerator'
+  s.add_runtime_dependency 'beaker-hostgenerator', '~> 2.0'
   s.add_runtime_dependency 'stringify-hash', '~> 0.0'
 end

data/lib/beaker/options/command_line_parser.rb

@@ -248,7 +248,7 @@ module Beaker
 
           opts.on '--[no-]debug',
                   'DEPRECATED, use --log-level' do |bool|
-            @cmd_options[:log_level] =  bool ? 'debug' : 'info'
+            @cmd_options[:log_level] = bool ? 'debug' : 'info'
           end
 
           opts.on '-x', '--[no-]xml',

data/lib/beaker/test_case.rb

@@ -22,7 +22,7 @@ module Beaker
     include Beaker::DSL
 
     # The Exception raised by Ruby's STDLIB's test framework (Ruby 1.9)
-    TEST_EXCEPTION_CLASS = ::MiniTest::Assertion
+    TEST_EXCEPTION_CLASS = ::Minitest::Assertion
 
     # Necessary for implementing {Beaker::DSL::Helpers#confine}.
     # Assumed to be an array of valid {Beaker::Host} objects for

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '5.2.0'
+    STRING = '5.3.1'
   end
 end

data/lib/beaker.rb

@@ -35,6 +35,6 @@ module Beaker
   # Shared methods and helpers
   require 'beaker/shared'
 
-  # MiniTest, for including MiniTest::Assertions
+  # Minitest, for including Minitest::Assertions
   require 'minitest/test'
 end

data/spec/beaker/dsl/assertions_spec.rb

@@ -79,7 +79,7 @@ EXPECT
         expect(result).to receive(:output).and_return(output)
 
         expect(subject).to receive(:result).at_least(:once).and_return(result)
-        expect { subject.assert_output expectation }.to raise_error(MiniTest::Assertion)
+        expect { subject.assert_output expectation }.to raise_error(Minitest::Assertion)
       end
     end
   end

data/spec/beaker/dsl/structure_spec.rb

@@ -196,11 +196,11 @@ describe ClassMixedWithDSLStructure do
   end
 
   describe '#expect_failure' do
-    it 'passes when a MiniTest assertion is raised' do
+    it 'passes when a Minitest assertion is raised' do
       expect(subject).to receive(:logger).and_return(logger)
       expect(logger).to receive(:notify)
       # We changed this lambda to use the simplest assert possible; using assert_equal
-      # caused an error in minitest 5.9.0 trying to write to the file system.
+      # caused an error in Minitest 5.9.0 trying to write to the file system.
       block = -> { assert(false, 'this assertion should be caught') }
       expect { subject.expect_failure 'this is an expected failure', &block }.not_to raise_error
     end
@@ -212,9 +212,9 @@ describe ClassMixedWithDSLStructure do
       expect { subject.expect_failure 'this is an expected failure', &block }.not_to raise_error
     end
 
-    it 'fails when a non-Beaker, non-MiniTest assertion is raised' do
-      block = -> { raise 'not a Beaker or MiniTest error' }
-      expect { subject.expect_failure 'this has a non-Beaker, non-MiniTest exception', &block }.to raise_error(RuntimeError, /not a Beaker or MiniTest error/)
+    it 'fails when a non-Beaker, non-Minitest assertion is raised' do
+      block = -> { raise 'not a Beaker or Minitest error' }
+      expect { subject.expect_failure 'this has a non-Beaker, non-Minitest exception', &block }.to raise_error(RuntimeError, /not a Beaker or Minitest error/)
     end
 
     it 'fails when no assertion is raised' do