beaker 5.2.0 → 5.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d16043faca3a48ef9dd5a7171bf0241dd30fd801029eba8e881fe9d3d8afbef1
-  data.tar.gz: 64bec8b91441d824ad87a112914a5f41b5fe2b48131b9f6d99599b201279b4a3
+  metadata.gz: b4829c1a428f59340c095f78aa87331fb6a7df76854cdb4d95ed62553af19112
+  data.tar.gz: 0e08786ce7520319ea25c94ece1fb8f3a2a56e507035fd4ced4edeabfa1153ac
 SHA512:
-  metadata.gz: 17f0baf5a669e5ffa2e9f4214dbeb84f0e5fbf4ff80e048243215006aa8e5fc91be5df24e1714f71962a7a1d2e3d4f83c74c987f98a9a8ceff2b9397762b5167
-  data.tar.gz: 2826c21940af588185545f7a4f987600a789a9c646b9fe0d31d9e6d6f4f5eae0573d51591de0943d0dc9077cb0e0f3114291881fc10c6dcd3b54af24ec2425e2
+  metadata.gz: 7ecddce8f3ffcc7fba3dceb5061667d48332808a76d88aae73b7d681e1d1f4478d99bdd464aa9ea3a6568425630a105618eb643ee6b9d9710e4e90adabb8e529
+  data.tar.gz: dd41043f67f6d951beb5de7739e7e9363a221ff2a09d9448edca2bdb9e054ad19200e639da3714d1c364e2fcc5c7ee6b1d17f572b5bdd7c458373301c23acf3a

data/.github/workflows/release.yml

@@ -18,7 +18,7 @@ jobs:
         env:
           BUNDLE_WITHOUT: release:development:rubocop
       - name: Build gem
-        run: gem build *.gemspec
+        run: gem build --strict --verbose *.gemspec
       - name: Publish gem to rubygems.org
         run: gem push *.gem
         env:

data/.github/workflows/test.yml

@@ -45,7 +45,7 @@ jobs:
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
       - name: Build gem
-        run: gem build *.gemspec
+        run: gem build --strict --verbose *.gemspec
       - name: Run unit tests
         run: bundle exec rake spec
       - name: Run acceptance tests

data/.rubocop.yml

@@ -1,6 +1,5 @@
 ---
-inherit_from:
-  - .rubocop_todo.yml
+inherit_from: .rubocop_todo.yml
 
 inherit_gem:
   voxpupuli-rubocop: rubocop.yml

data/.rubocop_todo.yml

@@ -1,11 +1,12 @@
 # This configuration was generated by
-# `rubocop --auto-gen-config --no-offense-counts --no-auto-gen-timestamp`
-# using RuboCop version 1.50.1.
+# `rubocop --auto-gen-config`
+# on 2023-05-30 09:17:22 UTC using RuboCop version 1.50.2.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
+# Offense count: 15
 # Configuration parameters: AllowedMethods.
 # AllowedMethods: enums
 Lint/ConstantDefinitionInBlock:
@@ -26,6 +27,7 @@ Lint/ConstantDefinitionInBlock:
     - 'spec/beaker/host/windows/pkg_spec.rb'
     - 'spec/beaker/options/hosts_file_parser_spec.rb'
 
+# Offense count: 17
 # Configuration parameters: AllowComments, AllowEmptyLambdas.
 Lint/EmptyBlock:
   Exclude:
@@ -35,16 +37,19 @@ Lint/EmptyBlock:
     - 'spec/beaker/logger_junit_spec.rb'
     - 'spec/beaker/logger_spec.rb'
 
+# Offense count: 1
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Lint/NonAtomicFileOperation:
   Exclude:
     - 'acceptance/tests/base/dsl/helpers/host_helpers/archive_file_from_test.rb'
 
+# Offense count: 2
 Lint/RescueException:
   Exclude:
     - 'lib/beaker/dsl/structure.rb'
     - 'lib/beaker/test_suite_result.rb'
 
+# Offense count: 27
 Lint/ShadowingOuterLocalVariable:
   Exclude:
     - 'lib/beaker/dsl/helpers/host_helpers.rb'
@@ -55,6 +60,7 @@ Lint/ShadowingOuterLocalVariable:
     - 'lib/beaker/host_prebuilt_steps.rb'
     - 'lib/beaker/perf.rb'
 
+# Offense count: 12
 Lint/UselessAssignment:
   Exclude:
     - 'acceptance/tests/base/dsl/helpers/host_helpers/curl_with_retries_test.rb'
@@ -62,6 +68,29 @@ Lint/UselessAssignment:
     - 'lib/beaker/dsl/helpers/host_helpers.rb'
     - 'lib/beaker/logger_junit.rb'
 
+# Offense count: 5
+# This cop supports unsafe autocorrection (--autocorrect-all).
+Minitest/AssertTruthy:
+  Exclude:
+    - 'acceptance/tests/base/dsl/helpers/host_helpers/archive_file_from_test.rb'
+    - 'acceptance/tests/base/host/host_test.rb'
+    - 'acceptance/tests/hypervisor/communication_test.rb'
+
+# Offense count: 2
+# Configuration parameters: Severity.
+Minitest/AssertWithExpectedArgument:
+  Exclude:
+    - 'acceptance/tests/base/dsl/helpers/hocon_helpers_test.rb'
+
+# Offense count: 9
+# This cop supports unsafe autocorrection (--autocorrect-all).
+Minitest/RefuteFalse:
+  Exclude:
+    - 'acceptance/tests/base/dsl/helpers/host_helpers/archive_file_from_test.rb'
+    - 'acceptance/tests/base/dsl/helpers/host_helpers/check_for_package_test.rb'
+    - 'acceptance/tests/base/host/host_test.rb'
+
+# Offense count: 20
 # Configuration parameters: ForbiddenDelimiters.
 # ForbiddenDelimiters: (?i-mx:(^|\s)(EO[A-Z]{1}|END)(\s|$))
 Naming/HeredocDelimiterNaming:
@@ -77,6 +106,7 @@ Naming/HeredocDelimiterNaming:
     - 'spec/beaker/host/windows_spec.rb'
     - 'spec/beaker/test_case_spec.rb'
 
+# Offense count: 2
 # Configuration parameters: EnforcedStyleForLeadingUnderscores.
 # SupportedStylesForLeadingUnderscores: disallowed, required, optional
 Naming/MemoizedInstanceVariableName:
@@ -84,6 +114,7 @@ Naming/MemoizedInstanceVariableName:
     - 'lib/beaker/host.rb'
     - 'lib/beaker/options/presets.rb'
 
+# Offense count: 4
 # Configuration parameters: MinSize.
 Performance/CollectionLiteralInLoop:
   Exclude:
@@ -91,11 +122,13 @@ Performance/CollectionLiteralInLoop:
     - 'lib/beaker/dsl/structure.rb'
     - 'lib/beaker/test_suite_result.rb'
 
+# Offense count: 17
 RSpec/AnyInstance:
   Exclude:
     - 'spec/beaker/host/windows/file_spec.rb'
     - 'spec/beaker/subcommand_spec.rb'
 
+# Offense count: 12
 # This cop supports unsafe autocorrection (--autocorrect-all).
 RSpec/BeEq:
   Exclude:
@@ -104,15 +137,18 @@ RSpec/BeEq:
     - 'spec/beaker/host/windows/exec_spec.rb'
     - 'spec/beaker/host_spec.rb'
 
+# Offense count: 121
 # Configuration parameters: Prefixes, AllowedPatterns.
 # Prefixes: when, with, without
 RSpec/ContextWording:
   Enabled: false
 
+# Offense count: 239
 # Configuration parameters: CountAsOne.
 RSpec/ExampleLength:
   Max: 44
 
+# Offense count: 27
 RSpec/ExpectInHook:
   Exclude:
     - 'spec/beaker/cli_spec.rb'
@@ -124,6 +160,7 @@ RSpec/ExpectInHook:
     - 'spec/beaker/options/parser_spec.rb'
     - 'spec/beaker/ssh_connection_spec.rb'
 
+# Offense count: 22
 # Configuration parameters: AssignmentOnly.
 RSpec/InstanceVariable:
   Exclude:
@@ -133,10 +170,12 @@ RSpec/InstanceVariable:
     - 'spec/beaker/dsl/test_tagging_spec.rb'
     - 'spec/beaker/host_prebuilt_steps_spec.rb'
 
+# Offense count: 3
 RSpec/IteratedExpectation:
   Exclude:
     - 'spec/beaker/dsl/helpers/host_helpers_spec.rb'
 
+# Offense count: 12
 RSpec/LeakyConstantDeclaration:
   Exclude:
     - 'spec/beaker/host/freebsd/exec_spec.rb'
@@ -152,19 +191,23 @@ RSpec/LeakyConstantDeclaration:
     - 'spec/beaker/host/windows/pkg_spec.rb'
     - 'spec/beaker/options/hosts_file_parser_spec.rb'
 
+# Offense count: 1
 RSpec/MultipleDescribes:
   Exclude:
     - 'spec/beaker/dsl/test_tagging_spec.rb'
 
+# Offense count: 134
 # Configuration parameters: AllowSubject.
 RSpec/MultipleMemoizedHelpers:
   Max: 17
 
+# Offense count: 500
 # Configuration parameters: EnforcedStyle, IgnoreSharedExamples.
 # SupportedStyles: always, named_only
 RSpec/NamedSubject:
   Enabled: false
 
+# Offense count: 42
 # Configuration parameters: AllowedPatterns.
 # AllowedPatterns: ^expect_, ^assert_
 RSpec/NoExpectationExample:
@@ -175,17 +218,20 @@ RSpec/NoExpectationExample:
     - 'spec/beaker/logger_spec.rb'
     - 'spec/beaker/options/subcommand_options_parser_spec.rb'
 
+# Offense count: 7
 RSpec/RepeatedDescription:
   Exclude:
     - 'spec/beaker/cli_spec.rb'
     - 'spec/beaker/host/unix/exec_spec.rb'
     - 'spec/beaker/host/unix/pkg_spec.rb'
 
+# Offense count: 4
 RSpec/RepeatedExample:
   Exclude:
     - 'spec/beaker/dsl/roles_spec.rb'
     - 'spec/beaker/logger_spec.rb'
 
+# Offense count: 178
 RSpec/SubjectStub:
   Exclude:
     - 'spec/beaker/dsl/assertions_spec.rb'
@@ -202,6 +248,7 @@ RSpec/SubjectStub:
     - 'spec/beaker/host/windows/user_spec.rb'
     - 'spec/beaker/host_prebuilt_steps_spec.rb'
 
+# Offense count: 12
 RSpec/UnspecifiedException:
   Exclude:
     - 'spec/beaker/cli_spec.rb'
@@ -209,15 +256,18 @@ RSpec/UnspecifiedException:
     - 'spec/beaker/host_spec.rb'
     - 'spec/beaker/test_suite_spec.rb'
 
+# Offense count: 86
 # Configuration parameters: IgnoreNameless, IgnoreSymbolicNames.
 RSpec/VerifiedDoubles:
   Enabled: false
 
+# Offense count: 2
 # This cop supports safe autocorrection (--autocorrect).
 Rake/Desc:
   Exclude:
     - 'Rakefile'
 
+# Offense count: 7
 Security/Eval:
   Exclude:
     - 'Rakefile'
@@ -228,10 +278,12 @@ Security/Eval:
     - 'lib/beaker/options/options_file_parser.rb'
     - 'lib/beaker/test_case.rb'
 
+# Offense count: 1
 Security/Open:
   Exclude:
     - 'lib/beaker/dsl/helpers/web_helpers.rb'
 
+# Offense count: 104
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
 # URISchemes: http, https

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## [5.3.0] (https://github.com/voxpupuli/beaker/tree/5.3.0) (2023-06-06)
+
+**Implemented enhancements:**
+
+- Add bcrypt_pbkdf to fix ed25519 ssh keys support [\#1810](https://github.com/voxpupuli/beaker/pull/1810) ([jay7x](https://github.com/jay7x))
+
+**Merged changes:**
+
+- Build gems with verbosity and strictness [\#1811](https://github.com/voxpupuli/beaker/pull/1811) ([bastelfreak](https://github.com/bastelfreak))
+- rubocop: autofix [\#1816](https://github.com/voxpupuli/beaker/pull/1816) ([bastelfreak](https://github.com/bastelfreak))
+- GCG: Add missing faraday dependency [\#1815](https://github.com/voxpupuli/beaker/pull/1815) ([bastelfreak](https://github.com/bastelfreak))
+
 ## [5.2.0](https://github.com/voxpupuli/beaker/tree/5.2.0) (2023-04-28)
 
 **Implemented enhancements:**

data/Gemfile

@@ -26,6 +26,7 @@ if ENV['BEAKER_HYPERVISOR']
 end
 
 group :release do
+  gem 'faraday-retry', require: false
   gem 'github_changelog_generator', require: false
 end
 

data/acceptance/tests/base/dsl/helpers/configuration_test.rb

@@ -8,6 +8,7 @@ test_name "dsl::helpers::host_helpers test configuration validation" do
            "dsl::helpers::host_helpers acceptance tests require at least two hosts"
 
     agents = select_hosts(:roles => "agent")
+
     assert (agents.size > 1),
            "dsl::helpers::host_helpers acceptance tests require at least two hosts with the :agent role"
 

data/acceptance/tests/base/dsl/helpers/hocon_helpers_test.rb

@@ -15,6 +15,7 @@ test_name 'Hocon Helpers Test' do
 
   step '#hocon_file_read : reads doc' do
     doc = hocon_file_read_on(hosts[0], hocon_filename)
+
     assert(doc.has_value?('setting2'))
   end
 
@@ -34,7 +35,7 @@ test_name 'Hocon Helpers Test' do
         end
         fail('execution should not continue in failure mode')
       rescue ArgumentError => e
-        assert(e.to_s.include?('requires a filename'))
+        assert_includes(e.to_s, 'requires a filename')
       else
         fail('No exception raised in failure mode')
       end
@@ -53,7 +54,7 @@ test_name 'Hocon Helpers Test' do
         hocon_file_edit_on(hosts, hocon_filename)
         fail('execution should not continue in failure mode')
       rescue ArgumentError => e
-        assert(e.to_s.include?('No block was provided'))
+        assert_includes(e.to_s, 'No block was provided')
       else
         fail('No exception raised in failure mode')
       end
@@ -71,6 +72,7 @@ test_name 'Hocon Helpers Test' do
     step '#hocon_file_edit_on : independently read value to verify save' do
       hocon_file_edit_on(hosts, hocon_filename) do |_host, doc|
         msg_fail = 'Should have saved "a.b" value inserted in previous step'
+
         assert(doc.has_value?('a.b'), msg_fail)
       end
     end
@@ -86,6 +88,7 @@ test_name 'Hocon Helpers Test' do
     step '#hocon_file_edit_in_place_on : verify save' do
       hocon_file_edit_on(hosts, hocon_filename) do |_host, doc|
         msg_fail = 'Should have saved "c.d" value inserted in previous step'
+
         assert(doc.has_value?('c.d'), msg_fail)
       end
     end

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

@@ -15,6 +15,7 @@ test_name "dsl::helpers::host_helpers #archive_file_from" do
     assert_equal(false, Dir.exist?('archive'))
     assert_equal(false, Dir.exist?('archive/sut-files'))
     archive_file_from(default, filepath)
+
     assert_equal(true, Dir.exist?('archive/sut-files'))
   end
 
@@ -32,17 +33,20 @@ test_name "dsl::helpers::host_helpers #archive_file_from" do
     # Create a remote file to archive
     filepath = default.tmpfile('archive-file-test')
     create_remote_file(default, filepath, 'number of the beast')
+
     assert_equal(false, Dir.exist?(filepath))
 
     # Test that the file is copied locally to <archiveroot>/<hostname>/<filepath>
     Dir.mktmpdir do |tmpdir|
       tar_path = File.join(tmpdir, default, filepath + '.tgz')
       archive_file_from(default, filepath, {}, tmpdir, tar_path)
-      assert(File.exist?(tar_path))
+
+      assert_path_exists(tar_path)
       expected_path = File.join(tmpdir, default)
 
       tgz = Zlib::GzipReader.new(File.open(tar_path, 'rb'))
       Minitar.unpack(tgz, expected_path)
+
       assert_equal('number of the beast', File.read(expected_path + '/' + filepath).strip)
     end
   end

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

@@ -6,6 +6,7 @@ test_name "dsl::helpers::host_helpers #backup_the_file" do
     remote_source = default.tmpdir
     remote_destination = default.tmpdir
     result = backup_the_file default, remote_source, remote_destination
+
     assert_nil result
   end
 
@@ -29,6 +30,7 @@ test_name "dsl::helpers::host_helpers #backup_the_file" do
 
     assert_equal remote_destination_filename, result
     remote_contents = on(default, "cat #{remote_destination_filename}").stdout
+
     assert_equal contents, remote_contents
   end
 
@@ -43,6 +45,7 @@ test_name "dsl::helpers::host_helpers #backup_the_file" do
 
     assert_equal remote_destination_filename, result
     remote_contents = on(default, "cat #{remote_destination_filename}").stdout
+
     assert_equal contents, remote_contents
   end
 

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

@@ -25,11 +25,13 @@ test_name "dsl::helpers::host_helpers #check_for_package" do
 
     step "#check_for_package will return false if the specified package is not installed on the remote host" do
       result = check_for_package default, "non-existent-package-name"
+
       assert !result
     end
 
     step "#check_for_package will return true if the specified package is installed on the remote host" do
       result = check_for_package default, known_installed_package
+
       assert result
     end
 
@@ -43,11 +45,13 @@ test_name "dsl::helpers::host_helpers #check_for_package" do
   confine_block :to, :platform => /solaris/ do
     step "#check_for_package will return false if the specified package is not installed on the remote host" do
       result = check_for_package default, "non-existent-package-name"
+
       assert !result
     end
 
     step "#check_for_package will return true if the specified package is installed on the remote host" do
       result = check_for_package default, known_installed_package
+
       assert result
     end
 
@@ -69,12 +73,14 @@ test_name "dsl::helpers::host_helpers #check_for_package" do
   confine_block :except, :platform => /windows|solaris|osx/ do
     step "#check_for_package will return false if the specified package is not installed on the remote host" do
       result = check_for_package default, "non-existent-package-name"
+
       assert !result
     end
 
     step "#check_for_package will return true if the specified package is installed on the remote host" do
       install_package default, known_installed_package
       result = check_for_package default, known_installed_package
+
       assert result
     end
 

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

@@ -43,6 +43,7 @@ test_name "dsl::helpers::host_helpers #create_remote_file" do
     create_remote_file_with_backups default, remote_filename, contents
 
     remote_contents = on(default, "cat #{remote_filename}").stdout
+
     assert_equal contents, remote_contents
   end
 
@@ -54,6 +55,7 @@ test_name "dsl::helpers::host_helpers #create_remote_file" do
     create_remote_file_with_backups default, remote_filename, contents, { :protocol => "scp" }
 
     remote_contents = on(default, "cat #{remote_filename}").stdout
+
     assert_equal contents, remote_contents
   end
 
@@ -72,6 +74,7 @@ test_name "dsl::helpers::host_helpers #create_remote_file" do
 
     hosts.each do |host|
       remote_contents = on(host, "cat #{remote_filename}").stdout
+
       assert_equal contents, remote_contents
     end
   end
@@ -91,6 +94,7 @@ test_name "dsl::helpers::host_helpers #create_remote_file" do
 
     hosts.each do |host|
       remote_contents = on(host, "cat #{remote_filename}").stdout
+
       assert_equal contents, remote_contents
     end
   end
@@ -144,6 +148,7 @@ test_name "dsl::helpers::host_helpers #create_remote_file" do
                            "contents" => contents,
                            "result" => result) do
         remote_contents = on(default, "cat #{remote_filename}").stdout
+
         assert_equal contents, remote_contents
       end
     end
@@ -171,6 +176,7 @@ test_name "dsl::helpers::host_helpers #create_remote_file" do
                              "contents" => contents,
                              "result" => result) do
           remote_contents = on(host, "cat #{remote_filename}").stdout
+
           assert_equal contents, remote_contents
         end
       end

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

@@ -25,6 +25,7 @@ test_name "dsl::helpers::host_helpers #curl_on" do
 
     assert_equal 0, result.exit_code
     remote_contents = on(default, "cat #{remote_targetfilename}").stdout
+
     assert_equal contents, remote_contents
   end
 
@@ -42,6 +43,7 @@ test_name "dsl::helpers::host_helpers #curl_on" do
 
     hosts.each do |host|
       remote_contents = on(host, "cat #{remote_targetfilename}").stdout
+
       assert_equal contents, remote_contents
     end
   end

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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 5.2.0
+  version: 5.3.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-28 00:00:00.000000000 Z
+date: 2023-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fakefs
@@ -98,30 +98,62 @@ dependencies:
   name: rexml
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.2.5
 - !ruby/object:Gem::Dependency
-  name: ed25519
+  name: bcrypt_pbkdf
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: ed25519
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: hocon
   requirement: !ruby/object:Gem::Requirement
@@ -174,16 +206,16 @@ dependencies:
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: in-parallel
   requirement: !ruby/object:Gem::Requirement
@@ -242,16 +274,16 @@ dependencies:
   name: beaker-hostgenerator
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: stringify-hash
   requirement: !ruby/object:Gem::Requirement