lib/beaker/dsl/helpers/host_helpers.rb in beaker-3.21.1 vs lib/beaker/dsl/helpers/host_helpers.rb in beaker-3.22.0
- old
+ new
@@ -258,11 +258,11 @@
# 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', archive_name = 'sut-files.tgz')
- require 'archive/tar/minitar'
+ require '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)
@@ -275,10 +275,10 @@
end
# @visibility private
def create_tarball(path, archive_name)
tgz = Zlib::GzipWriter.new(File.open(archive_name, 'wb'))
- Archive::Tar::Minitar.pack(path, tgz)
+ Minitar.pack(path, tgz)
end
private :create_tarball
# Deploy packaging configurations generated by