beaker 6.6.0 → 6.8.0

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '6.6.0'
+    STRING = '6.8.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/helpers.rb

@@ -131,6 +131,7 @@ module PlatformHelpers
     el-
     centos
     redhat
+    redhat-10
     oracle
     scientific
     archlinux

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.8.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,54 @@ 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
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1'
+- !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
@@ -313,6 +358,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/dependabot.yml"
+- ".github/release.yml"
 - ".github/workflows/release.yml"
 - ".github/workflows/test.yml"
 - ".gitignore"
@@ -576,6 +622,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 +678,6 @@ homepage: https://github.com/voxpupuli/beaker
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -646,8 +692,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: []