lib/puppet-check/output_results.rb in puppet-check-1.6.1 vs lib/puppet-check/output_results.rb in puppet-check-2.0.0
- old
+ new
@@ -20,25 +20,25 @@
print "\n\033[36mThe following files have unrecognized formats and therefore were not processed:\033[0m\n-- "
puts PuppetCheck.settings[:ignored_files].join("\n-- ")
end
# output the results as yaml or json
- def self.markup
+ def self.markup(settings)
# generate output hash
hash = {}
hash['errors'] = PuppetCheck.settings[:error_files] unless PuppetCheck.settings[:error_files].empty?
hash['warnings'] = PuppetCheck.settings[:warning_files] unless PuppetCheck.settings[:warning_files].empty?
hash['clean'] = PuppetCheck.settings[:clean_files] unless PuppetCheck.settings[:clean_files].empty?
hash['ignored'] = PuppetCheck.settings[:ignored_files] unless PuppetCheck.settings[:ignored_files].empty?
# convert hash to markup language
- if PuppetCheck.settings[:output_format] == 'yaml'
+ if settings[:output_format] == 'yaml'
require 'yaml'
puts Psych.dump(hash, indentation: 2)
- elsif PuppetCheck.settings[:output_format] == 'json'
+ elsif settings[:output_format] == 'json'
require 'json'
puts JSON.pretty_generate(hash)
else
- raise "puppet-check: Unsupported output format '#{PuppetCheck.settings[:output_format]}' was specified."
+ raise "puppet-check: Unsupported output format '#{settings[:output_format]}' was specified."
end
end
end