puppetlabs_spec_helper 5.0.3 → 6.0.0.rc.1

data/lib/puppetlabs_spec_helper/rake_tasks.rb

@@ -112,7 +112,7 @@ task :parallel_spec_standalone do |_t, args|
   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.push('--').concat(ENV['CI_SPEC_OPTIONS'].strip.split).push('--') unless ENV['CI_SPEC_OPTIONS'].nil? || ENV['CI_SPEC_OPTIONS'].strip.empty?
     args.concat(Rake::FileList[pattern].to_a)
 
     ParallelTests::CLI.new.run(args)
@@ -165,14 +165,14 @@ PuppetLint.configuration.ignore_paths << 'spec/**/*.pp'
 PuppetLint.configuration.ignore_paths << 'tests/**/*.pp'
 PuppetLint.configuration.ignore_paths << 'types/**/*.pp'
 PuppetLint.configuration.ignore_paths << 'vendor/**/*.pp'
-puppet_lint_disable_checks = [
-  '80chars',
-  '140chars',
-  'class_inherits_from_params_class',
-  'class_parameter_defaults',
-  'disable_autoloader_layout',
-  'documentation',
-  'single_quote_string_with_variables',
+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|
@@ -227,7 +227,7 @@ task :compute_dev_version do
     version = modinfo['version']
   elsif File.exist?('Modulefile')
     modfile = File.read('Modulefile')
-    version = modfile.match(%r{\nversion +['"](.*)['"]})[1]
+    version = modfile.match(/\nversion +['"](.*)['"]/)[1]
   else
     raise 'Could not find a metadata.json or Modulefile! Cannot compute dev version without one or the other!'
   end
@@ -239,11 +239,11 @@ task :compute_dev_version do
   # If the branch is a release branch we append an 'r' into the new_version,
   # this is due to the release branch buildID conflicting with main branch when trying to push to the staging forge.
   # More info can be found at https://tickets.puppetlabs.com/browse/FM-6170
-  new_version = if (build = ENV['BUILD_NUMBER'])
+  new_version = if (build = ENV.fetch('BUILD_NUMBER', nil))
                   if branch.eql? 'release'
-                    '%s-%s%04d-%s' % [version, 'r', build, sha] # legacy support code # rubocop:disable Style/FormatStringToken
+                    format('%s-%s%04d-%s', version, 'r', build, sha) # legacy support code
                   else
-                    '%s-%04d-%s' % [version, build, sha] # legacy support code # rubocop:disable Style/FormatStringToken
+                    format('%s-%04d-%s', version, build, sha) # legacy support code
                   end
                 else
                   "#{version}-#{sha}"
@@ -321,9 +321,7 @@ begin
     # Use Rubocop's Github Actions formatter if possible
     if ENV['GITHUB_ACTIONS'] == 'true'
       rubocop_spec = Gem::Specification.find_by_name('rubocop')
-      if Gem::Version.new(rubocop_spec.version) >= Gem::Version.new('1.2')
-        task.formatters << 'github'
-      end
+      task.formatters << 'github' if Gem::Version.new(rubocop_spec.version) >= Gem::Version.new('1.2')
     end
   end
 rescue LoadError
@@ -365,9 +363,7 @@ def create_gch_task(changelog_user = nil, changelog_project = nil, changelog_sin
     # rubocop:enable Lint/NestedMethodDefinition
 
     GitHubChangelogGenerator::RakeTask.new :changelog do |config|
-      if ENV['CHANGELOG_GITHUB_TOKEN'].nil?
-        raise "Set CHANGELOG_GITHUB_TOKEN environment variable eg 'export CHANGELOG_GITHUB_TOKEN=valid_token_here'"
-      end
+      raise "Set CHANGELOG_GITHUB_TOKEN environment variable eg 'export CHANGELOG_GITHUB_TOKEN=valid_token_here'" if ENV['CHANGELOG_GITHUB_TOKEN'].nil?
 
       config.user = changelog_user || changelog_user_from_metadata
       config.project = changelog_project || changelog_project_from_metadata
@@ -383,16 +379,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' => ['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)
@@ -26,7 +26,7 @@ module PuppetlabsSpecHelper
 
           if child.symlink?
             results << child
-          elsif child.directory? && child.basename.to_s !~ %r{^(\.git|\.?bundle)$}
+          elsif child.directory? && child.basename.to_s !~ /^(\.git|\.?bundle)$/
             results.concat(check(child))
           end
         end

data/lib/puppetlabs_spec_helper/tasks/fixtures.rb

@@ -107,9 +107,7 @@ module PuppetlabsSpecHelper
 
         fixtures = fixtures['fixtures']
 
-        if fixtures['symlinks'].nil?
-          fixtures['symlinks'] = auto_symlink
-        end
+        fixtures['symlinks'] = auto_symlink if fixtures['symlinks'].nil?
 
         result = {}
         if fixtures.include?(category) && !fixtures[category].nil?
@@ -117,16 +115,12 @@ module PuppetlabsSpecHelper
 
           # load defaults from the `.fixtures.yml` `defaults` section
           # for the requested category and merge them into my defaults
-          if fixture_defaults.include? category
-            defaults = defaults.merge(fixture_defaults[category])
-          end
+          defaults = defaults.merge(fixture_defaults[category]) if fixture_defaults.include? category
 
           fixtures[category].each do |fixture, opts|
             # convert a simple string fixture to a hash, by
             # using the string fixture as the `repo` option of the hash.
-            if opts.instance_of?(String)
-              opts = { 'repo' => opts }
-            end
+            opts = { 'repo' => opts } if opts.instance_of?(String)
             # there should be a warning or something if it's not a hash...
             next unless opts.instance_of?(Hash)
 
@@ -136,8 +130,6 @@ module PuppetlabsSpecHelper
 
             next unless include_repo?(opts['puppet_version'])
 
-            # rubocop:disable Security/Eval
-            # TODO: Remove eval
             real_target = eval("\"#{opts['target']}\"", binding, __FILE__, __LINE__) # evaluating target reference in this context (see auto_symlink)
             real_source = eval("\"#{opts['repo']}\"", binding, __FILE__, __LINE__) # evaluating repo reference in this context (see auto_symlink)
 
@@ -194,9 +186,7 @@ module PuppetlabsSpecHelper
           raise "Unfortunately #{scm} is not supported yet"
         end
         result = system("#{scm} #{args.flatten.join ' '}")
-        unless File.exist?(target)
-          raise "Failed to clone #{scm} repository #{remote} into #{target}"
-        end
+        raise "Failed to clone #{scm} repository #{remote} into #{target}" unless File.exist?(target)
 
         result
       end
@@ -251,10 +241,11 @@ module PuppetlabsSpecHelper
 
       def remove_subdirectory(target, subdir)
         return if subdir.nil?
+
         Dir.mktmpdir do |tmpdir|
-          FileUtils.mv(Dir.glob("#{target}/#{subdir}/{.[^\.]*,*}"), tmpdir)
+          FileUtils.mv(Dir.glob("#{target}/#{subdir}/{.[^.]*,*}"), tmpdir)
           FileUtils.rm_rf("#{target}/#{subdir}")
-          FileUtils.mv(Dir.glob("#{tmpdir}/{.[^\.]*,*}"), target.to_s)
+          FileUtils.mv(Dir.glob("#{tmpdir}/{.[^.]*,*}"), target.to_s)
         end
       end
 
@@ -319,7 +310,7 @@ module PuppetlabsSpecHelper
             # the last thread started should be the longest wait
             # Rubocop seems to push towards using select here.. however the implementation today relies on the result being
             # an array. Select returns a hash which makes it unsuitable so we need to use find_all.last.
-            item, item_opts = items.find_all { |_i, o| o.key?(:thread) }.last # rubocop:disable Performance/Detect, Style/CollectionMethods
+            item, item_opts = items.find_all { |_i, o| o.key?(:thread) }.last # rubocop:disable Performance/Detect
             logger.debug "Waiting on #{item}"
             item_opts[:thread].join # wait for the thread to finish
             # now that we waited lets try again
@@ -395,14 +386,12 @@ module PuppetlabsSpecHelper
         # so we randomize the directory instead.
         # Does working_dir even need to be passed?
         Dir.mktmpdir do |working_dir|
-          command = "puppet module install#{ref}#{flags} --ignore-dependencies" \
-          ' --force' \
-          " --module_working_dir \"#{working_dir}\"" \
-          " --target-dir \"#{module_target_dir}\" \"#{remote}\""
+          command = "puppet module install#{ref}#{flags} --ignore-dependencies " \
+                    '--force ' \
+                    "--module_working_dir \"#{working_dir}\" " \
+                    "--target-dir \"#{module_target_dir}\" \"#{remote}\""
 
-          unless system(command)
-            raise "Failed to install module #{remote} to #{module_target_dir}"
-          end
+          raise "Failed to install module #{remote} to #{module_target_dir}" unless system(command)
         end
         $CHILD_STATUS.success?
       end
@@ -453,9 +442,7 @@ task :spec_clean do
 
   Rake::Task[:spec_clean_symlinks].invoke
 
-  if File.zero?('spec/fixtures/manifests/site.pp')
-    FileUtils.rm_f('spec/fixtures/manifests/site.pp')
-  end
+  FileUtils.rm_f('spec/fixtures/manifests/site.pp') if File.empty?('spec/fixtures/manifests/site.pp')
 end
 
 desc 'Clean up any fixture symlinks'

data/lib/puppetlabs_spec_helper/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module PuppetlabsSpecHelper
-  VERSION = '5.0.3'
+  VERSION = '6.0.0.rc.1'
 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