beaker 6.6.0 → 6.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a7f2cf603e697740aab5a108dc690a6b5dd4800c52a9678941b826e422ee5e1
-  data.tar.gz: ce8bc6743384545f0d501fd54f221928bb731a16b3e1ce30a5494563aec0c69f
+  metadata.gz: d6594b0e7e997ac7193225892ff1a61e6e99ab090f7ed36f73d63f2426fb5fd5
+  data.tar.gz: f01d84b745674d752023fd78e32afbfd8f76cc242ce64d0a032a2f01c3a448e5
 SHA512:
-  metadata.gz: 4ec0253cd6bec780eac93937595b9f53a0be31e966123fd9c753b80661d145d226747537ca23b18aa79afcd7cc8932b83f3c8057a1f5a23cca4aa6ca332c7614
-  data.tar.gz: 5e495a3074e6fe7821bd810f7955542e130bb5673231d48c5107d138bfff7b15e22e3aacd84bd4adea66c4cfc52b20b6513b733051cf7bd4138e987e197774ec
+  metadata.gz: 6c20f0ed5b806258806c818877d8074e84223bb3a0174a707c91e84611dd78968cd413ba7277fae0cd771224b4dccb539e32d6119d9a8757b045ab18a146512d
+  data.tar.gz: b8fd90adf80fcacfaebb627fd2403a3795994f67a9d3209b7bb71a3e52f7fafbc8cbc41c43baf78ec2fa6c8e88b87918792515fdd06e0d80ebe8ca7f10230776

data/.github/workflows/release.yml

@@ -1,3 +1,4 @@
+---
 name: Release
 
 on:
@@ -7,14 +8,14 @@ on:
 
 jobs:
   release:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     if: github.repository_owner == 'voxpupuli'
     steps:
       - uses: actions/checkout@v4
-      - name: Install Ruby 3.0
+      - name: Install Ruby
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '3.3'
+          ruby-version: '3.4'
         env:
           BUNDLE_WITHOUT: release:development:rubocop
       - name: Build gem

data/.github/workflows/test.yml

@@ -1,3 +1,4 @@
+---
 name: Test
 
 on:
@@ -7,34 +8,33 @@ on:
       - master
 
 jobs:
-  rubocop:
+  rubocop_and_matrix:
     env:
       BUNDLE_WITHOUT: release
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
+    outputs:
+      ruby: ${{ steps.ruby.outputs.versions }}
     steps:
       - uses: actions/checkout@v4
       - name: Install Ruby ${{ matrix.ruby }}
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.3"
+          ruby-version: "3.4"
           bundler-cache: true
       - name: Run Rubocop
         run: bundle exec rake rubocop
+      - id: ruby
+        uses: voxpupuli/ruby-version@v1
 
   test:
-    runs-on: ubuntu-latest
+    name: "Ruby ${{ matrix.ruby }}"
+    runs-on: ubuntu-24.04
+    needs: rubocop_and_matrix
     strategy:
       fail-fast: false
       matrix:
-        include:
-          - ruby: "2.7"
-          - ruby: "3.0"
-          - ruby: "3.1"
-          - ruby: "3.2"
-          - ruby: "3.3"
-            coverage: "yes"
+        ruby: ${{ fromJSON(needs.rubocop_and_matrix.outputs.ruby) }}
     env:
-      COVERAGE: ${{ matrix.coverage }}
       BUNDLE_WITHOUT: release:rubocop
       BEAKER_HYPERVISOR: docker
     steps:
@@ -53,9 +53,9 @@ jobs:
 
   tests:
     needs:
-      - rubocop
+      - rubocop_and_matrix
       - test
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     name: Test suite
     steps:
       - run: echo Test suite completed

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
-# `rubocop --auto-gen-config`
-# on 2024-05-11 14:14:06 UTC using RuboCop version 1.62.1.
+# `rubocop --auto-gen-config --no-auto-gen-timestamp`
+# using RuboCop version 1.75.7.
 # 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,13 +43,7 @@ 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
+# Offense count: 26
 Lint/ShadowingOuterLocalVariable:
   Exclude:
     - 'lib/beaker/dsl/helpers/host_helpers.rb'
@@ -60,16 +54,6 @@ Lint/ShadowingOuterLocalVariable:
     - 'lib/beaker/host_prebuilt_steps.rb'
     - 'lib/beaker/perf.rb'
 
-# Offense count: 12
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: AutoCorrect.
-Lint/UselessAssignment:
-  Exclude:
-    - 'acceptance/tests/base/dsl/helpers/host_helpers/curl_with_retries_test.rb'
-    - 'lib/beaker/cli.rb'
-    - 'lib/beaker/dsl/helpers/host_helpers.rb'
-    - 'lib/beaker/logger_junit.rb'
-
 # Offense count: 5
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Minitest/AssertTruthy:
@@ -92,7 +76,7 @@ Minitest/RefuteFalse:
     - 'acceptance/tests/base/dsl/helpers/host_helpers/check_for_package_test.rb'
     - 'acceptance/tests/base/host/host_test.rb'
 
-# Offense count: 19
+# Offense count: 21
 # Configuration parameters: ForbiddenDelimiters.
 # ForbiddenDelimiters: (?i-mx:(^|\s)(EO[A-Z]{1}|END)(\s|$))
 Naming/HeredocDelimiterNaming:
@@ -124,6 +108,12 @@ Performance/CollectionLiteralInLoop:
     - 'lib/beaker/dsl/structure.rb'
     - 'lib/beaker/test_suite_result.rb'
 
+# Offense count: 1
+# This cop supports unsafe autocorrection (--autocorrect-all).
+Performance/ZipWithoutBlock:
+  Exclude:
+    - 'spec/beaker/dsl/test_tagging_spec.rb'
+
 # Offense count: 17
 RSpec/AnyInstance:
   Exclude:
@@ -143,7 +133,7 @@ RSpec/BeEq:
     - 'spec/beaker/subcommand/subcommand_util_spec.rb'
     - 'spec/beaker/test_suite_spec.rb'
 
-# Offense count: 113
+# Offense count: 115
 # Configuration parameters: Prefixes, AllowedPatterns.
 # Prefixes: when, with, without
 RSpec/ContextWording:
@@ -155,24 +145,23 @@ RSpec/Eq:
   Exclude:
     - 'spec/beaker/logger_spec.rb'
 
-# Offense count: 231
+# Offense count: 232
 # Configuration parameters: CountAsOne.
 RSpec/ExampleLength:
   Max: 44
 
-# Offense count: 27
+# Offense count: 24
 RSpec/ExpectInHook:
   Exclude:
     - 'spec/beaker/cli_spec.rb'
     - 'spec/beaker/dsl/helpers/host_helpers_spec.rb'
     - 'spec/beaker/host/unix/exec_spec.rb'
     - 'spec/beaker/host/windows/group_spec.rb'
-    - 'spec/beaker/host_prebuilt_steps_spec.rb'
     - 'spec/beaker/logger_spec.rb'
     - 'spec/beaker/options/parser_spec.rb'
     - 'spec/beaker/ssh_connection_spec.rb'
 
-# Offense count: 22
+# Offense count: 20
 # Configuration parameters: AssignmentOnly.
 RSpec/InstanceVariable:
   Exclude:
@@ -180,7 +169,6 @@ RSpec/InstanceVariable:
     - 'spec/beaker/dsl/helpers/test_helpers_spec.rb'
     - 'spec/beaker/dsl/roles_spec.rb'
     - 'spec/beaker/dsl/test_tagging_spec.rb'
-    - 'spec/beaker/host_prebuilt_steps_spec.rb'
 
 # Offense count: 3
 RSpec/IteratedExpectation:
@@ -208,12 +196,12 @@ RSpec/MultipleDescribes:
   Exclude:
     - 'spec/beaker/dsl/test_tagging_spec.rb'
 
-# Offense count: 134
+# Offense count: 140
 # Configuration parameters: AllowSubject.
 RSpec/MultipleMemoizedHelpers:
-  Max: 18
+  Max: 16
 
-# Offense count: 495
+# Offense count: 497
 # Configuration parameters: EnforcedStyle, IgnoreSharedExamples.
 # SupportedStyles: always, named_only
 RSpec/NamedSubject:
@@ -230,13 +218,12 @@ RSpec/NoExpectationExample:
     - 'spec/beaker/logger_spec.rb'
     - 'spec/beaker/options/subcommand_options_parser_spec.rb'
 
-# Offense count: 60
+# Offense count: 58
 # This cop supports unsafe autocorrection (--autocorrect-all).
 RSpec/ReceiveMessages:
   Exclude:
     - 'spec/beaker/cli_spec.rb'
     - 'spec/beaker/command_spec.rb'
-    - 'spec/beaker/host_prebuilt_steps_spec.rb'
     - 'spec/beaker/host_spec.rb'
     - 'spec/beaker/options/parser_spec.rb'
     - 'spec/beaker/shared/error_handler_spec.rb'
@@ -256,7 +243,7 @@ RSpec/RepeatedExample:
     - 'spec/beaker/dsl/roles_spec.rb'
     - 'spec/beaker/logger_spec.rb'
 
-# Offense count: 13
+# Offense count: 14
 # Configuration parameters: Include, CustomTransform, IgnoreMethods, IgnoreMetadata.
 # Include: **/*_spec.rb
 RSpec/SpecFilePathFormat:
@@ -271,12 +258,13 @@ RSpec/SpecFilePathFormat:
     - 'spec/beaker/dsl/structure_spec.rb'
     - 'spec/beaker/dsl/wrappers_spec.rb'
     - 'spec/beaker/host/mac/group_spec.rb'
+    - 'spec/beaker/host/mac/pkg_spec.rb'
     - 'spec/beaker/host/mac/user_spec.rb'
     - 'spec/beaker/host/pswindows/user_spec.rb'
     - 'spec/beaker/host/windows/user_spec.rb'
     - 'spec/beaker/host_prebuilt_steps_spec.rb'
 
-# Offense count: 175
+# Offense count: 176
 RSpec/SubjectStub:
   Exclude:
     - 'spec/beaker/dsl/assertions_spec.rb'
@@ -301,7 +289,7 @@ RSpec/UnspecifiedException:
     - 'spec/beaker/host_spec.rb'
     - 'spec/beaker/test_suite_spec.rb'
 
-# Offense count: 86
+# Offense count: 87
 # Configuration parameters: IgnoreNameless, IgnoreSymbolicNames.
 RSpec/VerifiedDoubles:
   Enabled: false
@@ -330,7 +318,7 @@ Security/Open:
 
 # Offense count: 104
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns, SplitStrings.
 # URISchemes: http, https
 Layout/LineLength:
   Max: 225

data/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Changelog
 
+## [6.7.0](https://github.com/voxpupuli/beaker/tree/6.6.0) (2025-05-28)
+
+**Implemented enhancements:**
+
+- Fix some doc issues [\#1916](https://github.com/voxpupuli/beaker/pull/1916)
+- Add Ruby 3.4 support [\#1917](https://github.com/voxpupuli/beaker/pull/1917)
+- Add benchmark dependency for Ruby 3.5 support [\#1920](https://github.com/voxpupuli/beaker/pull/1920)
+- fakefs: Allow 3.x [\#1918](https://github.com/voxpupuli/beaker/pull/1918)
+- voxpupuli-rubocop: Update 3.0.0->3.1.0 [\#1921](https://github.com/voxpupuli/beaker/pull/1921)
+
+**Fixed bugs:**
+
+- Fix macOS package installation when DMG content differs from filename [\#1915](https://github.com/voxpupuli/beaker/pull/1915)
+- Fix wrong parameter assignment in multiple places [\#1926](https://github.com/voxpupuli/beaker/pull/1926)
+
 ## [6.6.0](https://github.com/voxpupuli/beaker/tree/6.6.0) (2025-03-27)
 
 **Implemented enhancements:**

data/Gemfile

@@ -30,9 +30,4 @@ group :release do
   gem 'github_changelog_generator', require: false
 end
 
-group :coverage, optional: ENV['COVERAGE'] != 'yes' do
-  gem 'codecov', :require => false
-  gem 'simplecov-console', :require => false
-end
-
 gem 'rdoc' if RUBY_VERSION >= '3.1'

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

@@ -9,9 +9,9 @@ test_name "dsl::helpers::host_helpers #curl_with_retries" do
         "description",
         default,
         "file:///non/existent.html",
-        desired_exit_codes = [0],
-        max_retries = 2,
-        retry_interval = 0.01
+        desired_exit_codes: [0],
+        max_retries: 2,
+        retry_interval: 0.01
     end
   end
 

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

@@ -73,7 +73,7 @@ test_name "dsl::structure" do
 
       fail "#confine did not skip test but should have."
     rescue Beaker::DSL::Outcomes::SkipTest => e
-      assert_match(/No suitable hosts found with {:platform=>"test"}/, e.message, "#confine raised an unexpected skip_test")
+      assert_match(/No suitable hosts found with {(:platform=>|platform: )"test"}/, e.message, "#confine raised an unexpected skip_test")
     end
   end
 
@@ -83,7 +83,7 @@ test_name "dsl::structure" do
 
       fail "#confine did not skip test but should have."
     rescue Beaker::DSL::Outcomes::SkipTest => e
-      assert_match(/No suitable hosts found without {:platform=>"#{default['platform']}"}/, e.message, "#confine raised an unexpected
+      assert_match(/No suitable hosts found without {(:platform=>|platform: )"#{default['platform']}"}/, e.message, "#confine raised an unexpected
       # skip_test")
     end
   end

data/beaker.gemspec

@@ -19,12 +19,15 @@ Gem::Specification.new do |s|
   s.required_ruby_version = Gem::Requirement.new('>= 2.7')
 
   # Testing dependencies
-  s.add_development_dependency 'fakefs', '~> 2.4'
+  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.0.0'
+  s.add_development_dependency 'voxpupuli-rubocop', '~> 3.1.0'
 
   # Run time dependencies
+  # Required for Ruby 3.3+ support
+  s.add_dependency 'base64', '~> 0.2.0'
+  s.add_dependency 'benchmark', '>= 0.3', '< 0.5'
   # we cannot require 1.0.2 because that requires Ruby 3.1
   s.add_dependency 'minitar', '>= 0.12', '< 2'
   s.add_dependency 'minitest', '~> 5.4'

data/docs/tutorials/installation.md

@@ -12,7 +12,7 @@ In most cases, beaker is running on a system separate from the SUT; we will comm
 On a Debian or Ubuntu system you can install these using the command
 
 ```console
-  $ sudo apt-get install ruby-dev libxml2-dev libxslt1-dev g++ zlib1g-dev
+  $ sudo apt-get install ruby-dev libxml2-dev libxslt1-dev make g++ zlib1g-dev
 ```
 
 On an EL or Fedora system use:

data/docs/tutorials/quick_start_rake_tasks.md

@@ -27,8 +27,7 @@ You should see them listed along with any rake tasks you have defined in your lo
     rake beaker_quickstart:gen_hosts[hypervisor]  # Generate Default Beaker Host Config File, valid options are: vmpooler or vagrant
     rake beaker_quickstart:gen_pre_suite           # Generate Default Pre-Suite
     rake beaker_quickstart:gen_smoke_test          # Generate Default Smoke Test
-    rake beaker_quickstart:run_test[hypervisor]   # Run Default Smoke Test, after generating default host config and test files, valid
-    options are: vmpooler or vagrant
+    rake beaker_quickstart:run_test[hypervisor]   # Run Default Smoke Test, after generating default host config and test files, valid options are: vmpooler or vagrant
 ```
 
 ## Tasks

data/lib/beaker/cli.rb

@@ -129,10 +129,10 @@ module Beaker
           @perf.print_perf_info if defined? @perf
         end
       # cleanup phase
-      rescue => e
+      rescue
         begin
           run_suite(:pre_cleanup)
-        rescue => e
+        rescue
           # pre-cleanup failed
           @logger.error "Failed running the pre-cleanup suite."
         end
@@ -153,7 +153,7 @@ module Beaker
       else
         begin
           run_suite(:pre_cleanup)
-        rescue => e
+        rescue
           # pre-cleanup failed
           @logger.error "Failed running the pre-cleanup suite."
         end

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

@@ -560,7 +560,7 @@ module Beaker
           log_prefix = host.log_prefix
           logger.debug "\n#{log_prefix} #{Time.new.strftime('%H:%M:%S')}$ #{command}"
           logger.debug "  Trying command #{max_retries} times."
-          logger.debug ".", add_newline = false
+          logger.debug ".", add_newline: false
 
           result = on host, command, { :accept_all_exit_codes => true, :silent => !verbose }, &block
           num_retries = 0
@@ -568,7 +568,7 @@ module Beaker
             sleep retry_interval
             result = on host, command, { :accept_all_exit_codes => true, :silent => !verbose }, &block
             num_retries += 1
-            logger.debug ".", add_newline = false
+            logger.debug ".", add_newline: false
             if (num_retries > max_retries)
               logger.debug "  Command \`#{command}\` failed."
               fail("Command \`#{command}\` failed.")

data/lib/beaker/dsl/structure.rb

@@ -41,7 +41,7 @@ module Beaker
 
         begin
           logger.with_indent(&block)
-        rescue Exception => e
+        rescue StandardError => e
           if @options.has_key?(:debug_errors) && @options[:debug_errors] == true
             begin
               require 'pry'

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

@@ -6,6 +6,8 @@ module Mac::Pkg
   end
 
   def install_package(name, _cmdline_args = '', _version = nil)
+    # strip off any .dmg extension, if it exists
+    name = File.basename(name, '.dmg')
     generic_install_dmg("#{name}.dmg", name, "#{name}.pkg")
   end
 
@@ -16,7 +18,10 @@ module Mac::Pkg
   # @param [String] pkg_base      The base name of the directory that the dmg
   #                               attaches to under `/Volumes`
   # @param [String] pkg_name      The name of the package file that should be
-  #                               used by the installer
+  #                               used by the installer. If the specified
+  #                               package is not found, a wildcard search will be
+  #                               performed to locate and install the first `.pkg`
+  #                               file in the volume.
   # @example: Install vagrant from URL
   #   mymachost.generic_install_dmg('https://releases.hashicorp.com/vagrant/1.8.4/vagrant_1.8.4.dmg', 'Vagrant', 'Vagrant.pkg')
   def generic_install_dmg(dmg_file, pkg_base, pkg_name)
@@ -25,7 +30,28 @@ module Mac::Pkg
     end
     dmg_name = File.basename(dmg_file, '.dmg')
     execute("hdiutil attach #{dmg_name}.dmg")
-    execute("installer -pkg /Volumes/#{pkg_base}/#{pkg_name} -target /")
+
+    # First check if the specific package exists, otherwise use wildcard
+    specific_pkg_path = "/Volumes/#{pkg_base}/#{pkg_name}"
+    execute("test -f #{specific_pkg_path}", :accept_all_exit_codes => true) do |result|
+      if result.exit_code == 0
+        # $pkg_name package found so install it
+        execute("installer -pkg #{specific_pkg_path} -target /")
+      else
+        # else find and install the first *.pkg file in the volume
+        execute <<~SCRIPT
+          # find the first .pkg file in the mounted volume
+          pkg=$(find /Volumes/#{pkg_base} -name "*.pkg" -type f -print -quit)
+          if [ -n "$pkg" ]; then
+            echo "Installing $pkg"
+            installer -pkg "$pkg" -target /
+          else
+            echo "ERROR: No .pkg files found in /Volumes/#{pkg_base}/"
+            exit 1
+          fi
+        SCRIPT
+      end
+    end
   end
 
   def uninstall_package(name, _cmdline_args = '')

data/lib/beaker/logger_junit.rb

@@ -106,9 +106,9 @@ module Beaker
       else
         # no existing file, create a new one
         doc = REXML::Document.new
-        doc << REXML::XMLDecl.new(version = "1.0", encoding = "UTF-8")
+        doc << REXML::XMLDecl.new("1.0", "UTF-8")
         instruction_content = "type='text/xsl' href='#{File.basename(stylesheet)}'"
-        doc << REXML::Instruction.new(target = "xml-stylesheet", content = instruction_content)
+        doc << REXML::Instruction.new("xml-stylesheet", instruction_content)
       end
       return doc
     end

data/lib/beaker/ssh_connection.rb

@@ -194,9 +194,7 @@ module Beaker
       false
     end
 
-    def try_to_execute command, options = {}, stdout_callback = nil,
-                       stderr_callback = stdout_callback
-
+    def try_to_execute command, options = {}, stdout_callback = nil, stderr_callback = stdout_callback
       result = Result.new(@hostname, command)
 
       @ssh.open_channel do |channel|

data/lib/beaker/test_suite_result.rb

@@ -254,7 +254,7 @@ module Beaker
             end
           end
         end
-      rescue Exception => e
+      rescue StandardError => e
         @logger.error "failure in XML output: \n#{e}" + e.backtrace.join("\n")
       end
     end

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '6.6.0'
+    STRING = '6.7.0'
   end
 end

data/spec/beaker/host/mac/pkg_spec.rb

@@ -0,0 +1,85 @@
+require 'spec_helper'
+
+class MacPkgTest
+  include Mac::Pkg
+  # CommandFactory is included in Mac::Pkg to provide us with the execute method
+  include Beaker::CommandFactory
+
+  def initialize
+    @logger = RSpec::Mocks::Double.new('logger').as_null_object
+
+    # Set up the test host to be used
+    @hostname = "mac.test.com"
+    @options = {}
+    @test_host = Beaker::Host.create(@hostname, @options, {})
+  end
+
+  def logger
+    @logger
+  end
+end
+
+describe MacPkgTest do
+  let(:host) { described_class.new }
+  let(:result_success) { Beaker::Result.new('host', 'cmd') }
+  let(:result_failure) { Beaker::Result.new('host', 'cmd') }
+  let(:dmg_file) { 'test-package.dmg' }
+  let(:pkg_base) { 'test-package' }
+  let(:pkg_name) { 'test-package.pkg' }
+
+  before do
+    result_success.exit_code = 0
+    result_failure.exit_code = 1
+  end
+
+  describe '#generic_install_dmg' do
+    context 'when the DMG file does not exist' do
+      it 'curls the DMG file' do
+        allow(host).to receive(:execute).with("test -f #{dmg_file}", { :accept_all_exit_codes => true }).and_yield(result_failure)
+        expect(host).to receive(:execute).with("curl -O #{dmg_file}")
+        allow(host).to receive(:execute).with("hdiutil attach test-package.dmg")
+        allow(host).to receive(:execute).with("test -f /Volumes/#{pkg_base}/#{pkg_name}", { :accept_all_exit_codes => true }).and_yield(result_success)
+        allow(host).to receive(:execute).with("installer -pkg /Volumes/#{pkg_base}/#{pkg_name} -target /")
+
+        host.generic_install_dmg(dmg_file, pkg_base, pkg_name)
+      end
+    end
+
+    context 'when the specific package exists in the DMG' do
+      it 'installs the specific package' do
+        allow(host).to receive(:execute).with("test -f #{dmg_file}", { :accept_all_exit_codes => true }).and_yield(result_success)
+        allow(host).to receive(:execute).with("hdiutil attach test-package.dmg")
+        allow(host).to receive(:execute).with("test -f /Volumes/#{pkg_base}/#{pkg_name}", { :accept_all_exit_codes => true }).and_yield(result_success)
+        expect(host).to receive(:execute).with("installer -pkg /Volumes/#{pkg_base}/#{pkg_name} -target /")
+
+        host.generic_install_dmg(dmg_file, pkg_base, pkg_name)
+      end
+    end
+
+    context 'when the included pkg has a different name from the dmg' do
+      it 'searches for and installs the first package found' do
+        allow(host).to receive(:execute).with("test -f #{dmg_file}", { :accept_all_exit_codes => true }).and_yield(result_success)
+        allow(host).to receive(:execute).with("hdiutil attach test-package.dmg")
+        allow(host).to receive(:execute).with("test -f /Volumes/#{pkg_base}/#{pkg_name}", { :accept_all_exit_codes => true }).and_yield(result_failure)
+
+        # This is a bit complex as we're testing the heredoc script execution
+        # We're expecting the script to be executed and are not validating its exact content
+        expect(host).to receive(:execute).with(a_string_including("find /Volumes/#{pkg_base} -name \"*.pkg\" -type f -print -quit"))
+
+        host.generic_install_dmg(dmg_file, pkg_base, pkg_name)
+      end
+    end
+  end
+
+  describe '#install_package' do
+    it 'calls generic_install_dmg with the correct arguments' do
+      expect(host).to receive(:generic_install_dmg).with("package.dmg", "package", "package.pkg")
+      host.install_package("package")
+    end
+
+    it 'strips the .dmg extension if present' do
+      expect(host).to receive(:generic_install_dmg).with("package.dmg", "package", "package.pkg")
+      host.install_package("package.dmg")
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,27 +1,3 @@
-begin
-  require 'simplecov'
-  require 'simplecov-console'
-  require 'codecov'
-rescue LoadError
-else
-  SimpleCov.start do
-    track_files 'lib/**/*.rb'
-
-    add_filter '/spec'
-
-    enable_coverage :branch
-
-    # do not track vendored files
-    add_filter '/vendor'
-    add_filter '/.vendor'
-  end
-
-  SimpleCov.formatters = [
-    SimpleCov::Formatter::Console,
-    SimpleCov::Formatter::Codecov,
-  ]
-end
-
 require 'beaker'
 require 'fakefs/spec_helpers'
 require 'mocks'

metadata

@@ -1,29 +1,34 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 6.6.0
+  version: 6.7.0
 platform: ruby
 authors:
 - Puppet
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-27 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.4'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.4'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +63,48 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0
+- !ruby/object:Gem::Dependency
+  name: base64
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+- !ruby/object:Gem::Dependency
+  name: benchmark
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: minitar
   requirement: !ruby/object:Gem::Requirement
@@ -576,6 +615,7 @@ files:
 - spec/beaker/host/freebsd/pkg_spec.rb
 - spec/beaker/host/mac/exec_spec.rb
 - spec/beaker/host/mac/group_spec.rb
+- spec/beaker/host/mac/pkg_spec.rb
 - spec/beaker/host/mac/user_spec.rb
 - spec/beaker/host/pswindows/exec_spec.rb
 - spec/beaker/host/pswindows/file_spec.rb
@@ -631,7 +671,6 @@ homepage: https://github.com/voxpupuli/beaker
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -646,8 +685,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Let's test Puppet!
 test_files: []