inspec 2.2.54 → 2.2.55

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 977bb363360a10af70b26468798171a51e8ac00f4934dc62fe4efba59fdc9e5a
-  data.tar.gz: 7915d80127ade0039e184c1b5b6dc56c07ffb87fcbab2da6ef4f7a34d7ec87df
+  metadata.gz: 22dc0070f981d1f1fde01573ca60ffbd69820ae73f57d4b0ca671d919d028f6f
+  data.tar.gz: 784732d10c1ca8126b67566db2249fcba998a032bf6973c7070eccad72b60c94
 SHA512:
-  metadata.gz: add341eb8d92cb1f8ec093ff0bdb7bc22f4f63639e76defba94b1d8e4c823cf4948c845e4a1405b1778210fcd83d1108d7c8d91bc8aeba41d9409b4c79690a9f
-  data.tar.gz: 380330555e16c43839401811df31ebb4477a03a2718e89675302317ef61ed9958f4551fb37f79575ae11aa7ec9b732fb9404233a7166a39d0f49f36a8b45a376
+  metadata.gz: e6da791946069dbc546ded07b7289e294e23244b84d4795638886534a8e8c3b2fc5bd529bd3beb7110e3e562debcddc505b47d45b317e1282a49a24a38971e5f
+  data.tar.gz: cd6c9fa8e65a6db9d210aeb8b41644d885f2a4dd8e7bb3a3790419a1fd57f4ff8461d6253df840b11dc0f284f0308029a82f8fcf719470e49dc73bde7396a91a

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
 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
@@ -633,6 +633,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