simp-beaker-helpers 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ce5749e98e91120a7fe096123986044dadded4f84f2c2e7934c1d839078a17d
-  data.tar.gz: 1aebb5a748c01c77ee71f8dd042857bef2fde943f591b313bef04b9c69962927
+  metadata.gz: 20611993c0b38c821da287d01266302a5de462fce9dc91005f249675da5e0454
+  data.tar.gz: c069784a8d04644b1bf52c476b57cbb4d0432774ae87dabef8167387fd51bc08
 SHA512:
-  metadata.gz: deb933f2d39a411b0c8543dc4aff0977f43e6e30b9c3b92c9061891fc6c544ee4dd44c89e64dfec198143ae4b7fe53ac0936a290da0bffbc99dc06c3eac3543a
-  data.tar.gz: 3ef97ba170ee15f8cdef7b11128feb77102ac55cfda46f963e42e60165866d406be3480cae0d926d21420f5955abd57896a4c22cbb042c602523578b083b4453
+  metadata.gz: 6ce1b8cdd761a7893576d97403e0b6860fb626528f0fc6c64aad17c06029225f764b31f9648f4c60d7b0de96fde63e16cf8f2b5261e9ac2c9d05801919f13609
+  data.tar.gz: 99d9c3085ee58c56f8650bdd0708d81fdb2fc128f3d114afd31883533b058345edeadb46307b537341b294cf7a317d5ef3484d7b073f95726b918b850ae1a6cc

data/.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:

data/.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

data/.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:

data/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?`

data/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,15 +37,18 @@ 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.0'
-  gem 'rubocop', '~> 1.80.0'
-  gem 'rubocop-performance', '~> 1.23.0'
-  gem 'rubocop-rake', '~> 0.6.0'
-  gem 'rubocop-rspec', '~> 3.3.0'
+  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'
+  gem 'rubocop-rspec', '~> 3.7.0'
 end

data/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

data/lib/simp/beaker_helpers.rb

@@ -1,5 +1,6 @@
 require 'English'
-require 'beaker-puppet'
+require 'beaker_puppet_helpers'
+require 'beaker_puppet_helpers/dsl'
 require 'bundler'
 
 # SIMP namespace
@@ -7,7 +8,8 @@ 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 @@ module Simp::BeakerHelpers
         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 @@ module Simp::BeakerHelpers
   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)

data/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")

data/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') %>"

data/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') %>"

data/spec/acceptance/nodesets/docker.yml

@@ -12,7 +12,7 @@ HOSTS:
 CONFIG:
   log_level: verbose
   type: aio
-  puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'puppet8') %>"
+  puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'openvox8') %>"
   ssh:
     password: root
     auth_methods:

data/spec/acceptance/nodesets/oel.yml

@@ -19,7 +19,7 @@ CONFIG:
   log_level: verbose
   type: aio
   vagrant_cpus: 2
-  puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'puppet8') %>"
+  puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'openvox8') %>"
   ssh:
     keepalive: true
     keepalive_interval: 10

data/spec/acceptance/nodesets/ubuntu.yml

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

data/spec/acceptance/suites/default/fixture_modules_spec.rb

@@ -7,9 +7,9 @@ context 'after copy_fixture_modules_to( hosts )' do
   end
 
   describe "fact_on(default,'root_home')" do
-    it 'does not return value of `root_home`' do
-      pending 'Conflicts with beaker_puppet_helpers' unless Gem::Version.new(pfact_on(default, 'puppetversion').to_s) < Gem::Version.new('8')
-      expect(Beaker::DSL::Helpers::FacterHelpers.fact_on(default, 'root_home').to_s).to eq ''
+    # fact_on in beaker_puppet_helpers is equivalent to pfact_on
+    xit 'does not return value of `root_home`' do
+      expect(fact_on(default, 'root_home').to_s).to eq ''
     end
   end
 

data/spec/acceptance/suites/offline/nodesets/default.yml

@@ -13,7 +13,7 @@ HOSTS:
 CONFIG:
   log_level: verbose
   type: aio
-  puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'puppet8') %>"
+  puppet_collection: "<%= ENV.fetch('BEAKER_PUPPET_COLLECTION', 'openvox8') %>"
   libvirt:
     # Ensure that we use the best option available
     'cpu_mode': 'host-passthrough'

data/spec/acceptance/suites/snapshot/10_general_usage_spec.rb

@@ -43,13 +43,13 @@ hosts.each do |host|
       context 'existing snapshot' do
         let(:init_snapshot) { 'handoff' }
 
-        include_examples 'a snapshot test'
+        it_behaves_like 'a snapshot test'
       end
 
       context 'missing snapshot' do
         let(:init_snapshot) { 'missing' }
 
-        include_examples 'a snapshot test'
+        it_behaves_like 'a snapshot test'
       end
     end
   end

data/spec/acceptance/suites/windows/nodesets/default.yml

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

data/spec/acceptance/suites/windows/nodesets/win2012.yml

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

data/spec/acceptance/suites/windows/nodesets/win2016.yml

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

data/spec/acceptance/suites/windows/nodesets/win2019.yml

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-beaker-helpers
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-08-26 00:00:00.000000000 Z
+date: 2025-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beaker
@@ -17,20 +17,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.17.0
+        version: 4.28.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: 7.0.0
+        version: 8.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.17.0
+        version: 4.28.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: 7.0.0
+        version: 8.0.0
 - !ruby/object:Gem::Dependency
   name: beaker-docker
   requirement: !ruby/object:Gem::Requirement
@@ -40,7 +40,7 @@ dependencies:
         version: 0.8.3
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -50,61 +50,67 @@ dependencies:
         version: 0.8.3
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
-  name: beaker-puppet
+  name: beaker-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.18.14
+        version: '8.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 10.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.18.14
+        version: '8.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 10.0.0
 - !ruby/object:Gem::Dependency
-  name: beaker-rspec
+  name: beaker-vagrant
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '8.0'
+        version: 0.6.4
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '8.0'
+        version: 0.6.4
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
-  name: beaker-vagrant
+  name: beaker_puppet_helpers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 2.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.4
+        version: 2.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: docker-api
   requirement: !ruby/object:Gem::Requirement