mixlib-archive 0.4.20 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 584cdc22a40b50f6efbe4d362e27d20773e517ebf514a3becf46d5e1043eb072
-  data.tar.gz: b69d1b7787fe1fb7a26d4f3eca83196a0a1b20e1eb70d8741a3833eb819e9210
+  metadata.gz: 7867709116767b766939563553d761b532f1d9b60e73bc90096258cc8f161589
+  data.tar.gz: a179a95b20b4bee4578d21edd827ea3f2e58b2c6e7c7e0c2ed4515a928fa04a2
 SHA512:
-  metadata.gz: 0d72b76ca490eaecc8675a8a015b506f17df1785ac6c10f3418324aba6cdd73d02da770f86341dc271084a8f10e9163b68ee974f651190d66fc0e685519d5aa9
-  data.tar.gz: 0040a51e3efcd16ed84db2f513b162b7e1416befd67514305cf8bb1db1b2038b3168aee63e4ef0887dd78a3d6d7c6213db06a8e9a8f5f8501c257e108e2fcd5f
+  metadata.gz: 62687a247e2d3f150f2629c9edff63231b53b168780c3cfa66cba10c79230799b45416dcc93a73397a170e305110e188b355e90ff86e5c344365f28e66ec74a5
+  data.tar.gz: 5dc07f9102036e911fb92d906ee37001819b0ecc4f5faa945c46f622576bcd5f2f34e1e30dbc7a1d9f540df08999895668ab272a3bf2debd8e251967b86c502c

data/lib/mixlib/archive.rb

@@ -1,7 +1,7 @@
-require "mixlib/archive/tar"
-require "mixlib/archive/version"
+require_relative "archive/tar"
+require_relative "archive/version"
 require "mixlib/log"
-require "find"
+require "find" unless defined?(Find.find)
 
 module Mixlib
   class Archive
@@ -21,7 +21,7 @@ module Mixlib
       archive = File.expand_path(archive)
       begin
         # we prefer to use libarchive, which supports a great big pile o' stuff
-        require "mixlib/archive/lib_archive"
+        require_relative "archive/lib_archive"
         @archiver = Mixlib::Archive::LibArchive.new(archive)
       rescue LoadError
         # but if we can't use that, we'll fall back to ruby's native tar implementation
@@ -58,6 +58,7 @@ module Mixlib
       if @empty
         Dir.foreach(destination) do |entry|
           next if entry == "." || entry == ".."
+
           FileUtils.remove_entry_secure(File.join(destination, entry))
         end
       end

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+

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 = "0.4.20".freeze
+    VERSION = "1.1.3".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mixlib-archive
 version: !ruby/object:Gem::Version
-  version: 0.4.20
+  version: 1.1.3
 platform: ruby
 authors:
 - Chef Software, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-13 00:00:00.000000000 Z
+date: 2021-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-log
@@ -48,15 +48,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: A simple interface to various archive formats