inspec-core 2.2.54 → 2.2.55

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c90f578944eb5f074ecc0d5c8e8f00f1ac97041e8934eab84d891a20cd693707
-  data.tar.gz: 7dde3fb25a43ac5cc3e78afd619e299dfc2195e91135fa6bf5475db9c844a258
+  metadata.gz: 886615c61697bb4428e1a496b349a0ac39a1732142f66cc741d3e6c7339b649f
+  data.tar.gz: eb06d665de5738d4cab5719b91e745fc525935af52b3c1023c559ed62d45f063
 SHA512:
-  metadata.gz: 274a064b7010424eb43996dcd96a6e480cb71b4f70d36bfcb591f83f030bd2bff8baa234184b5083d9360e485e730f647b6512e922e25936af0bd7932d672673
-  data.tar.gz: 59b16dbb6935455c531485d442b3e7c723bd5a7bdf9462dcafec98454486ff97bc6e54ab35576bf5b5be80c7435dc136a9e3765c098e9b1b69cf8225c8c043c4
+  metadata.gz: 835a4b160e5d33ec1ac6bf2ff31ab895b3c6d1f8837458bb631b8abfaa1b741cb14f6e5688b6c211b152c83efc87c633e3a88d13eb75eb99892bfc61aa1cad80
+  data.tar.gz: cbd8f787e418ac09fac7b36312e979c5fedda71aaf1254bd59be2fb5ff091d3168b393a38b2e0ae22215926eff431fbf283c961beeff25e6395685ec55c75344

data/CHANGELOG.md

@@ -1,25 +1,31 @@
 # Change Log
 <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
-<!-- latest_release 2.2.54 -->
-## [v2.2.54](https://github.com/inspec/inspec/tree/v2.2.54) (2018-08-02)
+<!-- latest_release 2.2.55 -->
+## [v2.2.55](https://github.com/inspec/inspec/tree/v2.2.55) (2018-08-03)
 
 #### Enhancements
-- Escaping package names for windows packages [#3259](https://github.com/inspec/inspec/pull/3259) ([frezbo](https://github.com/frezbo))
+- Add a merged json report for A2 [#3261](https://github.com/inspec/inspec/pull/3261) ([jquick](https://github.com/jquick))
 <!-- latest_release -->
 
-<!-- release_rollup since=2.2.50 -->
-### Changes since 2.2.50 release
+<!-- release_rollup since=2.2.54 -->
+### Changes since 2.2.54 release
 
 #### Enhancements
-- Escaping package names for windows packages [#3259](https://github.com/inspec/inspec/pull/3259) ([frezbo](https://github.com/frezbo)) <!-- 2.2.54 -->
-- Populate report code for merged controls [#3264](https://github.com/inspec/inspec/pull/3264) ([jquick](https://github.com/jquick)) <!-- 2.2.53 -->
-- Bump the chef client version for tests. [#3260](https://github.com/inspec/inspec/pull/3260) ([jquick](https://github.com/jquick)) <!-- 2.2.52 -->
-
-#### Merged Pull Requests
-- Ability to render contrib resource pack docs on main website [#3184](https://github.com/inspec/inspec/pull/3184) ([clintoncwolfe](https://github.com/clintoncwolfe)) <!-- 2.2.51 -->
+- Add a merged json report for A2 [#3261](https://github.com/inspec/inspec/pull/3261) ([jquick](https://github.com/jquick)) <!-- 2.2.55 -->
 <!-- release_rollup -->
 
 <!-- latest_stable_release -->
+## [v2.2.54](https://github.com/inspec/inspec/tree/v2.2.54) (2018-08-02)
+
+#### Enhancements
+- Bump the chef client version for tests. [#3260](https://github.com/inspec/inspec/pull/3260) ([jquick](https://github.com/jquick))
+- Populate report code for merged controls [#3264](https://github.com/inspec/inspec/pull/3264) ([jquick](https://github.com/jquick))
+- Escaping package names for windows packages [#3259](https://github.com/inspec/inspec/pull/3259) ([frezbo](https://github.com/frezbo))
+
+#### Merged Pull Requests
+- Ability to render contrib resource pack docs on main website [#3184](https://github.com/inspec/inspec/pull/3184) ([clintoncwolfe](https://github.com/clintoncwolfe))
+<!-- latest_stable_release -->
+
 ## [v2.2.50](https://github.com/inspec/inspec/tree/v2.2.50) (2018-07-26)
 
 #### New Features
@@ -36,7 +42,6 @@
 - cli: Downcase supermarket tool name to match URL [#3242](https://github.com/inspec/inspec/pull/3242) ([jerryaldrichiii](https://github.com/jerryaldrichiii))
 - Satisfy RuboCop by adding `x` bit to `bin/inspec` [#3249](https://github.com/inspec/inspec/pull/3249) ([jerryaldrichiii](https://github.com/jerryaldrichiii))
 - Fix for profile version not being included in the compliance upload c… [#3252](https://github.com/inspec/inspec/pull/3252) ([devoptimist](https://github.com/devoptimist))
-<!-- latest_stable_release -->
 
 ## [v2.2.41](https://github.com/inspec/inspec/tree/v2.2.41) (2018-07-20)
 

data/lib/inspec/reporters.rb

@@ -1,6 +1,7 @@
 require 'inspec/reporters/base'
 require 'inspec/reporters/cli'
 require 'inspec/reporters/json'
+require 'inspec/reporters/json_merged'
 require 'inspec/reporters/json_min'
 require 'inspec/reporters/junit'
 require 'inspec/reporters/automate'

data/lib/inspec/reporters/automate.rb

@@ -4,7 +4,7 @@ require 'json'
 require 'net/http'
 
 module Inspec::Reporters
-  class Automate < Json
+  class Automate < JsonMerged
     def initialize(config)
       super(config)
 
@@ -17,7 +17,7 @@ module Inspec::Reporters
 
     def enriched_report
       # grab the report from the parent class
-      final_report = report
+      final_report = report_merged
 
       # Label this content as an inspec_report
       final_report[:type] = 'inspec_report'

data/lib/inspec/reporters/json_merged.rb

@@ -0,0 +1,73 @@
+# encoding: utf-8
+
+require 'json'
+
+module Inspec::Reporters
+  class JsonMerged < Json
+    def initialize(config)
+      super(config)
+      @profiles = []
+    end
+
+    def render
+      output(report_merged.to_json, false)
+    end
+
+    def report_merged
+      # grab profiles from the json parent class
+      @profiles = report[:profiles]
+
+      {
+        platform: platform,
+        profiles: merge_profiles,
+        statistics: {
+          duration: run_data[:statistics][:duration],
+        },
+        version: run_data[:version],
+      }
+    end
+
+    private
+
+    def merge_profiles
+      @profiles.each do |profile|
+        next unless profile.key?(:parent_profile)
+        parent_profile = find_master_parent(profile)
+        merge_controls(parent_profile, profile)
+        merge_depends(parent_profile, profile)
+      end
+
+      # delete child profiles
+      @profiles.delete_if { |p| p.key?(:parent_profile) }
+
+      @profiles
+    end
+
+    def find_master_parent(profile)
+      return profile unless profile.key?(:parent_profile)
+
+      parent_profile = @profiles.select { |parent| parent[:name] == profile[:parent_profile] }.first
+      find_master_parent(parent_profile)
+    end
+
+    def merge_controls(parent, child)
+      parent[:controls].each do |control|
+        child_control = child[:controls].select { |c| c[:id] == control[:id] }.first
+        next if child_control.nil?
+
+        control.each do |name, _value|
+          child_value = child_control[name]
+          next if child_value.nil? || (child_value.respond_to?(:empty?) && child_value.empty?)
+          control[name] = child_value
+        end
+      end
+    end
+
+    def merge_depends(parent, child)
+      return unless child.key?(:depends)
+      child[:depends].each do |d|
+        parent[:depends] << d
+      end
+    end
+  end
+end

data/lib/inspec/version.rb

@@ -4,5 +4,5 @@
 # author: Christoph Hartmann
 
 module Inspec
-  VERSION = '2.2.54'
+  VERSION = '2.2.55'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inspec-core
 version: !ruby/object:Gem::Version
-  version: 2.2.54
+  version: 2.2.55
 platform: ruby
 authors:
 - Dominik Richter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-02 00:00:00.000000000 Z
+date: 2018-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: train-core
@@ -562,6 +562,7 @@ files:
 - lib/inspec/reporters/base.rb
 - lib/inspec/reporters/cli.rb
 - lib/inspec/reporters/json.rb
+- lib/inspec/reporters/json_merged.rb
 - lib/inspec/reporters/json_min.rb
 - lib/inspec/reporters/junit.rb
 - lib/inspec/reporters/yaml.rb