mixlib-archive 1.0.1 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5b836a606a39c40788fc54fb673b0c5788a2a129e30f3e83d7d7c67ad69ecb6
-  data.tar.gz: d56a2122d4328da518ed7cae58410d37c9364c9f1a1129ef327adc64a68a7924
+  metadata.gz: 95a6b092d43b8a7c86fa53642f18463add7d2144b72579a9bb36d8a372610db2
+  data.tar.gz: f3dbad75990977256d807cb59878a0c31f8a1e1e8acac3212e6bbd2541583f20
 SHA512:
-  metadata.gz: 3fe3bf7c7bcd397cb813272a9a62cf5c53affc2b7591704248c4d12a9c48ea6187189ab415816ea7bd56042e52f67179eb2c3a90558ed480afb0aad50a677a6c
-  data.tar.gz: 9c6d31f210bd9be1336871cb11896e3f7d58c56a4cf59322575a06e5cb904197dd6c166f290f9bac2d1d28bfdd1a881dfbb5569dc0e089387b1e9e82da750f6f
+  metadata.gz: 10bdc649aa411f8eed22253339d7a1327da0a20980fe534006c92dd3bb73fed57fb4ecbb1855629d198d93af0bbe90ef957b8cdadde8c0c9fb85fcd615884625
+  data.tar.gz: c9cee26fa1a5b98c1a9d904c8cd62a7a48439c977abd044381a80fa90225243b02b71e27382e53291db47e0a369778659d91ba17fb735b71733de43d70cc0385

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: ruby
 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
@@ -40,7 +40,7 @@ homepage: https://github.com/chef/mixlib-archive
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -55,9 +55,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: []