simp-beaker-helpers 1.8.6 → 1.8.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 74893a8d275ad181e28f562775399df8dcddaaa2
-  data.tar.gz: 52d6f7397bdf03fa1d76647816686fcb522ce47e
+  metadata.gz: 99647061d2099c0d9753446de9ff5776748518c7
+  data.tar.gz: ba8cac3ea0d8d3e7afde6f7769c5a758d106da64
 SHA512:
-  metadata.gz: 08a07f6733d21f52af60991cb5d5325cf0db75a441220c9a0e8164b47f2ec350a27dcf523c6a66faad2a1c1b20430fe3e9f96cca20120088a109cd9665f6986d
-  data.tar.gz: 37e6e038510a9551cd93974527f1f0a67921e191c5177d0aabb83df1ac00e4c506d3d6a83f2baa74749cf7f37e071fb3b505d264c476354e8fa08d165b8428d3
+  metadata.gz: e476094d23239aa3d50b09f20e5d8b44e43cc9342d50f756ba844741af934166f573879582fe94b774ef5967a4ed722c854a0cfd14191d443a6913ddb447f635
+  data.tar.gz: 0a24d5762d9c3473915ae1341af2162039d03de1342e419ff290d446d9f7aa10623e315bb6c7bd6ca889ce8d92af6da588b18ba4244c9baf9572e7e3085fad56

data/lib/simp/beaker_helpers.rb

@@ -33,6 +33,16 @@ module Simp::BeakerHelpers
 
       %x(tar #{exclude_list.join(' ')} -hcf - -C "#{File.dirname(src)}" "#{File.basename(src)}" | docker exec -i "#{sut.hostname}" tar -C "#{dest}" -xf -)
     elsif @has_rsync
+      # This makes rsync_to work like beaker and scp usually do
+      exclude_hack = %(__GARBAge__' -L --exclude '__GARBAge__)
+      opts[:ignore] ||= []
+      opts[:ignore] << exclude_hack
+
+      dest = File.join(dest, File.basename(src)) if File.directory?(src)
+      # End rsync hackery
+
+      sut.mkdir_p(dest)
+
       rsync_to(sut, src, dest, opts)
     else
       scp_to(sut, src, dest, opts)

data/lib/simp/beaker_helpers/inspec.rb

@@ -72,7 +72,15 @@ module Simp::BeakerHelpers
 
           if File.exist?(local_inspec_results)
             begin
-              @results = JSON.load(File.read(local_inspec_results))
+              # The output is occasionally broken from past experience. Need to
+              # fetch the line that actually looks like JSON
+              inspec_json = File.read(local_inspec_results).lines.find do |line|
+                line.strip!
+
+                line.start_with?('{') && line.end_with?('}')
+              end
+
+              @results = JSON.load(inspec_json) if inspec_json
             rescue JSON::ParserError, JSON::GeneratorError
               @results = nil
             end

data/lib/simp/beaker_helpers/version.rb

@@ -1,5 +1,5 @@
 module Simp; end
 
 module Simp::BeakerHelpers
-  VERSION = '1.8.6'
+  VERSION = '1.8.7'
 end

data/lib/simp/rake/beaker.rb

@@ -102,7 +102,7 @@ module Simp::Rake
               'default_run' : <true|false> => Default: false
               ```
         EOM
-        task :suites, [:suite, :nodeset] do |t,args|
+        task :suites, [:suite, :nodeset] => ['spec_prep'] do |t,args|
           suite = args[:suite]
           nodeset = args[:nodeset]
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-beaker-helpers
 version: !ruby/object:Gem::Version
-  version: 1.8.6
+  version: 1.8.7
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-26 00:00:00.000000000 Z
+date: 2017-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beaker