mixlib-archive 0.4.2 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e333d2af05598e7404ffdd49f2333d5edf345e7483aa7d03270da16e10001e52
-  data.tar.gz: 26d5a8f15aef2788da1ce44636282e736172d6bd579b532e2c9efcb39c52e098
+  metadata.gz: e8685df8b7ce9e5ce9534e3475a5ecb35a01fd05f1491aad6cb096940c82bc37
+  data.tar.gz: 7baa4eee34d8d9c711aa88b790f516d76834ea608bf9f271f7a9cc66dd8c76cb
 SHA512:
-  metadata.gz: d08e1d6b5e38ccf53381f412ca1d1ffb400c6262f74fc972b5f798f52abc2136f7317f2ee99b9cdb4de6ee3eb7f5358b417897d194fe315ae7fcbcba76249ee8
-  data.tar.gz: 878e846762cae3ca0d21dcb9dc0975ad35c40705fa3cd29accf0d91b9b3eb15a65832be0ee95e0a6ec1379b9db1b6b56c5ed066db4e98cef94b9e15c6819c750
+  metadata.gz: e4f1224ad12d171a576482cdfcdc886cf6b52bd84f61a5acab5017e609db9effb7b2ad0fcde959e8be8ea3fb5ad2993c915d1c6a40dd99d7a1f8131675e32a5b
+  data.tar.gz: ecb2bc04a880797cc6fcf3b91e9be5b53c466ba2489634fff9b70c41e09a8b94cfe4c70f1230be7a70816f0d8003deb78b83c8620444883e223850e2135e7ab8

data/CHANGELOG.md

@@ -1,10 +1,18 @@
 <!-- usage documentation: http://expeditor-docs.es.chef.io/configuration/changelog/ -->
 # Change Log
 
-<!-- latest_release -->
+<!-- latest_release 0.4.4 -->
+## [v0.4.4](https://github.com/chef/mixlib-archive/tree/v0.4.4) (2018-04-30)
+
+#### Merged Pull Requests
+- Fix up creating archives [#18](https://github.com/chef/mixlib-archive/pull/18) ([thommay](https://github.com/thommay))
 <!-- latest_release -->
 
-<!-- release_rollup -->
+<!-- release_rollup since=0.4.2 -->
+### Changes not yet released to rubygems.org
+
+#### Merged Pull Requests
+- Fix up creating archives [#18](https://github.com/chef/mixlib-archive/pull/18) ([thommay](https://github.com/thommay)) <!-- 0.4.4 -->
 <!-- release_rollup -->
 
 <!-- latest_stable_release -->

data/VERSION

@@ -1 +1 @@
-0.4.3
+0.4.4

data/lib/mixlib/archive.rb

@@ -1,12 +1,18 @@
 require "mixlib/archive/tar"
 require "mixlib/archive/version"
 require "mixlib/log"
+require "find"
 
 module Mixlib
   class Archive
     attr_reader :archiver
     alias_method :extractor, :archiver
 
+    def self.archive_directory(path, archive, gzip: false, format: :tar, compression: :none)
+      targets = Find.find(path).collect { |fn| fn }
+      new(archive).create(targets, gzip: gzip)
+    end
+
     def initialize(archive, empty: false)
       @empty = empty
 

data/lib/mixlib/archive/lib_archive.rb

@@ -19,6 +19,7 @@ module Mixlib
       def extract(destination, perms: true, ignore: [])
         ignore_re = Regexp.union(ignore)
         flags = perms ? ::Archive::EXTRACT_PERM : nil
+        FileUtils.mkdir_p(destination)
         Dir.chdir(destination) do
           reader = ::Archive::Reader.open_filename(@archive)
 
@@ -47,17 +48,38 @@ module Mixlib
         ::Archive.write_open_filename(archive, compression, format) do |tar|
           files.each do |fn|
             tar.new_entry do |entry|
+              content = nil
               entry.pathname = fn
-              entry.copy_stat(fn)
-              tar.write_header(entry)
+              stat = File.lstat(fn)
               if File.file?(fn)
                 content = File.read(fn)
-                tar.write_data(content)
+                entry.size = content.size
               end
+              entry.mode = stat.mode
+              entry.filetype = resolve_type(stat.ftype)
+              entry.atime = stat.atime
+              entry.mtime = stat.mtime
+              entry.symlink = File.readlink(fn) if File.symlink?(fn)
+              tar.write_header(entry)
+
+              tar.write_data(content) unless content.nil?
             end
           end
         end
       end
+
+      def resolve_type(type)
+        case type
+        when "characterSpecial"
+          ::Archive::Entry::CHARACTER_SPECIAL
+        when "blockSpecial"
+          ::Archive::Entry::BLOCK_SPECIAL
+        when "link"
+          ::Archive::Entry::SYMBOLIC_LINK
+        else
+          ::Archive::Entry.const_get(type.upcase)
+        end
+      end
     end
   end
 end

data/lib/mixlib/archive/tar.rb

@@ -1,4 +1,5 @@
 require "rubygems/package"
+require "tempfile"
 require "zlib"
 
 module Mixlib
@@ -85,10 +86,14 @@ module Mixlib
 
         target.close
         if gzip
-          Zlib::GzipWriter.open(archive) do |gz|
+          Zlib::GzipWriter.open(archive, Zlib::BEST_COMPRESSION) do |gz|
             gz.mtime = File.mtime(target.path)
             gz.orig_name = File.basename(archive)
-            gz.write IO.binread(target.path)
+            File.open(target.path) do |file|
+              while (chunk = file.read(16 * 1024))
+                gz.write(chunk)
+              end
+            end
           end
         else
           FileUtils.mv(target.path, archive)

data/lib/mixlib/archive/version.rb

@@ -1,5 +1,5 @@
 module Mixlib
   class Archive
-    VERSION = "0.4.2"
+    VERSION = "0.4.4"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mixlib-archive
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.4
 platform: ruby
 authors:
 - Chef Software, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-25 00:00:00.000000000 Z
+date: 2018-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake