mixlib-archive 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8685df8b7ce9e5ce9534e3475a5ecb35a01fd05f1491aad6cb096940c82bc37
-  data.tar.gz: 7baa4eee34d8d9c711aa88b790f516d76834ea608bf9f271f7a9cc66dd8c76cb
+  metadata.gz: fc6683cb1ac7178e4fb261923f6a5c1849e2e8a73b7ab95afbb28af5e30b7496
+  data.tar.gz: fde910fa8c62984f215bbea2b0dabc97f039d56268fc2de5b75a52b5541170a7
 SHA512:
-  metadata.gz: e4f1224ad12d171a576482cdfcdc886cf6b52bd84f61a5acab5017e609db9effb7b2ad0fcde959e8be8ea3fb5ad2993c915d1c6a40dd99d7a1f8131675e32a5b
-  data.tar.gz: ecb2bc04a880797cc6fcf3b91e9be5b53c466ba2489634fff9b70c41e09a8b94cfe4c70f1230be7a70816f0d8003deb78b83c8620444883e223850e2135e7ab8
+  metadata.gz: d515dcc2ae6b37114e3abb384af186eab308317d5356782e6b4e48a25fa91592f4a8b6eaa4378191202ebce96d3f9d2ee853d43debd224d41ec79c20b539f3e0
+  data.tar.gz: 515ee38251f667317dfb88d3ea4df349d8c5d640508f534e7c71628b1d3654e9e406a6a8b661dae2cd7e488eb11ec0792babb18a73d64278aa99d30649a58ab0

data/CHANGELOG.md

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

data/VERSION

@@ -1 +1 @@
-0.4.4
+0.4.5

data/lib/mixlib/archive.rb

@@ -5,6 +5,8 @@ require "find"
 
 module Mixlib
   class Archive
+    class TarError < StandardError; end
+
     attr_reader :archiver
     alias_method :extractor, :archiver
 

data/lib/mixlib/archive/tar.rb

@@ -34,7 +34,7 @@ module Mixlib
               Mixlib::Archive::Log.warn "ignoring entry #{entry.full_name}"
               next
             end
-            dest ||= File.join(destination, entry.full_name)
+            dest ||= File.expand_path(File.join(destination, entry.full_name))
             parent = File.dirname(dest)
             FileUtils.mkdir_p(parent)
 
@@ -76,11 +76,18 @@ module Mixlib
         Gem::Package::TarWriter.new(target) do |tar|
           files.each do |fn|
             mode = File.stat(fn).mode
-            file = File.open(fn, "rb")
-            tar.add_file(fn, mode) do |io|
-              io.write(file)
+            if File.symlink?(fn)
+              target = File.readlink(fn)
+              tar.add_symlink(fn, target, mode)
+            elsif File.directory?(fn)
+              tar.mkdir(fn, mode)
+            elsif File.file?(fn)
+              file = File.open(fn, "rb")
+              tar.add_file(fn, mode) do |io|
+                io.write(file.read)
+              end
+              file.close
             end
-            file.close
           end
         end
 
@@ -110,6 +117,14 @@ module Mixlib
         IO.binread(path, 2) == [0x1F, 0x8B].pack("C*")
       end
 
+      # tar's magic is at byte 257 and is "ustar\0"
+      def is_tar_archive?(io)
+        io.rewind
+        magic = io.read[257..262]
+        io.rewind
+        magic == "ustar\0"
+      end
+
       def reader(&block)
         raw = File.open(archive, "rb")
 
@@ -120,6 +135,8 @@ module Mixlib
                  raw
                end
 
+        raise Mixlib::Archive::TarError, "Unrecognized archive format" unless is_tar_archive?(file)
+
         Gem::Package::TarReader.new(file, &block)
       ensure
         if file

data/lib/mixlib/archive/version.rb

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

metadata

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