inspec 1.51.6 → 1.51.15

data/lib/inspec/reporters/json.rb

@@ -1,132 +1,134 @@
-# encoding: utf-8
-
-require 'json'
-
-module Inspec::Reporters
-  class Json < Base
-    def render
-      report = {
-        platform: platform,
-        profiles: profiles,
-        statistics: { duration: run_data[:statistics][:duration] },
-        version: run_data[:version],
-        controls: controls,
-        other_checks: run_data[:other_checks],
-      }
-
-      output(report.to_json)
-    end
-
-    private
-
-    def platform
-      {
-        name: run_data[:platform][:name],
-        release: run_data[:platform][:release],
-      }
-    end
-
-    def controls
-      controls = []
-      return controls if run_data[:controls].nil?
-
-      run_data[:controls].each do |c|
-        control = {
-          status: c[:status],
-          start_time: c[:start_time],
-          run_time: c[:run_time],
-          code_desc: c[:code_desc],
-        }
-        control[:resource] = c[:resource] if c[:resource]
-        control[:skip_message] = c[:skip_message] if c[:skip_message]
-        control[:exception] = c[:exception] if c[:exception]
-        control[:backtrace] = c[:backtrace] if c[:backtrace]
-
-        controls << control
-      end
-      controls
-    end
-
-    def profile_results(control)
-      results = []
-      return results if control[:results].nil?
-
-      control[:results].each do |r|
-        result = {
-          status: r[:status],
-          code_desc: r[:code_desc],
-          run_time: r[:run_time],
-          start_time: r[:start_time],
-        }
-        result[:resource] = r[:resource] if r[:resource]
-        result[:skip_message] = r[:skip_message] if r[:skip_message]
-
-        results << result
-      end
-      results
-    end
-
-    def profile_controls(profile)
-      controls = []
-      return controls if profile[:controls].nil?
-
-      profile[:controls].each do |c|
-        control = {
-          id: c[:id],
-          title: c[:title],
-          desc: c[:desc],
-          impact: c[:impact],
-          refs: c[:refs],
-          tags: c[:tags],
-          code: c[:code],
-          source_location: {
-            line: c[:source_location][:line],
-            ref: c[:source_location][:ref],
-          },
-          results: profile_results(c),
-        }
-        controls << control
-      end
-      controls
-    end
-
-    def profile_groups(profile)
-      groups = []
-      return groups if profile[:groups].nil?
-
-      profile[:groups].each do |g|
-        group = {
-          id: g[:id],
-          controls: g[:controls],
-        }
-        group[:title] = g[:title] if g[:title]
-
-        groups << group
-      end
-      groups
-    end
-
-    def profiles
-      profiles = []
-      run_data[:profiles].each do |p|
-        profile = {
-          name: p[:name],
-          version: p[:version],
-          sha256: p[:sha256],
-          title: p[:title],
-          maintainer: p[:maintainer],
-          summary: p[:summary],
-          license: p[:license],
-          copyright: p[:copyright],
-          copyright_email: p[:copyright_email],
-          supports: p[:supports],
-          attributes: p[:attributes],
-          groups: profile_groups(p),
-          controls: profile_controls(p),
-        }
-        profiles << profile.reject { |_k, v| v.nil? }
-      end
-      profiles
-    end
-  end
-end
+# encoding: utf-8
+
+require 'json'
+
+module Inspec::Reporters
+  class Json < Base
+    def render
+      output(report.to_json, false)
+    end
+
+    def report
+      {
+        platform: platform,
+        profiles: profiles,
+        statistics: { duration: run_data[:statistics][:duration] },
+        version: run_data[:version],
+        controls: controls,
+        other_checks: run_data[:other_checks],
+      }
+    end
+
+    private
+
+    def platform
+      {
+        name: run_data[:platform][:name],
+        release: run_data[:platform][:release],
+      }
+    end
+
+    def controls
+      controls = []
+      return controls if run_data[:controls].nil?
+
+      run_data[:controls].each do |c|
+        control = {
+          status: c[:status],
+          start_time: c[:start_time],
+          run_time: c[:run_time],
+          code_desc: c[:code_desc],
+        }
+        control[:resource] = c[:resource] if c[:resource]
+        control[:skip_message] = c[:skip_message] if c[:skip_message]
+        control[:exception] = c[:exception] if c[:exception]
+        control[:backtrace] = c[:backtrace] if c[:backtrace]
+
+        controls << control
+      end
+      controls
+    end
+
+    def profile_results(control)
+      results = []
+      return results if control[:results].nil?
+
+      control[:results].each do |r|
+        result = {
+          status: r[:status],
+          code_desc: r[:code_desc],
+          run_time: r[:run_time],
+          start_time: r[:start_time],
+        }
+        result[:resource] = r[:resource] if r[:resource]
+        result[:skip_message] = r[:skip_message] if r[:skip_message]
+
+        results << result
+      end
+      results
+    end
+
+    def profile_controls(profile)
+      controls = []
+      return controls if profile[:controls].nil?
+
+      profile[:controls].each do |c|
+        control = {
+          id: c[:id],
+          title: c[:title],
+          desc: c[:desc],
+          impact: c[:impact],
+          refs: c[:refs],
+          tags: c[:tags],
+          code: c[:code],
+          source_location: {
+            line: c[:source_location][:line],
+            ref: c[:source_location][:ref],
+          },
+          results: profile_results(c),
+        }
+        controls << control
+      end
+      controls
+    end
+
+    def profile_groups(profile)
+      groups = []
+      return groups if profile[:groups].nil?
+
+      profile[:groups].each do |g|
+        group = {
+          id: g[:id],
+          controls: g[:controls],
+        }
+        group[:title] = g[:title] if g[:title]
+
+        groups << group
+      end
+      groups
+    end
+
+    def profiles
+      profiles = []
+      run_data[:profiles].each do |p|
+        profile = {
+          name: p[:name],
+          version: p[:version],
+          sha256: p[:sha256],
+          title: p[:title],
+          maintainer: p[:maintainer],
+          summary: p[:summary],
+          license: p[:license],
+          copyright: p[:copyright],
+          copyright_email: p[:copyright_email],
+          supports: p[:supports],
+          attributes: p[:attributes],
+          groups: profile_groups(p),
+          controls: profile_controls(p),
+        }
+        profiles << profile.reject { |_k, v| v.nil? }
+      end
+      profiles
+    end
+  end
+end

data/lib/inspec/reporters/json_min.rb

@@ -1,44 +1,48 @@
-# encoding: utf-8
-
-require 'json'
-
-module Inspec::Reporters
-  class JsonMin < Base
-    def render # rubocop:disable Metrics/AbcSize
-      report = {
-        controls: [],
-        statistics: { duration: run_data[:statistics][:duration] },
-        version: run_data[:version],
-      }
-
-      # collect all test results and add them to the report
-      run_data[:profiles].each do |profile|
-        profile_id = profile[:name]
-        next unless profile[:controls]
-        profile[:controls].each do |control|
-          control_id = control[:id]
-          next unless control[:results]
-          control[:results].each do |result|
-            result_for_report = {
-              id: control_id,
-              profile_id: profile_id,
-              profile_sha256: profile[:sha256],
-              status: result[:status],
-              code_desc: result[:code_desc],
-            }
-
-            result_for_report[:skip_message] = result[:skip_message] if result.key?(:skip_message)
-            result_for_report[:resource] = result[:resource] if result.key?(:resource)
-            result_for_report[:message] = result[:message] if result.key?(:message)
-            result_for_report[:exception] = result[:exception] if result.key?(:exception)
-            result_for_report[:backtrace] = result[:backtrace] if result.key?(:backtrace)
-
-            report[:controls] << result_for_report
-          end
-        end
-      end
-
-      output(report.to_json)
-    end
-  end
-end
+# encoding: utf-8
+
+require 'json'
+
+module Inspec::Reporters
+  class JsonMin < Base
+    def render
+      output(report.to_json, false)
+    end
+
+    def report # rubocop:disable Metrics/AbcSize
+      report = {
+        controls: [],
+        statistics: { duration: run_data[:statistics][:duration] },
+        version: run_data[:version],
+      }
+
+      # collect all test results and add them to the report
+      run_data[:profiles].each do |profile|
+        profile_id = profile[:name]
+        next unless profile[:controls]
+        profile[:controls].each do |control|
+          control_id = control[:id]
+          next unless control[:results]
+          control[:results].each do |result|
+            result_for_report = {
+              id: control_id,
+              profile_id: profile_id,
+              profile_sha256: profile[:sha256],
+              status: result[:status],
+              code_desc: result[:code_desc],
+            }
+
+            result_for_report[:skip_message] = result[:skip_message] if result.key?(:skip_message)
+            result_for_report[:resource] = result[:resource] if result.key?(:resource)
+            result_for_report[:message] = result[:message] if result.key?(:message)
+            result_for_report[:exception] = result[:exception] if result.key?(:exception)
+            result_for_report[:backtrace] = result[:backtrace] if result.key?(:backtrace)
+
+            report[:controls] << result_for_report
+          end
+        end
+      end
+
+      report
+    end
+  end
+end

data/lib/inspec/reporters/junit.rb

@@ -1,77 +1,77 @@
-# encoding: utf-8
-
-module Inspec::Reporters
-  class Junit < Base
-    def render
-      require 'rexml/document'
-      xml_output = REXML::Document.new
-      xml_output.add(REXML::XMLDecl.new)
-
-      testsuites = REXML::Element.new('testsuites')
-      xml_output.add(testsuites)
-
-      run_data[:profiles].each do |profile|
-        testsuites.add(build_profile_xml(profile))
-      end
-
-      formatter = REXML::Formatters::Pretty.new
-      formatter.compact = true
-      output(formatter.write(xml_output.xml_decl, ''))
-      output(formatter.write(xml_output.root, ''))
-    end
-
-    private
-
-    def build_profile_xml(profile)
-      profile_xml = REXML::Element.new('testsuite')
-      profile_xml.add_attribute('name', profile[:name])
-      profile_xml.add_attribute('tests', count_profile_tests(profile))
-      profile_xml.add_attribute('failed', count_profile_failed_tests(profile))
-
-      profile[:controls].each do |control|
-        next if control[:results].nil?
-
-        control[:results].each do |result|
-          profile_xml.add(build_result_xml(profile[:name], control, result))
-        end
-      end
-
-      profile_xml
-    end
-
-    def build_result_xml(profile_name, control, result)
-      result_xml = REXML::Element.new('testcase')
-      result_xml.add_attribute('name', result[:code_desc])
-      result_xml.add_attribute('classname', control[:title].nil? ? "#{profile_name}.Anonymous" : "#{profile_name}.#{control[:id]}")
-      result_xml.add_attribute('time', result[:run_time])
-
-      if result[:status] == 'failed'
-        failure_element = REXML::Element.new('failure')
-        failure_element.add_attribute('message', result[:message])
-        result_xml.add(failure_element)
-      elsif result[:status] == 'skipped'
-        result_xml.add_element('skipped')
-      end
-
-      result_xml
-    end
-
-    def count_profile_tests(profile)
-      profile[:controls].reduce(0) { |acc, elem|
-        acc + (elem[:results].nil? ? 0 : elem[:results].count)
-      }
-    end
-
-    def count_profile_failed_tests(profile)
-      profile[:controls].reduce(0) { |acc, elem|
-        if elem[:results].nil?
-          acc
-        else
-          acc + elem[:results].reduce(0) { |fail_test_total, test_case|
-            test_case[:status] == 'failed' ? fail_test_total + 1 : fail_test_total
-          }
-        end
-      }
-    end
-  end
-end
+# encoding: utf-8
+
+module Inspec::Reporters
+  class Junit < Base
+    def render
+      require 'rexml/document'
+      xml_output = REXML::Document.new
+      xml_output.add(REXML::XMLDecl.new)
+
+      testsuites = REXML::Element.new('testsuites')
+      xml_output.add(testsuites)
+
+      run_data[:profiles].each do |profile|
+        testsuites.add(build_profile_xml(profile))
+      end
+
+      formatter = REXML::Formatters::Pretty.new
+      formatter.compact = true
+      output(formatter.write(xml_output.xml_decl, ''))
+      output(formatter.write(xml_output.root, ''))
+    end
+
+    private
+
+    def build_profile_xml(profile)
+      profile_xml = REXML::Element.new('testsuite')
+      profile_xml.add_attribute('name', profile[:name])
+      profile_xml.add_attribute('tests', count_profile_tests(profile))
+      profile_xml.add_attribute('failed', count_profile_failed_tests(profile))
+
+      profile[:controls].each do |control|
+        next if control[:results].nil?
+
+        control[:results].each do |result|
+          profile_xml.add(build_result_xml(profile[:name], control, result))
+        end
+      end
+
+      profile_xml
+    end
+
+    def build_result_xml(profile_name, control, result)
+      result_xml = REXML::Element.new('testcase')
+      result_xml.add_attribute('name', result[:code_desc])
+      result_xml.add_attribute('classname', control[:title].nil? ? "#{profile_name}.Anonymous" : "#{profile_name}.#{control[:id]}")
+      result_xml.add_attribute('time', result[:run_time])
+
+      if result[:status] == 'failed'
+        failure_element = REXML::Element.new('failure')
+        failure_element.add_attribute('message', result[:message])
+        result_xml.add(failure_element)
+      elsif result[:status] == 'skipped'
+        result_xml.add_element('skipped')
+      end
+
+      result_xml
+    end
+
+    def count_profile_tests(profile)
+      profile[:controls].reduce(0) { |acc, elem|
+        acc + (elem[:results].nil? ? 0 : elem[:results].count)
+      }
+    end
+
+    def count_profile_failed_tests(profile)
+      profile[:controls].reduce(0) { |acc, elem|
+        if elem[:results].nil?
+          acc
+        else
+          acc + elem[:results].reduce(0) { |fail_test_total, test_case|
+            test_case[:status] == 'failed' ? fail_test_total + 1 : fail_test_total
+          }
+        end
+      }
+    end
+  end
+end