simp-beaker-helpers 1.10.3 → 1.10.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2abf8d079a5c6cfaae432269cdec1cc0a4fa2fd826ead96a7e85f4830e73c931
-  data.tar.gz: 310f9395e48e7a26163d0a6dd11d885fef90a31d5da496180e0c62846e6f5422
+  metadata.gz: 48ce171f013dbe8a52759ba1916ae8d0a938725fbb7e0a99ec665d7e4f0025e0
+  data.tar.gz: 9e641d1cec4789762b4edb28e16491a0775bb0e035e83f3e1df220615579c791
 SHA512:
-  metadata.gz: 23b276d8068e784f7dcf6c4869e33fc50f5775fe76ef3a68f749356607d18462f7018d06229bf17420b30a2fb78dd0e77adaf78d1c5754c661ea6c8e6359cc4d
-  data.tar.gz: 67a42bbc95c7e1ea60730ed0031651a502e3bac1665c070d8de1c7fecddc9268a01df0b9aa480cacada17f21933f00ec446ef4a107ef9c7e0b68a9b7642433a3
+  metadata.gz: a886b52d44503956347df34dcb439692d03e0bc83f7f4840569db331b8419cdf9bca07bfa9b993e1c9d0713e47714aaeb51e42b9766eae9a3548beffdefb809d
+  data.tar.gz: 4a8a263a155948001c12f8f5d1d8fe8b15c8bca2a36f57d6009a39ec48a3466058732482daf7a70cb0a6510cb97ab3a97bc643b2cf07e722ffa73138e28d6441

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+### 1.10.4 / 2018-04-25
+* Fix Inspec report failures
+* Fix SSG build failures
+* Allow the SSG remediation acceptance test to fail
+
 ### 1.10.3 / 2018-03-23
 * Avoid warnings when using `puppet config print`
 

data/lib/simp/beaker_helpers/inspec.rb

@@ -117,11 +117,15 @@ module Simp::BeakerHelpers
       end
     end
 
+    def process_inspec_results
+      self.class.process_inspec_results(@results)
+    end
+
     # Process the results of an InSpec run
     #
     # @return [Hash] A Hash of statistics and a formatted report
     #
-    def process_inspec_results
+    def self.process_inspec_results(results)
       require 'highline'
 
       HighLine.colorize_strings
@@ -133,7 +137,21 @@ module Simp::BeakerHelpers
         :report  => []
       }
 
-      profiles = @results['profiles']
+      if results.is_a?(String)
+        if File.readable?(results)
+          profiles = JSON.load(File.read(results))['profiles']
+        else
+          fail("Error: Could not read results file at #{results}")
+        end
+      elsif results.is_a?(Hash)
+        profiles = results['profiles']
+      else
+        fail("Error: first argument must be a String path to a file or a Hash")
+      end
+
+      if !profiles || profiles.empty?
+        fail("Error: Could not find 'profiles' in the passed results")
+      end
 
       profiles.each do |profile|
         stats[:report] << "Name: #{profile['name']}"
@@ -156,7 +174,7 @@ module Simp::BeakerHelpers
             stats[:report] << title_chunks.join("\n")
           end
 
-          if control['results']
+          if control['results'] && !control['results'].empty?
             status = control['results'].first['status']
           else
             status = 'skipped'

data/lib/simp/beaker_helpers/ssg.rb

@@ -9,10 +9,11 @@ module Simp::BeakerHelpers
     end
 
     EL_PACKAGES = [
-      'git',
+      'PyYAML',
       'cmake',
-      'openscap-utils',
+      'git',
       'openscap-python',
+      'openscap-utils',
       'python-lxml'
     ]
 

data/lib/simp/beaker_helpers/version.rb

@@ -1,5 +1,5 @@
 module Simp; end
 
 module Simp::BeakerHelpers
-  VERSION = '1.10.3'
+  VERSION = '1.10.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-beaker-helpers
 version: !ruby/object:Gem::Version
-  version: 1.10.3
+  version: 1.10.4
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-23 00:00:00.000000000 Z
+date: 2018-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beaker