beaker 5.7.0 → 5.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 59e94b473d8fa1a17f50b78a807e2b4d9f378cdab79241e982cfda9ee81225bf
-  data.tar.gz: e8954e2c42b3e31c396ef70c3d547c26bb8a48f87795f1d96d17406643f9e7d8
+  metadata.gz: 7d061888ee1343b5c49408cace97d3dc345b83ebc501a3d58e8401a71e8ae122
+  data.tar.gz: 03d81cdbcc7cb64fd69d8f6458bb71e50f74f0529b0c2537eaf5dc1cd38f6d6e
 SHA512:
-  metadata.gz: cfc90b119d87497b7a0469d36a24c49ce9b77813ccc41ff940326c0bfd07b7065fae98c028e424c0e660efe832ff3f79482a01857e6ab21965e6313c2a75404d
-  data.tar.gz: 888869c41f8a419e9226d81befa9a2059ccc943a024c758a24fe1d3220631043fa94b28c076fa7af3046468fc03fd2304aef0479a1059e5547f56c3ee5a0c71d
+  metadata.gz: 35354795689469b1b0a8cfad0069aa076adcfd40115f3ac8304ec9b061978a65002ee5fb276dcbd1d19bc6afc1bebfa3b56cb13765e6ccd46d2a156e9be45ee4
+  data.tar.gz: 769e7d16b9c04f07beb4c8e865905d6d6154d83de538544e4e2deaad46bf57458f947f563178784c00e7a1d993408c17dba9bfdaf197eb9fb58a7c13d141ebc4

data/.github/workflows/release.yml

@@ -14,7 +14,7 @@ jobs:
       - name: Install Ruby 3.0
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '3.0'
+          ruby-version: '3.3'
         env:
           BUNDLE_WITHOUT: release:development:rubocop
       - name: Build gem

data/.github/workflows/test.yml

@@ -16,7 +16,7 @@ jobs:
       - name: Install Ruby ${{ matrix.ruby }}
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: "3.2"
+          ruby-version: "3.3"
           bundler-cache: true
       - name: Run Rubocop
         run: bundle exec rake rubocop
@@ -32,6 +32,7 @@ jobs:
           - ruby: "3.0"
           - ruby: "3.1"
           - ruby: "3.2"
+          - ruby: "3.3"
             coverage: "yes"
     env:
       COVERAGE: ${{ matrix.coverage }}

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2024-01-08 14:04:43 UTC using RuboCop version 1.59.0.
+# on 2024-03-12 17:49:37 UTC using RuboCop version 1.62.1.
 # 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
@@ -62,6 +62,7 @@ Lint/ShadowingOuterLocalVariable:
 
 # 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'
@@ -230,6 +231,12 @@ RSpec/NoExpectationExample:
     - 'spec/beaker/logger_spec.rb'
     - 'spec/beaker/options/subcommand_options_parser_spec.rb'
 
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+RSpec/Rails/MinitestAssertions:
+  Exclude:
+    - 'spec/beaker/dsl/structure_spec.rb'
+
 # Offense count: 60
 # This cop supports unsafe autocorrection (--autocorrect-all).
 RSpec/ReceiveMessages:

data/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## [5.8.0](https://github.com/voxpupuli/beaker/tree/5.8.0) (2024-03-23)
+
+**Implemented enhancements:**
+
+- Add Ruby 3.3 support [\#1859](https://github.com/voxpupuli/beaker/pull/1859) ([bastelfreak](https://github.com/bastelfreak))
+- Do not attempt to install curl on DNF-based distros [\#1854](https://github.com/voxpupuli/beaker/pull/1854) ([ekohl](https://github.com/ekohl))
+- PE-37978: Add 'amazon' to #repo-filename method [\#1858](https://github.com/voxpupuli/beaker/pull/1858) ([span786](https://github.com/span786))
+
+**Fixed bugs:**
+
+- CLI: Fix typo: opton->option [\#1849](https://github.com/voxpupuli/beaker/pull/1849) ([bastelfreak](https://github.com/bastelfreak))
+
+**Others:**
+
+- build(deps-dev): update voxpupuli-rubocop requirement from ~> 2.4.0 to ~> 2.6.0 [\#1850](https://github.com/voxpupuli/beaker/pull/1850) (dependabot)
+
 ## [5.7.0](https://github.com/voxpupuli/beaker/tree/5.7.0) (2024-02-13)
 
 **Implemented enhancements:**

data/beaker.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'fakefs', '~> 2.4'
   s.add_development_dependency 'rake', '~> 13.0'
   s.add_development_dependency 'rspec', '~> 3.0'
-  s.add_development_dependency 'voxpupuli-rubocop', '~> 2.4.0'
+  s.add_development_dependency 'voxpupuli-rubocop', '~> 2.6.0'
 
   # Run time dependencies
   s.add_runtime_dependency 'minitar', '~> 0.6'

data/docs/concepts/argument_processing_and_precedence.md

@@ -89,7 +89,7 @@ Usage: beaker [options...]
                                      (default sample.cfg)
     -o, --options-file FILE          Read options from FILE
                                      This should evaluate to a ruby hash.
-                                     CLI optons are given precedence.
+                                     CLI options are given precedence.
         --type TYPE                  one of git, foss, or pe
                                      used to determine underlying path structure of puppet install
                                      (default pe)

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

@@ -113,7 +113,7 @@ module Unix::File
     repo_filename = format("pl-%s-%s-", package_name, build_version)
 
     case variant
-    when /fedora|el|redhat|centos|cisco_nexus|cisco_ios_xr|opensuse|sles/
+    when /amazon|fedora|el|redhat|centos|cisco_nexus|cisco_ios_xr|opensuse|sles/
       variant = 'el' if %w[centos redhat].include?(variant)
 
       variant = 'redhatfips' if self['packaging_platform']&.include?('redhatfips')

data/lib/beaker/host_prebuilt_steps.rb

@@ -10,10 +10,9 @@ module Beaker
     NTPSERVER = 'pool.ntp.org'
     SLEEPWAIT = 5
     TRIES = 5
-    AMAZON2023_PACKAGES = %w[curl-minimal chrony]
-    RHEL8_PACKAGES = %w[curl chrony]
-    RHEL9_PACKAGES = ['chrony']
-    FEDORA_PACKAGES = %w[curl chrony]
+    AMAZON2023_PACKAGES = %w[chrony]
+    RHEL8_PACKAGES = %w[chrony]
+    FEDORA_PACKAGES = %w[chrony]
     UNIX_PACKAGES = %w[curl ntpdate]
     FREEBSD_PACKAGES = ['curl', 'perl5|perl']
     OPENBSD_PACKAGES = ['curl']
@@ -111,10 +110,8 @@ module Beaker
       case host['platform']
       when /amazon/
         AMAZON2023_PACKAGES
-      when /el-8/
+      when /el-[89]/
         RHEL8_PACKAGES
-      when /el-9/
-        RHEL9_PACKAGES
       when /sles-10/
         SLES10_PACKAGES
       when /opensuse|sles-/

data/lib/beaker/options/command_line_parser.rb

@@ -25,7 +25,7 @@ module Beaker
           opts.on '-o', '--options-file FILE',
                   'Read options from FILE',
                   'This should evaluate to a ruby hash.',
-                  'CLI optons are given precedence.' do |file|
+                  'CLI options are given precedence.' do |file|
             @cmd_options[:options_file] = file
           end
 

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '5.7.0'
+    STRING = '5.8.0'
   end
 end

data/spec/beaker/host/unix/file_spec.rb

@@ -133,6 +133,14 @@ module Beaker
         expect(filename).to be === correct
       end
 
+      it 'builds the filename correctly for amazon-based platforms' do
+        @platform = 'amazon-2023-x86_64'
+        allow(instance).to receive(:is_pe?).and_return(true)
+        filename = instance.repo_filename('pkg_name', 'pkg_version')
+        correct = 'pl-pkg_name-pkg_version-amazon-2023-x86_64.repo'
+        expect(filename).to be === correct
+      end
+
       it 'builds the filename correctly for debian-based platforms' do
         @platform = 'debian-8-x86_64'
         filename = instance.repo_filename('pkg_name', 'pkg_version10')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 5.7.0
+  version: 5.8.0
 platform: ruby
 authors:
 - Puppet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-02-13 00:00:00.000000000 Z
+date: 2024-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fakefs
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 2.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: 2.6.0
 - !ruby/object:Gem::Dependency
   name: minitar
   requirement: !ruby/object:Gem::Requirement
@@ -656,7 +656,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
+rubygems_version: 3.5.3
 signing_key: 
 specification_version: 4
 summary: Let's test Puppet!