simp-beaker-helpers 1.8.3 → 1.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8057e97359b2ce3f693b144d39f261cf290e69bd
-  data.tar.gz: a2f7f470c423876cc605a889ade1e17b514ee20d
+  metadata.gz: 74893a8d275ad181e28f562775399df8dcddaaa2
+  data.tar.gz: 52d6f7397bdf03fa1d76647816686fcb522ce47e
 SHA512:
-  metadata.gz: 99fac64a05ae979b97cb88ebfeaea71e24c8b9d13416443168fb2c3c29cb2431d3b44adea3f658f02fbab6539e7c6fc302a19703335cf7241e5dfcad2674f937
-  data.tar.gz: 83c474b816ab946c71e5e272484c5727cb4959450627dd200d88e6e8436da0273ffeed49cbcdf8e04add066e30c7dd114d9d281ff71a05c046bd9576649dddd9
+  metadata.gz: 08a07f6733d21f52af60991cb5d5325cf0db75a441220c9a0e8164b47f2ec350a27dcf523c6a66faad2a1c1b20430fe3e9f96cca20120088a109cd9665f6986d
+  data.tar.gz: 37e6e038510a9551cd93974527f1f0a67921e191c5177d0aabb83df1ac00e4c506d3d6a83f2baa74749cf7f37e071fb3b505d264c476354e8fa08d165b8428d3

data/lib/simp/beaker_helpers/inspec.rb

@@ -42,18 +42,10 @@ module Simp::BeakerHelpers
 
       @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
+      copy_to(@sut, local_profile, @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
+        copy_to(@sut, local_deps, @deps_root)
       end
 
       # The results of the inspec scan in Hash form

data/lib/simp/beaker_helpers/ssg.rb

@@ -132,7 +132,7 @@ module Simp::BeakerHelpers
       ssg_release ||= Dir.glob('spec/fixtures/ssg_releases/*.bz2').last
 
       if ssg_release
-        scp_to(@sut, ssg_release, @scap_working_dir)
+        copy_to(@sut, ssg_release, @scap_working_dir)
 
         on(@sut, %(mkdir -p scap-security-guide && tar -xj -C scap-security-guide --strip-components 1 -f #{ssg_release} && cp scap-security-guide/*ds.xml #{@scap_working_dir}))
       else

data/lib/simp/beaker_helpers/version.rb

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

data/lib/simp/beaker_helpers.rb

@@ -11,6 +11,34 @@ module Simp::BeakerHelpers
   # oldest system that we support.
   DEFAULT_PUPPET_AGENT_VERSION = '1.7.1'
 
+  # Figure out the best method to copy files to a host and use it
+  #
+  # Will create the directories leading up to the target if they don't exist
+  def copy_to(sut, src, dest, opts={})
+    unless @has_rsync
+      %x{which rsync 2>/dev/null}.strip
+
+      @has_rsync = $?.success?
+    end
+
+    sut.mkdir_p(File.dirname(dest))
+
+    if sut[:hypervisor] == 'docker'
+      exclude_list = []
+      if opts.has_key?(:ignore) && !opts[:ignore].empty?
+        opts[:ignore].each do |value|
+          exclude_list << "--exclude '#{value}'"
+        end
+      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
+      rsync_to(sut, src, dest, opts)
+    else
+      scp_to(sut, src, dest, opts)
+    end
+  end
+
   # use the `puppet fact` face to look up facts on an SUT
   def pfact_on(sut, fact_name)
     facts_json = on(sut,'puppet facts find xxx').output
@@ -121,19 +149,21 @@ module Simp::BeakerHelpers
           mod_root = File.expand_path( "spec/fixtures/modules", File.dirname( fixtures_yml_path ))
 
           Dir.chdir(mod_root) do
-            tarfile = Dir::Tmpname.make_tmpname(['beaker','.tar'],nil)
-
-            excludes = PUPPET_MODULE_INSTALL_IGNORE.map do |x|
-              x = "--exclude '*/#{x}'"
-            end.join(' ')
+            begin
+              tarfile = Dir::Tmpname.make_tmpname(['beaker','.tar'],nil)
 
-            %x(tar -ch #{excludes} -f #{tarfile} *)
+              excludes = PUPPET_MODULE_INSTALL_IGNORE.map do |x|
+                x = "--exclude '*/#{x}'"
+              end.join(' ')
 
-            rsync_to(sut, tarfile, target_module_path)
+              %x(tar -ch #{excludes} -f #{tarfile} *)
 
-            FileUtils.rm_f(tarfile)
+              copy_to(sut, tarfile, target_module_path, opts)
 
-            on(sut, "cd #{target_module_path} && tar -xf #{File.basename(tarfile)}")
+              on(sut, "cd #{target_module_path} && tar -xf #{File.basename(tarfile)}")
+            ensure
+              FileUtils.remove_entry(tarfile, true)
+            end
           end
         end
       end
@@ -351,14 +381,14 @@ DEFAULT_KERNEL_TITLE=`/sbin/grubby --info=\\\${DEFAULT_KERNEL_INFO} | grep -m1 t
     host_dir = '/root/pki'
     fqdns    = fact_on(hosts, 'fqdn')
 
-    on ca_sut, %Q(mkdir -p "#{host_dir}")
-    Dir[ File.join(pki_dir, '*') ].each{|f| scp_to( ca_sut, f, host_dir)}
+    ca_sut.mkdir_p(host_dir)
+    Dir[ File.join(pki_dir, '*') ].each{|f| copy_to( ca_sut, f, host_dir)}
 
     # generate PKI certs for each SUT
     Dir.mktmpdir do |dir|
       pki_hosts_file = File.join(dir, 'pki.hosts')
       File.open(pki_hosts_file, 'w'){|fh| fqdns.each{|fqdn| fh.puts fqdn}}
-      scp_to(ca_sut, pki_hosts_file, host_dir)
+      copy_to(ca_sut, pki_hosts_file, host_dir)
       # generate certs
       on(ca_sut, "cd #{host_dir}; cat #{host_dir}/pki.hosts | xargs bash make.sh")
     end
@@ -391,14 +421,16 @@ DEFAULT_KERNEL_TITLE=`/sbin/grubby --info=\\\${DEFAULT_KERNEL_INFO} | grep -m1 t
       local_host_pki_tree = File.join(local_pki_dir,'pki','keydist',fqdn)
       local_cacert = File.join(local_pki_dir,'pki','demoCA','cacert.pem')
 
-      on sut, %Q(mkdir -p "#{sut_pki_dir}/public" "#{sut_pki_dir}/private" "#{sut_pki_dir}/cacerts")
-      scp_to(sut, "#{local_host_pki_tree}/#{fqdn}.pem",   "#{sut_pki_dir}/private/")
-      scp_to(sut, "#{local_host_pki_tree}/#{fqdn}.pub",   "#{sut_pki_dir}/public/")
+      sut.mkdir_p("#{sut_pki_dir}/public")
+      sut.mkdir_p("#{sut_pki_dir}/private")
+      sut.mkdir_p("#{sut_pki_dir}/cacerts")
+      copy_to(sut, "#{local_host_pki_tree}/#{fqdn}.pem",   "#{sut_pki_dir}/private/")
+      copy_to(sut, "#{local_host_pki_tree}/#{fqdn}.pub",   "#{sut_pki_dir}/public/")
 
-      scp_to(sut, local_cacert, "#{sut_pki_dir}/cacerts/simp_auto_ca.pem")
+      copy_to(sut, local_cacert, "#{sut_pki_dir}/cacerts/simp_auto_ca.pem")
 
       # NOTE: to match pki::copy, 'cacert.pem' is copied to 'cacerts.pem'
-      scp_to(sut, local_cacert, "#{sut_pki_dir}/cacerts/cacerts.pem")
+      copy_to(sut, local_cacert, "#{sut_pki_dir}/cacerts/cacerts.pem")
 
       # Need to hash all of the CA certificates so that apps can use them
       # properly! This must happen on the host itself since it needs to match
@@ -429,7 +461,7 @@ done
       host_keydist_dir = "#{modulepath.first}/pki/files/keydist"
     end
     on ca_sut, "rm -rf #{host_keydist_dir}/*"
-    on ca_sut, "mkdir -p #{host_keydist_dir}/"
+    ca_sut.mkdir_p(host_keydist_dir)
     on ca_sut, "cp -pR /root/pki/keydist/. #{host_keydist_dir}/"
     on ca_sut, "chgrp -R puppet #{host_keydist_dir}"
   end
@@ -549,7 +581,7 @@ done
       puts "  ** pluginsync_on: '#{sut}'" if ENV['BEAKER_helpers_verbose']
       fact_path = on(sut, %q(puppet config print factpath)).output.strip.split(':').first
       on(sut, %q(puppet config print modulepath)).output.strip.split(':').each do |mod_path|
-        on(sut, %Q(mkdir -p #{fact_path}))
+        sut.mkdir_p(fact_path)
         next if on(sut, "ls #{mod_path}/*/lib/facter 2>/dev/null ", :accept_all_exit_codes => true).exit_code != 0
         on(sut, %Q(find #{mod_path}/*/lib/facter -type f -name '*.rb' -exec cp -a {} '#{fact_path}/' \\; ))
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-beaker-helpers
 version: !ruby/object:Gem::Version
-  version: 1.8.3
+  version: 1.8.6
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-02 00:00:00.000000000 Z
+date: 2017-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: beaker
@@ -93,15 +93,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: beaker helper methods for SIMP
-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
+test_files: []