output_results.rb in puppet-check-1.4.1

- old
+ new
@@ -2,43 +2,43 @@
 
 # class to handle outputting diagnostic results in desired format
 class OutputResults
   # output the results as text
   def self.text
-    unless PuppetCheck.error_files.empty?
+    unless PuppetCheck.settings[:error_files].empty?
       print "\033[31mThe following files have errors:\033[0m\n-- "
-      puts PuppetCheck.error_files.join("\n\n-- ")
+      puts PuppetCheck.settings[:error_files].join("\n\n-- ")
     end
-    unless PuppetCheck.warning_files.empty?
+    unless PuppetCheck.settings[:warning_files].empty?
       print "\n\033[33mThe following files have warnings:\033[0m\n-- "
-      puts PuppetCheck.warning_files.join("\n\n-- ")
+      puts PuppetCheck.settings[:warning_files].join("\n\n-- ")
     end
-    unless PuppetCheck.clean_files.empty?
+    unless PuppetCheck.settings[:clean_files].empty?
       print "\n\033[32mThe following files have no errors or warnings:\033[0m\n-- "
-      puts PuppetCheck.clean_files.join("\n-- ")
+      puts PuppetCheck.settings[:clean_files].join("\n-- ")
     end
-    return if PuppetCheck.ignored_files.empty?
+    return if PuppetCheck.settings[:ignored_files].empty?
     print "\n\033[36mThe following files have unrecognized formats and therefore were not processed:\033[0m\n-- "
-    puts PuppetCheck.ignored_files.join("\n-- ")
+    puts PuppetCheck.settings[:ignored_files].join("\n-- ")
   end
 
   # output the results as yaml or json
   def self.markup
     # generate output hash
     hash = {}
-    hash['errors'] = PuppetCheck.error_files unless PuppetCheck.error_files.empty?
-    hash['warnings'] = PuppetCheck.warning_files unless PuppetCheck.warning_files.empty?
-    hash['clean'] = PuppetCheck.clean_files unless PuppetCheck.clean_files.empty?
-    hash['ignored'] = PuppetCheck.ignored_files unless PuppetCheck.ignored_files.empty?
+    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.output_format == 'yaml'
+    if PuppetCheck.settings[:output_format] == 'yaml'
       require 'yaml'
       puts Psych.dump(hash, indentation: 2)
-    elsif PuppetCheck.output_format == 'json'
+    elsif PuppetCheck.settings[:output_format] == 'json'
       require 'json'
       puts JSON.pretty_generate(hash)
     else
-      raise "puppet-check: Unsupported output format '#{PuppetCheck.output_format}' was specified."
+      raise "puppet-check: Unsupported output format '#{PuppetCheck.settings[:output_format]}' was specified."
     end
   end
 end