puppetlabs_spec_helper 5.0.0 → 6.0.0

data/lib/puppetlabs_spec_helper/version.rb

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

data/spec/acceptance/smoke_spec.rb

@@ -9,6 +9,6 @@ RSpec.describe 'rake' do
     Open3.capture2e('rake', '--rakefile', 'spec/acceptance/fixtures/Rakefile', '-T')
   end
 
-  it { expect(output[0]).to match %r{spec_prep} }
+  it { expect(output[0]).to match(/spec_prep/) }
   it { expect(output[1]).to be_success }
 end

data/spec/spec_helper.rb

@@ -8,7 +8,7 @@ if ENV['COVERAGE'] == 'yes'
   SimpleCov.formatters = [
     SimpleCov::Formatter::HTMLFormatter,
     SimpleCov::Formatter::Console,
-    SimpleCov::Formatter::Codecov,
+    SimpleCov::Formatter::Codecov
   ]
   SimpleCov.start do
     track_files 'lib/**/*.rb'
@@ -40,7 +40,7 @@ RSpec.shared_context 'with a rake task', type: :task do
 
   include FakeFS::SpecHelpers
 
-  let(:task_name) { self.class.top_level_description.sub(%r{\Arake }, '') }
+  let(:task_name) { self.class.top_level_description.delete_prefix('rake ') }
 end
 
 # configure RSpec after including all the code

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

@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 describe 'rake check:symlinks', type: :task do
-  before(:each) do
+  before do
     test_files.each do |f|
       FileUtils.mkdir_p(File.dirname(f))
       FileUtils.touch(f)
@@ -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,19 +43,19 @@ 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
 
     it 'raises an error' do
       expect { task.execute }
-        .to raise_error(%r{symlink\(s\) exist}i)
+        .to raise_error(/symlink\(s\) exist/i)
         .and output(a_string_including(expected_output)).to_stdout
     end
   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
 
@@ -115,19 +115,19 @@ describe 'rake check:symlinks', type: :task do
   end
 
   context 'when there are symlinks under a directory listed in .gitignore' do
-    before(:each) do
+    before do
       File.write(File.join(Dir.pwd, '.gitignore'), "a_directory/\n")
     end
 
     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
 
@@ -137,7 +137,7 @@ describe 'rake check:symlinks', type: :task do
   end
 
   context 'when there are symlinks under a directory listed in .pdkignore' do
-    before(:each) do
+    before do
       File.open(File.join(Dir.pwd, '.pdkignore'), 'w') do |f|
         f.puts '/another_directory/'
       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

@@ -4,7 +4,7 @@ require 'spec_helper'
 
 describe 'rake check:test_file', type: :task do
   context 'when there are .pp files under tests/' do
-    before(:each) do
+    before do
       test_files.each do |f|
         FileUtils.mkdir_p(File.dirname(f))
         FileUtils.touch(f)
@@ -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
 
@@ -22,13 +22,13 @@ describe 'rake check:test_file', type: :task do
       expected_output = test_files.join("\n")
 
       expect { task.execute }
-        .to raise_error(%r{pp files present in tests folder})
+        .to raise_error(/pp files present in tests folder/)
         .and output(a_string_including(expected_output)).to_stdout
     end
   end
 
   context 'when there are no .pp files under tests/' do
-    before(:each) do
+    before do
       FileUtils.mkdir('tests')
     end
 

data/spec/unit/puppetlabs_spec_helper/tasks/{fixtures_spec.rb → fixture_helpers_spec.rb}

@@ -7,7 +7,7 @@ describe PuppetlabsSpecHelper::Tasks::FixtureHelpers do
   describe '.module_name' do
     subject(:module_name) { described_class.module_name }
 
-    before(:each) do
+    before do
       allow(Dir).to receive(:pwd).and_return(File.join('path', 'to', 'my-awsome-module_from_pwd'))
     end
 
@@ -24,7 +24,7 @@ describe PuppetlabsSpecHelper::Tasks::FixtureHelpers do
     end
 
     context 'when metadata.json does not exist' do
-      before(:each) do
+      before do
         allow(File).to receive(:file?).with('metadata.json').and_return(false)
       end
 
@@ -32,49 +32,49 @@ describe PuppetlabsSpecHelper::Tasks::FixtureHelpers do
     end
 
     context 'when metadata.json does exist' do
-      before(:each) do
+      before do
         allow(File).to receive(:file?).with('metadata.json').and_return(true)
       end
 
-      context 'but it is not readable' do
-        before(:each) do
+      context 'when it is not readable' do
+        before do
           allow(File).to receive(:readable?).with('metadata.json').and_return(false)
         end
 
         it_behaves_like 'module name from working directory'
       end
 
-      context 'and it is readable' do
-        before(:each) do
+      context 'when it is readable' do
+        before do
           allow(File).to receive(:readable?).with('metadata.json').and_return(true)
           allow(File).to receive(:read).with('metadata.json').and_return(metadata_content)
         end
 
-        context 'but it contains invalid JSON' do
+        context 'when it contains invalid JSON' do
           let(:metadata_content) { '{ "name": "my-awesome-module_from_metadata", }' }
 
           it_behaves_like 'module name from working directory'
         end
 
-        context 'and it contains a name value' do
+        context 'when it contains a name value' do
           let(:metadata_content) { '{ "name": "my-awesome-module_from_metadata" }' }
 
           it_behaves_like 'module name from metadata'
         end
 
-        context 'but it does not contain a name value' do
+        context 'when it does not contain a name value' do
           let(:metadata_content) { '{}' }
 
           it_behaves_like 'module name from working directory'
         end
 
-        context 'but the name has a null value' do
+        context 'when the name has a null value' do
           let(:metadata_content) { '{ "name": null }' }
 
           it_behaves_like 'module name from working directory'
         end
 
-        context 'but the name is blank' do
+        context 'when the name is blank' do
           let(:metadata_content) { '{ "name": "" }' }
 
           it_behaves_like 'module name from working directory'
@@ -86,7 +86,7 @@ describe PuppetlabsSpecHelper::Tasks::FixtureHelpers do
   describe '.fixtures' do
     subject(:helper) { described_class }
 
-    before :each do
+    before do
       # Unstub the fixtures "helpers"
       PuppetlabsSpec::Fixtures.instance_methods.each do |m|
         PuppetlabsSpec::Fixtures.send(:undef_method, m)
@@ -118,7 +118,7 @@ describe PuppetlabsSpecHelper::Tasks::FixtureHelpers do
       it 'raises an error' do
         expect(File).to receive(:exist?).with('.fixtures.yml').and_return true
         expect(YAML).to receive(:load_file).with('.fixtures.yml').and_raise(Psych::SyntaxError.new('/file', '123', '0', '0', 'spec message', 'spec context'))
-        expect { helper.fixtures('forge_modules') }.to raise_error(RuntimeError, %r{malformed YAML})
+        expect { helper.fixtures('forge_modules') }.to raise_error(RuntimeError, /malformed YAML/)
       end
     end
 
@@ -126,7 +126,7 @@ describe PuppetlabsSpecHelper::Tasks::FixtureHelpers do
       it 'raises an error' do
         allow(File).to receive(:exist?).with('.fixtures.yml').and_return true
         allow(YAML).to receive(:load_file).with('.fixtures.yml').and_return('some' => 'key')
-        expect { helper.fixtures('forge_modules') }.to raise_error(RuntimeError, %r{No 'fixtures'})
+        expect { helper.fixtures('forge_modules') }.to raise_error(RuntimeError, /No 'fixtures'/)
       end
     end
 
@@ -141,7 +141,7 @@ describe PuppetlabsSpecHelper::Tasks::FixtureHelpers do
             'branch' => nil,
             'scm' => nil,
             'flags' => nil,
-            'subdir' => nil,
+            'subdir' => nil
           },
         )
       end
@@ -159,18 +159,18 @@ describe PuppetlabsSpecHelper::Tasks::FixtureHelpers do
             'branch' => nil,
             'scm' => nil,
             'flags' => '--module_repository=https://myforge.example.com/',
-            'subdir' => nil,
+            'subdir' => nil
           },
         )
       end
     end
 
     context 'when file specifies repository fixtures' do
-      before(:each) 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,14 +183,14 @@ describe PuppetlabsSpecHelper::Tasks::FixtureHelpers do
             'branch' => nil,
             'scm' => nil,
             'flags' => nil,
-            'subdir' => nil,
+            'subdir' => nil
           },
         )
       end
     end
 
     context 'when file specifies repository fixtures with an invalid git ref' do
-      before(:each) 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' => {
@@ -198,9 +198,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 +222,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 +236,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 +250,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

@@ -10,8 +10,8 @@ def growl(message)
   growlnotify = `which growlnotify`.chomp
   title = 'Watchr Test Results'
   image = case message
-          when %r{(\d+)\s+?(failure|error)}i
-            (Regexp.last_match(1).to_i == 0) ? '~/.watchr_images/passed.png' : '~/.watchr_images/failed.png'
+          when /(\d+)\s+?(failure|error)/i
+            Regexp.last_match(1).to_i == 0 ? '~/.watchr_images/passed.png' : '~/.watchr_images/failed.png'
           else
             '~/.watchr_images/unknown.png'
           end
@@ -35,9 +35,7 @@ def run_spec_test(file)
 end
 
 def filter_rspec(data)
-  data.split("\n").select { |l|
-    l =~ %r{^(\d+)\s+exampl\w+.*?(\d+).*?failur\w+.*?(\d+).*?pending}
-  }.join("\n")
+  data.split("\n").grep(/^(\d+)\s+exampl\w+.*?(\d+).*?failur\w+.*?(\d+).*?pending/).join("\n")
 end
 
 def run_all_tests

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puppetlabs_spec_helper
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 6.0.0
 platform: ruby
 authors:
 - Puppet, Inc.
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-23 00:00:00.000000000 Z
+date: 2023-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mocha
@@ -29,30 +29,42 @@ dependencies:
   name: pathspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: puppet-lint
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 4.0.0.rc
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 4.0.0.rc
 - !ruby/object:Gem::Dependency
   name: puppet-syntax
   requirement: !ruby/object:Gem::Requirement
@@ -85,16 +97,22 @@ dependencies:
   name: rspec-puppet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.0.rc
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.0'
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.0.0.rc
 description: Contains rake tasks and a standard spec_helper for running spec tests
   on puppet modules.
 email:
@@ -123,7 +141,7 @@ files:
 - spec/unit/puppetlabs_spec_helper/puppetlabs_spec/puppet_internals_spec.rb
 - spec/unit/puppetlabs_spec_helper/tasks/check_symlinks_spec.rb
 - spec/unit/puppetlabs_spec_helper/tasks/check_test_file_spec.rb
-- spec/unit/puppetlabs_spec_helper/tasks/fixtures_spec.rb
+- spec/unit/puppetlabs_spec_helper/tasks/fixture_helpers_spec.rb
 - spec/watchr.rb
 homepage: http://github.com/puppetlabs/puppetlabs_spec_helper
 licenses:
@@ -144,7 +162,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
-- puppet, >= 6.0.0
+- puppet, >= 7.0.0
 rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4