beaker 3.3.0 → 3.4.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OGEwYTM4MDM4OGExZmVmN2ExZjI4NGRjM2RjNmJlOGIyNDk0MWQ0MA==
+    MjUxN2I4ODkyOTg4MjI0YzI0MGVkNjEwNWU5NzFiNjZkMzc0MzgzYw==
   data.tar.gz: !binary |-
-    ZWE4NGY3ZDgzZWVmYzY3YTQ2ZTlkNjhmY2Y1ZGY4YjRlOTk1MTI3MA==
+    YjdmY2JmOTI1YTMyYjQxMzM3MDBhZjMzYTIwOWUwMjg3MWViYmE2Ng==
 SHA512:
   metadata.gz: !binary |-
-    MDIwMjY0OTIwMjgwYzljZWQzMTRmMjgyOGQ2YzE4OWViZjJhYWNiM2JkNDli
-    MTE1YTVmZjBkYWQ1OWJkMTg2M2JkOWUzNjdkOWM1M2ZlMGQzOGQ3NTY4MDE0
-    YWNhYTgzODViYWJjMjEwOWM0NDEyY2VjOWY3ZmJmYTQ3OTk4ZTY=
+    MWU2MTdkYWRlYmNjM2I1NmQ2MjM5MzJlNWNiYTc5MGFhYjc2MDg0ZjZmMTg2
+    MGRlNzU0Y2YyNDFiMDI5NWIyNzQ4MmRhZmEyYTMxYjYzODNjYmEyZDRhMTM1
+    MWY3ZTFjZDE5NWY2MDQ0ZjJiZDlhYmE5OTFkZWI0NDExY2E1YzE=
   data.tar.gz: !binary |-
-    ZWIxOGNkYjgyZTc2OTc2ZWRiMDczYjI2OGNhYmY3ZTA2ZjY0MjdhMWU4MGY2
-    NDIyMjhkZDUyM2ZhNWVjYmZiOGQ1NWU2ZDNjMTdkZjYzMGUzZWVjNzk3NzBl
-    N2IyMDYwMzk0OTk5Y2IyMDcyYWE1OTNkYTlmN2FiMmMwODc5Njc=
+    MWY5M2I4ZjIxMDA0NzUwNGM2MTU0MDcwMmNmMzcyYjI3NDY3YWNiY2VjMjdh
+    NDBiNTRhNmRjZGYzNzQ2YjQ0MTc3NTNkZjU1MWNlYTg4MmU1M2YwYTY1NmUz
+    MzY2ZGMzM2ZjZjI4Nzk4YWU5Y2E1YzhkOTNlMGVjYzAxMWJhYmY=

data/acceptance/tests/base/dsl/helpers/host_helpers/archive_file_from_test.rb

@@ -19,17 +19,29 @@ test_name "dsl::helpers::host_helpers #archive_file_from" do
     assert_equal(true, Dir.exists?('archive/sut-files'))
   end
 
-  step "file is copied to local <archiveroot>/<host name> directory" do
+  step "fails archive_file_from when from_path is non-existant" do
+    filepath = "foo-filepath-should-not-exist"
+    assert_raises IOError do
+      archive_file_from(default, filepath)
+    end
+  end
+
+  step "archive is copied to local <archiveroot>/<hostname>/<filepath> directory" do
     # Create a remote file to archive
     filepath = default.tmpfile('archive-file-test')
     create_remote_file(default, filepath, 'number of the beast')
+    assert_equal(false, Dir.exists?(filepath))
 
     # Test that the file is copied locally to <archiveroot>/<hostname>/<filepath>
     Dir.mktmpdir do |tmpdir|
-      archive_file_from(default, filepath, {}, tmpdir)
-      expected_path = File.join(tmpdir, default, filepath)
-      assert(File.exists?(expected_path))
-      assert_equal('number of the beast', File.read(expected_path).strip)
+      tar_path = File.join(tmpdir, default, filepath + '.tgz')
+      archive_file_from(default, filepath, {}, tmpdir, tar_path)
+      assert(File.exists?(tar_path))
+      expected_path = File.join(tmpdir, default)
+
+      tgz = Zlib::GzipReader.new(File.open(tar_path, 'rb'))
+      Archive::Tar::Minitar.unpack(tgz, expected_path)
+      assert_equal('number of the beast', File.read(expected_path + '/' + filepath).strip)
     end
   end
 end

data/beaker.gemspec

@@ -32,12 +32,13 @@ Gem::Specification.new do |s|
 
   # Run time dependencies
   s.add_runtime_dependency 'minitest', '~> 5.4'
+  s.add_runtime_dependency 'minitar', '~> 0.5.4'
   s.add_runtime_dependency 'json', '~> 1.8'
   ## json: will stay <2.0 while aws-sdk-v1 is in use
   ## aws-sdk-2 doesn't require json, so we can give this up when we move
 
   s.add_runtime_dependency 'hocon', '~> 1.0'
-  s.add_runtime_dependency 'net-ssh', '~> 3.2'
+  s.add_runtime_dependency 'net-ssh', '3.3.0.beta1'
   s.add_runtime_dependency 'net-scp', '~> 1.2'
   s.add_runtime_dependency 'inifile', '~> 2.0'
   ## inifile: keep <3.0, breaks puppet_helpers.rb:puppet_conf_for when updated

data/lib/beaker/dsl/helpers/host_helpers.rb

@@ -254,15 +254,34 @@ module Beaker
         # @option [String] archive_root The local directory to store the copied
         #                               file under. Defaults to
         #                               'archive/sut-files'.
+        # @option [String] archive_name The name of the archive to be copied to
+        #                               archive_root. Defaults to
+        #                               'sut-files.tgz'.
         #
         # @return [Result] Returns the result of the #scp_from operation.
-        def archive_file_from(host, from_path, opts = {}, archive_root = 'archive/sut-files')
+        def archive_file_from(host, from_path, opts = {}, archive_root = 'archive/sut-files', archive_name = 'sut-files.tgz')
+          require 'archive/tar/minitar'
           filedir = File.dirname(from_path)
           targetdir = File.join(archive_root, host.hostname, filedir)
+          # full path to check for existance later
+          filename = "#{targetdir}/" + File.basename(from_path)
           FileUtils.mkdir_p(targetdir)
           scp_from(host, from_path, targetdir, opts)
+          # scp_from does succeed on a non-existant file, checking if the file/folder actually exists
+          if not File.exists?(filename)
+            raise IOError, "No such file or directory - #{filename}"
+          end
+          create_tarball(archive_root, archive_name)
         end
 
+        # @visibility private
+        def create_tarball(path, archive_name)
+          tgz = Zlib::GzipWriter.new(File.open(archive_name, 'wb'))
+          Archive::Tar::Minitar.pack(path, tgz)
+        end
+        private :create_tarball
+
+
         # Deploy packaging configurations generated by
         # https://github.com/puppetlabs/packaging to a host.
         #

data/lib/beaker/version.rb

@@ -1,5 +1,5 @@
 module Beaker
   module Version
-    STRING = '3.3.0'
+    STRING = '3.4.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.4.0
 platform: ruby
 authors:
 - Puppetlabs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-07 00:00:00.000000000 Z
+date: 2016-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -122,6 +122,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '5.4'
+- !ruby/object:Gem::Dependency
+  name: minitar
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.4
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -154,16 +168,16 @@ dependencies:
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 3.3.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: 3.3.0.beta1
 - !ruby/object:Gem::Dependency
   name: net-scp
   requirement: !ruby/object:Gem::Requirement