mixlib-archive 1.0.5 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 044cadddda0adfaf4c67efc46395ba2eb4acb4d094d998c3840c6e96118e427c
-  data.tar.gz: ffd5dd9e5fb6baa92e387712ac51c1ccd243da136b38a93dbc6d89706dbee870
+  metadata.gz: e7583fe3ebc715aae1b1a0a9f2e1dea0821bac791cfdaf948c2ce25248bb85b3
+  data.tar.gz: 1c098798996d573f47403de8a87b6819959a1c8482edc5155b496b22582953a0
 SHA512:
-  metadata.gz: 6c78f92bc285494f0a287d223b8130dfd023b17af7bc41a0664af980ecea938f898e6d0f5bc5f88ee653e769a470c2a98eb8513b269306faa140c7101ad4d288
-  data.tar.gz: 00ea334196fa34c4b14b5fadfc79291fb284d4304ccc7eb34220c7fbdfb45d0bc0289d67468672b15f92053963ddfb2a50488480dbc651856e66b8f20a3da0c8
+  metadata.gz: bb15981cc414cf3faad750ef1b6bf4174aa9bd2fada20d378c1ee7df29c6f2fd178573c78cf2e746a0044194d624fb92a515a7f7d384749a4f9157900ba6cab2
+  data.tar.gz: f6d86b869dbf7b587273fddc516c084c4a82fe6a0094a59e3badcf9b6aafc297f06cad0ed19fd3f2c9803c16558d7fba76b00524e08a0ded2c2e6788901c1e5e

data/lib/mixlib/archive.rb

@@ -1,7 +1,7 @@
 require_relative "archive/tar"
 require_relative "archive/version"
 require "mixlib/log"
-require "find"
+require "find" unless defined?(Find.find)
 
 module Mixlib
   class Archive

data/lib/mixlib/archive/lib_archive.rb

@@ -6,12 +6,6 @@ module Mixlib
       attr_reader :options
       attr_reader :archive
 
-      class << self
-        attr_accessor :mutex_chdir
-      end
-
-      Mixlib::Archive::LibArchive.mutex_chdir = Mutex.new
-
       def initialize(archive, options = {})
         @archive = archive
         @options = options
@@ -27,24 +21,17 @@ module Mixlib
         flags = perms ? ::Archive::EXTRACT_PERM : nil
         FileUtils.mkdir_p(destination)
 
-        # @note Dir.chdir is applied to the process, thus it is not thread-safe
-        # and must be synchronized.
-        # TODO: figure out a better alternative to chdir
-        Mixlib::Archive::LibArchive.mutex_chdir.synchronize do
-          Dir.chdir(destination) do
-            reader = ::Archive::Reader.open_filename(@archive)
+        reader = ::Archive::Reader.open_filename(@archive)
 
-            reader.each_entry do |entry|
-              if entry.pathname =~ ignore_re
-                Mixlib::Archive::Log.warn "ignoring entry #{entry.pathname}"
-                next
-              end
-
-              reader.extract(entry, flags.to_i)
-            end
-            reader.close
+        reader.each_entry do |entry|
+          if entry.pathname =~ ignore_re
+            Mixlib::Archive::Log.warn "ignoring entry #{entry.pathname}"
+            next
           end
+
+          reader.extract(entry, flags.to_i, destination: destination)
         end
+        reader.close
       end
 
       # Creates an archive with the given set of +files+
@@ -64,7 +51,7 @@ module Mixlib
               entry.pathname = fn
               stat = File.lstat(fn)
               if File.file?(fn)
-                content = File.read(fn)
+                content = File.read(fn, mode: "rb")
                 entry.size = content.bytesize
               end
               entry.mode = stat.mode

data/lib/mixlib/archive/tar.rb

@@ -1,6 +1,6 @@
-require "rubygems/package"
-require "tempfile"
-require "zlib"
+require "rubygems/package" unless defined?(Gem::Package)
+require "tempfile" unless defined?(Tempfile)
+require "zlib" unless defined?(Zlib)
 
 module Mixlib
   class Archive

data/lib/mixlib/archive/version.rb

@@ -1,5 +1,5 @@
 module Mixlib
   class Archive
-    VERSION = "1.0.5".freeze
+    VERSION = "1.1.6".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mixlib-archive
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.1.6
 platform: ruby
 authors:
 - Chef Software, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-30 00:00:00.000000000 Z
+date: 2021-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-log
@@ -55,7 +55,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: A simple interface to various archive formats