simp-beaker-helpers 1.10.4 → 1.10.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48ce171f013dbe8a52759ba1916ae8d0a938725fbb7e0a99ec665d7e4f0025e0
-  data.tar.gz: 9e641d1cec4789762b4edb28e16491a0775bb0e035e83f3e1df220615579c791
+  metadata.gz: 8ef2969b67b01c0674df80bbea3c16889381922bbfdb08505c491a88c125e523
+  data.tar.gz: a86092fd607ad2b35e87c3242af394dc57f69441f2bca2d5c86adbf204a4bacd
 SHA512:
-  metadata.gz: a886b52d44503956347df34dcb439692d03e0bc83f7f4840569db331b8419cdf9bca07bfa9b993e1c9d0713e47714aaeb51e42b9766eae9a3548beffdefb809d
-  data.tar.gz: 4a8a263a155948001c12f8f5d1d8fe8b15c8bca2a36f57d6009a39ec48a3466058732482daf7a70cb0a6510cb97ab3a97bc643b2cf07e722ffa73138e28d6441
+  metadata.gz: ebf14936b15e19407abe6471a6b4fa0fee9c8b64db9a1e36c52922132e65fba63d29f99a1f9f1c10993bbfbfc334f77b1ec0531f67ef9780e732bc53f7e2a012
+  data.tar.gz: c30f517d4e108c4d7d5a4dfc5d8bb6a1399094bee4f454dcee4ed5b8b37667e596a020d4e370d1353a76375ae0259cf3fec13e0c01eb0c4fa513797606f49b60

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+### 1.10.5 / 2018-04-27
+* Fix issue with direct copy to/from docker containers
+* Add necessary package for SSG builds
+* Added the downloaded inspec_deps directory to the clean list
+
 ### 1.10.4 / 2018-04-25
 * Fix Inspec report failures
 * Fix SSG build failures

data/lib/simp/beaker_helpers/inspec.rb

@@ -63,7 +63,7 @@ module Simp::BeakerHelpers
       begin
         Dir.chdir(tmpdir) do
           if @sut[:hypervisor] == 'docker'
-            %x(docker cp "#{@sut.hostname}:#{sut_inspec_results}" .)
+            %x(docker cp "#{@sut.host_hash[:docker_container].id}:#{sut_inspec_results}" .)
           else
             scp_from(@sut, sut_inspec_results, '.')
           end

data/lib/simp/beaker_helpers/ssg.rb

@@ -14,7 +14,8 @@ module Simp::BeakerHelpers
       'git',
       'openscap-python',
       'openscap-utils',
-      'python-lxml'
+      'python-lxml',
+      'python-jinja2'
     ]
 
     OS_INFO = {

data/lib/simp/beaker_helpers/version.rb

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

data/lib/simp/beaker_helpers.rb

@@ -39,7 +39,7 @@ module Simp::BeakerHelpers
         end
       end
 
-      %x(tar #{exclude_list.join(' ')} -hcf - -C "#{File.dirname(src)}" "#{File.basename(src)}" | docker exec -i "#{sut.hostname}" tar -C "#{dest}" -xf -)
+      %x(tar #{exclude_list.join(' ')} -hcf - -C "#{File.dirname(src)}" "#{File.basename(src)}" | docker exec -i "#{sut.host_hash[:docker_container].id}" tar -C "#{dest}" -xf -)
     elsif @has_rsync && sut.check_for_command('rsync')
       # This makes rsync_to work like beaker and scp usually do
       exclude_hack = %(__-__' -L --exclude '__-__)

data/lib/simp/rake/beaker.rb

@@ -15,6 +15,7 @@ module Simp::Rake
       ::CLEAN.include( %{#{@base_dir}/log} )
       ::CLEAN.include( %{#{@base_dir}/junit} )
       ::CLEAN.include( %{#{@base_dir}/sec_results} )
+      ::CLEAN.include( %{#{@base_dir}/spec/fixtures/inspec_deps} )
 
       yield self if block_given?
 

metadata

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