mixlib-archive 1.0.6 → 1.1.7

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 0475c38b4846157e5892b1d01e6a6ba6adfb87d1fbbe048057fbd0bb2d5204c9
4
- data.tar.gz: 3ffae0ec5a167e33d8dd8a580890ff3738d94f0cb145e81945b0d86eed927b3b
3
+ metadata.gz: b35fec12553ca1063ebe885c7ac8bf8104aa06a1a023bf16f3dfa4d0ce179d61
4
+ data.tar.gz: ccdf277f081a43769e528a1c8e8698094b13cd96132de6b96ceba77de120e5f0
5
5
  SHA512:
6
- metadata.gz: bdf1f88d256476a49de22abb1881f552fdfb8cd00e5786cceeb69b27a563644ee9e64108cb2b9b2987c3a7a04e552f26995e1b41e072c39696d00b2084993d0f
7
- data.tar.gz: d38aac9e5e41c475707647f50cd5a09cdb2f937b58b7c2ef7448ac539a9005294e192761101039ec7c9505f89f68f1523878221d1725f42258ee4189bcba2fa7
6
+ metadata.gz: a2a5c1b8fe30b9006201512f1ff823bf87b0896b45f4b4783e1d48d79a5f1d586cd07ba57e79728c1e58306c4e76521468115df3957981c9c48e08b464638e7e
7
+ data.tar.gz: 81741f8241c8392918c0868fb4d32adb396e957e527a771dad363ac8d1efd892b9c4d3b6d0446d5b8bd3ea609dbc82f65d3eb3477dd078d62a5056b5e4573c9f
@@ -1,7 +1,7 @@
1
1
  require_relative "archive/tar"
2
2
  require_relative "archive/version"
3
3
  require "mixlib/log"
4
- require "find"
4
+ require "find" unless defined?(Find.find)
5
5
 
6
6
  module Mixlib
7
7
  class Archive
@@ -6,12 +6,6 @@ module Mixlib
6
6
  attr_reader :options
7
7
  attr_reader :archive
8
8
 
9
- class << self
10
- attr_accessor :mutex_chdir
11
- end
12
-
13
- Mixlib::Archive::LibArchive.mutex_chdir = Mutex.new
14
-
15
9
  def initialize(archive, options = {})
16
10
  @archive = archive
17
11
  @options = options
@@ -27,24 +21,17 @@ module Mixlib
27
21
  flags = perms ? ::Archive::EXTRACT_PERM : nil
28
22
  FileUtils.mkdir_p(destination)
29
23
 
30
- # @note Dir.chdir is applied to the process, thus it is not thread-safe
31
- # and must be synchronized.
32
- # TODO: figure out a better alternative to chdir
33
- Mixlib::Archive::LibArchive.mutex_chdir.synchronize do
34
- Dir.chdir(destination) do
35
- reader = ::Archive::Reader.open_filename(@archive)
24
+ reader = ::Archive::Reader.open_filename(@archive)
36
25
 
37
- reader.each_entry do |entry|
38
- if entry.pathname =~ ignore_re
39
- Mixlib::Archive::Log.warn "ignoring entry #{entry.pathname}"
40
- next
41
- end
42
-
43
- reader.extract(entry, flags.to_i)
44
- end
45
- reader.close
26
+ reader.each_entry do |entry|
27
+ if entry.pathname =~ ignore_re
28
+ Mixlib::Archive::Log.warn "ignoring entry #{entry.pathname}"
29
+ next
46
30
  end
31
+
32
+ reader.extract(entry, flags.to_i, destination: destination.to_s)
47
33
  end
34
+ reader.close
48
35
  end
49
36
 
50
37
  # Creates an archive with the given set of +files+
@@ -64,7 +51,7 @@ module Mixlib
64
51
  entry.pathname = fn
65
52
  stat = File.lstat(fn)
66
53
  if File.file?(fn)
67
- content = File.read(fn)
54
+ content = File.read(fn, mode: "rb")
68
55
  entry.size = content.bytesize
69
56
  end
70
57
  entry.mode = stat.mode
@@ -1,6 +1,6 @@
1
- require "rubygems/package"
1
+ require "rubygems/package" unless defined?(Gem::Package)
2
2
  require "tempfile" unless defined?(Tempfile)
3
- require "zlib"
3
+ require "zlib" unless defined?(Zlib)
4
4
 
5
5
  module Mixlib
6
6
  class Archive
@@ -1,5 +1,5 @@
1
1
  module Mixlib
2
2
  class Archive
3
- VERSION = "1.0.6".freeze
3
+ VERSION = "1.1.7".freeze
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: mixlib-archive
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.6
4
+ version: 1.1.7
5
5
  platform: ruby
6
6
  authors:
7
7
  - Chef Software, Inc
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2020-08-13 00:00:00.000000000 Z
11
+ date: 2021-02-18 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: mixlib-log
@@ -55,7 +55,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
55
55
  - !ruby/object:Gem::Version
56
56
  version: '0'
57
57
  requirements: []
58
- rubygems_version: 3.0.3
58
+ rubygems_version: 3.1.4
59
59
  signing_key:
60
60
  specification_version: 4
61
61
  summary: A simple interface to various archive formats