Bump Mixlib-Archive to 0.4

Signed-off-by: Thom May <thom@chef.io>
berkshelf · Feb 2, 2017 · 8349023 · 8349023
1 parent f49321c
commit 8349023
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -44,7 +44,7 @@ PATH
       faraday (~> 0.9)
       httpclient (~> 2.7)
       minitar (~> 0.5, >= 0.5.4)
-      mixlib-archive (~> 0.1)
+      mixlib-archive (~> 0.4)
       octokit (~> 4.0)
       retryable (~> 2.0)
       ridley (~> 5.0)
@@ -213,7 +213,7 @@ GEM
     method_source (0.8.2)
     minitar (0.5.4)
     minitest (5.10.1)
-    mixlib-archive (0.3.0)
+    mixlib-archive (0.4.1)
       mixlib-log
     mixlib-authentication (1.4.1)
       mixlib-log

diff --git a/berkshelf.gemspec b/berkshelf.gemspec
@@ -44,5 +44,5 @@ Gem::Specification.new do |s|
   s.add_dependency "solve",                "> 2.0", "< 4.0"
   s.add_dependency "thor",                 "~> 0.19", "< 0.19.2"
   s.add_dependency "octokit",              "~> 4.0"
-  s.add_dependency "mixlib-archive",       "~> 0.1"
+  s.add_dependency "mixlib-archive",       "~> 0.4"
 end
diff --git a/lib/berkshelf/downloader.rb b/lib/berkshelf/downloader.rb
@@ -166,8 +166,7 @@ def try_download(source, name, version)
         return nil unless resp.status == 200
         open(archive_path, "wb") { |file| file.write(resp.body) }
 
-        tgz = Zlib::GzipReader.new(File.open(archive_path, "rb"))
-        Archive::Tar::Minitar.unpack(tgz, unpack_dir)
+        Mixlib::Archive.new(archive_path).extract(unpack_dir)
 
         # The top level directory is inconsistant. So we unpack it and
         # use the only directory created in the unpack_dir.