puppet-check 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa44aac16d4ff64057807c913172a7a064352f4fcfee70868b0d0c06dc0dffd6
-  data.tar.gz: 4a1fbf02e9638af8605b26377ac335594ac8d640308f38fdbc9dbae1ada78a99
+  metadata.gz: 7f43468b01f25dba9ea6e997c982c632fb884d6cb8ec8faa31a670ac523a8ee8
+  data.tar.gz: 5baeb571e293b32c6120448d45c036523b96ffc0a325ba02c6f47e70323c1f3f
 SHA512:
-  metadata.gz: 58186b18c0aa0fe1600c158be2d20be6ccaf75389e18baae51041a47b8c314dd550f0817a329aca29e2ed1a6c96249f3220815b8f26387a2795306ce41715d9e
-  data.tar.gz: 616cdc41630d9b06e93cbc27015980baa3777063837ce91e1a88955a0fdbfb41cbcc79473133d4bbe1439961345cb8f745acda8f40b15c1d0bfb58b863a80be0
+  metadata.gz: f0ff327a57b78229800e56dae894b863ff0217d9ae8f368d7ff9db048160b29c0b1365144fb4db596c3951fafa4b5569d0c5ad741e7d0b3fa1a3491ed64fed50
+  data.tar.gz: 7b15f95dc0876eb1d8a6b9fa5295c45858fc7eef02ba6a2924c68ad29dadf6fa179c62ed32eae167923f39172eb9b1464910f48e7072dfaf8e9d98328dd6739e

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+### 2.1.0 (Roadmap)
+- Minimum supported version of Puppet bumped to 5.0.
+- Minimum Ruby version bumped to 2.4.
+- Official support for Puppet 7, Rubocop 1, and Reek 6.
+- Fix Puppet message string transform conditionals.
+
 ### 2.0.1
 - Check for existence of executables for dependency module retrieval.
 - Beta support for Puppet 7, Rubocop 1, and Reek 6.

data/README.md

@@ -1,5 +1,5 @@
 # Puppet Check
-[![Build Status](https://travis-ci.org/mschuchard/puppet-check.svg?branch=master)](https://travis-ci.org/mschuchard/puppet-check)
+[![Build Status](https://travis-ci.com/mschuchard/puppet-check.svg?branch=master)](https://travis-ci.com/mschuchard/puppet-check)
 [![CircleCI](https://circleci.com/gh/mschuchard/puppet-check.svg?style=svg)](https://circleci.com/gh/mschuchard/puppet-check)
 
 - [Description](#description)
@@ -125,8 +125,11 @@ The following files have unrecognized formats and therefore were not processed:
 ### What About Puppet Development Kit?
 The fairly recent release of the Puppet Development Kit (PDK) will hopefully eventually bring about the capability to test and validate your Puppet code and data in a streamlined, efficient, comprehensive, and accurate fashion comparable to Puppet Check. Unfortunately, the PDK has not yet achieved feature or efficiency parity with Puppet Check. The goal is for the PDK to one day replace Puppet Check and for Puppet Check to enter maintenance mode, but for now Puppet Check is still needed to lead Puppet testing.
 
+### What About PDK now?
+As of version 2.4.0 of the PDK, the PDK has essentially more or less achieved feature parity with Puppet Check. Although the PDK is not as efficient (including especially that Puppet Check executes significantly faster), it is still supported by Puppetlabs. Therefore, if you need an efficient and comprehensive Puppet validation solution, then you can still utilize Puppet Check, but the PDK is a recommended alternative for the future.
+
 ## Usage
-Please see the [Gemspec](puppet-check.gemspec) for dependency information.  All other dependencies should be fine with various versions. Puppet Check can be used with a CLI, Rake tasks, or API, from your system, rbenv, rvm, Docker, or Vagrant. Please note all interfaces (API by default, but can be modified) will ignore any directories named `fixtures` or specified paths with that directory during file checks and spec tests.
+Please see the [Gemspec](puppet-check.gemspec) for dependency information.  All other dependencies should be fine with various versions. Puppet Check can be used with a CLI, Rake tasks, or API, from your system, rbenv, rvm, Docker, or Vagrant. Please note all interfaces (API by default, but can be modified) will ignore any directories named `fixtures`, or specified paths with that directory during file checks and spec tests.
 
 ### CLI
 ```
@@ -278,15 +281,15 @@ task.pattern = Dir.glob('**/{classes,defines,facter,functions,hosts,puppet,unit,
 
 ### Docker
 
-You can also use Puppet Check inside of Docker for quick, portable, and disposable testing. Below is an example Dockerfile for this purpose:
+You can also use Puppet Check inside of Docker for quick, portable, and disposable testing. Below is an example `Dockerfile` for this purpose:
 
 ```dockerfile
-# a reliable and small container at the moment
-FROM ubuntu:18.04
+# a reliable and small container; today should maybe use ruby:slim instead
+FROM ubuntu:20.04
 # you need ruby and any other extra dependencies that come from packages; in this example we install git to use it for downloading external module dependencies
 RUN apt-get update && apt-get install ruby git -y
-# you need puppet-check and any other extra dependencies that come from gems; in this example we install reek because the ruby ABI is 2.3 and then rspec-puppet and rake for extra testing
-RUN gem install --no-document puppet-check reek rspec-puppet rake
+# you need puppet-check and any other extra dependencies that come from gems; in this example we install rspec-puppet and rake for extra testing
+RUN gem install --no-document puppet-check rspec-puppet rake
 # this is needed for the ruby json parser to not flip out on fresh os installs for some reason (change encoding value as necessary)
 ENV LANG en_US.UTF-8
 # create the directory for your module, directory environment, etc. and change directory into it
@@ -297,26 +300,26 @@ COPY / .
 ENTRYPOINT ["rake", "puppetcheck"]
 ```
 
-You can also build your own general container for testing various Puppet situations by removing the last three lines. You can then test each module, directory environment, etc. on top of that container by merely adding and modifying the final three lines to a Dockerfile that uses the container you built from the first four lines. This is recommended usage due to being very efficient and stable.
+You can also build your own general container image for testing various Puppet situations by removing the last three lines. You can then test each module, directory environment, etc. on top of that container by merely adding and modifying the final three lines to a `Dockerfile` that uses the container you built from the first four lines. This is recommended usage due to being very efficient and stable.
 
 As an alternative to copying Puppet code and data into the image for testing, it is also recommended to bind volume mount the container to the directory with your Puppet code and data.
 
 ### Vagrant
 
-As an alternative to Docker, you can also use Vagrant for quick and disposable testing, but it is not as portable as Docker for these testing purposes. Below is an example Vagrantfile for this purpose.
+As an alternative to Docker, you can also use Vagrant for quick and disposable testing, but it is not as portable as Docker for these testing purposes. Below is an example `Vagrantfile` for this purpose.
 
 ```ruby
 Vagrant.configure(2) do |config|
   # a reliable and small box at the moment
-  config.vm.box = 'fedora/26-cloud-base'
+  config.vm.box = 'fedora/35-cloud-base'
 
   config.vm.provision 'shell', inline: <<-SHELL
     # cd to '/vagrant'
     cd /vagrant
     # you need ruby and any other extra dependencies that come from packages; in this example we install git to use it for downloading external module dependencies
     sudo dnf install ruby rubygems git -y
-    # you need puppet-check and any other extra dependencies that come from gems; in this example we install reek because the ruby ABI is 2.2 and then rspec-puppet and rake for extra testing
-    sudo gem install --no-document puppet-check reek rspec-puppet rake
+    # you need puppet-check and any other extra dependencies that come from gems; in this example we install rspec-puppet and rake for extra testing
+    sudo gem install --no-document puppet-check rspec-puppet rake
     # this is needed for the ruby json parser to not flip out on fresh os installs for some reason (change encoding value as necessary)
     export LANG='en_US.UTF-8'
     # execute your tests; in this example we are executing the full suite of tests
@@ -330,7 +333,7 @@ To overcome the lack of convenient portability, you could try spinning up the Va
 ### Exit Codes
 - 0: PuppetCheck exited with no internal exceptions or errors in your code and data.
 - 1: PuppetCheck exited with an internal exception (takes preference over other non-zero exit codes) or failed spec test(s).
-- 2: PuppetCheck exited with one or more errors in your code and data. Alternatively, PuppetCheck exited with one or more warnings in your code and data and you specified to fail on warnings.
+- 2: PuppetCheck exited with one or more errors in your code and data. Alternatively, PuppetCheck exited with one or more warnings in your code and data, and you specified to fail on warnings.
 
 ### Optional Dependencies
 - **rake** (gem): install this if you want to use Puppet Check with `rake` tasks in addition to the CLI.

data/lib/puppet-check/cli.rb

@@ -1,5 +1,5 @@
 require 'optparse'
-require_relative '../puppet-check'
+require_relative '../puppet_check'
 
 # the command line interface for PuppetCheck
 class PuppetCheck::CLI
@@ -27,7 +27,7 @@ class PuppetCheck::CLI
 
       # base options
       opts.on('--version', 'Display the current version.') do
-        puts 'puppet-check 2.0.0'
+        puts 'puppet-check 2.1.0'
         exit 0
       end
 

data/lib/puppet-check/data_parser.rb

@@ -1,4 +1,4 @@
-require_relative '../puppet-check'
+require_relative '../puppet_check'
 
 # executes diagnostics on data files
 class DataParser
@@ -205,8 +205,7 @@ class DataParser
     warnings = []
 
     # disregard nil/undef value data check if default values (common)
-    unless file =~ /^common/
-    # unless /^common/.match?(file) TODO: use when ruby >= 2.4
+    unless /^common/.match?(file)
       data.each do |key, value|
         # check for nil values in the data (nil keys are fine)
         if (value.is_a?(Hash) && value.values.any?(&:nil?)) || value.nil?

data/lib/puppet-check/output_results.rb

@@ -1,4 +1,4 @@
-require_relative '../puppet-check'
+require_relative '../puppet_check'
 
 # class to handle outputting diagnostic results in desired format
 class OutputResults
@@ -22,7 +22,7 @@ class OutputResults
   end
 
   # output the results as yaml or json
-  def self.markup(settings)
+  def self.markup(format)
     # generate output hash
     hash = {}
     hash['errors'] = PuppetCheck.settings[:error_files] unless PuppetCheck.settings[:error_files].empty?
@@ -31,7 +31,7 @@ class OutputResults
     hash['ignored'] = PuppetCheck.settings[:ignored_files] unless PuppetCheck.settings[:ignored_files].empty?
 
     # convert hash to markup language
-    case settings[:output_format]
+    case format
     when 'yaml'
       require 'yaml'
       puts Psych.dump(hash, indentation: 2)
@@ -39,7 +39,7 @@ class OutputResults
       require 'json'
       puts JSON.pretty_generate(hash)
     else
-      raise "puppet-check: Unsupported output format '#{settings[:output_format]}' was specified."
+      raise "puppet-check: Unsupported output format '#{format}' was specified."
     end
   end
 end

data/lib/puppet-check/puppet_parser.rb

@@ -1,5 +1,5 @@
 require 'puppet'
-require_relative '../puppet-check'
+require_relative '../puppet_check'
 
 # executes diagnostics on puppet files
 class PuppetParser
@@ -28,14 +28,15 @@ class PuppetParser
       # this is the actual error that we need to rescue Puppet::Face from
       rescue SystemExit
         # puppet 5.4-6.4 has a new validator output format and eof errors have fake dir env info
-        if Gem::Version.new(Puppet::PUPPETVERSION) >= Gem::Version.new('5.4') && Gem::Version.new(Puppet::PUPPETVERSION) < Gem::Version.new('6.5')
-          message = errors.map(&:to_s).join("\n").gsub(/file: #{File.absolute_path(file)}(, |\))/, '').gsub(/Could not parse.*: /, '')
-        # puppet 5.0-5.2 can only do one error per line and outputs fake dir env info
-        elsif Gem::Version.new(Puppet::PUPPETVERSION) >= Gem::Version.new('5.0') && Gem::Version.new(Puppet::PUPPETVERSION) < Gem::Version.new('5.3')
-          message = errors.map(&:to_s).join("\n").gsub("#{File.absolute_path(file)}:", '').gsub(/Could not parse.*: /, '')
-        end
-        # puppet < 5 and 5.3 parser output style
-        message = errors.map(&:to_s).join("\n").gsub("#{File.absolute_path(file)}:", '')
+        message = if Gem::Version.new(Puppet::PUPPETVERSION) >= Gem::Version.new('5.4') && Gem::Version.new(Puppet::PUPPETVERSION) < Gem::Version.new('6.5')
+                    errors.map(&:to_s).join("\n").gsub(/file: #{File.absolute_path(file)}(, |\))/, '').gsub(/Could not parse.*: /, '')
+                  # puppet 5.0-5.2 can only do one error per line and outputs fake dir env info
+                  elsif Gem::Version.new(Puppet::PUPPETVERSION) >= Gem::Version.new('5.0') && Gem::Version.new(Puppet::PUPPETVERSION) < Gem::Version.new('5.3')
+                    errors.map(&:to_s).join("\n").gsub("#{File.absolute_path(file)}:", '').gsub(/Could not parse.*: /, '')
+                  # puppet < 5 and 5.3 parser output style
+                  else
+                    errors.map(&:to_s).join("\n").gsub("#{File.absolute_path(file)}:", '')
+                  end
       end
       # output message
       next PuppetCheck.settings[:error_files].push("#{file}:\n#{message}") unless message.empty?

data/lib/puppet-check/ruby_parser.rb

@@ -1,4 +1,4 @@
-require_relative '../puppet-check'
+require_relative '../puppet_check'
 require_relative 'utils'
 
 # executes diagnostics on ruby files
@@ -43,8 +43,14 @@ class RubyParser
       # check ruby template syntax
       begin
         # need to eventually have this associated with a different binding during each iteration
-        warnings = Utils.capture_stderr { ERB.new(File.read(file), nil, '-').result }
-        # ERB.new(File.read(file), nil, '-').result(RubyParser.new.bind)
+        # older usage throws extra warning and mixes with valid warnings confusingly
+        warnings = if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.6')
+                     Utils.capture_stderr { ERB.new(File.read(file), trim_mode: '-').result }
+                     # ERB.new(File.read(file), trim_mode: '-').result(RubyParser.new.bind)
+                   # and for extra fun it is incompatible with non-new ruby
+                   else
+                     Utils.capture_stderr { ERB.new(File.read(file), nil, '-').result }
+                   end
       rescue NameError, TypeError
         # empty out warnings since it would contain an error if this pass triggers
         warnings = ''
@@ -62,10 +68,9 @@ class RubyParser
     # efficient var assignment prior to iterator
     if style
       require 'rubocop'
-      # cop named differently depending upon version
-      filename_cop = RuboCop::Version::STRING.to_f >= 0.5 ? 'Naming/FileName' : 'Style/FileName'
+
       # RuboCop is grumpy about non-snake_case filenames so disable the FileName check
-      rc_args.include?('--except') ? rc_args[rc_args.index('--except') + 1] = "#{rc_args[rc_args.index('--except') + 1]},#{filename_cop}" : rc_args.concat(['--except', filename_cop])
+      rc_args.include?('--except') ? rc_args[rc_args.index('--except') + 1] = "#{rc_args[rc_args.index('--except') + 1]},Naming/FileName" : rc_args.concat(['--except', 'Naming/FileName'])
     end
 
     files.each do |file|

data/lib/puppet-check/tasks.rb

@@ -3,7 +3,7 @@ begin
 rescue LoadError
   raise 'Rake is not installed and you are attempting to execute Rake tasks with Puppet Check. Please install Rake before continuing.'
 end
-require_relative '../puppet-check'
+require_relative '../puppet_check'
 
 # the rake interface for PuppetCheck
 class PuppetCheck::Tasks < ::Rake::TaskLib

data/lib/{puppet-check.rb → puppet_check.rb}

@@ -28,7 +28,7 @@ class PuppetCheck
     execute_parsers(files, settings)
 
     # output the diagnostic results
-    settings[:output_format] == 'text' ? OutputResults.text : OutputResults.markup(settings)
+    settings[:output_format] == 'text' ? OutputResults.text : OutputResults.markup(settings[:output_format])
 
     # progress to regression checks if no errors in file checks
     if self.class.settings[:error_files].empty? && (!settings[:fail_on_warning] || self.class.settings[:warning_files].empty?)

data/spec/octocatalog-diff/{octocatalog-diff.cfg.rb → octocatalog_diff.cfg.rb}

@@ -4,13 +4,13 @@ module OctocatalogDiff
   class Config
     def self.config
       settings = {}
-      octocatalog_diff_dir = File.dirname(__FILE__) + '/'
+      octocatalog_diff_dir = "#{File.dirname(__FILE__)}/"
 
-      settings[:hiera_config] = octocatalog_diff_dir + 'hiera.yaml'
-      settings[:hiera_path] = octocatalog_diff_dir + 'hieradata'
-      settings[:fact_file] = octocatalog_diff_dir + 'facts.yaml'
-      settings[:puppet_binary] = if File.directory?('/home/travis')
-                                   octocatalog_diff_dir + '../../bin/puppet'
+      settings[:hiera_config] = "#{octocatalog_diff_dir}hiera.yaml"
+      settings[:hiera_path] = "#{octocatalog_diff_dir}hieradata"
+      settings[:fact_file] = "#{octocatalog_diff_dir}facts.yaml"
+      settings[:puppet_binary] = if ENV['TRAVIS'] == 'true'
+                                   "#{octocatalog_diff_dir}../../bin/puppet"
                                  else
                                    '/usr/local/bin/puppet'
                                  end

data/spec/puppet-check/data_parser_spec.rb

@@ -10,106 +10,104 @@ describe DataParser do
 
   context '.yaml' do
     it 'puts a bad syntax yaml file in the error files array' do
-      DataParser.yaml([fixtures_dir + 'hieradata/syntax.yaml'])
+      DataParser.yaml(["#{fixtures_dir}hieradata/syntax.yaml"])
       expect(PuppetCheck.settings[:error_files][0]).to match(%r{^#{fixtures_dir}hieradata/syntax.yaml:\nblock sequence entries are not allowed})
       expect(PuppetCheck.settings[:warning_files]).to eql([])
       expect(PuppetCheck.settings[:clean_files]).to eql([])
     end
     it 'puts a good yaml file with potential hiera issues in the warning files array' do
-      DataParser.yaml([fixtures_dir + 'hieradata/style.yaml'])
+      DataParser.yaml(["#{fixtures_dir}hieradata/style.yaml"])
       expect(PuppetCheck.settings[:error_files]).to eql([])
       expect(PuppetCheck.settings[:warning_files][0]).to match(%r{^#{fixtures_dir}hieradata/style.yaml:\nValue\(s\) missing in key.*\nValue\(s\) missing in key.*\nThe string --- appears more than once in this data and Hiera may fail to parse it correctly})
       expect(PuppetCheck.settings[:clean_files]).to eql([])
     end
     it 'puts a good yaml file in the clean files array' do
-      DataParser.yaml([fixtures_dir + 'hieradata/good.yaml'])
+      DataParser.yaml(["#{fixtures_dir}hieradata/good.yaml"])
       expect(PuppetCheck.settings[:error_files]).to eql([])
       expect(PuppetCheck.settings[:warning_files]).to eql([])
       expect(PuppetCheck.settings[:clean_files]).to eql(["#{fixtures_dir}hieradata/good.yaml"])
     end
   end
 
-  if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.3')
-    context '.eyaml' do
-      before(:each) do
-        PuppetCheck.settings[:ignored_files] = []
-      end
+  context '.eyaml' do
+    before(:each) do
+      PuppetCheck.settings[:ignored_files] = []
+    end
 
-      it 'returns a warning if a public key was not specified' do
-        expect { DataParser.eyaml(['foo.eyaml'], nil, 'private.pem') }.to output("Public X509 and/or Private RSA PKCS7 certs were not specified. EYAML checks will not be executed.\n").to_stderr
-      end
-      it 'returns a warning if a private key was not specified' do
-        expect { DataParser.eyaml(['foo.eyaml'], 'public.pem', nil) }.to output("Public X509 and/or Private RSA PKCS7 certs were not specified. EYAML checks will not be executed.\n").to_stderr
-      end
-      it 'returns a warning if the public key or private key are not existing files' do
-        expect { DataParser.eyaml(['foo.eyaml'], 'public.pem', 'private.pem') }.to output("Specified Public X509 and/or Private RSA PKCS7 certs do not exist. EYAML checks will not be executed.\n").to_stderr
-      end
-      it 'puts a bad syntax eyaml file in the error files array' do
-        # DataParser.eyaml([fixtures_dir + 'hieradata/syntax.eyaml'], fixtures_dir + 'keys/public_key.pkcs7.pem', fixtures_dir + 'keys/private_key.pkcs7.pem')
-        # expect(PuppetCheck.settings[:error_files][0]).to match(%r{^#{fixtures_dir}hieradata/syntax.eyaml:\nblock sequence entries are not allowed})
-        expect(PuppetCheck.settings[:warning_files]).to eql([])
-        expect(PuppetCheck.settings[:clean_files]).to eql([])
-      end
-      it 'puts a good eyaml file with potential hiera issues in the warning files array' do
-        # DataParser.eyaml([fixtures_dir + 'hieradata/style.eyaml'], fixtures_dir + 'keys/public_key.pkcs7.pem', fixtures_dir + 'keys/private_key.pkcs7.pem')
-        expect(PuppetCheck.settings[:error_files]).to eql([])
-        # expect(PuppetCheck.settings[:warning_files][0]).to match(%r{^#{fixtures_dir}hieradata/style.eyaml:\nValue\(s\) missing in key.*\nValue\(s\) missing in key.*\nThe string --- appears more than once in this data and Hiera will fail to parse it correctly})
-        expect(PuppetCheck.settings[:clean_files]).to eql([])
-      end
-      it 'puts a good eyaml file in the clean files array' do
-        # DataParser.eyaml([fixtures_dir + 'hieradata/good.eyaml'], fixtures_dir + 'keys/public_key.pkcs7.pem', fixtures_dir + 'keys/private_key.pkcs7.pem')
-        expect(PuppetCheck.settings[:error_files]).to eql([])
-        expect(PuppetCheck.settings[:warning_files]).to eql([])
-        # expect(PuppetCheck.settings[:clean_files]).to eql(["#{fixtures_dir}hieradata/good.eyaml"])
-      end
+    it 'returns a warning if a public key was not specified' do
+      expect { DataParser.eyaml(['foo.eyaml'], nil, 'private.pem') }.to output("Public X509 and/or Private RSA PKCS7 certs were not specified. EYAML checks will not be executed.\n").to_stderr
+    end
+    it 'returns a warning if a private key was not specified' do
+      expect { DataParser.eyaml(['foo.eyaml'], 'public.pem', nil) }.to output("Public X509 and/or Private RSA PKCS7 certs were not specified. EYAML checks will not be executed.\n").to_stderr
+    end
+    it 'returns a warning if the public key or private key are not existing files' do
+      expect { DataParser.eyaml(['foo.eyaml'], 'public.pem', 'private.pem') }.to output("Specified Public X509 and/or Private RSA PKCS7 certs do not exist. EYAML checks will not be executed.\n").to_stderr
+    end
+    it 'puts a bad syntax eyaml file in the error files array' do
+      # DataParser.eyaml(["#{fixtures_dir}hieradata/syntax.eyaml'], fixtures_dir + 'keys/public_key.pkcs7.pem', fixtures_dir + 'keys/private_key.pkcs7.pem")
+      # expect(PuppetCheck.settings[:error_files][0]).to match(%r{^#{fixtures_dir}hieradata/syntax.eyaml:\nblock sequence entries are not allowed})
+      expect(PuppetCheck.settings[:warning_files]).to eql([])
+      expect(PuppetCheck.settings[:clean_files]).to eql([])
+    end
+    it 'puts a good eyaml file with potential hiera issues in the warning files array' do
+      # DataParser.eyaml(["#{fixtures_dir}hieradata/style.eyaml'], fixtures_dir + 'keys/public_key.pkcs7.pem', fixtures_dir + 'keys/private_key.pkcs7.pem")
+      expect(PuppetCheck.settings[:error_files]).to eql([])
+      # expect(PuppetCheck.settings[:warning_files][0]).to match(%r{^#{fixtures_dir}hieradata/style.eyaml:\nValue\(s\) missing in key.*\nValue\(s\) missing in key.*\nThe string --- appears more than once in this data and Hiera will fail to parse it correctly})
+      expect(PuppetCheck.settings[:clean_files]).to eql([])
+    end
+    it 'puts a good eyaml file in the clean files array' do
+      # DataParser.eyaml(["#{fixtures_dir}hieradata/good.eyaml'], fixtures_dir + 'keys/public_key.pkcs7.pem', fixtures_dir + 'keys/private_key.pkcs7.pem")
+      expect(PuppetCheck.settings[:error_files]).to eql([])
+      expect(PuppetCheck.settings[:warning_files]).to eql([])
+      # expect(PuppetCheck.settings[:clean_files]).to eql(["#{fixtures_dir}hieradata/good.eyaml"])
     end
   end
 
   context '.json' do
     it 'puts a bad syntax json file in the error files array' do
-      DataParser.json([fixtures_dir + 'hieradata/syntax.json'])
+      DataParser.json(["#{fixtures_dir}hieradata/syntax.json"])
       expect(PuppetCheck.settings[:error_files][0]).to match(%r{^#{fixtures_dir}hieradata/syntax.json:\n.*unexpected token})
       expect(PuppetCheck.settings[:warning_files]).to eql([])
       expect(PuppetCheck.settings[:clean_files]).to eql([])
     end
     it 'puts a bad metadata json file in the error files array' do
-      DataParser.json([fixtures_dir + 'metadata_syntax/metadata.json'])
+      DataParser.json(["#{fixtures_dir}metadata_syntax/metadata.json"])
       expect(PuppetCheck.settings[:error_files][0]).to match(%r{^#{fixtures_dir}metadata_syntax/metadata.json:\nRequired field.*\nField 'requirements'.*\nDuplicate dependencies.*\nDeprecated field.*\nSummary exceeds})
       expect(PuppetCheck.settings[:warning_files]).to eql([])
       expect(PuppetCheck.settings[:clean_files]).to eql([])
     end
     it 'puts a bad style metadata json file in the warning files array' do
-      DataParser.json([fixtures_dir + 'metadata_style/metadata.json'])
+      DataParser.json(["#{fixtures_dir}metadata_style/metadata.json"])
       expect(PuppetCheck.settings[:error_files]).to eql([])
       expect(PuppetCheck.settings[:warning_files][0]).to match(%r{^#{fixtures_dir}metadata_style/metadata.json:\n'pe' is missing an upper bound.\n.*operatingsystem_support.*\nLicense identifier})
       expect(PuppetCheck.settings[:clean_files]).to eql([])
     end
     it 'puts another bad style metadata json file in the warning files array' do
-      DataParser.json([fixtures_dir + 'metadata_style_two/metadata.json'])
+      DataParser.json(["#{fixtures_dir}metadata_style_two/metadata.json"])
       expect(PuppetCheck.settings[:error_files]).to eql([])
       expect(PuppetCheck.settings[:warning_files][0]).to match(%r{^#{fixtures_dir}metadata_style_two/metadata.json:\n'puppetlabs/one' has non-semantic versioning.*\n'puppetlabs/two' is missing an upper bound\.\n.*operatingsystem.*\n.*operatingsystemrelease})
       expect(PuppetCheck.settings[:clean_files]).to eql([])
     end
     it 'puts a bad task metadata json file in the warning files array' do
-      DataParser.json([fixtures_dir + 'task_metadata/task_bad.json'])
+      DataParser.json(["#{fixtures_dir}task_metadata/task_bad.json"])
       expect(PuppetCheck.settings[:error_files]).to eql([])
       expect(PuppetCheck.settings[:warning_files][0]).to match(%r{^#{fixtures_dir}task_metadata/task_bad.json:\ndescription value is not a String\ninput_method value is not one of environment, stdin, or powershell\nparameters value is not a Hash\npuppet_task_version value is not an Integer\nsupports_noop value is not a Boolean})
       expect(PuppetCheck.settings[:clean_files]).to eql([])
     end
     it 'puts a good json file in the clean files array' do
-      DataParser.json([fixtures_dir + 'hieradata/good.json'])
+      DataParser.json(["#{fixtures_dir}hieradata/good.json"])
       expect(PuppetCheck.settings[:error_files]).to eql([])
       expect(PuppetCheck.settings[:warning_files]).to eql([])
       expect(PuppetCheck.settings[:clean_files]).to eql(["#{fixtures_dir}hieradata/good.json"])
     end
     it 'puts a good metadata json file in the clean files array' do
-      DataParser.json([fixtures_dir + 'metadata_good/metadata.json'])
+      DataParser.json(["#{fixtures_dir}metadata_good/metadata.json"])
       expect(PuppetCheck.settings[:error_files]).to eql([])
       expect(PuppetCheck.settings[:warning_files]).to eql([])
       expect(PuppetCheck.settings[:clean_files]).to eql(["#{fixtures_dir}metadata_good/metadata.json"])
     end
     it 'puts a good task metadata json file in the clean files array' do
-      DataParser.json([fixtures_dir + 'task_metadata/task_good.json'])
+      DataParser.json(["#{fixtures_dir}task_metadata/task_good.json"])
       expect(PuppetCheck.settings[:error_files]).to eql([])
       expect(PuppetCheck.settings[:warning_files]).to eql([])
       expect(PuppetCheck.settings[:clean_files]).to eql(["#{fixtures_dir}task_metadata/task_good.json"])

data/spec/puppet-check/output_results_spec.rb

@@ -38,38 +38,38 @@ describe OutputResults do
 
     it 'outputs files with errors as yaml' do
       PuppetCheck.settings[:error_files] = ['foo: i had an error']
-      expect { OutputResults.markup(output_format: 'yaml') }.to output("---\nerrors:\n- 'foo: i had an error'\n").to_stdout
+      expect { OutputResults.markup('yaml') }.to output("---\nerrors:\n- 'foo: i had an error'\n").to_stdout
     end
     it 'outputs files with warnings as yaml' do
       PuppetCheck.settings[:warning_files] = ['foo: i had a warning']
-      expect { OutputResults.markup(output_format: 'yaml') }.to output("---\nwarnings:\n- 'foo: i had a warning'\n").to_stdout
+      expect { OutputResults.markup('yaml') }.to output("---\nwarnings:\n- 'foo: i had a warning'\n").to_stdout
     end
     it 'outputs files with no errors or warnings as yaml' do
       PuppetCheck.settings[:clean_files] = ['foo: i was totally good to go']
-      expect { OutputResults.markup(output_format: 'yaml') }.to output("---\nclean:\n- 'foo: i was totally good to go'\n").to_stdout
+      expect { OutputResults.markup('yaml') }.to output("---\nclean:\n- 'foo: i was totally good to go'\n").to_stdout
     end
     it 'outputs files that were not processed as yaml' do
       PuppetCheck.settings[:ignored_files] = ['foo: who knows what i am']
-      expect { OutputResults.markup(output_format: 'yaml') }.to output("---\nignored:\n- 'foo: who knows what i am'\n").to_stdout
+      expect { OutputResults.markup('yaml') }.to output("---\nignored:\n- 'foo: who knows what i am'\n").to_stdout
     end
     it 'outputs files with errors as json' do
       PuppetCheck.settings[:error_files] = ['foo: i had an error']
-      expect { OutputResults.markup(output_format: 'json') }.to output("{\n  \"errors\": [\n    \"foo: i had an error\"\n  ]\n}\n").to_stdout
+      expect { OutputResults.markup('json') }.to output("{\n  \"errors\": [\n    \"foo: i had an error\"\n  ]\n}\n").to_stdout
     end
     it 'outputs files with warnings as json' do
       PuppetCheck.settings[:warning_files] = ['foo: i had a warning']
-      expect { OutputResults.markup(output_format: 'json') }.to output("{\n  \"warnings\": [\n    \"foo: i had a warning\"\n  ]\n}\n").to_stdout
+      expect { OutputResults.markup('json') }.to output("{\n  \"warnings\": [\n    \"foo: i had a warning\"\n  ]\n}\n").to_stdout
     end
     it 'outputs files with no errors or warnings as json' do
       PuppetCheck.settings[:clean_files] = ['foo: i was totally good to go']
-      expect { OutputResults.markup(output_format: 'json') }.to output("{\n  \"clean\": [\n    \"foo: i was totally good to go\"\n  ]\n}\n").to_stdout
+      expect { OutputResults.markup('json') }.to output("{\n  \"clean\": [\n    \"foo: i was totally good to go\"\n  ]\n}\n").to_stdout
     end
     it 'outputs files that were not processed as json' do
       PuppetCheck.settings[:ignored_files] = ['foo: who knows what i am']
-      expect { OutputResults.markup(output_format: 'json') }.to output("{\n  \"ignored\": [\n    \"foo: who knows what i am\"\n  ]\n}\n").to_stdout
+      expect { OutputResults.markup('json') }.to output("{\n  \"ignored\": [\n    \"foo: who knows what i am\"\n  ]\n}\n").to_stdout
     end
     it 'raises an error for an unsupported output format' do
-      expect { OutputResults.markup(output_format: 'awesomesauce') }.to raise_error(RuntimeError, 'puppet-check: Unsupported output format \'awesomesauce\' was specified.')
+      expect { OutputResults.markup('awesomesauce') }.to raise_error(RuntimeError, 'puppet-check: Unsupported output format \'awesomesauce\' was specified.')
     end
   end
 end

data/spec/puppet-check/puppet_parser_spec.rb

@@ -10,12 +10,9 @@ describe PuppetParser do
 
   context '.manifest' do
     it 'puts a bad syntax Puppet manifest in the error files array' do
-      PuppetParser.manifest([fixtures_dir + 'manifests/syntax.pp'], false, [])
+      PuppetParser.manifest(["#{fixtures_dir}manifests/syntax.pp"], false, [])
       if Gem::Version.new(Puppet::PUPPETVERSION) >= Gem::Version.new('6.5.0')
         expect(PuppetCheck.settings[:error_files][0]).to match(%r{^#{fixtures_dir}manifests/syntax.pp:\nLanguage validation logged 2 errors})
-      # dealing with annoying warning in puppet 5 and 6
-      elsif Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.3')
-        expect(PuppetCheck.settings[:error_files][0]).to match(%r{^#{fixtures_dir}manifests/syntax.pp:\nSupport for ruby version.*\n.*\nThis Variable has no effect.*\nIllegal variable name})
       else
         expect(PuppetCheck.settings[:error_files][0]).to match(%r{^#{fixtures_dir}manifests/syntax.pp:\nThis Variable has no effect.*\nIllegal variable name})
       end
@@ -25,50 +22,50 @@ describe PuppetParser do
     # puppet 5 api has output issues for this fixture
     unless Gem::Version.new(Puppet::PUPPETVERSION) < Gem::Version.new('6.0.0')
       it 'puts a bad syntax at eof Puppet manifest in the error files array' do
-        PuppetParser.manifest([fixtures_dir + 'manifests/eof_syntax.pp'], false, [])
+        PuppetParser.manifest(["#{fixtures_dir}manifests/eof_syntax.pp"], false, [])
         expect(PuppetCheck.settings[:error_files][0]).to match(%r{^#{fixtures_dir}manifests/eof_syntax.pp:\nSyntax error at end of input})
         expect(PuppetCheck.settings[:warning_files]).to eql([])
         expect(PuppetCheck.settings[:clean_files]).to eql([])
       end
     end
     it 'puts a bad parser and lint style Puppet manifest in the warning files array' do
-      PuppetParser.manifest([fixtures_dir + 'manifests/style_parser.pp'], true, [])
+      PuppetParser.manifest(["#{fixtures_dir}manifests/style_parser.pp"], true, [])
       expect(PuppetCheck.settings[:error_files]).to eql([])
       expect(PuppetCheck.settings[:warning_files][0]).to match(%r{^#{fixtures_dir}manifests/style_parser.pp:\nUnrecognized escape sequence.*\nUnrecognized escape sequence.*\n.*double quoted string containing})
       expect(PuppetCheck.settings[:clean_files]).to eql([])
     end
     it 'puts a bad lint style Puppet manifest in the warning files array' do
-      PuppetParser.manifest([fixtures_dir + 'manifests/style_lint.pp'], true, [])
+      PuppetParser.manifest(["#{fixtures_dir}manifests/style_lint.pp"], true, [])
       expect(PuppetCheck.settings[:error_files]).to eql([])
       expect(PuppetCheck.settings[:warning_files][0]).to match(%r{^#{fixtures_dir}manifests/style_lint.pp:\n.*(?:indentation of|double quoted string containing).*\n.*(?:indentation of|double quoted string containing)})
       expect(PuppetCheck.settings[:clean_files]).to eql([])
     end
     it 'puts a bad style Puppet manifest in the clean files array when puppetlint_args ignores its warnings' do
-      PuppetParser.manifest([fixtures_dir + 'manifests/style_lint.pp'], true, ['--no-double_quoted_strings-check', '--no-arrow_alignment-check'])
+      PuppetParser.manifest(["#{fixtures_dir}manifests/style_lint.pp"], true, ['--no-double_quoted_strings-check', '--no-arrow_alignment-check'])
       expect(PuppetCheck.settings[:error_files]).to eql([])
       expect(PuppetCheck.settings[:warning_files]).to eql([])
       expect(PuppetCheck.settings[:clean_files]).to eql(["#{fixtures_dir}manifests/style_lint.pp"])
     end
     it 'puts a good Puppet manifest in the clean files array' do
-      PuppetParser.manifest([fixtures_dir + 'manifests/good.pp'], true, [])
+      PuppetParser.manifest(["#{fixtures_dir}manifests/good.pp"], true, [])
       expect(PuppetCheck.settings[:error_files]).to eql([])
       expect(PuppetCheck.settings[:warning_files]).to eql([])
       expect(PuppetCheck.settings[:clean_files]).to eql(["#{fixtures_dir}manifests/good.pp"])
     end
     it 'throws a well specified error for an invalid PuppetLint argument' do
-      expect { PuppetParser.manifest([fixtures_dir + 'manifests/style_lint.pp'], true, ['--non-existent', '--does-not-exist']) }.to raise_error(RuntimeError, 'puppet-lint: invalid option supplied among --non-existent --does-not-exist')
+      expect { PuppetParser.manifest(["#{fixtures_dir}manifests/style_lint.pp"], true, ['--non-existent', '--does-not-exist']) }.to raise_error(RuntimeError, 'puppet-lint: invalid option supplied among --non-existent --does-not-exist')
     end
   end
 
   context '.template' do
     it 'puts a bad syntax Puppet template in the error files array' do
-      PuppetParser.template([fixtures_dir + 'templates/syntax.epp'])
+      PuppetParser.template(["#{fixtures_dir}templates/syntax.epp"])
       expect(PuppetCheck.settings[:error_files][0]).to match(%r{^#{fixtures_dir}templates/syntax.epp:\nThis Name has no effect})
       expect(PuppetCheck.settings[:warning_files]).to eql([])
       expect(PuppetCheck.settings[:clean_files]).to eql([])
     end
     it 'puts a good Puppet template in the clean files array' do
-      PuppetParser.template([fixtures_dir + 'templates/good.epp'])
+      PuppetParser.template(["#{fixtures_dir}templates/good.epp"])
       expect(PuppetCheck.settings[:error_files]).to eql([])
       expect(PuppetCheck.settings[:warning_files]).to eql([])
       expect(PuppetCheck.settings[:clean_files]).to eql(["#{fixtures_dir}templates/good.epp"])

data/spec/puppet-check/regression_check_spec.rb

@@ -5,13 +5,11 @@ require_relative '../../lib/puppet-check/regression_check'
 describe RegressionCheck do
   context '.config' do
     # json gem got messed up for the EOL Ruby versions
-    if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.2')
-      it 'raise an appropriate error if the file is malformed' do
-        expect { RegressionCheck.config(fixtures_dir + 'metadata.json') }.to raise_error(OctocatalogDiff::Errors::ConfigurationFileContentError, 'Configuration must define OctocatalogDiff::Config!')
-      end
+    it 'raise an appropriate error if the file is malformed' do
+      expect { RegressionCheck.config("#{fixtures_dir}metadata.json") }.to raise_error(OctocatalogDiff::Errors::ConfigurationFileContentError, 'Configuration must define OctocatalogDiff::Config!')
     end
     it 'loads in a good octocatalog-diff config file' do
-      expect { RegressionCheck.config(octocatalog_diff_dir + 'octocatalog-diff.cfg.rb') }.not_to raise_exception
+      expect { RegressionCheck.config("#{octocatalog_diff_dir}octocatalog_diff.cfg.rb") }.not_to raise_exception
     end
     it 'loads in the settings from the file correctly' do
     end
@@ -19,16 +17,16 @@ describe RegressionCheck do
 
   context '.smoke' do
     # octocatalog-diff is returning a blank error for these tests
-    unless File.directory?('/home/travis')
+    unless ENV['TRAVIS'] == 'true' || ENV['CIRCLECI'] == 'true'
       it 'returns a pass for a successful catalog compilation' do
-        expect { RegressionCheck.smoke(['good.example.com'], "#{octocatalog_diff_dir}octocatalog-diff.cfg.rb") }.not_to raise_exception
+        expect { RegressionCheck.smoke(['good.example.com'], "#{octocatalog_diff_dir}octocatalog_diff.cfg.rb") }.not_to raise_exception
       end
       it 'returns a failure for a catalog with an error' do
-        expect { RegressionCheck.smoke(['does_not_exist.example.com'], "#{octocatalog_diff_dir}octocatalog-diff.cfg.rb") }.to raise_error(OctocatalogDiff::Errors::CatalogError)
+        expect { RegressionCheck.smoke(['does_not_exist.example.com'], "#{octocatalog_diff_dir}octocatalog_diff.cfg.rb") }.to raise_error(OctocatalogDiff::Errors::CatalogError)
       end
     end
     it 'returns a failure for a good and bad catalog' do
-      # RegressionCheck.smoke(['good.example.com', 'syntax_error.example.com'], "#{fixtures_dir}octocatalog-diff.cfg.rb")
+      # RegressionCheck.smoke(['good.example.com', 'syntax_error.example.com'], "#{fixtures_dir}octocatalog_diff.cfg.rb")
     end
   end
 

data/spec/puppet-check/rspec_puppet_support_spec.rb

@@ -1,12 +1,12 @@
-require_relative '../spec_helper.rb'
+require_relative '../spec_helper'
 require_relative '../../lib/puppet-check/rspec_puppet_support'
 require 'fileutils'
 
 describe RSpecPuppetSupport do
   after(:all) do
     # cleanup rspec_puppet_setup
-    File.delete('spec/spec_helper.rb')
-    %w[manifests modules].each { |dir| FileUtils.rm_r('spec/fixtures/' + dir) }
+    File.delete("#{fixtures_dir}/spec/spec_helper.rb")
+    %w[manifests modules].each { |dir| FileUtils.rm_r("#{fixtures_dir}/spec/fixtures/#{dir}") }
   end
 
   context '.run' do
@@ -14,8 +14,12 @@ describe RSpecPuppetSupport do
     before(:each) { Dir.chdir(fixtures_dir) }
 
     it 'creates missing directories, missing site.pp, missing symlinks, and a missing spec_helper' do
-      if File.directory?('/home/travis')
+      # travis ci
+      if ENV['TRAVIS'] == 'true'
         expect { rspec_puppet_setup }.to output("puppetlabs/gruntmaster has an unspecified, or specified but unsupported, download method.\n").to_stderr
+      # circle ci
+      elsif ENV['CIRCLECI'] == 'true'
+        expect { rspec_puppet_setup }.to output("git is not installed and cannot be used to retrieve dependency modules\nsubversion is not installed and cannot be used to retrieve dependency modules\npuppetlabs/gruntmaster has an unspecified, or specified but unsupported, download method.\n").to_stderr
       else
         expect { rspec_puppet_setup }.to output("subversion is not installed and cannot be used to retrieve dependency modules\npuppetlabs/gruntmaster has an unspecified, or specified but unsupported, download method.\n").to_stderr
       end
@@ -28,7 +32,7 @@ describe RSpecPuppetSupport do
       expect(File.file?('spec/spec_helper.rb')).to be true
 
       # .dependency_setup
-      expect(File.directory?('spec/fixtures/modules/puppetlabs-lvm')).to be true
+      expect(File.directory?('spec/fixtures/modules/puppetlabs-lvm')).to be true unless ENV['CIRCLECI'] == 'true'
       expect(File.directory?('spec/fixtures/modules/stdlib')).to be true
     end
   end

data/spec/puppet-check/ruby_parser_spec.rb

@@ -10,25 +10,25 @@ describe RubyParser do
 
   context '.ruby' do
     it 'puts a bad syntax ruby file in the error files array' do
-      RubyParser.ruby([fixtures_dir + 'lib/syntax.rb'], false, [])
+      RubyParser.ruby(["#{fixtures_dir}lib/syntax.rb"], false, [])
       expect(PuppetCheck.settings[:error_files][0]).to match(%r{^#{fixtures_dir}lib/syntax.rb:\n.*syntax error})
       expect(PuppetCheck.settings[:warning_files]).to eql([])
       expect(PuppetCheck.settings[:clean_files]).to eql([])
     end
     it 'puts a bad style ruby file in the warning files array' do
-      RubyParser.ruby([fixtures_dir + 'lib/style.rb'], true, [])
+      RubyParser.ruby(["#{fixtures_dir}lib/style.rb"], true, [])
       expect(PuppetCheck.settings[:error_files]).to eql([])
       expect(PuppetCheck.settings[:warning_files][0]).to match(%r{^#{fixtures_dir}lib/style.rb:\n.*Useless assignment.*\n.*Use the new.*\n.*Do not introduce.*\n.*Prefer single.*\n.*Source code comment is empty.*\n.*is a writable attribute.*\n.*Issue has no descriptive comment})
       expect(PuppetCheck.settings[:clean_files]).to eql([])
     end
     it 'puts a bad style ruby file in the clean files array when rubocop_args ignores its warnings' do
-      RubyParser.ruby([fixtures_dir + 'lib/rubocop_style.rb'], true, ['--except', 'Lint/UselessAssignment,Style/HashSyntax,Style/GlobalVars,Style/StringLiterals'])
+      RubyParser.ruby(["#{fixtures_dir}lib/rubocop_style.rb"], true, ['--except', 'Lint/UselessAssignment,Style/HashSyntax,Style/GlobalVars,Style/StringLiterals'])
       expect(PuppetCheck.settings[:error_files]).to eql([])
       expect(PuppetCheck.settings[:warning_files]).to eql([])
       expect(PuppetCheck.settings[:clean_files]).to eql(["#{fixtures_dir}lib/rubocop_style.rb"])
     end
     it 'puts a good ruby file in the clean files array' do
-      RubyParser.ruby([fixtures_dir + 'lib/good.rb'], true, [])
+      RubyParser.ruby(["#{fixtures_dir}lib/good.rb"], true, [])
       expect(PuppetCheck.settings[:error_files]).to eql([])
       expect(PuppetCheck.settings[:warning_files]).to eql([])
       expect(PuppetCheck.settings[:clean_files]).to eql(["#{fixtures_dir}lib/good.rb"])
@@ -37,7 +37,7 @@ describe RubyParser do
 
   context '.template' do
     it 'puts a bad syntax ruby template file in the error files array' do
-      RubyParser.template([fixtures_dir + 'templates/syntax.erb'])
+      RubyParser.template(["#{fixtures_dir}templates/syntax.erb"])
       if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.7')
         expect(PuppetCheck.settings[:error_files][0]).to match(%r{^#{fixtures_dir}templates/syntax.erb:\n.*1: syntax error, unexpected.*\n.*ruby})
       else
@@ -47,19 +47,19 @@ describe RubyParser do
       expect(PuppetCheck.settings[:clean_files]).to eql([])
     end
     it 'puts a bad style ruby template file in the warning files array' do
-      RubyParser.template([fixtures_dir + 'templates/style.erb'])
+      RubyParser.template(["#{fixtures_dir}templates/style.erb"])
       expect(PuppetCheck.settings[:error_files]).to eql([])
       expect(PuppetCheck.settings[:warning_files][0]).to match(%r{^#{fixtures_dir}templates/style.erb:\n.*already initialized constant.*\n.*previous definition of})
       expect(PuppetCheck.settings[:clean_files]).to eql([])
     end
     it 'puts a ruby template file with ignored errors in the clean files array' do
-      RubyParser.template([fixtures_dir + 'templates/no_method_error.erb'])
+      RubyParser.template(["#{fixtures_dir}templates/no_method_error.erb"])
       expect(PuppetCheck.settings[:error_files]).to eql([])
       expect(PuppetCheck.settings[:warning_files]).to eql([])
       expect(PuppetCheck.settings[:clean_files]).to eql(["#{fixtures_dir}templates/no_method_error.erb"])
     end
     it 'puts a good ruby template file in the clean files array' do
-      RubyParser.template([fixtures_dir + 'templates/good.erb'])
+      RubyParser.template(["#{fixtures_dir}templates/good.erb"])
       expect(PuppetCheck.settings[:error_files]).to eql([])
       expect(PuppetCheck.settings[:warning_files]).to eql([])
       expect(PuppetCheck.settings[:clean_files]).to eql(["#{fixtures_dir}templates/good.erb"])
@@ -68,25 +68,25 @@ describe RubyParser do
 
   context '.librarian' do
     it 'puts a bad syntax librarian Puppet file in the error files array' do
-      RubyParser.librarian([fixtures_dir + 'librarian_syntax/Puppetfile'], false, [])
+      RubyParser.librarian(["#{fixtures_dir}librarian_syntax/Puppetfile"], false, [])
       expect(PuppetCheck.settings[:error_files][0]).to match(%r{^#{fixtures_dir}librarian_syntax/Puppetfile:\n.*syntax error})
       expect(PuppetCheck.settings[:warning_files]).to eql([])
       expect(PuppetCheck.settings[:clean_files]).to eql([])
     end
     it 'puts a bad style librarian Puppet file in the warning files array' do
-      RubyParser.librarian([fixtures_dir + 'librarian_style/Puppetfile'], true, [])
+      RubyParser.librarian(["#{fixtures_dir}librarian_style/Puppetfile"], true, [])
       expect(PuppetCheck.settings[:error_files]).to eql([])
       expect(PuppetCheck.settings[:warning_files][0]).to match(%r{^#{fixtures_dir}librarian_style/Puppetfile:\n.*Align the arguments.*\n.*Use the new})
       expect(PuppetCheck.settings[:clean_files]).to eql([])
     end
     it 'puts a bad style librarian Puppet file in the clean files array when rubocop_args ignores its warnings' do
-      RubyParser.librarian([fixtures_dir + 'librarian_style/Puppetfile'], true, ['--except', 'Layout/AlignArguments,Style/HashSyntax'])
+      RubyParser.librarian(["#{fixtures_dir}librarian_style/Puppetfile"], true, ['--except', 'Layout/AlignArguments,Style/HashSyntax'])
       expect(PuppetCheck.settings[:error_files]).to eql([])
       expect(PuppetCheck.settings[:warning_files]).to eql([])
       expect(PuppetCheck.settings[:clean_files]).to eql(["#{fixtures_dir}librarian_style/Puppetfile"])
     end
     it 'puts a good librarian Puppet file in the clean files array' do
-      RubyParser.librarian([fixtures_dir + 'librarian_good/Puppetfile'], true, [])
+      RubyParser.librarian(["#{fixtures_dir}librarian_good/Puppetfile"], true, [])
       expect(PuppetCheck.settings[:error_files]).to eql([])
       expect(PuppetCheck.settings[:warning_files]).to eql([])
       expect(PuppetCheck.settings[:clean_files]).to eql(["#{fixtures_dir}librarian_good/Puppetfile"])

data/spec/puppet-check/tasks_spec.rb

@@ -1,12 +1,12 @@
 require 'rake/task'
-require_relative '../spec_helper.rb'
+require_relative '../spec_helper'
 require_relative '../../lib/puppet-check/tasks'
 
 describe PuppetCheck::Tasks do
   after(:all) do
     # cleanup rspec_puppet_setup
-    %w[spec/spec_helper.rb].each { |file| File.delete(file) }
-    %w[manifests modules].each { |dir| FileUtils.rm_r('spec/fixtures/' + dir) }
+    File.delete("#{fixtures_dir}/spec/spec_helper.rb")
+    %w[manifests modules].each { |dir| FileUtils.rm_r("#{fixtures_dir}/spec/fixtures/#{dir}") }
   end
 
   context 'puppetcheck:spec' do

data/spec/{puppet-check_spec.rb → puppet_check_spec.rb}

@@ -1,5 +1,5 @@
 require_relative 'spec_helper'
-require_relative '../lib/puppet-check'
+require_relative '../lib/puppet_check'
 
 describe PuppetCheck do
   context 'self' do

data/spec/spec_helper.rb

@@ -4,8 +4,13 @@ require 'rspec'
 module Variables
   extend RSpec::SharedContext
 
-  let(:fixtures_dir) { File.dirname(__FILE__) + '/fixtures/' }
-  let(:octocatalog_diff_dir) { File.dirname(__FILE__) + '/octocatalog-diff/' }
+  def fixtures_dir
+    @fixtures_dir = "#{File.dirname(__FILE__)}/fixtures/"
+  end
+
+  def octocatalog_diff_dir
+    @octocatalog_diff_dir = "#{File.dirname(__FILE__)}/octocatalog-diff/"
+  end
 end
 
 RSpec.configure do |config|

data/spec/system/system_spec.rb

@@ -1,12 +1,12 @@
 require 'rake/task'
-require_relative '../spec_helper.rb'
+require_relative '../spec_helper'
 require_relative '../../lib/puppet-check/cli'
 require_relative '../../lib/puppet-check/tasks'
 
 describe PuppetCheck do
   context 'executed as a system from the CLI with arguments and various files to be processed' do
     # see regression_check_spec
-    if File.directory?('/home/travis')
+    if ENV['TRAVIS'] == 'true' || ENV['CIRCLECI'] == 'true'
       let(:cli) { PuppetCheck::CLI.run(%w[-s --puppet-lint no-hard_tabs-check,no-140chars-check --rubocop Metrics/LineLength,Style/Encoding .]) }
     else
       let(:cli) { PuppetCheck::CLI.run(%w[-s --puppet-lint no-hard_tabs-check,no-140chars-check --rubocop Metrics/LineLength,Style/Encoding --smoke -n good.example.com --octoconfig spec/octocatalog-diff/octocatalog-diff.cfg.rb .]) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet-check
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Matt Schuchard
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-22 00:00:00.000000000 Z
+date: 2022-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: puppet
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '8'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
         version: '8'
@@ -153,7 +153,6 @@ files:
 - LICENSE.md
 - README.md
 - bin/puppet-check
-- lib/puppet-check.rb
 - lib/puppet-check/cli.rb
 - lib/puppet-check/data_parser.rb
 - lib/puppet-check/output_results.rb
@@ -163,6 +162,7 @@ files:
 - lib/puppet-check/ruby_parser.rb
 - lib/puppet-check/tasks.rb
 - lib/puppet-check/utils.rb
+- lib/puppet_check.rb
 - spec/fixtures/foobarbaz
 - spec/fixtures/hieradata/good.eyaml
 - spec/fixtures/hieradata/good.json
@@ -204,7 +204,7 @@ files:
 - spec/octocatalog-diff/facts.yaml
 - spec/octocatalog-diff/hiera.yaml
 - spec/octocatalog-diff/manifests/site.pp
-- spec/octocatalog-diff/octocatalog-diff.cfg.rb
+- spec/octocatalog-diff/octocatalog_diff.cfg.rb
 - spec/puppet-check/cli_spec.rb
 - spec/puppet-check/data_parser_spec.rb
 - spec/puppet-check/output_results_spec.rb
@@ -214,7 +214,7 @@ files:
 - spec/puppet-check/ruby_parser_spec.rb
 - spec/puppet-check/tasks_spec.rb
 - spec/puppet-check/utils_spec.rb
-- spec/puppet-check_spec.rb
+- spec/puppet_check_spec.rb
 - spec/spec_helper.rb
 - spec/system/system_spec.rb
 homepage: https://www.github.com/mschuchard/puppet-check
@@ -229,7 +229,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.0
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -283,7 +283,7 @@ test_files:
 - spec/octocatalog-diff/facts.yaml
 - spec/octocatalog-diff/hiera.yaml
 - spec/octocatalog-diff/manifests/site.pp
-- spec/octocatalog-diff/octocatalog-diff.cfg.rb
+- spec/octocatalog-diff/octocatalog_diff.cfg.rb
 - spec/puppet-check/cli_spec.rb
 - spec/puppet-check/data_parser_spec.rb
 - spec/puppet-check/output_results_spec.rb
@@ -293,6 +293,6 @@ test_files:
 - spec/puppet-check/ruby_parser_spec.rb
 - spec/puppet-check/tasks_spec.rb
 - spec/puppet-check/utils_spec.rb
-- spec/puppet-check_spec.rb
+- spec/puppet_check_spec.rb
 - spec/spec_helper.rb
 - spec/system/system_spec.rb