simp-beaker-helpers 2.0.4 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3916923de88666ed3a88a41f3053dca5791fb456d6386121c6a85c40641113e6
-  data.tar.gz: f1ebb8c0b1c9faf276537948cf31432305715921476132e4c39fff0411a36c79
+  metadata.gz: 4e51892c7f01f52c49e29840032a8e4b7d5f524a3c3160b3218d3839224bfaf6
+  data.tar.gz: abbce77cea4030bcc802eaa16359e5f53998fb1dda40cd8dbb5aa11e56fff768
 SHA512:
-  metadata.gz: d639af43846bb7c711d42348f035e096c54afcc1b7a8e6db537412dbee093d5d2618e2f329a8fd95865d5514d59d2ecc0d33842334d1d1978e1f984e65b92497
-  data.tar.gz: 3b77cd3c5403c706a4198e8cc95465e504aac01640e5e614a6bf3aa1b8390a5e0a9e8a170852c9448f7738cf38ecdbb1299e84b02a770b3ac215946493809d36
+  metadata.gz: 3c0c3ef0740aef92c4dcb643b94ac228d5484a0ad524b7b419832f30e28caa63f4ba802bf48d721ae242af7a387cc291582e33e9ad23ef345f6bc88105161f67
+  data.tar.gz: 61829ea33bf1911ee6da64d46b29f270f907631c01b3e681b62ac4650716ccaeba4d3d8dababc07cfea1eb8400b1bd2ab72d8528940e296bf4e35f290f36ddac

data/.github/workflows/add_new_issue_to_triage_project.yml

@@ -15,7 +15,7 @@ jobs:
     name: Add issue to project
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/add-to-project@v1.0.2
+      - uses: actions/add-to-project@v2
         with:
           project-url: https://github.com/orgs/simp/projects/11
           github-token: ${{ secrets.AUTO_TRIAGE_TOKEN }}

data/.github/workflows/pr_acceptance.yml

@@ -17,14 +17,6 @@ jobs:
     strategy:
       matrix:
         puppet:
-          - label: 'Puppet 7.x [SIMP 6.6/PE 2021.7]'
-            puppet_version: '~> 7.0'
-            ruby_version: '2.7'
-            experimental: false
-          - label: 'Puppet 8.x'
-            puppet_version: '~> 8.0'
-            ruby_version: '3.2'
-            experimental: false
           - label: 'OpenVox 8.x'
             puppet_version: '~> 8.0'
             ruby_version: '3.2'
@@ -37,9 +29,6 @@ jobs:
           - label: beaker puppet_collections
             suite: puppet_collections
             allowed_to_fail: false
-          - label: beaker ssg
-            suite: ssg
-            allowed_to_fail: false
           # The inspec suite fails for unclear reasons during an scp.
           # Sicura tests compliance at the framework level, so troubleshooting
           # inspec acceptance tests is not a priority at present.
@@ -51,7 +40,7 @@ jobs:
       PUPPET_VERSION: ${{matrix.puppet.puppet_version}}
     steps:
       - name: checkout repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v7
       - name: setup ruby
         uses: ruby/setup-ruby@v1
         with:

data/.github/workflows/pr_tests.yml

@@ -32,11 +32,11 @@ jobs:
     runs-on: ubuntu-latest
     continue-on-error: true
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v7
       - name: "Install Ruby 3.2"
         uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 3.2
+          ruby-version: 4.0.5
           bundler-cache: true
       - run: |
           bundle show
@@ -48,18 +48,20 @@ jobs:
     strategy:
       matrix:
         puppet:
-          - label: 'Puppet 7.x [SIMP 6.6/PE 2021.7]'
-            puppet_version: '~> 7.0'
-            ruby_version: '2.7'
-            experimental: false
-          - label: 'Puppet 8.x'
+          - label: 'OpenVox 8.x'
             puppet_version: '~> 8.0'
             ruby_version: '3.2'
             experimental: false
+          # OpenVox 9 is unreleased; preview the future Ruby 4.0 / OpenVox 9
+          # combo by running the OpenVox 8 gem on Ruby 4.0.
+          - label: 'OpenVox 9.x preview (Ruby 4.0, OpenVox 8 gem)'
+            puppet_version: '~> 8.0'
+            ruby_version: '4.0'
+            experimental: false
     env:
       PUPPET_VERSION: ${{matrix.puppet.puppet_version}}
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v7
       - name: 'Install Ruby ${{matrix.puppet.ruby_version}}'
         uses: ruby/setup-ruby@v1
         with:

data/.github/workflows/tag_deploy_rubygem.yml

@@ -48,7 +48,7 @@ on:
       - '[0-9]+\.[0-9]+\.[0-9]+\-[a-z]+[0-9]+'
 
 env:
-  PUPPET_VERSION: '~> 7'
+  PUPPET_VERSION: '~> 8'
   LOCAL_WORKFLOW_CONFIG_FILE: .github/workflows.local.json
 
 jobs:
@@ -63,7 +63,7 @@ jobs:
     steps:
       - name: "Assert '${{ github.ref }}' is a tag"
         run: '[[ "$GITHUB_REF" =~ ^refs/tags/ ]] || { echo "::error ::GITHUB_REF is not a tag: ${GITHUB_REF}"; exit 1 ; }'
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v7
         with:
           ref: ${{ github.ref }}
           clean: true
@@ -92,7 +92,7 @@ jobs:
           echo "release_command=$GEM_RELEASE_COMMAND" | tee -a "$GITHUB_OUTPUT"
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.7
+          ruby-version: 4.0.5
           bundler-cache: true
       - name: Test build the package
         run: "${{ steps.commands.outputs.build_command }}"
@@ -116,7 +116,7 @@ jobs:
       tag: ${{ steps.tag-check.outputs.tag }}
     steps:
       - name: Checkout code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v7
         with:
           ref: ${{ github.ref }}
           clean: true
@@ -178,13 +178,13 @@ jobs:
       PKG_DIR: ${{ needs.releng-checks.outputs.pkg_dir }}
     steps:
       - name: Checkout code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v7
         with:
           ref: ${{ github.ref }}
           clean: true
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: 2.7
+          ruby-version: 4.0.5
           bundler-cache: true
       - name: Build RubyGem
         run: |

data/CHANGELOG.md

@@ -1,3 +1,29 @@
+### 3.0.0 / 2026-06-24
+* Changed (**Breaking**):
+  * Dropped support for Puppet 7 / Ruby 2.7. CI now tests Puppet/OpenVox 8 only,
+    and the default OpenVox gem floor is raised to `>= 8.0.0`.
+  * Replaced the `puppetlabs_spec_helper/tasks/fixtures` dependency with
+    `puppet_fixtures`, enabling Ruby 4.0 support. `puppetlabs_spec_helper` pulls
+    in `puppet-syntax` < 5, which depends on the `puppet` gem and its `facter`
+    dependency that does not support Ruby >= 4.0; `puppet_fixtures` is the
+    OpenVox-ecosystem replacement and supports Ruby 4.0.
+  * The `beaker:suites` task now depends on `fixtures:prep` (from
+    `puppet_fixtures`) instead of `spec_prep`, and `ensure_fixture_modules` now
+    runs `rake fixtures:prep`.
+* Removed (**Breaking**):
+  * Removed the unsupported `Simp::BeakerHelpers::SSG` helpers, the `ssg`
+    acceptance suite, and the `SSG_REPO_URL` constant (#268)
+* Added:
+  * `puppet_fixtures` runtime dependency
+  * OpenVox-named environment variables for `get_puppet_install_info`, taking
+    precedence over the Puppet-named equivalents (which remain as fallbacks):
+    `OPENVOX_VERSION`, `OPENVOX_INSTALL_VERSION`, `OPENVOX_INSTALL_TYPE`,
+    `BEAKER_OPENVOX_AGENT_VERSION`, `BEAKER_OPENVOX_COLLECTION`,
+    `BEAKER_OPENVOX_PACKAGE_NAME`
+
+### 2.0.5 / 2026-06-06
+* Fixed:
+  * Additional cleanup for rubocop
 ### 2.0.4 / 2025-10-16
 * Fixed:
   * `install_puppet` failure on Windows (#266)

data/Gemfile

@@ -40,15 +40,15 @@ group :system_tests do
   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 'puppetlabs_spec_helper', '>= 4.0.0', '< 9.0.0'
+  # renovate: datasource=rubygems versioning=ruby
+  gem 'openvox', ENV.fetch('OPENVOX_VERSION', ENV.fetch('PUPPET_VERSION', ['>= 8.0.0', '< 9.0.0']))
+  gem 'pry-byebug', '~> 3.12.0'
   gem 'syslog' # Required for Ruby >= 3.4
 end
 
 group :tests do
-  gem 'rubocop', '~> 1.81.0'
+  gem 'rubocop', '~> 1.88.0'
   gem 'rubocop-performance', '~> 1.26.0'
   gem 'rubocop-rake', '~> 0.7.0'
-  gem 'rubocop-rspec', '~> 3.7.0'
+  gem 'rubocop-rspec', '~> 3.10.0'
 end

data/lib/simp/beaker_helpers/constants.rb

@@ -2,15 +2,13 @@
 module Simp; end
 
 # SIMP Beaker helper methods for testing
-module Simp::BeakerHelpers
+module Simp::BeakerHelpers # rubocop:disable Style/OneClassPerFile
   # This is the *oldest* puppet-agent version that the latest release of SIMP supports
   #
   # This is done so that we know if some new thing that we're using breaks the
   # oldest system that we support
   DEFAULT_PUPPET_AGENT_VERSION = '~> 8.0'.freeze
 
-  SSG_REPO_URL = ENV['BEAKER_ssg_repo'] || 'https://github.com/ComplianceAsCode/content.git'
-
   if ['true', 'yes'].include?(ENV['BEAKER_online'])
     ONLINE = true
   elsif ['false', 'no'].include?(ENV['BEAKER_online'])

data/lib/simp/beaker_helpers/version.rb

@@ -3,6 +3,6 @@
 # SIMP namespace
 module Simp; end
 
-module Simp::BeakerHelpers
-  VERSION = '2.0.4'
+module Simp::BeakerHelpers # rubocop:disable Style/OneClassPerFile
+  VERSION = '3.0.0'
 end

data/lib/simp/beaker_helpers/windows.rb

@@ -1,10 +1,10 @@
 # SIMP namespace
 module Simp; end
 # SIMP Beaker helper methods for testing
-module Simp::BeakerHelpers; end
+module Simp::BeakerHelpers; end # rubocop:disable Style/OneClassPerFile
 
 # Windows-specific helper methods
-module Simp::BeakerHelpers::Windows
+module Simp::BeakerHelpers::Windows # rubocop:disable Style/OneClassPerFile
   begin
     require 'beaker-windows'
   rescue LoadError

data/lib/simp/beaker_helpers.rb

@@ -7,14 +7,13 @@ require 'bundler'
 module Simp; end
 
 # SIMP Beaker helper methods for testing
-module Simp::BeakerHelpers
+module Simp::BeakerHelpers # rubocop:disable Style/OneClassPerFile
   include BeakerPuppetHelpers
   include BeakerPuppetHelpers::DSL
 
   require 'simp/beaker_helpers/constants'
   require 'simp/beaker_helpers/inspec'
   require 'simp/beaker_helpers/snapshot'
-  require 'simp/beaker_helpers/ssg'
   require 'simp/beaker_helpers/version'
   require 'find'
 
@@ -367,8 +366,8 @@ module Simp::BeakerHelpers
       if missing_modules.empty?
         puts '  == all fixture modules present'
       else
-        cmd = 'bundle exec rake spec_prep'
-        puts "  -- running spec_prep: '#{cmd}'"
+        cmd = 'bundle exec rake fixtures:prep'
+        puts "  -- running fixtures:prep: '#{cmd}'"
         `#{cmd}`
       end
     end
@@ -1235,13 +1234,13 @@ module Simp::BeakerHelpers
     data_dir = Dir.mktmpdir('hieradata')
     @temp_hieradata_dirs << data_dir
 
-    fh = File.open(File.join(data_dir, 'common.yaml'), 'w')
-    if hieradata.is_a?(String)
-      fh.puts(hieradata)
-    else
-      fh.puts(hieradata.to_yaml)
+    File.open(File.join(data_dir, 'common.yaml'), 'w') do |fh|
+      if hieradata.is_a?(String)
+        fh.puts(hieradata)
+      else
+        fh.puts(hieradata.to_yaml)
+      end
     end
-    fh.close
 
     copy_hiera_data_to sut, File.join(data_dir, 'common.yaml')
   end
@@ -1426,16 +1425,25 @@ module Simp::BeakerHelpers
   #       install version and a puppet collection are specified. This is
   #       because the puppet install version can specify more precise
   #       version information than is available from a puppet collection.
+  #
+  #       Each Puppet-named environment variable has an OpenVox-named
+  #       equivalent (e.g. OPENVOX_VERSION, BEAKER_OPENVOX_COLLECTION) that
+  #       takes precedence; the Puppet-named variables are kept as fallbacks
+  #       for backwards compatibility.
   def get_puppet_install_info
-    # The first match is internal Beaker and the second is legacy SIMP
-    puppet_install_version = ENV['BEAKER_PUPPET_AGENT_VERSION'] || ENV['PUPPET_INSTALL_VERSION'] || ENV['PUPPET_VERSION']
+    # OpenVox-named variables win; the Puppet-named ones remain as fallbacks.
+    # Within each pair the first match is internal Beaker, the second legacy SIMP.
+    puppet_install_version =
+      ENV['BEAKER_OPENVOX_AGENT_VERSION'] || ENV['BEAKER_PUPPET_AGENT_VERSION'] ||
+      ENV['OPENVOX_INSTALL_VERSION'] || ENV['PUPPET_INSTALL_VERSION'] ||
+      ENV['OPENVOX_VERSION'] || ENV['PUPPET_VERSION']
 
     if puppet_install_version && !puppet_install_version.strip.empty?
       puppet_agent_version = latest_puppet_agent_version_for(puppet_install_version.strip)
     end
 
     if puppet_agent_version.nil?
-      if (puppet_collection = ENV['BEAKER_PUPPET_COLLECTION'] || host.options['puppet_collection'])
+      if (puppet_collection = ENV['BEAKER_OPENVOX_COLLECTION'] || ENV['BEAKER_PUPPET_COLLECTION'] || host.options['puppet_collection'])
         raise("Error: Puppet Collection '#{puppet_collection}' must match /(puppet|openvox)(\\d+)/") unless puppet_collection =~ %r{(puppet|openvox)(\d+)}
         puppet_collection_name = ::Regexp.last_match(1)
         puppet_install_version = "~> #{::Regexp.last_match(2)}"
@@ -1453,18 +1461,18 @@ module Simp::BeakerHelpers
     {
       puppet_install_version: puppet_agent_version,
       puppet_collection: puppet_collection,
-      puppet_install_type: ENV.fetch('PUPPET_INSTALL_TYPE', 'agent')
+      puppet_install_type: ENV['OPENVOX_INSTALL_TYPE'] || ENV.fetch('PUPPET_INSTALL_TYPE', 'agent')
     }
   end
 
   def run_puppet_install_helper_on(hosts)
     block_on hosts, run_in_parallel: true do |host|
-      puppet_collection = ENV.fetch('BEAKER_PUPPET_COLLECTION', nil) || host.options['puppet_collection']
+      puppet_collection = ENV['BEAKER_OPENVOX_COLLECTION'] || ENV.fetch('BEAKER_PUPPET_COLLECTION', nil) || host.options['puppet_collection']
       if is_windows?(host)
         install_msi_on(host, puppet_collection)
       else
         BeakerPuppetHelpers::InstallUtils.install_puppet_release_repo_on(host, puppet_collection)
-        package_name = ENV.fetch('BEAKER_PUPPET_PACKAGE_NAME', BeakerPuppetHelpers::InstallUtils.collection2packagename(host, puppet_collection))
+        package_name = ENV['BEAKER_OPENVOX_PACKAGE_NAME'] || ENV.fetch('BEAKER_PUPPET_PACKAGE_NAME', BeakerPuppetHelpers::InstallUtils.collection2packagename(host, puppet_collection))
         host.install_package(package_name)
       end
     end

data/lib/simp/rake/beaker.rb

@@ -4,15 +4,15 @@ require 'rake/tasklib'
 require 'fileutils'
 require 'beaker/tasks/rake_task'
 require 'beaker-rspec/rake_task'
-require 'puppetlabs_spec_helper/tasks/fixtures'
+require 'puppet_fixtures/tasks'
 
 # Simp namespace
 module Simp; end
 # Simp::Rake namespace
-module Simp::Rake; end
+module Simp::Rake; end # rubocop:disable Style/OneClassPerFile
 
 # Rake tasks for SIMP Beaker testing
-class Simp::Rake::Beaker < ::Rake::TaskLib
+class Simp::Rake::Beaker < ::Rake::TaskLib # rubocop:disable Style/OneClassPerFile
   def initialize(base_dir) # rubocop:disable Lint/MissingSuper
     @base_dir   = base_dir
     @clean_list = []
@@ -111,7 +111,7 @@ class Simp::Rake::Beaker < ::Rake::TaskLib
               'default_run' : <true|false> => Default: false
               ```
         EOM
-      task :suites, [:suite, :nodeset] => ['spec_prep'] do |_t, args|
+      task :suites, [:suite, :nodeset] => ['fixtures:prep'] do |_t, args|
         suite = args[:suite]
         nodeset = args[:nodeset]
 

data/renovate.json

@@ -1,6 +1,8 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
   "extends": [
-    "config:recommended"
+    "config:recommended",
+    "github>simp/renovate-config",
+    "github>simp/renovate-config:ruby.json"
   ]
 }

data/simp-beaker-helpers.gemspec

@@ -30,6 +30,7 @@ Gem::Specification.new do |s|
   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 'puppet_fixtures',       ['>= 0.1', '< 3.0.0']
 
   ### 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/suites/default/check_puppet_version_spec.rb

@@ -1,19 +1,25 @@
 require 'spec_helper_acceptance'
 
-unless ENV['PUPPET_VERSION'] || ENV['BEAKER_PUPPET_COLLECTION']
-  raise('You must set either PUPPET_VERSION or BEAKER_PUPPET_COLLECTION as an environment variable')
-end
+def target_version
+  return @target_version if @target_version
+
+  unless ENV['PUPPET_VERSION'] || ENV['BEAKER_PUPPET_COLLECTION']
+    raise('You must set either PUPPET_VERSION or BEAKER_PUPPET_COLLECTION as an environment variable')
+  end
+
+  if ENV['BEAKER_PUPPET_COLLECTION']
+    @target_version = ENV['BEAKER_PUPPET_COLLECTION'][%r{(\d+)$}, 1]
+  elsif ENV['PUPPET_VERSION']
+    @target_version = ENV['PUPPET_VERSION'].split('.').first
+  end
 
-if ENV['BEAKER_PUPPET_COLLECTION']
-  target_version = ENV['BEAKER_PUPPET_COLLECTION'][%r{(\d+)$}, 1]
-elsif ENV['PUPPET_VERSION']
-  target_version = ENV['PUPPET_VERSION'].split('.').first
+  @target_version
 end
 
 hosts.each do |host|
   describe 'make sure puppet version is valid' do
     context "on #{host}" do
-      client_puppet_version = on(host, 'puppet --version').output.lines.last.strip
+      let(:client_puppet_version) { on(host, 'puppet --version').output.lines.last.strip }
 
       it "is running puppet version #{target_version}" do
         expect(Gem::Version.new(client_puppet_version)).to be >= Gem::Version.new(target_version)

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

@@ -32,7 +32,7 @@ context 'after copy_fixture_modules_to( hosts )' do
   end
 
   describe "pfact_on(default,'fips_enabled')" do
-    expected = (ENV['BEAKER_fips'] == 'yes')
+    let(:expected) { ENV['BEAKER_fips'] == 'yes' }
 
     it 'returns false' do
       expect(pfact_on(default, 'fips_enabled')).to eq expected

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

@@ -1,11 +1,14 @@
 require 'spec_helper_acceptance'
 
-hosts.each do |host|
-  expect_failures = false
-  if hosts_with_role(hosts, 'el9').include?(host)
-    expect_failures = true
-  end
+def expect_failures?(host)
+  os = fact_on(host, 'os')
+
+  return true if os['family'] == 'RedHat' && os['release']['major'].to_i >= 9
 
+  false
+end
+
+hosts.each do |host|
   describe '#install_simp_repos' do
     it 'installs yum utils' do
       host.install_package('yum-utils')
@@ -15,12 +18,12 @@ hosts.each do |host|
       before(:all) do
         install_simp_repos(host)
       rescue => e
-        raise e unless expect_failures
+        raise e unless expect_failures?(host)
         warn e.message
       end
 
       it 'enables the correct repos' do
-        skip "#{host} is not supported yet" if expect_failures
+        skip "#{host} is not supported yet" if expect_failures?(host)
         on(host, 'yum -y list simp')
         on(host, 'yum -y list postgresql96')
       end
@@ -33,7 +36,7 @@ hosts.each do |host|
       end
 
       it 'lists the simp rpm' do
-        skip "#{host} is not supported yet" if expect_failures
+        skip "#{host} is not supported yet" if expect_failures?(host)
         on(host, 'yum list simp')
       end
     end
@@ -42,12 +45,12 @@ hosts.each do |host|
       before(:all) do
         install_simp_repos(host, ['simp-community-simp'])
       rescue => e
-        raise e unless expect_failures
+        raise e unless expect_failures?(host)
         warn e.message
       end
 
       it 'enables the correct repos' do
-        skip "#{host} is not supported yet" if expect_failures
+        skip "#{host} is not supported yet" if expect_failures?(host)
         on(host, 'yum -y list postgresql96')
       end
 

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

@@ -24,8 +24,13 @@ context 'PKI operations' do
     end
 
     describe 'a Fake CA under /root' do
-      tmp_keydist_dir = Dir.mktmpdir 'simp-beaker-helpers__pki-tests'
-      run_fake_pki_ca_on(default, hosts, tmp_keydist_dir)
+      def tmp_keydist_dir
+        @tmp_keydist_dir ||= Dir.mktmpdir 'simp-beaker-helpers__pki-tests'
+      end
+
+      before(:all) do
+        run_fake_pki_ca_on(default, hosts, tmp_keydist_dir)
+      end
 
       it 'creates /root/pki' do
         on(default, 'test -d /root/pki')
@@ -35,15 +40,19 @@ context 'PKI operations' do
     end
 
     describe 'after copy_keydist_to' do
-      test_dir = '/etc/puppetlabs/code/environments/production/modules/pki/files/keydist'
-      copy_keydist_to(default)
-      it_behaves_like 'a correctly copied keydist/ tree', test_dir
+      before(:all) do
+        copy_keydist_to(default)
+      end
+
+      it_behaves_like 'a correctly copied keydist/ tree', '/etc/puppetlabs/code/environments/production/modules/pki/files/keydist'
     end
 
-    describe 'after copy_keydist_to(default,"/tmp/foo")' do
-      test_dir = '/tmp/foo'
-      copy_keydist_to(default, test_dir)
-      it_behaves_like 'a correctly copied keydist/ tree', test_dir
+    describe 'after copy_keydist_to(default, "/tmp/foo")' do
+      before(:all) do
+        copy_keydist_to(default, '/tmp/foo')
+      end
+
+      it_behaves_like 'a correctly copied keydist/ tree', '/tmp/foo'
     end
   end
 end

data/spec/acceptance/suites/fips_from_fixtures/00_default_spec.rb

@@ -10,7 +10,11 @@ end
 require 'yaml'
 require 'tempfile'
 
-alt_fixtures = File.absolute_path('.fips_fixtures.yml')
+def alt_fixtures
+  return @alt_fixtures if @alt_fixtures
+
+  @alt_fixtures = File.absolute_path('.fips_fixtures.yml')
+end
 
 new_fixtures = {
   'fixtures' => {

data/spec/acceptance/suites/inspec/00_default_spec.rb

@@ -38,7 +38,7 @@ describe 'Inspec STIG Profile' do
 
             it 'has a report' do
               expect(inspec_report_data[:report]).not_to be_nil
-              puts inspec_report_data[:report]
+              puts inspec_report_data[:report] # rubocop:disable RSpec/Output
             end
           else
             # rubocop:disable RSpec/RepeatedDescription

data/spec/acceptance/suites/puppet_collections/00_default_spec.rb

@@ -1,19 +1,21 @@
 require 'spec_helper_acceptance'
 
-unless ENV['PUPPET_VERSION'] || ENV['BEAKER_PUPPET_COLLECTION']
-  raise('You must set either PUPPET_VERSION or BEAKER_PUPPET_COLLECTION as an environment variable')
-end
+def target_version
+  unless ENV['PUPPET_VERSION'] || ENV['BEAKER_PUPPET_COLLECTION']
+    raise('You must set either PUPPET_VERSION or BEAKER_PUPPET_COLLECTION as an environment variable')
+  end
 
-if ENV['BEAKER_PUPPET_COLLECTION']
-  target_version = ENV['BEAKER_PUPPET_COLLECTION'][%r{(\d+)$}, 1]
-elsif ENV['PUPPET_VERSION']
-  target_version = ENV['PUPPET_VERSION'].split('.').first
+  if ENV['BEAKER_PUPPET_COLLECTION']
+    ENV['BEAKER_PUPPET_COLLECTION'][%r{(\d+)$}, 1]
+  elsif ENV['PUPPET_VERSION']
+    ENV['PUPPET_VERSION'].split('.').first
+  end
 end
 
 hosts.each do |host|
   describe 'make sure puppet version is valid' do
     context "on #{host}" do
-      client_puppet_version = on(host, 'puppet --version').output.lines.last.strip
+      let(:client_puppet_version) { on(host, 'puppet --version').output.lines.last.strip }
 
       it "is running puppet version #{target_version}" do
         expect(Gem::Version.new(client_puppet_version)).to be >= Gem::Version.new(target_version)

data/spec/fixtures/inspec_profiles/CentOS-7-disa_stig

@@ -1 +1 @@
-spec/fixtures/inspec_profiles/RedHat-7-disa_stig
+RedHat-7-disa_stig