simp-beaker-helpers 1.8.0 → 1.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b69c64c0e9ffb93f64c83ebbe0670ebd776192d1
-  data.tar.gz: 01a07f71decb9ae9508bf68242339c7b77703449
+  metadata.gz: 8057e97359b2ce3f693b144d39f261cf290e69bd
+  data.tar.gz: a2f7f470c423876cc605a889ade1e17b514ee20d
 SHA512:
-  metadata.gz: 798910baaa7ee07e834fd0ce319a76b5805623a607cb587d984160b30ecb5f441a503028399102901507df82a88d316fc21f4e97e5ad6c099539380339ae8f31
-  data.tar.gz: ce26140a890e5516284e4a14625cfad77cd336192de592142d0f0bf70848f869ab390b2c99bfb84bac146c505fde158f1b6c5b092611eaca9108c8f5a75fce9d
+  metadata.gz: 99fac64a05ae979b97cb88ebfeaea71e24c8b9d13416443168fb2c3c29cb2431d3b44adea3f658f02fbab6539e7c6fc302a19703335cf7241e5dfcad2674f937
+  data.tar.gz: 83c474b816ab946c71e5e272484c5727cb4959450627dd200d88e6e8436da0273ffeed49cbcdf8e04add066e30c7dd114d9d281ff71a05c046bd9576649dddd9

data/lib/simp/beaker_helpers/inspec.rb

@@ -2,6 +2,11 @@ module Simp::BeakerHelpers
 
   # Helpers for working with Inspec
   class Inspec
+
+    attr_reader :profile
+    attr_reader :profile_dir
+    attr_reader :deps_root
+
     # Create a new Inspec helper for the specified host against the specified profile
     #
     # @param sut
@@ -15,7 +20,16 @@ module Simp::BeakerHelpers
 
       @sut.install_package('inspec')
 
-      @sut_profile_dir = '/tmp/inspec_tests'
+      os = fact_on(@sut, 'operatingsystem')
+      os_rel = fact_on(@sut, 'operatingsystemmajrelease')
+
+      @profile = "#{os}-#{os_rel}-#{profile}"
+      @profile_dir = '/tmp/inspec/inspec_profiles'
+      @deps_root = '/tmp/inspec'
+
+      @test_dir = @profile_dir + "/#{@profile}"
+
+      sut.mkdir_p(@profile_dir)
 
       output_dir = File.absolute_path('sec_results/inspec')
 
@@ -23,37 +37,52 @@ module Simp::BeakerHelpers
         FileUtils.mkdir_p(output_dir)
       end
 
-      inspec_fixtures = File.join(fixtures_path, 'inspec_profiles')
-      os = fact_on(@sut, 'operatingsystem')
-      os_rel = fact_on(@sut, 'operatingsystemmajrelease')
+      local_profile = File.join(fixtures_path, 'inspec_profiles', %(#{os}-#{os_rel}-#{profile}))
+      local_deps = File.join(fixtures_path, 'inspec_deps')
+
+      @result_file = File.join(output_dir, "#{@sut.hostname}-inspec-#{Time.now.to_i}")
 
-      @inspec_result_file = File.join(output_dir, "#{@sut.hostname}-inspec-#{Time.now.to_i}")
+      if @sut[:hypervisor] == 'docker'
+        %x(docker cp -L "#{local_profile}" "#{@sut.hostname}:#{@test_dir}")
+      else
+        scp_to(@sut, local_profile, @test_dir)
+      end
 
-      scp_to(@sut, File.join(inspec_fixtures, "#{os}-#{os_rel}-#{profile}"), @sut_profile_dir)
+      if File.exist?(local_deps)
+        if @sut[:hypervisor] == 'docker'
+          %x(docker cp -L "#{local_deps}" "#{@sut.hostname}:#{@deps_root}")
+        else
+          scp_to(@sut, local_deps, @deps_root)
+        end
+      end
 
       # The results of the inspec scan in Hash form
-      @inspec_results = {}
+      @results = {}
     end
 
     # Run the inspec tests and record the results
     def run
       sut_inspec_results = '/tmp/inspec_results.json'
 
-      inspec_cmd = "inspec exec --format json #{@sut_profile_dir} > #{sut_inspec_results}"
+      inspec_cmd = "inspec exec --format json #{@test_dir} > #{sut_inspec_results}"
       result = on(@sut, inspec_cmd, :accept_all_exit_codes => true)
 
       tmpdir = Dir.mktmpdir
       begin
         Dir.chdir(tmpdir) do
-          scp_from(@sut, sut_inspec_results, '.')
+          if @sut[:hypervisor] == 'docker'
+            %x(docker cp "#{@sut.hostname}:#{sut_inspec_results}" .)
+          else
+            scp_from(@sut, sut_inspec_results, '.')
+          end
 
           local_inspec_results = File.basename(sut_inspec_results)
 
           if File.exist?(local_inspec_results)
             begin
-              @inspec_results = JSON.load(File.read(local_inspec_results))
+              @results = JSON.load(File.read(local_inspec_results))
             rescue JSON::ParserError, JSON::GeneratorError
-              @inspec_results = nil
+              @results = nil
             end
           end
         end
@@ -61,13 +90,13 @@ module Simp::BeakerHelpers
         FileUtils.remove_entry_secure tmpdir
       end
 
-      unless @inspec_results
-        File.open(@inspec_result_file + '.err', 'w') do |fh|
+      unless @results
+        File.open(@result_file + '.err', 'w') do |fh|
           fh.puts(result.stderr.strip)
         end
 
         err_msg = ["Error running inspec command #{inspec_cmd}"]
-        err_msg << "Error captured in #{@inspec_result_file}" + '.err'
+        err_msg << "Error captured in #{@result_file}" + '.err'
 
         fail(err_msg.join("\n"))
       end
@@ -79,11 +108,11 @@ module Simp::BeakerHelpers
     #   The inspec results Hash
     #
     def write_report(report)
-      File.open(@inspec_result_file + '.json', 'w') do |fh|
-        fh.puts(JSON.pretty_generate(@inspec_results))
+      File.open(@result_file + '.json', 'w') do |fh|
+        fh.puts(JSON.pretty_generate(@results))
       end
 
-      File.open(@inspec_result_file + '.report', 'w') do |fh|
+      File.open(@result_file + '.report', 'w') do |fh|
         fh.puts(report[:report].uncolor)
       end
     end
@@ -104,7 +133,7 @@ module Simp::BeakerHelpers
         :report  => []
       }
 
-      profiles = @inspec_results['profiles']
+      profiles = @results['profiles']
 
       profiles.each do |profile|
         stats[:report] << "Name: #{profile['name']}"
@@ -112,6 +141,9 @@ module Simp::BeakerHelpers
         profile['controls'].each do |control|
           title = control['title']
 
+          # Skip auto-generated material
+          next unless title
+
           if title.length > 72
             title = title[0..71] + '(...)'
           end

data/lib/simp/beaker_helpers/version.rb

@@ -1,5 +1,5 @@
 module Simp; end
 
 module Simp::BeakerHelpers
-  VERSION = '1.8.0'
+  VERSION = '1.8.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-beaker-helpers
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.8.3
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-21 00:00:00.000000000 Z
+date: 2017-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beaker
@@ -93,8 +93,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: beaker helper methods for SIMP
-test_files: []
+test_files:
+- spec/acceptance/enable_fips_spec.rb
+- spec/acceptance/fixture_modules_spec.rb
+- spec/acceptance/nodesets/default.yml
+- spec/acceptance/pki_tests_spec.rb
+- spec/acceptance/set_hieradata_on_spec.rb
+- spec/acceptance/write_hieradata_to_spec.rb
+- spec/spec_helper_acceptance.rb