simp-beaker-helpers 1.8.8 → 1.8.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1d313d1a89d6d6f450edd38bcd7414ae4b7f56d
-  data.tar.gz: e9ed6ecf0d27944cd51c5fa6b9d6148ae3da740b
+  metadata.gz: c6c57afa93ab55a9de6cb0e80911855e700db41d
+  data.tar.gz: a2379476a363a111aaa5170eb1e7a0337d511ebf
 SHA512:
-  metadata.gz: b574baf7e3fcac90f4e641ea33f03e2f9d1487068b9333cc9438320410c6e4a2897288ae8a541a1c8daaa2162173605d2aafe037a57fd2771e3c2007304792df
-  data.tar.gz: 382360a5c8010e48c2586f6850271590d2f29cfec201f98210f9ea43e51737b752b5d022b544af79a067c8edc1f6a39d81df88a7b47d9505a417244c9b7c6d1a
+  metadata.gz: 45c36c003498f9bf9ac6a26daf06d4680eb752eb7eb2fb4b2b6706cbb97d7ce4264b9232d5d9952069c9fb6b8f1bd50e5a9427977d2b686886c086d41af8bb13
+  data.tar.gz: 913e8f4d117e9c6f7508aa55138db9f4eccb439b2fdeb5086400519469763a84c77ca2cd553055d921e6f0a8f7c1e2ebaee0b0d85f6f343477568b4be78bee63

data/README.md

@@ -12,6 +12,7 @@ Methods to assist beaker acceptance tests for SIMP.
     * [YUM Repo Support](#yum_repo_support)
 5. [Methods](#methods)
     * [`copy_fixture_modules_to`](#copy_fixture_modules_to)
+    * [`copy_to`](#copy_to)
     * [`fix_errata_on`](#fix_errata_on)
     * PKI
       * [`run_fake_pki_ca_on`](#run_fake_pki_ca_on)
@@ -145,6 +146,17 @@ yum_repos:
 
 ## Methods
 
+#### `copy_to`
+
+Abstracts copying files and directories in the most efficient manner possible.
+
+* If your system is a ``docker`` container it uses ``docker cp``
+* If your system is anything else:
+  * Attempts to use ``rsync`` if it is present on both sides
+  * Falls back to ``scp``
+
+All copy semantics are consistent with what you would expect from ``scp_to``
+
 #### `copy_fixture_modules_to`
 
 Copies the local fixture modules (under `spec/fixtures/modules`) onto a list of

data/lib/simp/beaker_helpers.rb

@@ -32,11 +32,16 @@ module Simp::BeakerHelpers
       end
 
       %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
+    elsif @has_rsync && sut.check_for_command('rsync')
       # This makes rsync_to work like beaker and scp usually do
       exclude_hack = %(__-__' -L --exclude '__-__)
-      opts[:ignore] ||= []
-      opts[:ignore] << exclude_hack
+
+      # There appears to be a single copy of 'opts' that gets passed around
+      # through all of the different hosts so we're going to make a local deep
+      # copy so that we don't destroy the world accidentally.
+      _opts = Marshal.load(Marshal.dump(opts))
+      _opts[:ignore] ||= []
+      _opts[:ignore] << exclude_hack
 
       if File.directory?(src)
         dest = File.join(dest, File.basename(src)) if File.directory?(src)
@@ -45,7 +50,7 @@ module Simp::BeakerHelpers
 
       # End rsync hackery
 
-      rsync_to(sut, src, dest, opts)
+      rsync_to(sut, src, dest, _opts)
     else
       scp_to(sut, src, dest, opts)
     end
@@ -170,7 +175,11 @@ module Simp::BeakerHelpers
 
               %x(tar -ch #{excludes} -f #{tarfile} *)
 
-              copy_to(sut, tarfile, target_module_path, opts)
+              if File.exist?(tarfile)
+                copy_to(sut, tarfile, target_module_path, opts)
+              else
+                fail("Error: module tar file '#{tarfile}' could not be created at #{mod_root}")
+              end
 
               on(sut, "cd #{target_module_path} && tar -xf #{File.basename(tarfile)}")
             ensure

data/lib/simp/beaker_helpers/version.rb

@@ -1,5 +1,5 @@
 module Simp; end
 
 module Simp::BeakerHelpers
-  VERSION = '1.8.8'
+  VERSION = '1.8.9'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-beaker-helpers
 version: !ruby/object:Gem::Version
-  version: 1.8.8
+  version: 1.8.9
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-02 00:00:00.000000000 Z
+date: 2017-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beaker
@@ -93,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: beaker helper methods for SIMP