beaker 7.0.0 → 7.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a52a04e5317c78954859cef26c1988cf66a832ad0f62de9d78c69ffbe23c108c
-  data.tar.gz: 4de10d9e282aaa62986410393d440278c5821d042505436131ba5d6ac92a2fdd
+  metadata.gz: 7aac904257f5f7c3605a6139a432f9768a1bf33a476f8069d66566853b31cee4
+  data.tar.gz: f853066d6563fa82c6e4fc8c66167ac200c6aad5ca49d15b1269771f4d1fd036
 SHA512:
-  metadata.gz: 155935fc22c9dd129c5c54c6179709b330048f85f6048aa4f67430b61402bbdc1934856138f23e159aaa40c306024208b7ad18ca9d9628df9c17326b20725e31
-  data.tar.gz: 92508f324729fde5238743beabd46b89c98921d5bd28321240ae73aebb06690cceae28db7a403ed4f385812353f650e01a82d6a67d35592d82673f6b6d7322bc
+  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:

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

@@ -22,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.8.
+# 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:
@@ -310,9 +323,9 @@ Security/Open:
   Exclude:
     - 'lib/beaker/dsl/helpers/web_helpers.rb'
 
-# Offense count: 105
+# 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,14 @@
 # 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)

data/beaker.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   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', '~> 4.1.0'
+  s.add_development_dependency 'voxpupuli-rubocop', '~> 4.2.0'
 
   # Run time dependencies
   # Required for Ruby 3.3+ support

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

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '7.0.0'
+    STRING = '7.0.1'
   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'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 7.0.0
+  version: 7.0.1
 platform: ruby
 authors:
 - Puppet
@@ -63,14 +63,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 4.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: base64
   requirement: !ruby/object:Gem::Requirement