Update dependencies (#240)

* Update dependencies
* Drop beaker-puppet dependency
* Don't override BEAKER_PUPPET_COLLECTION
* Use openvox for testing
* Clean up for rubocop

Fixes #239

Author: silug

.github/workflows/pr_acceptance.yml

@@ -1,6 +1,7 @@
 # Run all tests as GitHub Actions
+---
 name: Acceptance Tests
-on:
+'on':
   push:
     branches:
       # A test branch for seeing if your tests will pass in your personal fork
@@ -10,7 +11,7 @@ on:
 
 jobs:
   acceptance:
-    name: '${{matrix.beaker.suite}}, Puppet ${{matrix.puppet.puppet_version}}'
+    name: '${{matrix.beaker.suite}}, ${{matrix.puppet.label}}'
     runs-on:
       - ubuntu-latest
     strategy:
@@ -24,6 +25,11 @@ jobs:
             puppet_version: '~> 8.0'
             ruby_version: '3.2'
             experimental: false
+          - label: 'OpenVox 8.x'
+            puppet_version: '~> 8.0'
+            ruby_version: '3.2'
+            collection: 'openvox8'
+            experimental: false
         beaker:
           - label: beaker
             suite: default
@@ -67,6 +73,9 @@ jobs:
         run: |
           bundle config path vendor
           bundle install -j $(nproc)
+      - name: set BEAKER_PUPPET_COLLECTION
+        if: ${{matrix.puppet.collection}}
+        run: echo "BEAKER_PUPPET_COLLECTION=${{matrix.puppet.collection}}" >> $GITHUB_ENV
       - name: 'run beaker:suite "${{matrix.beaker.label}}"'
         continue-on-error: ${{matrix.puppet.experimental || matrix.beaker.allowed_to_fail}}
         env:

.github/workflows/pr_tests.yml

@@ -13,9 +13,9 @@
 #
 # https://docs.github.com/en/actions/reference/events-that-trigger-workflows
 #
-
+---
 name: PR Tests
-on:
+'on':
   push:
     branches:
       # A test branch for seeing if your tests will pass in your personal fork
@@ -24,7 +24,7 @@ on:
     types: [opened, reopened, synchronize]
 
 env:
-  PUPPET_VERSION: '~> 7'
+  PUPPET_VERSION: '~> 8'
 
 jobs:
   ruby-style:
@@ -33,10 +33,10 @@ jobs:
     continue-on-error: true
     steps:
       - uses: actions/checkout@v5
-      - name: "Install Ruby 2.7"
+      - name: "Install Ruby 3.2"
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.7
+          ruby-version: 3.2
           bundler-cache: true
       - run: |
           bundle show

.rubocop.yml

@@ -1,12 +1,12 @@
 ---
-require:
+plugins:
   - rubocop-performance
   - rubocop-rake
   - rubocop-rspec
 AllCops:
   NewCops: enable
   DisplayCopNames: true
-  TargetRubyVersion: "2.7"
+  TargetRubyVersion: 2.7
   Include:
     - "**/*.rb"
   Exclude:

CHANGELOG.md

@@ -1,3 +1,7 @@
+### 2.0.2 / 2025-08-12
+* Fixed:
+  * Updated dependencies to allow beaker >= 7.0.0 (#239)
+
 ### 2.0.1 / 2025-08-28
 * Fixed:
   * Rename `fips_enabled` method to `fips_enabled?`

Gemfile

@@ -11,7 +11,7 @@ gemspec
 gem 'rake'
 
 group :system_tests do
-  beaker_gem_options = ENV.fetch('BEAKER_GEM_OPTIONS', ['>= 4.28.1', '< 7.0.0'])
+  beaker_gem_options = ENV.fetch('BEAKER_GEM_OPTIONS', ['>= 4.28.1', '< 8.0.0'])
 
   if beaker_gem_options.to_s.include?(':')
     # Just pass in BEAKER_GEM_OPTIONS as a string that would represent the usual
@@ -25,8 +25,8 @@ group :system_tests do
       beaker_gem_options = Hash[
         beaker_gem_options.split(',').
                            # Split passed options on k/v pairs
-                           map { |x| x.gsub('"', '').strip.split(%r{:\s|\s+=>\s+}) }. # Allow for either format hash keys
-                           map { |k, v| [k.delete(':').to_sym, v.strip] } # Convert all keys to symbols
+                           map { |x| x.delete('"').strip.split(%r{:\s|\s+=>\s+}) } # Allow for either format hash keys
+                          .map { |k, v| [k.delete(':').to_sym, v.strip] } # Convert all keys to symbols
       ] # Convert the whole thing to a valid Hash
     rescue StandardError => e
       raise "Invalid BEAKER_GEM_OPTIONS: '#{beaker_gem_options}' => '#{e}'"
@@ -37,13 +37,16 @@ group :system_tests do
 
   gem 'bcrypt_pbkdf'
   gem 'beaker-rspec'
-  gem 'beaker_puppet_helpers'
   gem 'beaker-windows'
   gem 'ed25519'
   gem 'net-ssh'
+  gem 'openvox', ENV.fetch('OPENVOX_VERSION', ENV.fetch('PUPPET_VERSION', ['>= 7.0.0', '< 9.0.0']))
   gem 'pry-byebug', '~> 3.10.0'
-  gem 'puppet', ENV.fetch('PUPPET_VERSION', ['>= 7.0.0', '< 9.0.0'])
-  gem 'puppetlabs_spec_helper', '>= 4.0.0', '< 8.0.1'
+  gem 'puppetlabs_spec_helper', '>= 4.0.0', '< 9.0.0'
+  gem 'syslog' # Required for Ruby >= 3.4
+end
+
+group :tests do
   gem 'rubocop', '~> 1.81.0'
   gem 'rubocop-performance', '~> 1.26.0'
   gem 'rubocop-rake', '~> 0.7.0'

lib/simp/beaker_helpers.rb

@@ -1,13 +1,15 @@
 require 'English'
-require 'beaker-puppet'
+require 'beaker_puppet_helpers'
+require 'beaker_puppet_helpers/dsl'
 require 'bundler'
 
 # SIMP namespace
 module Simp; end
 
 # SIMP Beaker helper methods for testing
 module Simp::BeakerHelpers
-  include BeakerPuppet
+  include BeakerPuppetHelpers
+  include BeakerPuppetHelpers::DSL
 
   require 'simp/beaker_helpers/constants'
   require 'simp/beaker_helpers/inspec'
@@ -16,6 +18,9 @@ module Simp::BeakerHelpers
   require 'simp/beaker_helpers/version'
   require 'find'
 
+  PUPPET_MODULE_INSTALL_IGNORE = ['/.bundle', '/.git', '/.idea', '/.vagrant', '/.vendor', '/vendor', '/acceptance',
+                                  '/bundle', '/spec', '/tests', '/log', '/.svn', '/junit', '/pkg', '/example', '/tmp'].freeze
+
   @run_in_parallel = (ENV['BEAKER_SIMP_parallel'] == 'yes')
 
   # Stealing this from the Ruby 2.5 Dir::Tmpname workaround from Rails
@@ -782,14 +787,6 @@ def linux_errata(suts)
         on sut, 'puppet config set stringify_facts false'
       end
 
-      # Occasionally we run across something similar to BKR-561, so to ensure we
-      # at least have the host defaults:
-      #
-      # :hieradatadir is used as a canary here; it isn't the only missing key
-      unless sut.host_hash.key? :hieradatadir
-        configure_type_defaults_on(sut)
-      end
-
       if os_info['family'] == 'RedHat'
         # OS-specific items
         if os_info['name'] == 'RedHat'
@@ -1502,10 +1499,8 @@ def run_puppet_install_helper_on(hosts)
   def install_puppet
     install_info = get_puppet_install_info
 
-    # In case  Beaker needs this info internally
-    if install_info[:puppet_collection]
-      ENV['BEAKER_PUPPET_COLLECTION'] = install_info[:puppet_collection]
-    end
+    # In case Beaker needs this info internally
+    ENV['BEAKER_PUPPET_COLLECTION'] ||= install_info[:puppet_collection] if install_info.is_a?(Hash) && install_info.key?(:puppet_collection)
 
     require 'beaker_puppet_helpers'
     run_puppet_install_helper_on(hosts)

lib/simp/beaker_helpers/version.rb

@@ -4,5 +4,5 @@
 module Simp; end
 
 module Simp::BeakerHelpers
-  VERSION = '2.0.1'
+  VERSION = '2.0.2'
 end

simp-beaker-helpers.gemspec

@@ -22,14 +22,14 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = '>= 2.7.0'
 
-  s.add_runtime_dependency 'beaker',         ['>= 4.17.0', '< 7.0.0']
-  s.add_runtime_dependency 'beaker-docker',  ['>= 0.8.3', '< 3.0.0']
-  s.add_runtime_dependency 'beaker-puppet',  ['>= 1.18.14', '< 5.0.0']
-  s.add_runtime_dependency 'beaker-rspec',   '~> 8.0'
-  s.add_runtime_dependency 'beaker-vagrant', ['>= 0.6.4', '< 2.0.0']
-  s.add_runtime_dependency 'docker-api',     ['>= 2.1.0', '< 3.0.0']
-  s.add_runtime_dependency 'highline',       ['>= 2.0', '< 4.0.0']
-  s.add_runtime_dependency 'nokogiri',       '~> 1.8'
+  s.add_runtime_dependency 'beaker',                ['>= 4.28.1', '< 8.0.0']
+  s.add_runtime_dependency 'beaker-docker',         ['>= 0.8.3', '< 4.0.0']
+  s.add_runtime_dependency 'beaker-rspec',          ['>= 8.0', '< 10.0.0']
+  s.add_runtime_dependency 'beaker-vagrant',        ['>= 0.6.4', '< 3.0.0']
+  s.add_runtime_dependency 'beaker_puppet_helpers', ['>= 2.0.0', '< 4.0.0']
+  s.add_runtime_dependency 'docker-api',            ['>= 2.1.0', '< 3.0.0']
+  s.add_runtime_dependency 'highline',              ['>= 2.0', '< 4.0.0']
+  s.add_runtime_dependency 'nokogiri',              '~> 1.8'
 
   ### s.files = Dir['Rakefile', '{bin,lib,spec}/**/*', 'README*', 'LICENSE*'] & `git ls-files -z .`.split("\0")
   s.files       = %x(git ls-files).split("\n")

spec/acceptance/nodesets/amzn2.yml

@@ -11,4 +11,4 @@ CONFIG:
   log_level: verbose
   synced_folder: disabled
   type: aio
-  puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'puppet8') %>"
+  puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'openvox8') %>"

spec/acceptance/nodesets/default.yml

@@ -24,4 +24,4 @@ CONFIG:
       - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:encryption].join("\n#{' '*6}- ") %>
     hmac:
       - <%= Net::SSH::Transport::Algorithms::ALGORITHMS[:hmac].join("\n#{' '*6}- ") %>
-  puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'puppet8') %>"
+  puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'openvox8') %>"