puppetlabs_spec_helper 2.7.0 → 3.0.0

data/README.md

@@ -59,7 +59,7 @@ Host github.com
 
 ```
 
-Note: parallel downloads is only available for repositories and not forge modules.
+Note: parallel downloads are available for repositories and forge modules.
 
 ### Parallel tests
 It is also possible to use the `parallel_tests` Gem via the `:parallel_spec` Rake task to run rspec commands in parallel on groups of spec files.
@@ -79,8 +79,7 @@ And then to run spec tests in parallel:
 Issues
 ======
 
-Please file issues against this project at the [Puppet Labs Issue
-Tracker](https://tickets.puppetlabs.com/browse/MODULES)
+Please file issues against this project at the [Puppet Labs Issue Tracker](https://tickets.puppetlabs.com/browse/MODULES)
 
 The Long Version
 ----------------
@@ -142,9 +141,6 @@ A number of the Puppet parser features, controlled via configuration during a
 normal puppet run, can be controlled by exporting specific environment
 variables for the spec run. These are:
 
-* ``FUTURE_PARSER`` - set to "yes" to enable the [future parser](http://docs.puppetlabs.com/puppet/latest/reference/experiments_future.html),
-  the equivalent of setting [parser=future](http://docs.puppetlabs.com/references/latest/configuration.html#parser)
-  in puppet.conf.
 * ``STRICT_VARIABLES`` - set to "yes" to enable set to strict variable checking when using Puppet versions between 3.5 and 4.0;
   set to "no" to disable strict variable checking on Puppet versions 4.0, and later.
   See [strict_variables](http://docs.puppetlabs.com/references/latest/configuration.html#strictvariables)
@@ -153,14 +149,18 @@ variables for the spec run. These are:
   to set the order of unrelated resources when applying a catalog. Leave unset for the default
   behavior, currently "random". This is equivalent to setting [ordering](http://docs.puppetlabs.com/references/latest/configuration.html#ordering)
   in puppet.conf.
-* ``STRINGIFY_FACTS`` - set to "no" to enable [structured facts](http://docs.puppetlabs.com/facter/2.0/fact_overview.html#writing-structured-facts),
-  otherwise leave unset to retain the current default behavior. This is equivalent to setting
-  [stringify_facts=false](http://docs.puppetlabs.com/references/latest/configuration.html#stringifyfacts)
-  in puppet.conf.
-* ``TRUSTED_NODE_DATA`` - set to "yes" to enable [the $facts hash and trusted node data](http://docs.puppetlabs.com/puppet/latest/reference/lang_facts_and_builtin_vars.html),
-  which enabled ``$facts`` and ``$trusted`` hashes. This is equivalent to setting
-  [trusted_node_data=true](http://docs.puppetlabs.com/references/latest/configuration.html#trustednodedata)
-  in puppet.conf.
+* The following options only affect Puppet 3.x:
+  * ``FUTURE_PARSER`` _(Puppet 3.x, starting with 3.2)_ - set to "yes" to enable the [future parser](https://docs.puppet.com/puppet/3/experiments_future.html),
+    the equivalent of setting [parser=future](https://puppet.com/docs/puppet/3.8/configuration.html#parser)
+    in puppet.conf.
+  * ``TRUSTED_NODE_DATA``  _(Puppet 3.x, starting with 3.4)_ - set to "yes" to enable [the $facts hash and trusted node data](https://puppet.com/docs/puppet/3.8/lang_facts_and_builtin_vars.html#trusted-facts),
+    which enabled ``$facts`` and ``$trusted`` hashes. This is equivalent to setting
+    [trusted_node_data=true](https://puppet.com/docs/puppet/3.8/configuration.html#trustednodedata)
+    in puppet.conf.
+  * ``STRINGIFY_FACTS``  _(Puppet 3.x, starting with 3.5)_  - set to "no" to enable [structured facts](http://docs.puppetlabs.com/facter/2.0/fact_overview.html#writing-structured-facts),
+    otherwise leave unset to retain the current default behavior. This is equivalent to setting
+    [stringify_facts=false](https://puppet.com/docs/puppet/3.8/configuration.html#stringifyfacts)
+    in puppet.conf.
 
 As an example, to run spec tests with the future parser, strict variable checking,
 and manifest ordering, you would:
@@ -191,32 +191,40 @@ file named `.fixtures.yml` in the root of the project. You can specify a alterna
 You can use the `MODULE_WORKING_DIR` environment variable to specify a diffent location when installing module fixtures via the forge. By default the
 working directory is `<module directory>/spec/fixtures/work-dir`.
 
-When specifying the repo source of the fixture you have a few options as to which revision of the codebase you wish to use.
+When specifying the repo source of the fixture you have a few options as to which revision of the codebase you wish to use, and optionally, the puppet versions where the fixture is needed.
 
- * repo - the url to the repo
- * scm - options include git or hg. This is an optional step as the helper code will figure out which scm is used.
+ * `repo` - the url to the repo
+ * `scm` - options include git or hg. This is an optional step as the helper code will figure out which scm is used.
 
    ```yaml
    scm: git
    scm: hg
    ```
 
- * target - the directory name to clone the repo into ie. `target: mymodule`  defaults to the repo name  (Optional)
- * subdir - directory to be removed from the cloned repo. Its contents will be moved to the root directory (Optional)
- * ref - used to specify the tag name like version hash of commit (Optional)
+ * `target` - the directory name to clone the repo into ie. `target: mymodule`  defaults to the repo name  (Optional)
+ * `subdir` - directory to be removed from the cloned repo. Its contents will be moved to the root directory (Optional)
+ * `ref` - used to specify the tag name (like version) or commit hash to be checked out (Optional). Branch names should use the `branch` option instead.
 
    ```yaml
    ref: 1.0.0
    ref: 880fca52c
    ```
- * branch - used to specify the branch name you want to use ie. `branch: development`
- * flags - additional flags passed to the module installer (both puppet and scm)
+ * `branch` - used to specify the branch name you want to use ie. `branch: development`
+ * `flags` - additional flags passed to the module installer (both puppet and scm)
 
    ```yaml
    flags: --verbose
    ```
+ * `puppet_version` - versions of puppet for which the fixture should be installed. Ruby version constraints are supported. Only works when the `semantic_puppet` gem is available (shipped with puppet 4.0 and up, by default).
+
+   ```yaml
+   puppet_version: '>= 6.0.0'
+   ```
+
+ **Notes:**
 
- **Note:** ref and branch can be used together to get a specific revision on a specific branch
+ * `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
 
 Fixtures Examples
 -----------------
@@ -252,7 +260,7 @@ fixtures:
       target: "spec/fixtures/control_repos"
 ```
 
-Specify that the git tag `2.4.2` of `stdlib' should be checked out:
+Specify that the git tag `2.4.2` of `stdlib` should be checked out:
 
 ```yaml
 fixtures:
@@ -263,6 +271,16 @@ fixtures:
       ref: "2.6.0"
 ```
 
+Only install the `yumrepo_core` module when testing against Puppet 6 or greater:
+
+```yaml
+fixtures:
+  repositories:
+    yumrepo_core:
+      repo: "git://github.com/puppetlabs/puppetlabs-yumrepo_core"
+      puppet_version: ">= 6.0.0"
+```
+
 Move manifests and siblings to root directory when they are inside a `code` directory:
 
 ```yaml
@@ -300,6 +318,27 @@ fixtures:
         flags: "--verbose"
 ```
 
+Use `defaults` to define global parameters:
+
+```yaml
+defaults:
+  forge_modules:
+    flags: "--module_repository https://my_repo.com"
+fixtures:
+  forge_modules:
+    stdlib:
+      repo: "puppetlabs/stdlib"
+      ref: "2.6.0"
+    repositories:
+      firewall:
+        repo: "git://github.com/puppetlabs/puppetlabs-firewall"
+        ref: "2.6.0"
+```
+
+Fixture Loading
+---------------
+Any module that has a `spec/lib` directory will be available on the ruby `LOAD_PATH` for tests to consume. This allows modules to provide additional helper code to be supplied. The [augeasprovider_core](https://github.com/hercules-team/augeasproviders_core) module has [some examples](https://github.com/hercules-team/augeasproviders_core/tree/master/spec/lib).
+
 Testing Parser Functions
 ========================
 
@@ -347,12 +386,16 @@ remembering to duplicate any existing environment variables:
       - FUTURE_PARSER=yes CI_NODE_TOTAL=2 CI_NODE_INDEX=2
 
 #### Running tests tagged with test tiers
-To run tests tagged with risk levels set the ``TEST_TIERS`` environment variable to a comma-separated list of
-the appropriate tiers.
+To run tests tagged with risk levels set the ``TEST_TIERS`` environment variable to a comma-separated list of the appropriate tiers.
 
 For example: to run tests marked ``tier_high => true`` and ``tier_medium => true`` in the same test run set the
 environment variable``TEST_TIERS=high,medium``
 
+By default ``TEST_TIERS`` only accepts low, medium and high as valid tiers.  If you would like to use your own keywords to set the environment variable ``TEST_TIERS_ALLOWED``.
+
+For example: to use the keywords dev, rnd, staging and production you can set
+``TEST_TIERS_ALLOWED=dev,rnd,staging,production``. Then you would be able to run tests marked ``tier_dev => true``, ``tier_production => true`` with ``TEST_TIERS=dev,production``
+
 Note, if the ``TEST_TIERS`` environment variable is set to empty string or nil, all tiers will be executed.
 
 
@@ -364,80 +407,20 @@ See the documentation of [RSpec-Puppet](https://github.com/rodjek/rspec-puppet)
 for Puppet manifest coverage reports.
 
 Starting with Ruby 1.9, the *de facto* standard for Ruby code coverage is
-[SimpleCov](https://github.com/colszowka/simplecov).
-You can add it to your module like this:
-
-```Ruby
-# First line of spec/spec_helper.rb
-require 'simplecov'
-
-SimpleCov.start do
-  add_filter '/spec/'
-  # Exclude bundled Gems in `/.vendor/`
-  add_filter '/.vendor/'
-end
+[SimpleCov](https://github.com/colszowka/simplecov). It is implemented as a Rake task in this gem.
 
-require 'puppetlabs_spec_helper/module_spec_helper'
-# Further content
-```
-
-The reports will then be generated every time you invoke RSpec, e.g. via `rake spec`,
-and are written to `/coverage/`, which you should add to `.gitignore`.
-
-Remember to add `gem 'simplecov', require: false` to your `Gemfile`.
+To run code coverage:
 
-Using Code Climate
-------------------
+    $ rake spec:simplecov
 
-You can also use [Code Climate](https://codeclimate.com/) together with SimpleCov:
+Reports are written to `/coverage/`, which you should add to `.gitignore`.
 
-```Ruby
-# First line of spec/spec_helper.rb
-require 'codeclimate-test-reporter'
-
-SimpleCov.formatters = [
-  SimpleCov::Formatter::HTMLFormatter,
-  CodeClimate::TestReporter::Formatter
-]
-
-SimpleCov.start do
-  add_filter '/spec/'
-  # Exclude bundled Gems in `/.vendor/`
-  add_filter '/.vendor/'
-end
+The reports can be generated every time you invoke RSpec, e.g. via `rake spec`,
+You can enable it, set the following environment variable:s
 
-require 'puppetlabs_spec_helper/module_spec_helper'
-# Further content
-```
-
-Remember to add `gem 'codeclimate-test-reporter', require: false` to your `Gemfile`.
-
-Using Coveralls
----------------
-
-You can also use [Coveralls](https://coveralls.io/) together with SimpleCov:
-
-```Ruby
-# First line of spec/spec_helper.rb
-require 'simplecov'
-require 'coveralls'
-
-SimpleCov.formatters = [
-  SimpleCov::Formatter::HTMLFormatter,
-  Coveralls::SimpleCov::Formatter
-]
-
-SimpleCov.start do
-  add_filter '/spec/'
-  # Exclude bundled Gems in `/.vendor/`
-  add_filter '/.vendor/'
-end
-
-require 'puppetlabs_spec_helper/module_spec_helper'
-# Further content
-```
+``SIMPLECOV=yes``
 
-Remember to add `gem 'coveralls', require: false` to your `Gemfile`.
+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/ .
 
 Some Notes for Windows Users
 ============================
@@ -466,7 +449,7 @@ The following links may give you some insight into why...
 mock_with
 =========
 
-There are two major mocking frameworks in modules test suites today: [mocha](https://rubygems.org/gems/mocha) and [rspec-mocks](https://rubygems.org/gems/rspec-mocks). It is recommended to choose rspec-mocks explicitely by specifying `mock_with` either in your `spec_helper.rb` like so:
+There are two major mocking frameworks in modules test suites today: [mocha](https://rubygems.org/gems/mocha) and [rspec-mocks](https://rubygems.org/gems/rspec-mocks). We recommend that you choose rspec-mocks explicitly by specifying `mock_with`, either in your `spec_helper.rb` like so:
 
 ```
 RSpec.configure do |c|
@@ -475,7 +458,7 @@ end
 require 'puppetlabs_spec_helper/module_spec_helper'
 ```
 
-or by using the PDK's [`mock_with` option in `.sync.yml`](https://github.com/puppetlabs/pdk-templates#specspec_helperrb) and `pdk update`.
+or by using Puppet Development Kit's [`mock_with` option in `.sync.yml`](https://github.com/puppetlabs/pdk-templates#specspec_helperrb) and `pdk update`.
 
 You can also continue to use mocha by explicitly specifying `:mocha`, following the [mocha documentation](http://gofreerange.com/mocha/docs/).
 
@@ -490,7 +473,7 @@ context.stubs(:some_method).with(arguments).returns('value')
 ```
 to this:
 ```
-allow(context).to receive(:some_method).with(arguments).and_returns('value')
+allow(context).to receive(:some_method).with(arguments).and_return('value')
 ```
 
 Translate all expectations:
@@ -499,7 +482,7 @@ context.expects(:some_method).with(arguments).returns('value')
 ```
 to this:
 ```
-expect(context).to receive(:some_method).with(arguments).and_returns('value')
+expect(context).to receive(:some_method).with(arguments).and_return('value')
 ```
 
 Rationale

data/Rakefile

@@ -1,15 +1,45 @@
-# encoding: utf-8
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+# frozen_string_literal: true
 
-task :default => :spec
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
+
+def gem_present(name)
+  !Bundler.rubygems.find_name(name).empty?
+end
 
 RSpec::Core::RakeTask.new(:spec) do |spec|
   spec.pattern = FileList['spec/**/*_spec.rb'].exclude('spec/fixtures/**/*_spec.rb')
 end
 
-require 'rubocop/rake_task'
-RuboCop::RakeTask.new
-
 require 'yard'
 YARD::Rake::YardocTask.new
+
+default_tasks = [:spec]
+
+if gem_present 'rubocop'
+  require 'rubocop/rake_task'
+  RuboCop::RakeTask.new
+  default_tasks.unshift(:rubocop)
+end
+
+task default: default_tasks
+
+#### CHANGELOG ####
+begin
+  require 'github_changelog_generator/task'
+  GitHubChangelogGenerator::RakeTask.new :changelog do |config|
+    require 'puppetlabs_spec_helper/version'
+    config.since_tag = 'v2.8.0'
+    config.future_release = "v#{PuppetlabsSpecHelper::VERSION}"
+    config.header = "# Changelog\n\n" \
+      "All significant changes to this repo will be summarized in this file.\n"
+    # config.include_labels = %w[enhancement bug]
+    config.user = 'puppetlabs'
+    config.project = 'puppetlabs_spec_helper'
+  end
+rescue LoadError
+  desc 'Install github_changelog_generator to get access to automatic changelog generation'
+  task :changelog do
+    raise 'Install github_changelog_generator to get access to automatic changelog generation'
+  end
+end

data/lib/puppetlabs_spec_helper/module_spec_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rspec-puppet'
 require 'puppetlabs_spec_helper/puppet_spec_helper'
 require 'puppetlabs_spec_helper/puppetlabs_spec/puppet_internals'
@@ -18,6 +20,45 @@ env_module_path = ENV['MODULEPATH']
 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'
+    require 'codecov'
+
+    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
+    end
+  rescue LoadError
+    raise 'Add the simplecov, simplecov-console, codecov gems to Gemfile to enable this task'
+  end
+end
+
+# Add all spec lib dirs to LOAD_PATH
+components = module_path.split(File::PATH_SEPARATOR).collect do |dir|
+  Dir.entries(dir).reject { |f| f =~ %r{^\.} }.collect { |f| File.join(dir, f, 'spec', 'lib') }
+end
+components.flatten.each do |d|
+  $LOAD_PATH << d if FileTest.directory?(d) && !$LOAD_PATH.include?(d)
+end
 
 RSpec.configure do |c|
   c.environmentpath = spec_path if Puppet.version.to_f >= 4.0

data/lib/puppetlabs_spec_helper/puppet_spec_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'puppetlabs_spec_helper/puppetlabs_spec_helper'
 
 # Don't want puppet getting the command line arguments for rake or autotest
@@ -13,7 +15,7 @@ require 'rspec/expectations'
 # See also below in RSpec.configure
 if RSpec.configuration.instance_variable_get(:@mock_framework).nil?
   # This is needed because we're using mocha with rspec instead of Test::Unit or MiniTest
-  ENV['MOCHA_OPTIONS']='skip_integration'
+  ENV['MOCHA_OPTIONS'] = 'skip_integration'
 
   # Current versions of RSpec already load this for us, but who knows what's used out there?
   require 'mocha/api'
@@ -45,7 +47,7 @@ require 'puppetlabs_spec_helper/puppetlabs_spec/files'
 # to compatibility mode for older versions of puppet.
 begin
   require 'puppet/test/test_helper'
-rescue LoadError => err
+rescue LoadError
 end
 
 # This is just a utility class to allow us to isolate the various version-specific
@@ -58,7 +60,7 @@ module Puppet
     # Puppet's Settings singleton object, and other fun implementation details
     # that code external to puppet should really never know about.
     def self.initialize_via_fallback_compatibility(config)
-      $stderr.puts("Warning: you appear to be using an older version of puppet; spec_helper will use fallback compatibility mode.")
+      warn('Warning: you appear to be using an older version of puppet; spec_helper will use fallback compatibility mode.')
       config.before :all do
         # nothing to do for now
       end
@@ -79,11 +81,11 @@ module Puppet
 
         # Set the confdir and vardir to gibberish so that tests
         # have to be correctly mocked.
-        Puppet[:confdir] = "/dev/null"
-        Puppet[:vardir] = "/dev/null"
+        Puppet[:confdir] = '/dev/null'
+        Puppet[:vardir] = '/dev/null'
 
         # Avoid opening ports to the outside world
-        Puppet.settings[:bindaddress] = "127.0.0.1"
+        Puppet.settings[:bindaddress] = '127.0.0.1'
       end
 
       config.after :each do
@@ -91,7 +93,7 @@ module Puppet
 
         Puppet::Node::Environment.clear
         Puppet::Util::Storage.clear
-        Puppet::Util::ExecutionStub.reset if Puppet::Util.constants.include? "ExecutionStub"
+        Puppet::Util::ExecutionStub.reset if Puppet::Util.constants.include? 'ExecutionStub'
 
         PuppetlabsSpec::Files.cleanup
       end
@@ -100,7 +102,7 @@ module Puppet
 end
 
 # JJM Hack to make the stdlib tests run in Puppet 2.6 (See puppet commit cf183534)
-if not Puppet.constants.include? "Test" then
+unless Puppet.constants.include? 'Test'
   module Puppet::Test
     class LogCollector
       def initialize(logs)
@@ -113,7 +115,7 @@ if not Puppet.constants.include? "Test" then
     end
   end
   Puppet::Util::Log.newdesttype :log_collector do
-    match "Puppet::Test::LogCollector"
+    match 'Puppet::Test::LogCollector'
 
     def initialize(messages)
       @messages = messages
@@ -137,7 +139,7 @@ RSpec.configure do |config|
   end
 
   # determine whether we can use the new API or not, and call the appropriate initializer method.
-  if (defined?(Puppet::Test::TestHelper))
+  if defined?(Puppet::Test::TestHelper)
     # This case is handled by rspec-puppet since v1.0.0 (via 41257b33cb1f9ade4426b044f70be511b0c89112)
   else
     Puppet::PuppetSpecInitializer.initialize_via_fallback_compatibility(config)
@@ -173,5 +175,4 @@ RSpec.configure do |config|
     Puppet::Util::Log.close_all
     Puppet::Util::Log.level = @log_level
   end
-
 end

data/lib/puppetlabs_spec_helper/puppetlabs_spec/files.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'fileutils'
 require 'tempfile'
 require 'pathname'
@@ -18,11 +20,11 @@ module PuppetlabsSpec::Files
 
   def self.cleanup
     $global_tempfiles ||= []
-    while path = $global_tempfiles.pop do
-      fail "Not deleting tmpfile #{path} outside regular tmpdir" unless in_tmp(path)
+    while path = $global_tempfiles.pop
+      raise "Not deleting tmpfile #{path} outside regular tmpdir" unless in_tmp(path)
 
       begin
-        FileUtils.rm_r path, :secure => true
+        FileUtils.rm_r path, secure: true
       rescue Errno::ENOENT
         # nothing to do
       end

data/lib/puppetlabs_spec_helper/puppetlabs_spec/fixtures.rb

@@ -1,8 +1,9 @@
+# frozen_string_literal: true
+
 # This module provides some helper methods to assist with fixtures. It's
 # methods are designed to help when you have a conforming fixture layout so we
 # get project consistency.
 module PuppetlabsSpec::Fixtures
-
   # Returns the joined path of the global FIXTURE_DIR plus any path given to it
   def fixtures(*rest)
     File.join(PuppetlabsSpec::FIXTURE_DIR, *rest)
@@ -13,21 +14,23 @@ module PuppetlabsSpec::Fixtures
   # <project>/spec/fixture/unit/facter/foo
   def my_fixture_dir
     callers = caller
-    while line = callers.shift do
+    while line = callers.shift
       next unless found = line.match(%r{/spec/(.*)_spec\.rb:})
+
       return fixtures(found[1])
     end
-    fail "sorry, I couldn't work out your path from the caller stack!"
+    raise "sorry, I couldn't work out your path from the caller stack!"
   end
 
   # Given a name, returns the full path of a file from your relative fixture
   # dir as returned by my_fixture_dir.
   def my_fixture(name)
     file = File.join(my_fixture_dir, name)
-    unless File.readable? file then
-      fail "fixture '#{name}' for #{my_fixture_dir} is not readable"
+    unless File.readable? file
+      raise "fixture '#{name}' for #{my_fixture_dir} is not readable"
     end
-    return file
+
+    file
   end
 
   # Return the contents of the file using read when given a name. Uses
@@ -38,12 +41,13 @@ module PuppetlabsSpec::Fixtures
 
   # Provides a block mechanism for iterating across the files in your fixture
   # area.
-  def my_fixtures(glob = '*', flags = 0)
+  def my_fixtures(glob = '*', flags = 0, &block)
     files = Dir.glob(File.join(my_fixture_dir, glob), flags)
-    unless files.length > 0 then
-      fail "fixture '#{glob}' for #{my_fixture_dir} had no files!"
+    if files.empty?
+      raise "fixture '#{glob}' for #{my_fixture_dir} had no files!"
     end
-    block_given? and files.each do |file| yield file end
+
+    block_given? && files.each(&block)
     files
   end
 end

data/lib/puppetlabs_spec_helper/puppetlabs_spec/matchers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'stringio'
 require 'rspec/expectations'
 
@@ -6,18 +8,17 @@ require 'rspec/expectations'
 module RSpec
   module Matchers
     module BlockAliases
-      if method_defined? :should
-        alias_method :to, :should unless method_defined? :to
+      if method_defined?(:should) && !method_defined?(:to)
+        alias to should
       end
       if method_defined? :should_not
-        alias_method :to_not, :should_not unless method_defined? :to_not
-        alias_method :not_to, :should_not unless method_defined? :not_to
+        alias to_not should_not unless method_defined? :to_not
+        alias not_to should_not unless method_defined? :not_to
       end
     end
   end
 end
 
-
 ########################################################################
 # Custom matchers...
 RSpec::Matchers.define :have_matching_element do |expected|
@@ -26,7 +27,6 @@ RSpec::Matchers.define :have_matching_element do |expected|
   end
 end
 
-
 RSpec::Matchers.define :exit_with do |expected|
   actual = nil
   match do |block|
@@ -35,13 +35,13 @@ RSpec::Matchers.define :exit_with do |expected|
     rescue SystemExit => e
       actual = e.status
     end
-    actual and actual == expected
+    actual && actual == expected
   end
-  failure_message_for_should do |block|
+  failure_message_for_should do |_block|
     "expected exit with code #{expected} but " +
-      (actual.nil? ? " exit was not called" : "we exited with #{actual} instead")
+      (actual.nil? ? ' exit was not called' : "we exited with #{actual} instead")
   end
-  failure_message_for_should_not do |block|
+  failure_message_for_should_not do |_block|
     "expected that exit would not be called with #{expected}"
   end
   description do
@@ -49,7 +49,6 @@ RSpec::Matchers.define :exit_with do |expected|
   end
 end
 
-
 RSpec::Matchers.define :have_printed do |expected|
   match do |block|
     $stderr = $stdout = StringIO.new
@@ -64,7 +63,7 @@ RSpec::Matchers.define :have_printed do |expected|
       $stderr = STDERR
     end
 
-    if @actual then
+    if @actual
       case expected
       when String
         @actual.include? expected
@@ -77,7 +76,7 @@ RSpec::Matchers.define :have_printed do |expected|
   end
 
   failure_message_for_should do |actual|
-    if actual.nil? then
+    if actual.nil?
       "expected #{expected.inspect}, but nothing was printed"
     else
       "expected #{expected.inspect} to be printed; got:\n#{actual}"