simp-beaker-helpers 1.10.4 → 1.10.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 48ce171f013dbe8a52759ba1916ae8d0a938725fbb7e0a99ec665d7e4f0025e0
4
- data.tar.gz: 9e641d1cec4789762b4edb28e16491a0775bb0e035e83f3e1df220615579c791
3
+ metadata.gz: 8ef2969b67b01c0674df80bbea3c16889381922bbfdb08505c491a88c125e523
4
+ data.tar.gz: a86092fd607ad2b35e87c3242af394dc57f69441f2bca2d5c86adbf204a4bacd
5
5
  SHA512:
6
- metadata.gz: a886b52d44503956347df34dcb439692d03e0bc83f7f4840569db331b8419cdf9bca07bfa9b993e1c9d0713e47714aaeb51e42b9766eae9a3548beffdefb809d
7
- data.tar.gz: 4a8a263a155948001c12f8f5d1d8fe8b15c8bca2a36f57d6009a39ec48a3466058732482daf7a70cb0a6510cb97ab3a97bc643b2cf07e722ffa73138e28d6441
6
+ metadata.gz: ebf14936b15e19407abe6471a6b4fa0fee9c8b64db9a1e36c52922132e65fba63d29f99a1f9f1c10993bbfbfc334f77b1ec0531f67ef9780e732bc53f7e2a012
7
+ data.tar.gz: c30f517d4e108c4d7d5a4dfc5d8bb6a1399094bee4f454dcee4ed5b8b37667e596a020d4e370d1353a76375ae0259cf3fec13e0c01eb0c4fa513797606f49b60
data/CHANGELOG.md CHANGED
@@ -1,3 +1,8 @@
1
+ ### 1.10.5 / 2018-04-27
2
+ * Fix issue with direct copy to/from docker containers
3
+ * Add necessary package for SSG builds
4
+ * Added the downloaded inspec_deps directory to the clean list
5
+
1
6
  ### 1.10.4 / 2018-04-25
2
7
  * Fix Inspec report failures
3
8
  * Fix SSG build failures
@@ -63,7 +63,7 @@ module Simp::BeakerHelpers
63
63
  begin
64
64
  Dir.chdir(tmpdir) do
65
65
  if @sut[:hypervisor] == 'docker'
66
- %x(docker cp "#{@sut.hostname}:#{sut_inspec_results}" .)
66
+ %x(docker cp "#{@sut.host_hash[:docker_container].id}:#{sut_inspec_results}" .)
67
67
  else
68
68
  scp_from(@sut, sut_inspec_results, '.')
69
69
  end
@@ -14,7 +14,8 @@ module Simp::BeakerHelpers
14
14
  'git',
15
15
  'openscap-python',
16
16
  'openscap-utils',
17
- 'python-lxml'
17
+ 'python-lxml',
18
+ 'python-jinja2'
18
19
  ]
19
20
 
20
21
  OS_INFO = {
@@ -1,5 +1,5 @@
1
1
  module Simp; end
2
2
 
3
3
  module Simp::BeakerHelpers
4
- VERSION = '1.10.4'
4
+ VERSION = '1.10.5'
5
5
  end
@@ -39,7 +39,7 @@ module Simp::BeakerHelpers
39
39
  end
40
40
  end
41
41
 
42
- %x(tar #{exclude_list.join(' ')} -hcf - -C "#{File.dirname(src)}" "#{File.basename(src)}" | docker exec -i "#{sut.hostname}" tar -C "#{dest}" -xf -)
42
+ %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 -)
43
43
  elsif @has_rsync && sut.check_for_command('rsync')
44
44
  # This makes rsync_to work like beaker and scp usually do
45
45
  exclude_hack = %(__-__' -L --exclude '__-__)
@@ -15,6 +15,7 @@ module Simp::Rake
15
15
  ::CLEAN.include( %{#{@base_dir}/log} )
16
16
  ::CLEAN.include( %{#{@base_dir}/junit} )
17
17
  ::CLEAN.include( %{#{@base_dir}/sec_results} )
18
+ ::CLEAN.include( %{#{@base_dir}/spec/fixtures/inspec_deps} )
18
19
 
19
20
  yield self if block_given?
20
21
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: simp-beaker-helpers
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.10.4
4
+ version: 1.10.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2018-04-26 00:00:00.000000000 Z
12
+ date: 2018-04-28 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: beaker