puppetlabs_spec_helper 6.0.1 → 8.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9697b23b7652cc4dd9158675666a7f64ea3a902a4ec8367977712b9549e94951
-  data.tar.gz: e1913dfc25f36d2067d4f9003810e5d0602a105b2442aaca1bba8a09dff484bb
+  metadata.gz: f6e4f387a2e5ca2ffdaf54834dba59bddbc793d099a32844e406d6bcf1906345
+  data.tar.gz: a5d37de14da8a64547e4dd3a40a649b0eac66d7c73d7d2aff561dafc569c3299
 SHA512:
-  metadata.gz: e3ee3dbfac1577f1933f00e9b2cb6ac5fb2b4162054b9e9dcedd5921c7cbdcd279dce6294db6ec9cf29919c572ab0087ff62b3175ad1b3ddb24c8d261553587b
-  data.tar.gz: a0c034d5006429965a0a86a96de2011f708f9ce32893d2518dc6e062c73644560d6651f071c58a7c3d20c91e8013af46c45f14ea1cec7d61ff77beb52f05a0d3
+  metadata.gz: 0c5d1c7bc0f185b696570c75bccab95349681e09bc213e91f5ffeb855d462a4e98c30cc3049ccb44cb083936438ccc386bcee6096a92f2ff8e8eb48c1fc8478e
+  data.tar.gz: 7da07d5ea2f8c277944bb803765fe2a39695c38ee3342bf0da34fdefce301e20edce6d9a201337db7cbbb14536ac2f9894cb50925f439a6214f9aa1a35669b97

data/.rubocop.yml

@@ -1,19 +1,12 @@
+---
 inherit_from: .rubocop_todo.yml
 
-require:
-  - rubocop-performance
-  - rubocop-rspec
-
-AllCops:
-  Exclude:
-    - Gemfile
-    - Rakefile
-    - spec/fixtures/**/*
-    - vendor/bundle/**/*
-  NewCops: enable
-  SuggestExtensions: false
-  TargetRubyVersion: '2.7'
+inherit_gem:
+  voxpupuli-rubocop: rubocop.yml
 
 # Disabled
 Style/ClassAndModuleChildren:
   Enabled: false
+
+Layout/LineLength:
+  Max: 200

data/README.md

@@ -1,6 +1,10 @@
 Puppet Labs Spec Helper
 =======================
 
+[![Code Owners](https://img.shields.io/badge/owners-DevX--team-blue)](https://github.com/puppetlabs/puppetlabs_spec_helper/blob/main/CODEOWNERS)
+![ci](https://github.com/puppetlabs/puppetlabs_spec_helper/actions/workflows/ci.yml/badge.svg)
+![GitHub release (latest by date)](https://img.shields.io/github/v/release/puppetlabs/puppetlabs_spec_helper)
+
 The Short Version
 -----------------
 
@@ -212,6 +216,17 @@ When specifying the repo source of the fixture you have a few options as to whic
  * `ref` and `branch` can be used together to get a specific revision on a specific branch
  * Top level `defaults` option could be used to set global options
 
+Using Forge Authorization
+-----------------
+
+In order to perform forge operations which require authorization, such as installing premium modules, you can export your forge api key as an environment variable in your terminal.
+
+```bash
+FORGE_API_KEY='your_api_key'
+```
+
+puppetlabs_spec_helper will then automatically append this key to all `puppet module install` requests when running `rake spec_prep`.
+
 Fixtures Examples
 -----------------
 Basic fixtures that will symlink `spec/fixtures/modules/my_modules` to the
@@ -230,8 +245,8 @@ Add `firewall` and `stdlib` as required module fixtures:
 ```yaml
 fixtures:
   repositories:
-    firewall: "git://github.com/puppetlabs/puppetlabs-firewall"
-    stdlib: "git://github.com/puppetlabs/puppetlabs-stdlib"
+    firewall: "https://github.com/puppetlabs/puppetlabs-firewall.git"
+    stdlib: "https://github.com/puppetlabs/puppetlabs-stdlib.git"
 ```
 
 Put a supplementary repository at a different location
@@ -239,8 +254,8 @@ Put a supplementary repository at a different location
 ```yaml
 fixtures:
   repositories:
-    firewall: "git://github.com/puppetlabs/puppetlabs-firewall"
-    stdlib: "git://github.com/puppetlabs/puppetlabs-stdlib"
+    firewall: "https://github.com/puppetlabs/puppetlabs-firewall.git"
+    stdlib: "https://github.com/puppetlabs/puppetlabs-stdlib.git"
     control_repo:
       repo: "https://github.com/puppetlabs/control-repo"
       target: "spec/fixtures/control_repos"
@@ -251,9 +266,9 @@ Specify that the git tag `2.4.2` of `stdlib` should be checked out:
 ```yaml
 fixtures:
   repositories:
-    firewall: "git://github.com/puppetlabs/puppetlabs-firewall"
+    firewall: "https://github.com/puppetlabs/puppetlabs-firewall.git"
     stdlib:
-      repo: "git://github.com/puppetlabs/puppetlabs-stdlib"
+      repo: "https://github.com/puppetlabs/puppetlabs-stdlib.git"
       ref: "2.6.0"
 ```
 
@@ -263,7 +278,7 @@ Only install the `yumrepo_core` module when testing against Puppet 7 or greater:
 fixtures:
   repositories:
     yumrepo_core:
-      repo: "git://github.com/puppetlabs/puppetlabs-yumrepo_core"
+      repo: "https://github.com/puppetlabs/puppetlabs-yumrepo_core.git"
       puppet_version: ">= 6.0.0"
 ```
 
@@ -273,7 +288,7 @@ Move manifests and siblings to root directory when they are inside a `code` dire
 fixtures:
   repositories:
     stdlib:
-      repo: "git://github.com/puppetlabs/puppetlabs-extradirectory"
+      repo: "https://github.com/puppetlabs/puppetlabs-extradirectory.git"
       subdir: "code"
 ```
 
@@ -299,7 +314,7 @@ fixtures:
       flags: "--module_repository https://my_repo.com"
     repositories:
       firewall:
-        repo: "git://github.com/puppetlabs/puppetlabs-firewall"
+        repo: "https://github.com/puppetlabs/puppetlabs-firewall.git"
         ref: "2.6.0"
         flags: "--verbose"
 ```
@@ -317,7 +332,7 @@ fixtures:
       ref: "2.6.0"
     repositories:
       firewall:
-        repo: "git://github.com/puppetlabs/puppetlabs-firewall"
+        repo: "https://github.com/puppetlabs/puppetlabs-firewall.git"
         ref: "2.6.0"
 ```
 
@@ -406,7 +421,7 @@ You can enable it, set the following environment variable:s
 
 ``SIMPLECOV=yes``
 
-Remember to add the simplecov-console and codecov gems to your `Gemfile`. If you run `spec:simplecov` on Travis-CI or any of the other supported CI services, reports gets automatically uploaded to https://codecov.io/ .
+Remember to add the simplecov-console gem to your `Gemfile`. If you run `spec:simplecov` on Travis-CI or any of the other supported CI services, reports get generated which can then be uploaded to [codecov.io](https://codecov.io) with the recommended [codecov uploader](https://docs.codecov.com/docs/codecov-uploader).
 
 Some Notes for Windows Users
 ============================
@@ -481,3 +496,7 @@ Rationale
 * mocha is an additional dependency to carry.
 
 EOF
+
+## License
+
+This codebase is licensed under Apache 2.0. However, the open source dependencies included in this codebase might be subject to other software licenses such as AGPL, GPL2.0, and MIT.

data/lib/puppetlabs_spec_helper/module_spec_helper.rb

@@ -20,35 +20,42 @@ env_module_path = ENV.fetch('MODULEPATH', nil)
 module_path = File.join(fixture_path, 'modules')
 
 module_path = [module_path, env_module_path].join(File::PATH_SEPARATOR) if env_module_path
+
 if ENV['SIMPLECOV'] == 'yes'
   begin
     require 'simplecov'
     require 'simplecov-console'
+  rescue LoadError
+    raise 'Add the simplecov and simplecov-console gems to Gemfile to enable this task'
+  end
+
+  SimpleCov.formatters = [
+    SimpleCov::Formatter::HTMLFormatter,
+    SimpleCov::Formatter::Console,
+  ]
+
+  begin
     require 'codecov'
+    SimpleCov.formatters << SimpleCov::Formatter::Codecov
+  rescue LoadError
+    # continue without codecov, we could warn here but we want to avoid its use if possible
+  end
+
+  SimpleCov.start do
+    track_files 'lib/**/*.rb'
+    add_filter '/spec'
 
-    SimpleCov.formatters = [
-      SimpleCov::Formatter::HTMLFormatter,
-      SimpleCov::Formatter::Console,
-      SimpleCov::Formatter::Codecov
-    ]
-    SimpleCov.start do
-      track_files 'lib/**/*.rb'
-      add_filter '/spec'
-
-      # do not track vendored files
-      add_filter '/vendor'
-      add_filter '/.vendor'
-
-      # do not track gitignored files
-      # this adds about 4 seconds to the coverage check
-      # this could definitely be optimized
-      add_filter do |f|
-        # system returns true if exit status is 0, which with git-check-ignore means file is ignored
-        system("git check-ignore --quiet #{f.filename}")
-      end
+    # do not track vendored files
+    add_filter '/vendor'
+    add_filter '/.vendor'
+
+    # do not track gitignored files
+    # this adds about 4 seconds to the coverage check
+    # this could definitely be optimized
+    add_filter do |f|
+      # system returns true if exit status is 0, which with git-check-ignore means file is ignored
+      system("git check-ignore --quiet #{f.filename}")
     end
-  rescue LoadError
-    raise 'Add the simplecov, simplecov-console, codecov gems to Gemfile to enable this task'
   end
 end
 
@@ -58,7 +65,7 @@ components = module_path.split(File::PATH_SEPARATOR).map do |dir|
 
   Dir.entries(dir).grep_v(/^\./).map { |f| File.join(dir, f, 'spec', 'lib') }
 end
-components.flatten.each do |d|
+components.compact.flatten.each do |d|
   $LOAD_PATH << d if FileTest.directory?(d) && !$LOAD_PATH.include?(d)
 end
 
@@ -67,7 +74,6 @@ RSpec.configure do |c|
 
   c.environmentpath = spec_path
   c.module_path = module_path
-  c.manifest_dir = File.join(fixture_path, 'manifests')
 
   # https://github.com/puppetlabs/rspec-puppet#strict_variables
   c.strict_variables = ENV['STRICT_VARIABLES'] != 'no'

data/lib/puppetlabs_spec_helper/puppetlabs_spec/puppet_internals.rb

@@ -39,7 +39,7 @@ module PuppetlabsSpec
       # exposed hack.
       return nil unless Puppet::Parser::Functions.function(name)
 
-      scope.method("function_#{name}".to_sym)
+      scope.method(:"function_#{name}")
     end
     module_function :function_method
   end

data/lib/puppetlabs_spec_helper/rake_tasks.rb

@@ -111,8 +111,9 @@ task :parallel_spec_standalone do |_t, args|
     warn 'No files for parallel_spec to run against'
   else
 
-    args = ['-t', 'rspec']
-    args.push('--').concat(ENV['CI_SPEC_OPTIONS'].strip.split).push('--') unless ENV['CI_SPEC_OPTIONS'].nil? || ENV['CI_SPEC_OPTIONS'].strip.empty?
+    args = ['--type', 'rspec']
+    additional_options = ['--format', 'progress'] + ENV['CI_SPEC_OPTIONS'].to_s.strip.split
+    args.push('--').concat(additional_options).push('--')
     args.concat(Rake::FileList[pattern].to_a)
 
     ParallelTests::CLI.new.run(args)
@@ -120,35 +121,6 @@ task :parallel_spec_standalone do |_t, args|
   end
 end
 
-desc 'Build puppet module package'
-task :build do
-  Rake::Task['build:pdk'].invoke
-end
-
-namespace :build do
-  desc 'Build Puppet module with PDK'
-  task :pdk do
-    require 'pdk/util'
-    require 'pdk/module/build'
-
-    path = PDK::Module::Build.invoke(force: true, 'target-dir': File.join(Dir.pwd, 'pkg'))
-    puts "Module built: #{path}"
-  rescue LoadError
-    _ = `pdk --version`
-    unless $CHILD_STATUS.success?
-      warn 'Unable to build module. Please install PDK or add the `pdk` gem to your Gemfile.'
-      abort
-    end
-
-    system('pdk build --force')
-  end
-end
-
-desc 'Clean a built module package'
-task :clean do
-  FileUtils.rm_rf('pkg/')
-end
-
 require 'puppet-lint/tasks/puppet-lint'
 # Must clear as it will not override the existing puppet-lint rake task since we require to import for
 # the PuppetLint::RakeTask
@@ -169,14 +141,13 @@ puppet_lint_disable_checks = %w[
   80chars
   140chars
   class_inherits_from_params_class
-  class_parameter_defaults
   disable_autoloader_layout
   documentation
   single_quote_string_with_variables
 ]
 
 puppet_lint_disable_checks.each do |check|
-  PuppetLint.configuration.send("disable_#{check}")
+  PuppetLint.configuration.send(:"disable_#{check}")
 end
 PuppetLint::RakeTask.new(:lint)
 
@@ -191,7 +162,8 @@ PuppetSyntax.exclude_paths << 'spec/fixtures/**/*'
 PuppetSyntax.exclude_paths << 'pkg/**/*'
 PuppetSyntax.exclude_paths << 'vendor/**/*'
 PuppetSyntax.exclude_paths << '.vendor/**/*'
-PuppetSyntax.exclude_paths << 'plans/**/*'
+PuppetSyntax.check_hiera_keys = true
+PuppetSyntax.check_hiera_data = true
 
 desc 'Check syntax of Ruby files and call :syntax and :metadata_lint'
 task :validate do
@@ -379,16 +351,16 @@ def create_gch_task(changelog_user = nil, changelog_project = nil, changelog_sin
       config.configure_sections = {
         'Changed' => {
           'prefix' => '### Changed',
-          'labels' => ['backwards-incompatible']
+          'labels' => ['backwards-incompatible'],
         },
         'Added' => {
           'prefix' => '### Added',
-          'labels' => %w[feature enhancement]
+          'labels' => %w[feature enhancement],
         },
         'Fixed' => {
           'prefix' => '### Fixed',
-          'labels' => ['bugfix']
-        }
+          'labels' => ['bugfix'],
+        },
       }
     end
   else

data/lib/puppetlabs_spec_helper/tasks/check_symlinks.rb

@@ -9,12 +9,12 @@ module PuppetlabsSpecHelper
       DEFAULT_IGNORED = [
         '/.git/',
         '/.bundle/',
-        '/vendor/'
+        '/vendor/',
       ].freeze
 
       IGNORE_LIST_FILES = [
         '.pdkignore',
-        '.gitignore'
+        '.gitignore',
       ].freeze
 
       def check(dir = Dir.pwd)

data/lib/puppetlabs_spec_helper/tasks/fixtures.rb

@@ -106,8 +106,7 @@ module PuppetlabsSpecHelper
                            end
 
         fixtures = fixtures['fixtures']
-
-        fixtures['symlinks'] = auto_symlink if fixtures['symlinks'].nil?
+        fixtures['symlinks'] = (fixtures['symlinks'].nil? || fixtures['symlinks'].empty?) ? auto_symlink : auto_symlink.merge!(fixtures['symlinks'])
 
         result = {}
         if fixtures.include?(category) && !fixtures[category].nil?
@@ -151,7 +150,7 @@ module PuppetlabsSpecHelper
         return hash unless hash['scm'] == 'git'
 
         # Forward slashes in the ref aren't allowed. And is probably a branch name.
-        raise ArgumentError, "The ref for #{hash['target']} is invalid (Contains a forward slash). If this is a branch name, please use the 'branch' setting instead." if hash['ref'].include?('/')
+        raise ArgumentError, "The ref for #{hash['target']} is invalid (Contains a forward slash). If this is a branch name, please use the 'branch' setting instead." if hash['ref']&.include?('/')
 
         hash
       end
@@ -318,7 +317,7 @@ module PuppetlabsSpecHelper
           end
         end
         # wait for all the threads to finish
-        items.each { |_remote, opts| opts[:thread].join }
+        items.each_value { |opts| opts[:thread].join }
       end
 
       # @param target [String] - the target directory
@@ -380,6 +379,9 @@ module PuppetlabsSpecHelper
           flags = " #{opts['flags']}" if opts['flags']
         end
 
+        forge_token = ENV.fetch('FORGE_API_KEY', nil)
+        flags += " --forge_authorization \"Bearer #{forge_token}\"" if forge_token
+
         return false if File.directory?(target) && (ref.empty? || opts['ref'] == module_version(target))
 
         # The PMT cannot handle multi threaded runs due to cache directory collisons
@@ -428,12 +430,12 @@ end
 
 desc 'Clean up the fixtures directory'
 task :spec_clean do
-  repositories.each do |_remote, opts|
+  repositories.each_value do |opts|
     target = opts['target']
     FileUtils.rm_rf(target)
   end
 
-  forge_modules.each do |_remote, opts|
+  forge_modules.each_value do |opts|
     target = opts['target']
     FileUtils.rm_rf(target)
   end
@@ -447,7 +449,7 @@ end
 
 desc 'Clean up any fixture symlinks'
 task :spec_clean_symlinks do
-  fixtures('symlinks').each do |_source, opts|
+  fixtures('symlinks').each_value do |opts|
     target = opts['target']
     FileUtils.rm_f(target)
   end

data/lib/puppetlabs_spec_helper/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PuppetlabsSpecHelper
-  VERSION = '6.0.1'
+  VERSION = '8.0.0'
 end

data/spec/spec_helper.rb

@@ -1,15 +1,18 @@
 # frozen_string_literal: true
 
 if ENV['COVERAGE'] == 'yes'
-  require 'simplecov'
-  require 'simplecov-console'
-  require 'codecov'
+  begin
+    require 'simplecov'
+    require 'simplecov-console'
+  rescue LoadError
+    raise 'Add the simplecov and simplecov-console gems to Gemfile to enable this task'
+  end
 
   SimpleCov.formatters = [
     SimpleCov::Formatter::HTMLFormatter,
     SimpleCov::Formatter::Console,
-    SimpleCov::Formatter::Codecov
   ]
+
   SimpleCov.start do
     track_files 'lib/**/*.rb'
 

data/spec/unit/puppetlabs_spec_helper/tasks/check_symlinks_spec.rb

@@ -31,7 +31,7 @@ describe 'rake check:symlinks', type: :task do
     let(:test_files) do
       [
         File.join(Dir.pwd, 'files', 'a_file.pp'),
-        File.join(Dir.pwd, 'files', 'another_file.pp')
+        File.join(Dir.pwd, 'files', 'another_file.pp'),
       ]
     end
 
@@ -43,13 +43,13 @@ describe 'rake check:symlinks', type: :task do
   context 'when there is a symlink present' do
     let(:test_files) do
       [
-        File.join(Dir.pwd, 'files', 'a_file.pp')
+        File.join(Dir.pwd, 'files', 'a_file.pp'),
       ]
     end
 
     let(:symlinks) do
       {
-        File.join(Dir.pwd, 'files', 'a_symlink.pp') => File.join(Dir.pwd, 'files', 'a_file.pp')
+        File.join(Dir.pwd, 'files', 'a_symlink.pp') => File.join(Dir.pwd, 'files', 'a_file.pp'),
       }
     end
 
@@ -63,13 +63,13 @@ describe 'rake check:symlinks', type: :task do
   context 'when there are symlinks under .git/' do
     let(:test_files) do
       [
-        File.join(Dir.pwd, 'files', 'a_file.pp')
+        File.join(Dir.pwd, 'files', 'a_file.pp'),
       ]
     end
 
     let(:symlinks) do
       {
-        File.join(Dir.pwd, '.git', 'a_symlink.pp') => File.join(Dir.pwd, 'files', 'a_file.pp')
+        File.join(Dir.pwd, '.git', 'a_symlink.pp') => File.join(Dir.pwd, 'files', 'a_file.pp'),
       }
     end
 
@@ -81,13 +81,13 @@ describe 'rake check:symlinks', type: :task do
   context 'when there are symlinks under .bundle/' do
     let(:test_files) do
       [
-        File.join(Dir.pwd, 'files', 'a_file.pp')
+        File.join(Dir.pwd, 'files', 'a_file.pp'),
       ]
     end
 
     let(:symlinks) do
       {
-        File.join(Dir.pwd, '.bundle', 'a_symlink.pp') => File.join(Dir.pwd, 'files', 'a_file.pp')
+        File.join(Dir.pwd, '.bundle', 'a_symlink.pp') => File.join(Dir.pwd, 'files', 'a_file.pp'),
       }
     end
 
@@ -99,13 +99,13 @@ describe 'rake check:symlinks', type: :task do
   context 'when there are symlinks under vendor/' do
     let(:test_files) do
       [
-        File.join(Dir.pwd, 'files', 'a_file.pp')
+        File.join(Dir.pwd, 'files', 'a_file.pp'),
       ]
     end
 
     let(:symlinks) do
       {
-        File.join(Dir.pwd, 'vendor', 'a_symlink.pp') => File.join(Dir.pwd, 'files', 'a_file.pp')
+        File.join(Dir.pwd, 'vendor', 'a_symlink.pp') => File.join(Dir.pwd, 'files', 'a_file.pp'),
       }
     end
 
@@ -121,13 +121,13 @@ describe 'rake check:symlinks', type: :task do
 
     let(:test_files) do
       [
-        File.join(Dir.pwd, 'files', 'a_file.pp')
+        File.join(Dir.pwd, 'files', 'a_file.pp'),
       ]
     end
 
     let(:symlinks) do
       {
-        File.join(Dir.pwd, 'a_directory', 'a_symlink.pp') => File.join(Dir.pwd, 'files', 'a_file.pp')
+        File.join(Dir.pwd, 'a_directory', 'a_symlink.pp') => File.join(Dir.pwd, 'files', 'a_file.pp'),
       }
     end
 
@@ -145,13 +145,13 @@ describe 'rake check:symlinks', type: :task do
 
     let(:test_files) do
       [
-        File.join(Dir.pwd, 'files', 'a_file.pp')
+        File.join(Dir.pwd, 'files', 'a_file.pp'),
       ]
     end
 
     let(:symlinks) do
       {
-        File.join(Dir.pwd, 'another_directory', 'a_symlink.pp') => File.join(Dir.pwd, 'files', 'a_file.pp')
+        File.join(Dir.pwd, 'another_directory', 'a_symlink.pp') => File.join(Dir.pwd, 'files', 'a_file.pp'),
       }
     end
 

data/spec/unit/puppetlabs_spec_helper/tasks/check_test_file_spec.rb

@@ -14,7 +14,7 @@ describe 'rake check:test_file', type: :task do
     let(:test_files) do
       [
         File.join(Dir.pwd, 'tests', 'an_example.pp'),
-        File.join(Dir.pwd, 'tests', 'deep', 'directory', 'structure', 'another_example.pp')
+        File.join(Dir.pwd, 'tests', 'deep', 'directory', 'structure', 'another_example.pp'),
       ]
     end
 

data/spec/unit/puppetlabs_spec_helper/tasks/fixture_helpers_spec.rb

@@ -141,7 +141,7 @@ describe PuppetlabsSpecHelper::Tasks::FixtureHelpers do
             'branch' => nil,
             'scm' => nil,
             'flags' => nil,
-            'subdir' => nil
+            'subdir' => nil,
           },
         )
       end
@@ -159,18 +159,41 @@ describe PuppetlabsSpecHelper::Tasks::FixtureHelpers do
             'branch' => nil,
             'scm' => nil,
             'flags' => '--module_repository=https://myforge.example.com/',
-            'subdir' => nil
+            'subdir' => nil,
           },
         )
       end
     end
 
+    context 'when forge_api_key env variable is set' do
+      before do
+        # required to prevent unwanted output on stub of $CHILD_STATUS
+        RSpec::Mocks.configuration.allow_message_expectations_on_nil = true
+      end
+
+      after do
+        RSpec::Mocks.configuration.allow_message_expectations_on_nil = false
+      end
+
+      it 'correctly sets --forge_authorization' do
+        allow(ENV).to receive(:fetch).with('FORGE_API_KEY', nil).and_return('myforgeapikey')
+        # Mock the system call to prevent actual execution
+        allow_any_instance_of(Kernel).to receive(:system) do |command| # rubocop:disable RSpec/AnyInstance
+          expect(command).to include('--forge_authorization "Bearer myforgeapikey"')
+          # Simulate setting $CHILD_STATUS to a successful status
+          allow($CHILD_STATUS).to receive(:success?).and_return(true)
+          true
+        end
+        helper.download_module('puppetlabs-stdlib', 'target' => 'spec/fixtures/modules/stdlib')
+      end
+    end
+
     context 'when file specifies repository fixtures' do
       before do
         allow(File).to receive(:exist?).with('.fixtures.yml').and_return true
         allow(YAML).to receive(:load_file).with('.fixtures.yml').and_return(
           'fixtures' => {
-            'repositories' => { 'stdlib' => 'https://github.com/puppetlabs/puppetlabs-stdlib.git' }
+            'repositories' => { 'stdlib' => 'https://github.com/puppetlabs/puppetlabs-stdlib.git' },
           },
         )
       end
@@ -183,7 +206,7 @@ describe PuppetlabsSpecHelper::Tasks::FixtureHelpers do
             'branch' => nil,
             'scm' => nil,
             'flags' => nil,
-            'subdir' => nil
+            'subdir' => nil,
           },
         )
       end
@@ -198,9 +221,9 @@ describe PuppetlabsSpecHelper::Tasks::FixtureHelpers do
               'stdlib' => {
                 'scm' => 'git',
                 'repo' => 'https://github.com/puppetlabs/puppetlabs-stdlib.git',
-                'ref' => 'this/is/a/branch'
-              }
-            }
+                'ref' => 'this/is/a/branch',
+              },
+            },
           },
         )
       end
@@ -222,9 +245,9 @@ describe PuppetlabsSpecHelper::Tasks::FixtureHelpers do
             'forge_modules' => {
               'stdlib' => {
                 'repo' => 'puppetlabs-stdlib',
-                'puppet_version' => Puppet::PUPPETVERSION
-              }
-            }
+                'puppet_version' => Puppet::PUPPETVERSION,
+              },
+            },
           },
         )
         expect(helper.fixtures('forge_modules')).to include('puppetlabs-stdlib')
@@ -236,9 +259,9 @@ describe PuppetlabsSpecHelper::Tasks::FixtureHelpers do
             'forge_modules' => {
               'stdlib' => {
                 'repo' => 'puppetlabs-stdlib',
-                'puppet_version' => '>= 999.9.9'
-              }
-            }
+                'puppet_version' => '>= 999.9.9',
+              },
+            },
           },
         )
         expect(helper.fixtures('forge_modules')).to eq({})
@@ -250,9 +273,9 @@ describe PuppetlabsSpecHelper::Tasks::FixtureHelpers do
             'forge_modules' => {
               'stdlib' => {
                 'repo' => 'puppetlabs-stdlib',
-                'puppet_version' => Puppet::PUPPETVERSION
-              }
-            }
+                'puppet_version' => Puppet::PUPPETVERSION,
+              },
+            },
           },
         )
         expect(helper.fixtures('forge_modules')).to include('puppetlabs-stdlib')

data/spec/watchr.rb

@@ -11,7 +11,7 @@ def growl(message)
   title = 'Watchr Test Results'
   image = case message
           when /(\d+)\s+?(failure|error)/i
-            Regexp.last_match(1).to_i == 0 ? '~/.watchr_images/passed.png' : '~/.watchr_images/failed.png'
+            (Regexp.last_match(1).to_i == 0) ? '~/.watchr_images/passed.png' : '~/.watchr_images/failed.png'
           else
             '~/.watchr_images/unknown.png'
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puppetlabs_spec_helper
 version: !ruby/object:Gem::Version
-  version: 6.0.1
+  version: 8.0.0
 platform: ruby
 authors:
 - Puppet, Inc.
@@ -9,22 +9,28 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-25 00:00:00.000000000 Z
+date: 2024-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: pathspec
   requirement: !ruby/object:Gem::Requirement
@@ -34,7 +40,7 @@ dependencies:
         version: '0.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -44,35 +50,41 @@ dependencies:
         version: '0.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: puppet-lint
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: puppet-syntax
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.1.1
 - !ruby/object:Gem::Dependency
   name: rspec-github
   requirement: !ruby/object:Gem::Requirement
@@ -91,16 +103,30 @@ dependencies:
   name: rspec-puppet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: voxpupuli-rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.8.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.8.0
 description: Contains rake tasks and a standard spec_helper for running spec tests
   on puppet modules.
 email: