mixlib-archive 1.0.1-universal-mingw32 → 1.1.4-universal-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3257be73a98527e13ed8c47c4c93b3aabe0d8444764646b38e8621cf755e3a1a
-  data.tar.gz: 75ae3489c75b2d9c0214627b3fa8240c1312d2ed5a8359ec6df6d7c2e9cef225
+  metadata.gz: 047bea16a67fe85bed1e833d57984037118cff998cb203c40eb1e22c31cc4cbc
+  data.tar.gz: 48be81edf028239f70dc9523a6902d0078d97ca3478c1bb898285beb5a9cb225
 SHA512:
-  metadata.gz: 52d96f21a49417c1b434c7297b3bfe512d1c05417a737aa51632bb9c80d3300dc6daf0d0ddf8ffd94fc52596d8105c44ec94afed52f48dda2a065486b64843dc
-  data.tar.gz: '08158917b97540e807e3e32c1d7303267aba83523e94a002ce6782455cccbbfba6524fc3cbd69aae6e43dd2a1c4dcf2ea871bd4816ecd68c771815aa33c6b106'
+  metadata.gz: c594dc361aa18493eca90e0dd6381e6ae07b517fd86592f975929ff4d59ac2eb5b3601d83fc1982b2b3a1ee00347a726b68650627f96428afc6bed373fce9b6a
+  data.tar.gz: 03252431a3f5b09b64d2e98ba8c144c5536dc1ca9ad2e79de0cf012a0120cc1fa2bc39f9857854eec64ad6ed3dce880f9316ef13c04a6dbe4d606afb11a073a6

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 = "1.0.1".freeze
+    VERSION = "1.1.4".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mixlib-archive
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.4
 platform: universal-mingw32
 authors:
 - Chef Software, Inc
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-01-16 00:00:00.000000000 Z
+date: 2021-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-log
@@ -43,7 +43,7 @@ homepage: https://github.com/chef/mixlib-archive
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -58,9 +58,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: A simple interface to various archive formats
 test_files: []