puppet-check 1.6.1 → 2.1.0

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

@@ -19,19 +19,19 @@ class PuppetCheck
     self.class.settings = settings
 
     # settings defaults
-    self.class.defaults
+    self.class.defaults(settings)
 
     # grab all of the files to be processed
     files = self.class.parse_paths(paths)
 
     # parse the files
-    execute_parsers(files, settings[:future_parser], settings[:style_check], settings[:public], settings[:private], settings[:puppetlint_args], settings[:rubocop_args])
+    execute_parsers(files, settings)
 
     # output the diagnostic results
-    settings[:output_format] == 'text' ? OutputResults.text : OutputResults.markup
+    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? && (!self.class.settings[:fail_on_warning] || self.class.settings[:warning_files].empty?)
+    if self.class.settings[:error_files].empty? && (!settings[:fail_on_warning] || self.class.settings[:warning_files].empty?)
       begin
         require_relative 'puppet-check/regression_check'
       # if octocatalog-diff is not installed then return immediately
@@ -41,7 +41,7 @@ class PuppetCheck
 
       # perform smoke checks if there were no errors and the user desires
       begin
-        catalog = RegressionCheck.smoke(settings[:octonodes], settings[:octoconfig]) if settings[:smoke_check]
+        catalog = RegressionCheck.smoke(settings[:octonodes], settings[:octoconfig]) if settings[:smoke]
       # smoke check failure? output message and return 2
       rescue OctocatalogDiff::Errors::CatalogError => err
         puts 'There was a smoke check error:'
@@ -51,7 +51,7 @@ class PuppetCheck
       end
       # perform regression checks if there were no errors and the user desires
       # begin
-      #   catalog = RegressionCheck.regression(settings[:octonodes], settings[:octoconfig]) if settings[:regression_check]
+      #   catalog = RegressionCheck.regression(settings[:octonodes], settings[:octoconfig]) if settings[:regression]
       # rescue OctocatalogDiff::Errors::CatalogError => err
       #   puts 'There was a catalog compilation error during the regression check:'
       #   puts err
@@ -68,20 +68,19 @@ class PuppetCheck
   end
 
   # establish default settings
-  def self.defaults
-    # initialize future parser, fail on warning,  style check, and regression check bools
-    @settings[:future_parser] ||= false
-    @settings[:fail_on_warning] ||= false
-    @settings[:style_check] ||= false
-    @settings[:smoke_check] ||= false
-    @settings[:regression_check] ||= false
+  def self.defaults(settings)
+    # initialize fail on warning,  style check, and regression check bools
+    settings[:fail_on_warning] ||= false
+    settings[:style] ||= false
+    settings[:smoke] ||= false
+    settings[:regression] ||= false
 
     # initialize ssl keys for eyaml checks
-    @settings[:public] ||= nil
-    @settings[:private] ||= nil
+    settings[:public] ||= nil
+    settings[:private] ||= nil
 
     # initialize output format option
-    @settings[:output_format] ||= 'text'
+    settings[:output_format] ||= 'text'
 
     # initialize diagnostic output arrays
     @settings[:error_files] = []
@@ -90,12 +89,12 @@ class PuppetCheck
     @settings[:ignored_files] = []
 
     # initialize octocatalog-diff options
-    @settings[:octoconfig] ||= '.octocatalog-diff.cfg.rb'
-    @settings[:octonodes] ||= %w[localhost.localdomain]
+    settings[:octoconfig] ||= '.octocatalog-diff.cfg.rb'
+    settings[:octonodes] ||= %w[localhost.localdomain]
 
     # initialize style arg arrays
-    @settings[:puppetlint_args] ||= []
-    @settings[:rubocop_args] ||= []
+    settings[:puppetlint_args] ||= []
+    settings[:rubocop_args] ||= []
   end
 
   # parse the paths and return the array of files
@@ -120,16 +119,16 @@ class PuppetCheck
   end
 
   # categorize and pass the files out to the parsers to determine their status
-  def execute_parsers(files, future, style, public, private, pl_args, rc_args)
+  def execute_parsers(files, settings)
     # check manifests
     manifests, files = files.partition { |file| File.extname(file) == '.pp' }
-    PuppetParser.manifest(manifests, future, style, pl_args) unless manifests.empty?
+    PuppetParser.manifest(manifests, settings[:style], settings[:puppetlint_args]) unless manifests.empty?
     # check puppet templates
     templates, files = files.partition { |file| File.extname(file) == '.epp' }
     PuppetParser.template(templates) unless templates.empty?
     # check ruby files
     rubies, files = files.partition { |file| File.extname(file) == '.rb' }
-    RubyParser.ruby(rubies, style, rc_args) unless rubies.empty?
+    RubyParser.ruby(rubies, settings[:style], settings[:rubocop_args]) unless rubies.empty?
     # check ruby templates
     templates, files = files.partition { |file| File.extname(file) == '.erb' }
     RubyParser.template(templates) unless templates.empty?
@@ -144,7 +143,7 @@ class PuppetCheck
     # DataParser.eyaml(eyamls, public, private) unless eyamls.empty?
     # check misc ruby
     librarians, files = files.partition { |file| File.basename(file) =~ /(?:Puppet|Module|Rake|Gem)file$/ }
-    RubyParser.librarian(librarians, style, rc_args) unless librarians.empty?
+    RubyParser.librarian(librarians, settings[:style], settings[:rubocop_args]) unless librarians.empty?
     # ignore everything else
     self.class.settings[:ignored_files].concat(files)
   end

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/cli_spec.rb

@@ -13,8 +13,8 @@ describe PuppetCheck::CLI do
       expect { PuppetCheck::CLI.parse(%w[-s -f -asdf foo]) }.to raise_error(OptionParser::InvalidOption)
     end
 
-    it 'allows future parser, fail on warnings, style, smoke, and regression checks to be enabled' do
-      expect(PuppetCheck::CLI.parse(%w[-f --fail-on-warnings -s -r --smoke foo])).to include(future_parser: true, fail_on_warnings: true, style_check: true, smoke_check: true, regression_check: true)
+    it 'allows fail on warnings, style, smoke, and regression checks to be enabled' do
+      expect(PuppetCheck::CLI.parse(%w[--fail-on-warnings -s -r --smoke foo])).to include(fail_on_warnings: true, style: true, smoke: true, regression: true)
     end
 
     it 'correctly parser EYAML options' do
@@ -42,7 +42,7 @@ describe PuppetCheck::CLI do
     end
 
     it 'correctly parses multiple sets of arguments' do
-      expect(PuppetCheck::CLI.parse(%w[-s -f --puppet-lint puppetlint-arg-one,puppetlint-arg-two --rubocop rubocop-arg-one,rubocop-arg-two foo])).to include(future_parser: true, style_check: true, puppetlint_args: ['--puppetlint-arg-one', '--puppetlint-arg-two'], rubocop_args: ['--except', 'rubocop-arg-one,rubocop-arg-two'])
+      expect(PuppetCheck::CLI.parse(%w[-s --puppet-lint puppetlint-arg-one,puppetlint-arg-two --rubocop rubocop-arg-one,rubocop-arg-two foo])).to include(style: true, puppetlint_args: ['--puppetlint-arg-one', '--puppetlint-arg-two'], rubocop_args: ['--except', 'rubocop-arg-one,rubocop-arg-two'])
     end
   end
 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 RUBY_VERSION.to_f >= 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

@@ -37,48 +37,39 @@ describe OutputResults do
     end
 
     it 'outputs files with errors as yaml' do
-      PuppetCheck.settings[:output_format] = 'yaml'
       PuppetCheck.settings[:error_files] = ['foo: i had an error']
-      expect { OutputResults.markup }.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[:output_format] = 'yaml'
       PuppetCheck.settings[:warning_files] = ['foo: i had a warning']
-      expect { OutputResults.markup }.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[:output_format] = 'yaml'
       PuppetCheck.settings[:clean_files] = ['foo: i was totally good to go']
-      expect { OutputResults.markup }.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[:output_format] = 'yaml'
       PuppetCheck.settings[:ignored_files] = ['foo: who knows what i am']
-      expect { OutputResults.markup }.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[:output_format] = 'json'
       PuppetCheck.settings[:error_files] = ['foo: i had an error']
-      expect { OutputResults.markup }.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[:output_format] = 'json'
       PuppetCheck.settings[:warning_files] = ['foo: i had a warning']
-      expect { OutputResults.markup }.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[:output_format] = 'json'
       PuppetCheck.settings[:clean_files] = ['foo: i was totally good to go']
-      expect { OutputResults.markup }.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[:output_format] = 'json'
       PuppetCheck.settings[:ignored_files] = ['foo: who knows what i am']
-      expect { OutputResults.markup }.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
-      PuppetCheck.settings[:output_format] = 'awesomesauce'
-      expect { OutputResults.markup }.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,60 +10,62 @@ 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, false, [])
-      # dealing with annoying warning in puppet 5
-      if RUBY_VERSION.to_f < 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})
+      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})
       else
         expect(PuppetCheck.settings[:error_files][0]).to match(%r{^#{fixtures_dir}manifests/syntax.pp:\nThis Variable has no effect.*\nIllegal variable name})
       end
       expect(PuppetCheck.settings[:warning_files]).to eql([])
       expect(PuppetCheck.settings[:clean_files]).to eql([])
     end
-    it 'puts a bad syntax at eof Puppet manifest in the error files array' do
-      PuppetParser.manifest([fixtures_dir + 'manifests/eof_syntax.pp'], false, 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([])
+    # 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, [])
+        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'], false, 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'], false, 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.*double quoted string containing.*\n.*indentation of})
+      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'], false, 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'], false, 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'], false, 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 RUBY_VERSION.to_f >= 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,7 +14,15 @@ describe RSpecPuppetSupport do
     before(:each) { Dir.chdir(fixtures_dir) }
 
     it 'creates missing directories, missing site.pp, missing symlinks, and a missing spec_helper' do
-      expect { rspec_puppet_setup }.to output("puppetlabs/gruntmaster has an unspecified, or specified but unsupported, download method.\n").to_stderr
+      # 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
 
       # .file_setup
       expect(File.directory?('spec/fixtures/manifests')).to be true
@@ -24,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