beaker 6.8.1 → 7.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 569f6e836d92183b8d192a6865f0db91f711fe52235c37a4d3faaf0dbde2daec
-  data.tar.gz: 49dd48391cb708a5dd9eb17272c8a84df1658b1263664c185caa8da81592b213
+  metadata.gz: 7aac904257f5f7c3605a6139a432f9768a1bf33a476f8069d66566853b31cee4
+  data.tar.gz: f853066d6563fa82c6e4fc8c66167ac200c6aad5ca49d15b1269771f4d1fd036
 SHA512:
-  metadata.gz: a0f60c37aa1325936de181703c981bab351560035cb42b50b9c0789ce39463c655848c7856d4387dac64a4d7dbf1be6b16102447017aec25fb3befe0a7af3b78
-  data.tar.gz: b26dc87dbff51e7437594c17a0dfac7dd0287a7e91a5f03070dbb7783f2e32a26d832ce7048a32713aec9d04824aa4b2bc1780a0625b71c1d1dd9cd0ead43142
+  metadata.gz: 63c3f7bc55be648f3dd630065c2db6669a6740c9cdfc5da7bae529587403fc0b7d64edbdc9665c364616cfc47a9eb2a9fc8502693fa8b132e06dd66fb1f7f216
+  data.tar.gz: 6818daa647d74f067e1ed8c21ef98ae92bd42f69539e864f708e2a51d40e3d1f9d68c82a76517662758d04db18fd37a67287c3d339192d8244f50a2bfe2bcbae

data/.github/workflows/release.yml

@@ -15,7 +15,7 @@ jobs:
     name: Build the gem
     runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Install Ruby
         uses: ruby/setup-ruby@v1
         with:
@@ -39,7 +39,7 @@ jobs:
       contents: write # clone repo and create release
     steps:
       - name: Download gem from GitHub cache
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
         with:
           name: gem-artifact
       - name: Create Release
@@ -56,7 +56,7 @@ jobs:
       packages: write # publish to rubygems.pkg.github.com
     steps:
       - name: Download gem from GitHub cache
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
         with:
           name: gem-artifact
       - name: Publish gem to GitHub packages
@@ -73,7 +73,7 @@ jobs:
       id-token: write # rubygems.org authentication
     steps:
       - name: Download gem from GitHub cache
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
         with:
           name: gem-artifact
       - uses: rubygems/configure-rubygems-credentials@v1.0.0
@@ -92,7 +92,7 @@ jobs:
       - release-to-rubygems
     steps:
       - name: Download gem from GitHub cache
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
         with:
           name: gem-artifact
       - name: Install Ruby

data/.github/workflows/test.yml

@@ -7,13 +7,16 @@ on:
     branches:
       - master
 
+permissions:
+  contents: read
+
 jobs:
   rubocop_and_matrix:
     runs-on: ubuntu-24.04
     outputs:
       ruby: ${{ steps.ruby.outputs.versions }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Install Ruby ${{ matrix.ruby }}
         uses: ruby/setup-ruby@v1
         with:
@@ -35,7 +38,7 @@ jobs:
     env:
       BEAKER_HYPERVISOR: docker
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Install Ruby ${{ matrix.ruby }}
         uses: ruby/setup-ruby@v1
         with:

data/.rubocop.yml

@@ -4,6 +4,9 @@ inherit_from: .rubocop_todo.yml
 inherit_gem:
   voxpupuli-rubocop: rubocop.yml
 
+AllCops:
+  TargetRubyVersion: 3.2
+
 Layout/LineLength:
   Exclude:
     - acceptance/**/*.rb
@@ -19,7 +22,7 @@ Naming/FileName:
 Naming/MethodParameterName:
   MinNameLength: 1
 
-Naming/PredicateName:
+Naming/PredicatePrefix:
   Enabled: false
 
 RSpec/DescribeClass:

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config --no-auto-gen-timestamp`
-# using RuboCop version 1.75.7.
+# using RuboCop version 1.79.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
@@ -43,16 +43,10 @@ Lint/NonAtomicFileOperation:
   Exclude:
     - 'acceptance/tests/base/dsl/helpers/host_helpers/archive_file_from_test.rb'
 
-# Offense count: 26
-Lint/ShadowingOuterLocalVariable:
+# Offense count: 1
+Lint/UselessOr:
   Exclude:
-    - 'lib/beaker/dsl/helpers/host_helpers.rb'
-    - 'lib/beaker/dsl/helpers/web_helpers.rb'
-    - 'lib/beaker/dsl/wrappers.rb'
-    - 'lib/beaker/host/pswindows/exec.rb'
-    - 'lib/beaker/host/unix/pkg.rb'
-    - 'lib/beaker/host_prebuilt_steps.rb'
-    - 'lib/beaker/perf.rb'
+    - 'lib/beaker/test_suite_result.rb'
 
 # Offense count: 5
 # This cop supports unsafe autocorrection (--autocorrect-all).
@@ -100,6 +94,25 @@ Naming/MemoizedInstanceVariableName:
     - 'lib/beaker/host.rb'
     - 'lib/beaker/options/presets.rb'
 
+# Offense count: 22
+# Configuration parameters: Mode, AllowedMethods, AllowedPatterns, AllowBangMethods, WaywardPredicates.
+# AllowedMethods: call
+# WaywardPredicates: nonzero?
+Naming/PredicateMethod:
+  Exclude:
+    - 'lib/beaker/dsl/helpers/host_helpers.rb'
+    - 'lib/beaker/dsl/roles.rb'
+    - 'lib/beaker/host/freebsd/pkg.rb'
+    - 'lib/beaker/host/mac/pkg.rb'
+    - 'lib/beaker/host/pswindows/exec.rb'
+    - 'lib/beaker/host/pswindows/pkg.rb'
+    - 'lib/beaker/host/unix.rb'
+    - 'lib/beaker/host/unix/exec.rb'
+    - 'lib/beaker/host/unix/pkg.rb'
+    - 'lib/beaker/host/windows/exec.rb'
+    - 'lib/beaker/host/windows/pkg.rb'
+    - 'lib/beaker/ssh_connection.rb'
+
 # Offense count: 4
 # Configuration parameters: MinSize.
 Performance/CollectionLiteralInLoop:
@@ -294,12 +307,6 @@ RSpec/UnspecifiedException:
 RSpec/VerifiedDoubles:
   Enabled: false
 
-# Offense count: 2
-# This cop supports safe autocorrection (--autocorrect).
-Rake/Desc:
-  Exclude:
-    - 'Rakefile'
-
 # Offense count: 7
 Security/Eval:
   Exclude:
@@ -318,7 +325,7 @@ Security/Open:
 
 # Offense count: 104
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns, SplitStrings.
+# Configuration parameters: AllowHeredoc, AllowURI, AllowQualifiedName, URISchemes, IgnoreCopDirectives, AllowedPatterns, SplitStrings.
 # URISchemes: http, https
 Layout/LineLength:
   Max: 225

data/CHANGELOG.md

@@ -1,5 +1,26 @@
 # Changelog
 
+## [7.0.1](https://github.com/voxpupuli/beaker/tree/7.0.1) (2025-08-14)
+
+[Full Changelog](https://github.com/voxpupuli/beaker/compare/7.0.0...7.0.1)
+
+**Fixed bugs:**
+
+- Update verify\_host\_key usage to :never, fixes deprecation warning [\#1945](https://github.com/voxpupuli/beaker/pull/1945) ([silug](https://github.com/silug))
+- Merge ssh settings [\#1944](https://github.com/voxpupuli/beaker/pull/1944) ([silug](https://github.com/silug))
+
+## [7.0.0](https://github.com/voxpupuli/beaker/tree/7.0.0) (2025-08-07)
+
+[Full Changelog](https://github.com/voxpupuli/beaker/compare/6.8.1...7.0.0)
+
+**Breaking changes:**
+
+- Require Ruby 3.2 [\#1906](https://github.com/voxpupuli/beaker/pull/1906) ([bastelfreak](https://github.com/bastelfreak))
+
+**Implemented enhancements:**
+
+- beaker-hostgenerator: Switch to 3.x [\#1937](https://github.com/voxpupuli/beaker/pull/1937) ([bastelfreak](https://github.com/bastelfreak))
+
 ## [6.8.1](https://github.com/voxpupuli/beaker/tree/6.8.1) (2025-06-16)
 
 [Full Changelog](https://github.com/voxpupuli/beaker/compare/6.8.0...6.8.1)

data/Rakefile

@@ -6,10 +6,12 @@ HOSTS_PRESERVED  = 'log/latest/hosts_preserved.yml'
 
 task :default => ['test:spec']
 
+desc 'Run unit tests'
 task :test do
   Rake::Task['test:spec'].invoke
 end
 
+desc 'run unit tests'
 task :spec do
   Rake::Task['test:spec'].invoke
 end
@@ -186,7 +188,7 @@ begin
   require 'github_changelog_generator/task'
 
   GitHubChangelogGenerator::RakeTask.new :changelog do |config|
-    config.exclude_labels = %w{duplicate question invalid wontfix wont-fix skip-changelog}
+    config.exclude_labels = %w{duplicate question invalid wontfix wont-fix skip-changelog github_actions}
     config.user = 'voxpupuli'
     config.project = 'beaker'
     gem_version = Gem::Specification.load("#{config.project}.gemspec").version

data/beaker.gemspec

@@ -16,13 +16,13 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.required_ruby_version = Gem::Requirement.new('>= 2.7')
+  s.required_ruby_version = Gem::Requirement.new('>= 3.2')
 
   # Testing dependencies
   s.add_development_dependency 'fakefs', '>= 2.4', '< 4'
   s.add_development_dependency 'rake', '~> 13.0'
   s.add_development_dependency 'rspec', '~> 3.0'
-  s.add_development_dependency 'voxpupuli-rubocop', '~> 3.1.0'
+  s.add_development_dependency 'voxpupuli-rubocop', '~> 4.2.0'
 
   # Run time dependencies
   # Required for Ruby 3.3+ support
@@ -47,6 +47,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'thor', ['>= 1.0.1', '< 2.0']
 
   # Run time dependencies that are Beaker libraries
-  s.add_dependency 'beaker-hostgenerator', '~> 2.0'
+  s.add_dependency 'beaker-hostgenerator', '~> 3.0'
   s.add_dependency 'stringify-hash', '~> 0.0'
 end

data/docs/concepts/argument_processing_and_precedence.md

@@ -257,7 +257,7 @@ Values already included in Beaker as defaults for required arguments.
           :run_in_parallel        => [],
           :ssh                    => {
                                      :config                => false,
-                                     :verify_host_key       => false,
+                                     :verify_host_key       => :never,
                                      :auth_methods          => ["publickey"],
                                      :port                  => 22,
                                      :forward_agent         => true,

data/docs/how_to/use_user_password_authentication.md

@@ -26,7 +26,7 @@ The log will then read as:
 _snip_
 ```
 pe-centos6 20:19:16$ echo hello!
-Attempting ssh connection to pe-centos6, user: anode, opts: {:config=>false, :verify_host_key=>false, :timeout=>300, :auth_methods=>["password"], :port=>22, :forward_agent=>true, :keys=>["/Users/anode/.ssh/id_rsa"], :user_known_hosts_file=>"/Users/anode/.ssh/known_hosts", :password=>"anode", :user=>"anode"}
+Attempting ssh connection to pe-centos6, user: anode, opts: {:config=>false, :verify_host_key=>:never, :timeout=>300, :auth_methods=>["password"], :port=>22, :forward_agent=>true, :keys=>["/Users/anode/.ssh/id_rsa"], :user_known_hosts_file=>"/Users/anode/.ssh/known_hosts", :password=>"anode", :user=>"anode"}
 ```
 _/snip_
 

data/lib/beaker/command_factory.rb

@@ -3,6 +3,7 @@ require 'minitest/test'
 module Beaker
   module CommandFactory
     include Minitest::Assertions
+
     # Why do we need this accessor?
     # https://github.com/seattlerb/minitest/blob/master/lib/minitest/assertions.rb#L8-L12
     # Protocol: Nearly everything here boils up to +assert+, which

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

@@ -118,8 +118,8 @@ module Beaker
         #
         # @return [Result]   An object representing the outcome of *command*.
         # @raise  [FailTest] Raises an exception if *command* obviously fails.
-        def shell(command, opts = {}, &block)
-          on(default, command, opts, &block)
+        def shell(command, opts = {}, &)
+          on(default, command, opts, &)
         end
 
         # Move a file from a remote to a local path
@@ -307,7 +307,7 @@ module Beaker
         # @param [Proc] block Additional tests to run after script has executed
         #
         # @return [Result] Returns the result of the underlying SCP operation.
-        def run_script_on(host, script, opts = {}, &block)
+        def run_script_on(host, script, opts = {}, &)
           # this is unsafe as it uses the File::SEPARATOR will be set to that
           # of the coordinator node.  This works for us because we use cygwin
           # which will properly convert the paths.  Otherwise this would not
@@ -317,13 +317,13 @@ module Beaker
           remote_path = File.join("", "tmp", File.basename(script))
 
           scp_to host, script, remote_path
-          on host, remote_path, opts, &block
+          on(host, remote_path, opts, &)
         end
 
         # Move a local script to default host and execute it
         # @see #run_script_on
-        def run_script(script, opts = {}, &block)
-          run_script_on(default, script, opts, &block)
+        def run_script(script, opts = {}, &)
+          run_script_on(default, script, opts, &)
         end
 
         # Install a package on a host
@@ -515,8 +515,8 @@ module Beaker
         # @param [Proc]              block   Additional actions or assertions.
         # @!macro common_opts
         #
-        def curl_on(host, cmd, opts = {}, &block)
-          on host, "curl --tlsv1 %s" % cmd, opts, &block
+        def curl_on(host, cmd, opts = {}, &)
+          on(host, "curl --tlsv1 %s" % cmd, opts, &)
         end
 
         def curl_with_retries(_desc, host, url, desired_exit_codes, max_retries = 60, retry_interval = 1)
@@ -547,7 +547,7 @@ module Beaker
         # @option opts [Boolean] :verbose (false)
         #
         # @return [Result] Result object of the last command execution
-        def retry_on(host, command, opts = {}, &block)
+        def retry_on(host, command, opts = {}, &)
           option_exit_codes     = opts[:desired_exit_codes]
           option_max_retries    = opts[:max_retries].to_i
           option_retry_interval = opts[:retry_interval].to_f
@@ -562,11 +562,11 @@ module Beaker
           logger.debug "  Trying command #{max_retries} times."
           logger.debug ".", add_newline: false
 
-          result = on host, command, { :accept_all_exit_codes => true, :silent => !verbose }, &block
+          result = on(host, command, { :accept_all_exit_codes => true, :silent => !verbose }, &)
           num_retries = 0
           until desired_exit_codes.include?(result.exit_code)
             sleep retry_interval
-            result = on host, command, { :accept_all_exit_codes => true, :silent => !verbose }, &block
+            result = on(host, command, { :accept_all_exit_codes => true, :silent => !verbose }, &)
             num_retries += 1
             logger.debug ".", add_newline: false
             if (num_retries > max_retries)

data/lib/beaker/dsl/patterns.rb

@@ -22,7 +22,7 @@ module Beaker
       #
       # @return [Array<Result>, Result, nil] An array of results, a result object, or nil.
       #   Check {Beaker::Shared::HostManager#run_block_on} for more details on this.
-      def block_on hosts_or_filter, opts = {}, &block
+      def block_on(hosts_or_filter, opts = {}, &)
         block_hosts = nil
         if defined? hosts
           block_hosts = hosts
@@ -33,7 +33,7 @@ module Beaker
         else
           block_hosts = hosts_or_filter
         end
-        run_block_on block_hosts, filter, opts, &block
+        run_block_on(block_hosts, filter, opts, &)
       end
     end
   end

data/lib/beaker/dsl/structure.rb

@@ -107,10 +107,10 @@ module Beaker
       # @param [String] manual_test_name The name of the test to be logged.
       # @param [Proc] block The actions to be performed during this test.
       #
-      def manual_test manual_test_name, &block
+      def manual_test(manual_test_name, &)
         if @options.has_key?(:exec_manual_tests) && @options[:exec_manual_tests] == true
           # here the option is set so we run the test as normal
-          test_name manual_test_name, &block
+          test_name(manual_test_name, &)
         else
           # here no option was set so we log the test name and skip it
           test_name manual_test_name
@@ -261,13 +261,13 @@ module Beaker
       #   targets for this tests case.
       # @raise [SkipTest] Raises skip test if there are no valid hosts for
       #   this test case after confinement.
-      def confine(type, criteria, host_array = nil, &block)
+      def confine(type, criteria, host_array = nil, &)
         hosts_to_modify = Array(host_array || hosts)
         hosts_not_modified = hosts - hosts_to_modify # we aren't examining these hosts
         case type
         when :except
           hosts_to_modify = if criteria and (not criteria.empty?)
-                              hosts_to_modify - select_hosts(criteria, hosts_to_modify, &block) + hosts_not_modified
+                              hosts_to_modify - select_hosts(criteria, hosts_to_modify, &) + hosts_not_modified
                             else
                               # confining to all hosts *except* provided array of hosts
                               hosts_not_modified
@@ -278,7 +278,7 @@ module Beaker
           end
         when :to
           if criteria and (not criteria.empty?)
-            hosts_to_modify = select_hosts(criteria, hosts_to_modify, &block) + hosts_not_modified
+            hosts_to_modify = select_hosts(criteria, hosts_to_modify, &) + hosts_not_modified
           else
             # confining to only hosts in provided array of hosts
           end

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

@@ -26,11 +26,11 @@ module Aix::Group
     end
   end
 
-  def group_present(name, &block)
-    execute("if ! lsgroup #{name}; then mkgroup #{name}; fi", {}, &block)
+  def group_present(name, &)
+    execute("if ! lsgroup #{name}; then mkgroup #{name}; fi", {}, &)
   end
 
-  def group_absent(name, &block)
-    execute("if lsgroup #{name}; then rmgroup #{name}; fi", {}, &block)
+  def group_absent(name, &)
+    execute("if lsgroup #{name}; then rmgroup #{name}; fi", {}, &)
   end
 end

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

@@ -23,11 +23,11 @@ module Aix::User
     end
   end
 
-  def user_present(name, &block)
-    execute("if ! lsuser #{name}; then mkuser #{name}; fi", {}, &block)
+  def user_present(name, &)
+    execute("if ! lsuser #{name}; then mkuser #{name}; fi", {}, &)
   end
 
-  def user_absent(name, &block)
-    execute("if lsuser #{name}; then rmuser #{name}; fi", {}, &block)
+  def user_absent(name, &)
+    execute("if lsuser #{name}; then rmuser #{name}; fi", {}, &)
   end
 end

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

@@ -83,8 +83,8 @@ module Mac::Group
   #
   # @param [String] name Name of the group
   # @param [Proc] block Additional actions or insertions
-  def group_absent(name, &block)
-    execute("if dscl . -list /Groups/#{name}; then dscl . -delete /Groups/#{name}; fi", {}, &block)
+  def group_absent(name, &)
+    execute("if dscl . -list /Groups/#{name}; then dscl . -delete /Groups/#{name}; fi", {}, &)
   end
 
   # Gives the next gid not used on the system

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

@@ -66,8 +66,8 @@ module Mac::User
   #
   # @param [String] name Name of the user
   # @param [Proc] block Additional actions or insertions
-  def user_absent(name, &block)
-    execute("if dscl . -list /Users/#{name}; then dscl . -delete /Users/#{name}; fi", {}, &block)
+  def user_absent(name, &)
+    execute("if dscl . -list /Users/#{name}; then dscl . -delete /Users/#{name}; fi", {}, &)
   end
 
   # Gives the next uid not used on the system

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

@@ -27,11 +27,11 @@ module PSWindows::Group
     raise NotImplementedError, "Can't retrieve group gid on a Windows host"
   end
 
-  def group_present(name, &block)
-    execute("net localgroup /add \"#{name}\"", { :acceptable_exit_codes => [0, 2] }, &block)
+  def group_present(name, &)
+    execute("net localgroup /add \"#{name}\"", { :acceptable_exit_codes => [0, 2] }, &)
   end
 
-  def group_absent(name, &block)
-    execute("net localgroup /delete \"#{name}\"", { :acceptable_exit_codes => [0, 2] }, &block)
+  def group_absent(name, &)
+    execute("net localgroup /delete \"#{name}\"", { :acceptable_exit_codes => [0, 2] }, &)
   end
 end

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

@@ -23,11 +23,11 @@ module PSWindows::User
     end
   end
 
-  def user_present(name, &block)
-    execute("net user /add \"#{name}\"", { :acceptable_exit_codes => [0, 2] }, &block)
+  def user_present(name, &)
+    execute("net user /add \"#{name}\"", { :acceptable_exit_codes => [0, 2] }, &)
   end
 
-  def user_absent(name, &block)
-    execute("net user /delete \"#{name}\"", { :acceptable_exit_codes => [0, 2] }, &block)
+  def user_absent(name, &)
+    execute("net user /delete \"#{name}\"", { :acceptable_exit_codes => [0, 2] }, &)
   end
 end

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

@@ -31,11 +31,11 @@ module Unix::Group
     end
   end
 
-  def group_present(name, &block)
-    execute("if ! getent group #{name}; then groupadd #{name}; fi", {}, &block)
+  def group_present(name, &)
+    execute("if ! getent group #{name}; then groupadd #{name}; fi", {}, &)
   end
 
-  def group_absent(name, &block)
-    execute("if getent group #{name}; then groupdel #{name}; fi", {}, &block)
+  def group_absent(name, &)
+    execute("if getent group #{name}; then groupdel #{name}; fi", {}, &)
   end
 end

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

@@ -23,11 +23,11 @@ module Unix::User
     end
   end
 
-  def user_present(name, &block)
-    execute("if ! getent passwd #{name}; then useradd #{name}; fi", {}, &block)
+  def user_present(name, &)
+    execute("if ! getent passwd #{name}; then useradd #{name}; fi", {}, &)
   end
 
-  def user_absent(name, &block)
-    execute("if getent passwd #{name}; then userdel #{name}; fi", {}, &block)
+  def user_absent(name, &)
+    execute("if getent passwd #{name}; then userdel #{name}; fi", {}, &)
   end
 end

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

@@ -41,11 +41,11 @@ module Windows::Group
     raise NotImplementedError, "Can't retrieve group gid on a Windows host"
   end
 
-  def group_present(name, &block)
-    execute("net localgroup /add \"#{name}\"", { :acceptable_exit_codes => [0, 2] }, &block)
+  def group_present(name, &)
+    execute("net localgroup /add \"#{name}\"", { :acceptable_exit_codes => [0, 2] }, &)
   end
 
-  def group_absent(name, &block)
-    execute("net localgroup /delete \"#{name}\"", { :acceptable_exit_codes => [0, 2] }, &block)
+  def group_absent(name, &)
+    execute("net localgroup /delete \"#{name}\"", { :acceptable_exit_codes => [0, 2] }, &)
   end
 end

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

@@ -37,11 +37,11 @@ module Windows::User
     end
   end
 
-  def user_present(name, &block)
-    execute("net user /add \"#{name}\"", { :acceptable_exit_codes => [0, 2] }, &block)
+  def user_present(name, &)
+    execute("net user /add \"#{name}\"", { :acceptable_exit_codes => [0, 2] }, &)
   end
 
-  def user_absent(name, &block)
-    execute("net user /delete \"#{name}\"", { :acceptable_exit_codes => [0, 2] }, &block)
+  def user_absent(name, &)
+    execute("net user /delete \"#{name}\"", { :acceptable_exit_codes => [0, 2] }, &)
   end
 end

data/lib/beaker/host.rb

@@ -141,7 +141,19 @@ module Beaker
 
     # Does this host have this key?  Either as defined in the host itself, or globally?
     def [] k
-      host_hash[k] || options[k]
+      if k == 'ssh' || k == :ssh
+        # Merge global and host-level ssh options, host-level wins
+        global_ssh = options[k] || {}
+        host_ssh = host_hash[k] || {}
+        # Use OptionsHash if available for deep merge
+        if defined?(Beaker::Options::OptionsHash)
+          Beaker::Options::OptionsHash.new.merge(global_ssh).merge(host_ssh)
+        else
+          global_ssh.merge(host_ssh)
+        end
+      else
+        host_hash[k] || options[k]
+      end
     end
 
     # Does this host have this key?  Either as defined in the host itself, or globally?

data/lib/beaker/options/presets.rb

@@ -187,7 +187,7 @@ module Beaker
                   :use_fog_credentials => true,
                   :ssh => {
                     :config => false,
-                    :verify_host_key => false,
+                    :verify_host_key => :never,
                     :auth_methods => ["publickey"],
                     :port => 22,
                     :forward_agent => true,

data/lib/beaker/shared/repetition.rb

@@ -1,9 +1,9 @@
 module Beaker
   module Shared
     module Repetition
-      def repeat_for seconds, &block
+      def repeat_for(seconds, &)
         # do not peg CPU if &block takes less than 1 second
-        repeat_for_and_wait seconds, 1, &block
+        repeat_for_and_wait(seconds, 1, &)
       end
 
       def repeat_for_and_wait seconds, wait

data/lib/beaker/tasks/rake_task.rb

@@ -29,14 +29,14 @@ module Beaker
       # Sets up the predefine task checking
       # @param args [Array] First argument is always the name of the task
       # if no additonal arguments are defined such as parameters it will default to [:hosts,:type]
-      def initialize(*args, &task_block)
+      def initialize(*args, &)
         super
 
         @name = args.shift || 'beaker:test'
         args = %i[hosts type] if args.empty?
         @acceptance_root = DEFAULT_ACCEPTANCE_ROOT
         @options_file = nil
-        define(args, &task_block)
+        define(args, &)
       end
 
       private

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '6.8.1'
+    STRING = '7.0.1'
   end
 end

data/spec/beaker/host_prebuilt_steps_spec.rb

@@ -380,14 +380,14 @@ describe Beaker do
         let(:cygwin) { true }
         let(:cat) { "cat /cygdrive/c/Windows/System32/drivers/etc/hosts" }
 
-        include_examples 'find domain name'
+        it_behaves_like 'find domain name'
       end
 
       context "without cygwin" do
         let(:cygwin) { false }
         let(:cat) { 'type C:\Windows\System32\drivers\etc\hosts' }
 
-        include_examples 'find domain name'
+        it_behaves_like 'find domain name'
       end
     end
 
@@ -399,25 +399,25 @@ describe Beaker do
         context "with a domain entry" do
           let(:stdout) { "domain labs.lan d.labs.net dc1.labs.net labs.com\nnameserver 10.16.22.10\nnameserver 10.16.22.11" }
 
-          include_examples 'find domain name'
+          it_behaves_like 'find domain name'
         end
 
         context "with a search entry" do
           let(:stdout) { "search labs.lan d.labs.net dc1.labs.net labs.com\nnameserver 10.16.22.10\nnameserver 10.16.22.11" }
 
-          include_examples 'find domain name'
+          it_behaves_like 'find domain name'
         end
 
         context "with a both a domain and a search entry" do
           let(:stdout) { "domain labs.lan\nsearch d.labs.net dc1.labs.net labs.com\nnameserver 10.16.22.10\nnameserver 10.16.22.11" }
 
-          include_examples 'find domain name'
+          it_behaves_like 'find domain name'
         end
 
         context "with a both a domain and a search entry, the search entry first" do
           let(:stdout) { "search foo.example.net\ndomain labs.lan d.labs.net dc1.labs.net labs.com\nnameserver 10.16.22.10\nnameserver 10.16.22.11" }
 
-          include_examples 'find domain name'
+          it_behaves_like 'find domain name'
         end
       end
     end

data/spec/beaker/host_spec.rb

@@ -629,7 +629,7 @@ module Beaker
         # since were using fakefs we need to create the file and directories
         FileUtils.mkdir_p('/var/folders/v0/')
         FileUtils.touch('/var/folders/v0/centos-64-x6420150625-48025-lu3u86')
-        rsync_args = ['source', 'target', ['-az', "-e \"ssh -F /var/folders/v0/centos-64-x6420150625-48025-lu3u86 -o 'StrictHostKeyChecking no'\"", "--exclude '.bundle'"]]
+        rsync_args = ['source', 'target', ['-az', "-e \"ssh -F /var/folders/v0/centos-64-x6420150625-48025-lu3u86 -p 22 -o 'StrictHostKeyChecking no'\"", "--exclude '.bundle'"]]
         expect(Rsync).to receive(:run).with(*rsync_args).and_return(Rsync::Result.new('raw rsync output', 0))
         expect(host.do_rsync_to(*args).success?).to eq(true)
       end
@@ -639,7 +639,7 @@ module Beaker
         create_files(['source'])
         args = ['source', 'target',
                 { :ignore => ['.bundle'] },]
-        rsync_args = ['source', 'target', ['-az', "-e \"ssh -o 'StrictHostKeyChecking no'\"", "--exclude '.bundle'"]]
+        rsync_args = ['source', 'target', ['-az', "-e \"ssh -p 22 -o 'StrictHostKeyChecking no'\"", "--exclude '.bundle'"]]
         expect(Rsync).to receive(:run).with(*rsync_args).and_return(Rsync::Result.new('raw rsync output', 0))
         expect(host.do_rsync_to(*args).success?).to eq(true)
       end

data/spec/beaker/options/data/hosts_preserved.yml

@@ -72,7 +72,7 @@
 :use_fog_credentials: true
 :ssh: !ruby/hash:Beaker::Options::OptionsHash
   :config: true
-  :verify_host_key: false
+  :verify_host_key: :never
   :auth_methods: &7
   - publickey
   :port: 22
@@ -360,7 +360,7 @@
   :use_fog_credentials: true
   :ssh: !ruby/hash:Beaker::Options::OptionsHash
     :config: true
-    :verify_host_key: false
+    :verify_host_key: :never
     :auth_methods: *7
     :port: 22
     :forward_agent: 'true'

data/spec/beaker/platform_spec.rb

@@ -140,7 +140,7 @@ module Beaker
         if YAML.respond_to?(:unsafe_load)
           YAML.unsafe_load(YAML.dump(platform))
         else
-          YAML.load(YAML.dump(platform)) # rubocop:disable Security/YAMLLoad
+          YAML.load(YAML.dump(platform))
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 6.8.1
+  version: 7.0.1
 platform: ruby
 authors:
 - Puppet
@@ -63,14 +63,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 4.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: base64
   requirement: !ruby/object:Gem::Requirement
@@ -327,14 +327,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: stringify-hash
   requirement: !ruby/object:Gem::Requirement
@@ -685,14 +685,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Let's test Puppet!
 test_files: []