beaker 6.4.1 → 6.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 743599fd9c51c9174f9a69e8eeb78d93454f09301be04a4e7125dec169303b37
-  data.tar.gz: 1c22c0da86003c04c7bd3a6832b5777aa6e45c46d9b02239ac5959e8143b2b9f
+  metadata.gz: db37fef3002087da1c247d4e9fe9fc1aa9659eae3baf81381e262df37a3f53d5
+  data.tar.gz: c8fb420632fc699b6229afb4c03c4451ffd899ac4a3dd40db979f1e9d3e5d539
 SHA512:
-  metadata.gz: 578b26052fd432404d2c564f970758191803f5f9bedda58c186ccf241b5e77257c232e9eea0783e08bc9fd973fd9250891e93a310f7aa8327dbbea2aa947ff03
-  data.tar.gz: 42140d421e592015b7eae2a6c4f3c2c5bda26d364d8af8afc9b5b0bd4f0c3e7a21bec6124d065d98c82f05111ad069c7b04627215614ca377f5c2aafcafb187c
+  metadata.gz: bc45220ea4bfad23b108a78236911b6304a79e942bdc14343ad02f1896563ec4d1a21c9d5e9fba44f6ec267e1096d76ae6255928e1e3c365d4e881b45f86beb5
+  data.tar.gz: 583e6217c676037490c22a614a666080a4fd3a164b269684ee85c224ac1deae6b28457a4c504c78f93937a7c0bda43ad394bf95bab3232459613232ffd4b1067

data/.rubocop.yml

@@ -26,9 +26,6 @@ RSpec/DescribeClass:
   Exclude:
     - acceptance/fixtures/module/spec/**/*.rb
 
-RSpec/FilePath:
-  Enabled: false
-
 RSpec/MessageSpies:
   Enabled: false
 

data/.rubocop_todo.yml

@@ -306,12 +306,6 @@ RSpec/UnspecifiedException:
 RSpec/VerifiedDoubles:
   Enabled: false
 
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-RSpecRails/MinitestAssertions:
-  Exclude:
-    - 'spec/beaker/dsl/structure_spec.rb'
-
 # Offense count: 2
 # This cop supports safe autocorrection (--autocorrect).
 Rake/Desc:

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [6.5.0](https://github.com/voxpupuli/beaker/tree/6.5.0) (2025-03-18)
+
+**Implemented enhancements:**
+
+* Add support for amazonfips [\#1908](https://github.com/voxpupuli/beaker/pull/1908)
+* Allow minitar 1.x [\#1910](https://github.com/voxpupuli/beaker/pull/1910)
+
 ## [6.4.1](https://github.com/voxpupuli/beaker/tree/6.4.1) (2024-08-27)
 
 **Fixed bugs:**

data/Gemfile

@@ -1,7 +1,7 @@
 source ENV['GEM_SOURCE'] || 'https://rubygems.org'
 
 gemspec
-
+gem 'stringio'
 # This section of the gemspec is for Puppet CI; it will pull in
 # a supported beaker library for testing to overwrite the gemspec if
 # a corresponding ENV var is found. Currently, the only supported lib

data/beaker.gemspec

@@ -22,27 +22,28 @@ 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.8.0'
+  s.add_development_dependency 'voxpupuli-rubocop', '~> 3.0.0'
 
   # Run time dependencies
-  s.add_runtime_dependency 'minitar', '~> 0.12' # newer versions require Ruby 3.1
-  s.add_runtime_dependency 'minitest', '~> 5.4'
-  s.add_runtime_dependency 'rexml', '~> 3.2', '>= 3.2.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'
+  s.add_dependency 'rexml', '~> 3.2', '>= 3.2.5'
 
   # net-ssh compatibility with ed25519 keys
-  s.add_runtime_dependency 'bcrypt_pbkdf', '>= 1.0', '< 2.0'
-  s.add_runtime_dependency 'ed25519', '>= 1.2', '<2.0'
+  s.add_dependency 'bcrypt_pbkdf', '>= 1.0', '< 2.0'
+  s.add_dependency 'ed25519', '>= 1.2', '<2.0'
 
-  s.add_runtime_dependency 'hocon', '~> 1.0'
-  s.add_runtime_dependency 'inifile', '~> 3.0'
-  s.add_runtime_dependency 'net-scp', '>= 1.2', '< 5.0'
-  s.add_runtime_dependency 'net-ssh', '~> 7.1'
+  s.add_dependency 'hocon', '~> 1.0'
+  s.add_dependency 'inifile', '~> 3.0'
+  s.add_dependency 'net-scp', '>= 1.2', '< 5.0'
+  s.add_dependency 'net-ssh', '~> 7.1'
 
-  s.add_runtime_dependency 'in-parallel', '>= 0.1', '< 2.0'
-  s.add_runtime_dependency 'rsync', '~> 1.0.9'
-  s.add_runtime_dependency 'thor', ['>= 1.0.1', '< 2.0']
+  s.add_dependency 'in-parallel', '>= 0.1', '< 2.0'
+  s.add_dependency 'rsync', '~> 1.0.9'
+  s.add_dependency 'thor', ['>= 1.0.1', '< 2.0']
 
   # Run time dependencies that are Beaker libraries
-  s.add_runtime_dependency 'beaker-hostgenerator', '~> 2.0'
-  s.add_runtime_dependency 'stringify-hash', '~> 0.0'
+  s.add_dependency 'beaker-hostgenerator', '~> 2.0'
+  s.add_dependency 'stringify-hash', '~> 0.0'
 end

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

@@ -87,7 +87,7 @@ module Unix::Pkg
     case self['platform']
     when /opensuse|sles-/
       execute("zypper --non-interactive --gpg-auto-import-keys in #{name}", opts)
-    when /amazon-2023|el-(8|9|1[0-9])|fedora/
+    when /amazon(fips)?-2023|el-(8|9|1[0-9])|fedora/
       name = "#{name}-#{version}" if version
       execute("dnf -y #{cmdline_args} install #{name}", opts)
     when /amazon-(2|7)|centos|redhat|el-[1-7]-/
@@ -170,7 +170,7 @@ module Unix::Pkg
     case self['platform']
     when /opensuse|sles-/
       execute("zypper --non-interactive rm #{name}", opts)
-    when /amazon-2023|el-(8|9|1[0-9])|fedora/
+    when /amazon(fips)?-2023|el-(8|9|1[0-9])|fedora/
       execute("dnf -y #{cmdline_args} remove #{name}", opts)
     when /amazon-(2|7)|centos|redhat|el-[1-7]-/
       execute("yum -y #{cmdline_args} remove #{name}", opts)
@@ -260,7 +260,7 @@ module Unix::Pkg
   def install_local_package(onhost_package_file, onhost_copy_dir = nil)
     variant, version, _arch, _codename = self['platform'].to_array
     case variant
-    when /^(amazon|fedora|el|redhat|centos)$/
+    when /^(amazon(fips)?|fedora|el|redhat|centos)$/
       command_name = 'yum'
       command_name = 'dnf' if (variant == 'fedora' && version.to_i > 21) || (variant == 'amazon' && version.to_i >= 2023)
       execute("#{command_name} --nogpgcheck localinstall -y #{onhost_package_file}")
@@ -291,7 +291,7 @@ module Unix::Pkg
   def uncompress_local_tarball(onhost_tar_file, onhost_base_dir, download_file)
     variant, version, _arch, _codename = self['platform'].to_array
     case variant
-    when /^(amazon|fedora|el|centos|redhat|opensuse|sles|debian|ubuntu)$/
+    when /^(amazon(fips)?|fedora|el|centos|redhat|opensuse|sles|debian|ubuntu)$/
       execute("tar -zxvf #{onhost_tar_file} -C #{onhost_base_dir}")
     when /^solaris$/
       # uncompress PE puppet-agent tarball

data/lib/beaker/platform.rb

@@ -3,7 +3,7 @@ module Beaker
   # all String methods while adding several platform-specific use cases.
   class Platform < String
     # Supported platforms
-    PLATFORMS = /^(alpine|amazon|(free|open)bsd|osx|centos|fedora|debian|oracle|redhat|redhatfips|scientific|opensuse|sles|ubuntu|windows|solaris|aix|archlinux|el)\-.+\-.+$/
+    PLATFORMS = /^(alpine|amazon(fips)?|(free|open)bsd|osx|centos|fedora|debian|oracle|redhat|redhatfips|scientific|opensuse|sles|ubuntu|windows|solaris|aix|archlinux|el)\-.+\-.+$/
     # Platform version numbers vs. codenames conversion hash
     PLATFORM_VERSION_CODES =
       { :debian => { "forky" => "14",
@@ -38,6 +38,7 @@ module Beaker
     # provided meets the platform formatting rules.  Platforms name must be of
     # the format /^OSFAMILY-VERSION-ARCH.*$/ where OSFAMILY is one of:
     # * amazon
+    # * amazonfips
     # * freebsd
     # * openbsd
     # * osx
@@ -127,7 +128,7 @@ module Beaker
         @version.to_i >= 11 ? %w[curl] : %w[CSWcurl wget]
       when 'archlinux'
         %w[curl net-tools openssh]
-      when 'amazon', 'fedora'
+      when 'amazon', 'amazonfips', 'fedora'
         ['iputils']
       when 'aix', 'osx', 'windows'
         []

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '6.4.1'
+    STRING = '6.5.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 6.4.1
+  version: 6.5.0
 platform: ruby
 authors:
 - Puppet
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-27 00:00:00.000000000 Z
+date: 2025-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fakefs
@@ -58,28 +58,34 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 3.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: minitar
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.12'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0.12'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -625,7 +631,7 @@ homepage: https://github.com/voxpupuli/beaker
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -640,8 +646,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
-signing_key: 
+rubygems_version: 3.5.22
+signing_key:
 specification_version: 4
 summary: Let's test Puppet!
 test_files: []