puppet-check 1.4.0 → 1.4.1

data/lib/puppet-check/puppet_parser.rb

@@ -21,7 +21,7 @@ class PuppetParser
         Puppet::Face[:parser, :current].validate(file)
       # this is the actual error that we need to rescue Puppet::Face from
       rescue SystemExit
-        next PuppetCheck.error_files.push("#{file}:\n#{errors.map(&:to_s).join("\n").gsub("#{File.absolute_path(file)}:", '')}")
+        next PuppetCheck.settings[:error_files].push("#{file}:\n#{errors.map(&:to_s).join("\n").gsub("#{File.absolute_path(file)}:", '')}")
       end
 
       # initialize warnings with output from the parser if it exists, since the output is warnings if Puppet::Face did not trigger a SystemExit
@@ -50,8 +50,8 @@ class PuppetParser
           puppet_lint.problems.each { |values| warnings += "\n#{values[:line]}:#{values[:column]}: #{values[:message]}" }
         end
       end
-      next PuppetCheck.warning_files.push(warnings) unless warnings == "#{file}:"
-      PuppetCheck.clean_files.push(file.to_s)
+      next PuppetCheck.settings[:warning_files].push(warnings) unless warnings == "#{file}:"
+      PuppetCheck.settings[:clean_files].push(file.to_s)
     end
   end
 
@@ -61,16 +61,16 @@ class PuppetParser
 
     files.each do |file|
       # puppet before version 4 cannot check template syntax
-      next PuppetCheck.ignored_files.push("#{file}: ignored due to Puppet < 4") if Puppet::PUPPETVERSION.to_i < 4
+      next PuppetCheck.settings[:ignored_files].push("#{file}: ignored due to Puppet < 4") if Puppet::PUPPETVERSION.to_i < 4
 
       # check puppet template syntax
       begin
         # credits to gds-operations/puppet-syntax for the parser function call
         Puppet::Pops::Parser::EvaluatingParser::EvaluatingEppParser.new.parse_file(file)
       rescue StandardError => err
-        PuppetCheck.error_files.push("#{file}:\n#{err.to_s.gsub("#{file}:", '')}")
+        PuppetCheck.settings[:error_files].push("#{file}:\n#{err.to_s.gsub("#{file}:", '')}")
       else
-        PuppetCheck.clean_files.push(file.to_s)
+        PuppetCheck.settings[:clean_files].push(file.to_s)
       end
     end
   end

data/lib/puppet-check/regression_check.rb

@@ -14,8 +14,8 @@ class RegressionCheck
 
   # regression testing
   # def self.regression(nodes, octoconfig)
-    # options = RegressionCheck.config(octoconfig)
-    # nodes.each { |node| stuff }
+  #   options = RegressionCheck.config(octoconfig)
+  #   nodes.each { |node| stuff }
   # end
 
   # config file loading

data/lib/puppet-check/rspec_puppet_support.rb

@@ -4,7 +4,7 @@ class RSpecPuppetSupport
   # 'puppetcheck:spec' task invokes 'run'
   # 'run' invokes 'file_setup' always and 'dependency_setup' if metadata.json exists
   # 'dependency_setup' invokes 'git/forge/hg' if dependencies exist and git/forge/hg is download option
-  # 'git/forge/hg' downloads module fixture appropriately
+  # 'git/forge/svn/hg' downloads module fixture appropriately
 
   # prepare the spec fixtures directory for rspec-puppet testing
   def self.run
@@ -39,7 +39,7 @@ class RSpecPuppetSupport
     File.write('spec/fixtures/manifests/site.pp', '') unless File.file?('spec/fixtures/manifests/site.pp')
 
     # symlink over everything the module needs for compilation
-    %w(hiera.yaml data hieradata functions manifests lib files templates).each do |file|
+    %w[hiera.yaml data hieradata functions manifests lib files templates].each do |file|
       File.symlink("../../../../#{file}", "spec/fixtures/modules/#{module_name}/#{file}") if File.exist?(file) && !File.exist?("spec/fixtures/modules/#{module_name}/#{file}")
     end
 
@@ -63,6 +63,8 @@ class RSpecPuppetSupport
         git(dependency_hash['git'], dependency_hash['args'])
       elsif dependency_hash.key?('forge')
         forge(dependency_hash['forge'], dependency_hash['args'])
+      elsif dependency_hash.key?('svn')
+        svn(dependency_hash['svn'], dependency_hash['args'])
       elsif dependency_hash.key?('hg')
         hg(dependency_hash['hg'], dependency_hash['args'])
       else
@@ -81,11 +83,17 @@ class RSpecPuppetSupport
 
   # download external module dependency with forge
   def self.forge(forge_name, args = '')
-    if File.directory?("spec/fixtures/modules/#{forge_name}")
-      system("puppet module upgrade --modulepath spec/fixtures/modules/ #{args} #{forge_name}")
-    else
-      system("puppet module install --modulepath spec/fixtures/modules/ #{args} #{forge_name}")
-    end
+    # is the module present? do an upgrade; otherwise, do an install
+    subcommand = File.directory?("spec/fixtures/modules/#{forge_name}") ? 'upgrade' : 'install'
+    system("puppet module #{subcommand} --modulepath spec/fixtures/modules/ #{args} #{forge_name}")
+  end
+
+  # download external module dependency with svn
+  def self.svn(svn_url, args = '')
+    # establish path to checkout module to
+    path = "spec/fixtures/modules/#{File.basename(svn_url)}"
+    # is the module present and already checked out with svn? do an update; otherwise, do a checkout
+    File.directory?("#{path}/.svn") ? system("svn update #{path}") : system("svn co #{args} #{svn_url} #{path}")
   end
 
   # download external module dependency with hg

data/lib/puppet-check/ruby_parser.rb

@@ -11,7 +11,7 @@ class RubyParser
         # prevents ruby code from actually executing
         catch(:good) { instance_eval("BEGIN {throw :good}; #{File.read(file)}") }
       rescue ScriptError, StandardError => err
-        PuppetCheck.error_files.push("#{file}:\n#{err}")
+        PuppetCheck.settings[:error_files].push("#{file}:\n#{err}")
       else
         # check ruby style
         if style
@@ -28,9 +28,9 @@ class RubyParser
           warnings += reek_warnings.split("\n")[1..-1].map(&:strip).join("\n") unless reek_warnings == ''
 
           # return warnings
-          next PuppetCheck.warning_files.push("#{file}:\n#{warnings.strip}") unless warnings == ''
+          next PuppetCheck.settings[:warning_files].push("#{file}:\n#{warnings.strip}") unless warnings == ''
         end
-        PuppetCheck.clean_files.push(file.to_s)
+        PuppetCheck.settings[:clean_files].push(file.to_s)
       end
     end
   end
@@ -49,11 +49,11 @@ class RubyParser
         # empty out warnings since it would contain an error if this pass triggers
         warnings = ''
       rescue ScriptError => err
-        next PuppetCheck.error_files.push("#{file}:\n#{err}")
+        next PuppetCheck.settings[:error_files].push("#{file}:\n#{err}")
       end
       # return warnings from the check if there were any
-      next PuppetCheck.warning_files.push("#{file}:\n#{warnings.gsub('warning: ', '').split('(erb):').join('').strip}") unless warnings == ''
-      PuppetCheck.clean_files.push(file.to_s)
+      next PuppetCheck.settings[:warning_files].push("#{file}:\n#{warnings.gsub('warning: ', '').split('(erb):').join('').strip}") unless warnings == ''
+      PuppetCheck.settings[:clean_files].push(file.to_s)
     end
   end
 
@@ -65,7 +65,7 @@ class RubyParser
         # prevents ruby code from actually executing
         catch(:good) { instance_eval("BEGIN {throw :good}; #{File.read(file)}") }
       rescue SyntaxError, LoadError, ArgumentError => err
-        PuppetCheck.error_files.push("#{file}:\n#{err}")
+        PuppetCheck.settings[:error_files].push("#{file}:\n#{err}")
       # check librarian puppet style
       else
         if style
@@ -77,9 +77,9 @@ class RubyParser
           warnings = Utils.capture_stdout { RuboCop::CLI.new.run(rc_args + ['--format', 'emacs', file]) }
 
           # collect style warnings
-          next PuppetCheck.warning_files.push("#{file}:\n#{warnings.split("#{File.absolute_path(file)}:").join('')}") unless warnings.empty?
+          next PuppetCheck.settings[:warning_files].push("#{file}:\n#{warnings.split("#{File.absolute_path(file)}:").join('')}") unless warnings.empty?
         end
-        PuppetCheck.clean_files.push(file.to_s)
+        PuppetCheck.settings[:clean_files].push(file.to_s)
       end
     end
   end

data/lib/puppet-check/tasks.rb

@@ -1,13 +1,15 @@
-require 'rspec/core/rake_task'
-require 'rake/tasklib'
+begin
+  require 'rake/tasklib'
+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 'rspec_puppet_support'
 
 # the rake interface for PuppetCheck
 class PuppetCheck::Tasks < ::Rake::TaskLib
   def initialize
     desc 'Execute all Puppet-Check checks'
-    task puppetcheck: %w(puppetcheck:file puppetcheck:spec puppetcheck:beaker)
+    task puppetcheck: %w[puppetcheck:file puppetcheck:spec puppetcheck:beaker]
 
     namespace :puppetcheck do
       desc 'Execute Puppet-Check file checks'
@@ -15,21 +17,28 @@ class PuppetCheck::Tasks < ::Rake::TaskLib
         PuppetCheck.new.run(Dir.glob('*'))
       end
 
-      desc 'Execute RSpec and RSpec-Puppet tests'
-      RSpec::Core::RakeTask.new(:spec) do |task|
-        RSpecPuppetSupport.run
-        # generate tasks for all recognized directories and ensure spec tests inside module dependencies are ignored
-        spec_dirs = Dir.glob('**/{classes,defines,facter,functions,hosts,puppet,unit,types}/**/*_spec.rb').reject { |dir| dir =~ /fixtures/ }
-        task.pattern = spec_dirs.empty? ? 'skip_rspec' : spec_dirs
-        task.rspec_opts = '-f json' if PuppetCheck.output_format == 'json'
-      end
+      begin
+        require 'rspec/core/rake_task'
+        require_relative 'rspec_puppet_support'
+
+        desc 'Execute RSpec and RSpec-Puppet tests'
+        RSpec::Core::RakeTask.new(:spec) do |task|
+          RSpecPuppetSupport.run
+          # generate tasks for all recognized directories and ensure spec tests inside module dependencies are ignored
+          spec_dirs = Dir.glob('**/{classes,defines,facter,functions,hosts,puppet,unit,types}/**/*_spec.rb').reject { |dir| dir =~ /fixtures/ }
+          task.pattern = spec_dirs.empty? ? 'skip_rspec' : spec_dirs
+          task.rspec_opts = '-f json' if PuppetCheck.settings[:output_format] == 'json'
+        end
 
-      desc 'Execute Beaker acceptance tests'
-      RSpec::Core::RakeTask.new(:beaker) do |task|
-        # generate tasks for all recognized directories and ensure acceptance tests inside module dependencies are ignored
-        acceptance_dirs = Dir.glob('**/acceptance').reject { |dir| dir =~ /fixtures/ }
-        task.pattern = acceptance_dirs.empty? ? 'skip_beaker' : acceptance_dirs
-        task.rspec_opts = '-f json' if PuppetCheck.output_format == 'json'
+        desc 'Execute Beaker acceptance tests'
+        RSpec::Core::RakeTask.new(:beaker) do |task|
+          # generate tasks for all recognized directories and ensure acceptance tests inside module dependencies are ignored
+          acceptance_dirs = Dir.glob('**/acceptance').reject { |dir| dir =~ /fixtures/ }
+          task.pattern = acceptance_dirs.empty? ? 'skip_beaker' : acceptance_dirs
+          task.rspec_opts = '-f json' if PuppetCheck.settings[:output_format] == 'json'
+        end
+      rescue LoadError
+        puts 'RSpec is not installed. The RSpec/RSpecPuppet and Beaker tasks will not be available.'
       end
     end
   end

data/spec/fixtures/metadata.json

@@ -40,6 +40,11 @@
       "version_requirement": ">= 0.5.0 < 1.0.0",
       "git": "https://github.com/puppetlabs/puppetlabs-lvm.git"
     },
+    {
+      "name": "puppetlabs/foo",
+      "version_requirement": ">= 0.0.0 < 1.0.0",
+      "svn": "https://www.doesnotexist.com/foo"
+    },
     {
       "name": "puppetlabs/gruntmaster",
       "version_requirement": ">= 6000.0.0 < 9000.0.0",

data/spec/octocatalog-diff/hiera.yaml

@@ -1,6 +1,5 @@
 ---
-:backends:
-  - yaml
+:backends: yaml
 :yaml:
   :datadir: "hieradata"
 :hierarchy:

data/spec/octocatalog-diff/octocatalog-diff.cfg.rb

@@ -9,7 +9,11 @@ module OctocatalogDiff
       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] = '/usr/local/bin/puppet'
+      settings[:puppet_binary] = if File.directory?('/home/travis')
+                                   octocatalog_diff_dir + '../../bin/puppet'
+                                 else
+                                   '/usr/local/bin/puppet'
+                                 end
       settings[:bootstrapped_to_dir] = octocatalog_diff_dir
 
       settings

data/spec/puppet-check/cli_spec.rb

@@ -4,69 +4,71 @@ require_relative '../../lib/puppet-check/cli'
 describe PuppetCheck::CLI do
   context '.run' do
     it 'raises an error if no paths were specified' do
-      expect { PuppetCheck::CLI.run(%w(-s -f)) }.to raise_error(RuntimeError, 'puppet-check: no paths specified; try using --help')
+      expect { PuppetCheck::CLI.run(%w[-s -f]) }.to raise_error(RuntimeError, 'puppet-check: no paths specified; try using --help')
     end
   end
 
   context '.parse' do
     it 'raises an error if an invalid option was specified' do
-      expect { PuppetCheck::CLI.parse(%w(-s -f -asdf foo)) }.to raise_error(OptionParser::InvalidOption)
+      expect { PuppetCheck::CLI.parse(%w[-s -f -asdf foo]) }.to raise_error(OptionParser::InvalidOption)
     end
 
-    it 'allows future parser, style, smoke, and regression checks to be enabled' do
-      PuppetCheck.future_parser = false
-      PuppetCheck.style_check = false
-      PuppetCheck.smoke_check = false
-      PuppetCheck.regression_check = false
-      PuppetCheck::CLI.parse(%w(-s -f -r --smoke foo))
-      expect(PuppetCheck.future_parser).to eql(true)
-      expect(PuppetCheck.style_check).to eql(true)
-      expect(PuppetCheck.smoke_check).to eql(true)
-      expect(PuppetCheck.regression_check).to eql(true)
+    it 'allows future parser, fail on warnings, style, smoke, and regression checks to be enabled' do
+      PuppetCheck.settings[:future_parser] = false
+      PuppetCheck.settings[:fail_on_warnings] = false
+      PuppetCheck.settings[:style_check] = false
+      PuppetCheck.settings[:smoke_check] = false
+      PuppetCheck.settings[:regression_check] = false
+      PuppetCheck::CLI.parse(%w[-f --fail-on-warnings -s -r --smoke foo])
+      expect(PuppetCheck.settings[:future_parser]).to eql(true)
+      expect(PuppetCheck.settings[:fail_on_warnings]).to eql(true)
+      expect(PuppetCheck.settings[:style_check]).to eql(true)
+      expect(PuppetCheck.settings[:smoke_check]).to eql(true)
+      expect(PuppetCheck.settings[:regression_check]).to eql(true)
     end
 
     it 'correctly parses a formatting option' do
-      PuppetCheck.output_format = ''
-      PuppetCheck::CLI.parse(%w(-o text))
-      expect(PuppetCheck.output_format).to eql('text')
+      PuppetCheck.settings[:output_format] = ''
+      PuppetCheck::CLI.parse(%w[-o text])
+      expect(PuppetCheck.settings[:output_format]).to eql('text')
     end
 
     it 'correctly parses octocatalog-diff options' do
-      PuppetCheck.octoconfig = ''
-      PuppetCheck.octonodes = []
-      PuppetCheck::CLI.parse(%w(--octoconfig config.cfg.rb --octonodes server1,server2))
-      expect(PuppetCheck.octoconfig).to eql('config.cfg.rb')
-      expect(PuppetCheck.octonodes).to eql(%w(server1 server2))
+      PuppetCheck.settings[:octoconfig] = ''
+      PuppetCheck.settings[:octonodes] = []
+      PuppetCheck::CLI.parse(%w[--octoconfig config.cfg.rb --octonodes server1,server2])
+      expect(PuppetCheck.settings[:octoconfig]).to eql('config.cfg.rb')
+      expect(PuppetCheck.settings[:octonodes]).to eql(%w[server1 server2])
     end
 
     it 'correctly parses PuppetLint arguments' do
-      PuppetCheck.puppetlint_args = []
-      PuppetCheck::CLI.parse(%w(--puppet-lint puppetlint-arg-one,puppetlint-arg-two foo))
-      expect(PuppetCheck.puppetlint_args).to eql(['--puppetlint-arg-one', '--puppetlint-arg-two'])
+      PuppetCheck.settings[:puppetlint_args] = []
+      PuppetCheck::CLI.parse(%w[--puppet-lint puppetlint-arg-one,puppetlint-arg-two foo])
+      expect(PuppetCheck.settings[:puppetlint_args]).to eql(['--puppetlint-arg-one', '--puppetlint-arg-two'])
     end
 
     it 'correctly loads a .puppet-lint.rc' do
-      PuppetCheck.puppetlint_args = []
-      PuppetCheck::CLI.parse(%W(-c #{fixtures_dir}/manifests/.puppet-lint.rc))
-      expect(PuppetCheck.puppetlint_args).to eql(['--puppetlint-arg-one', '--puppetlint-arg-two'])
+      PuppetCheck.settings[:puppetlint_args] = []
+      PuppetCheck::CLI.parse(%W[-c #{fixtures_dir}/manifests/.puppet-lint.rc])
+      expect(PuppetCheck.settings[:puppetlint_args]).to eql(['--puppetlint-arg-one', '--puppetlint-arg-two'])
     end
 
     it 'correctly parses Rubocop arguments' do
-      PuppetCheck.rubocop_args = []
-      PuppetCheck::CLI.parse(%w(--rubocop rubocop-arg-one,rubocop-arg-two foo))
-      expect(PuppetCheck.rubocop_args).to eql(['--except', 'rubocop-arg-one,rubocop-arg-two'])
+      PuppetCheck.settings[:rubocop_args] = []
+      PuppetCheck::CLI.parse(%w[--rubocop rubocop-arg-one,rubocop-arg-two foo])
+      expect(PuppetCheck.settings[:rubocop_args]).to eql(['--except', 'rubocop-arg-one,rubocop-arg-two'])
     end
 
     it 'correctly parses multiple sets of arguments' do
-      PuppetCheck.future_parser = false
-      PuppetCheck.style_check = false
-      PuppetCheck.puppetlint_args = []
-      PuppetCheck.rubocop_args = []
-      PuppetCheck::CLI.parse(%w(-s -f --puppet-lint puppetlint-arg-one,puppetlint-arg-two --rubocop rubocop-arg-one,rubocop-arg-two foo))
-      expect(PuppetCheck.future_parser).to eql(true)
-      expect(PuppetCheck.style_check).to eql(true)
-      expect(PuppetCheck.puppetlint_args).to eql(['--puppetlint-arg-one', '--puppetlint-arg-two'])
-      expect(PuppetCheck.rubocop_args).to eql(['--except', 'rubocop-arg-one,rubocop-arg-two'])
+      PuppetCheck.settings[:future_parser] = false
+      PuppetCheck.settings[:style_check] = false
+      PuppetCheck.settings[:puppetlint_args] = []
+      PuppetCheck.settings[:rubocop_args] = []
+      PuppetCheck::CLI.parse(%w[-s -f --puppet-lint puppetlint-arg-one,puppetlint-arg-two --rubocop rubocop-arg-one,rubocop-arg-two foo])
+      expect(PuppetCheck.settings[:future_parser]).to eql(true)
+      expect(PuppetCheck.settings[:style_check]).to eql(true)
+      expect(PuppetCheck.settings[:puppetlint_args]).to eql(['--puppetlint-arg-one', '--puppetlint-arg-two'])
+      expect(PuppetCheck.settings[:rubocop_args]).to eql(['--except', 'rubocop-arg-one,rubocop-arg-two'])
     end
   end
 end

data/spec/puppet-check/data_parser_spec.rb

@@ -3,68 +3,68 @@ require_relative '../../lib/puppet-check/data_parser'
 
 describe DataParser do
   before(:each) do
-    PuppetCheck.error_files = []
-    PuppetCheck.warning_files = []
-    PuppetCheck.clean_files = []
+    PuppetCheck.settings[:error_files] = []
+    PuppetCheck.settings[:warning_files] = []
+    PuppetCheck.settings[:clean_files] = []
   end
 
   context '.yaml' do
     it 'puts a bad syntax yaml file in the error files array' do
       DataParser.yaml([fixtures_dir + 'hieradata/syntax.yaml'])
-      expect(PuppetCheck.error_files[0]).to match(%r{^#{fixtures_dir}hieradata/syntax.yaml:\nblock sequence entries are not allowed})
-      expect(PuppetCheck.warning_files).to eql([])
-      expect(PuppetCheck.clean_files).to eql([])
+      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'])
-      expect(PuppetCheck.error_files).to eql([])
-      expect(PuppetCheck.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 will fail to parse it correctly})
-      expect(PuppetCheck.clean_files).to eql([])
+      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 will 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'])
-      expect(PuppetCheck.error_files).to eql([])
-      expect(PuppetCheck.warning_files).to eql([])
-      expect(PuppetCheck.clean_files).to eql(["#{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
 
   context '.json' do
     it 'puts a bad syntax json file in the error files array' do
       DataParser.json([fixtures_dir + 'hieradata/syntax.json'])
-      expect(PuppetCheck.error_files[0]).to match(%r{^#{fixtures_dir}hieradata/syntax.json:\n.*unexpected token})
-      expect(PuppetCheck.warning_files).to eql([])
-      expect(PuppetCheck.clean_files).to eql([])
+      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'])
-      expect(PuppetCheck.error_files[0]).to match(%r{^#{fixtures_dir}metadata_syntax/metadata.json:\nRequired field.*\nField 'requirements'.*\nDuplicate dependencies.*\nDeprecated field.*\nSummary exceeds})
-      expect(PuppetCheck.warning_files).to eql([])
-      expect(PuppetCheck.clean_files).to eql([])
+      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'])
-      expect(PuppetCheck.error_files).to eql([])
-      expect(PuppetCheck.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.clean_files).to eql([])
+      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'])
-      expect(PuppetCheck.error_files).to eql([])
-      expect(PuppetCheck.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.clean_files).to eql([])
+      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 good json file in the clean files array' do
       DataParser.json([fixtures_dir + 'hieradata/good.json'])
-      expect(PuppetCheck.error_files).to eql([])
-      expect(PuppetCheck.warning_files).to eql([])
-      expect(PuppetCheck.clean_files).to eql(["#{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'])
-      expect(PuppetCheck.error_files).to eql([])
-      expect(PuppetCheck.warning_files).to eql([])
-      expect(PuppetCheck.clean_files).to eql(["#{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
   end
 end