mixlib-archive 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c0da99947c11bfbad6ca390ab05d7693ded8b13
-  data.tar.gz: 5001dfe12d40f5c2616a6f758ff99220d1123e09
+  metadata.gz: b64bcab7b9f78579acaea734d9a1678db7d542c5
+  data.tar.gz: 8116bd9eef7f1748a7cc37e27141d169f3c18426
 SHA512:
-  metadata.gz: e65f94017899ce5debd241bfa5e6841bc92cba382f7a81291107939cd3fd14088c41c3f7ff6fa514e1bd57c65fd20267a6f78da0ec2ef249e0be538ca53f33b6
-  data.tar.gz: 5b62892bd31eeb24c935e6fd28411ca862ede7f3a33ef1e5f449d68c5cda1ccad992ec43c1f4444400ee74fe50f634a1953648a7df1bdec0dd46b15c78db2808
+  metadata.gz: e2cc989da54ab896edf43c73b328369ca5190e2a08a21d29c90bf382e1bbabb2d6313aa181cde4c9a28623de88116abd60627b66d3ca6ef3bcf4fd61a9e255f9
+  data.tar.gz: 80fa165ebdae08bc5c398e7c06eea5662d3bf9d204ffa0c63636ea53c1172d8b83a3eb7a11164fd0001c9b22c26a573cbb0ad478d5e193035cf98e7a0975ec4e

data/lib/mixlib/archive.rb

@@ -1,5 +1,6 @@
 require "mixlib/archive/tar"
 require "mixlib/archive/version"
+require "mixlib/log"
 
 module Mixlib
   class Archive
@@ -13,10 +14,16 @@ module Mixlib
       @extractor = Mixlib::Archive::Tar.new(archive)
     end
 
-    def extract(destination)
+    class Log
+      extend Mixlib::Log
+    end
+
+    Log.level = :error
+
+    def extract(destination, perms: true, ignore: [])
       create_and_empty(destination)
 
-      extractor.extract(destination)
+      extractor.extract(destination, perms: perms, ignore: ignore)
     end
 
     private

data/lib/mixlib/archive/tar.rb

@@ -14,8 +14,14 @@ module Mixlib
         @options = options
       end
 
-      def extract(destination)
+      # Extracts the archive to the given +destination+
+      #
+      # === Parameters
+      # perms<Boolean>:: should the extracter use permissions from the archive.
+      # ignore[Array]:: an array of matches of file paths to ignore
+      def extract(destination, perms: true, ignore: [])
         # (http://stackoverflow.com/a/31310593/506908)
+        ignore_re = Regexp.union(ignore)
         reader do |tar|
           dest = nil
           tar.each do |entry|
@@ -23,24 +29,31 @@ module Mixlib
               dest = File.join(destination, entry.read.strip)
               next
             end
+            next if entry.full_name =~ ignore_re
             dest ||= File.join(destination, entry.full_name)
             parent = File.dirname(dest)
-            FileUtils.mkdir_p(parent, mode: 0755)
+            FileUtils.mkdir_p(parent)
 
             if entry.directory? || (entry.header.typeflag == "" && entry.full_name.end_with?("/"))
               File.delete(dest) if File.file?(dest)
-              FileUtils.mkdir_p(dest, mode: entry.header.mode, verbose: false)
+
+              if perms
+                FileUtils.mkdir_p(dest, mode: entry.header.mode, verbose: false)
+              else
+                FileUtils.mkdir_p(dest, verbose: false)
+              end
+
             elsif entry.file? || (entry.header.typeflag == "" && !entry.full_name.end_with?("/"))
               FileUtils.rm_rf(dest) if File.directory?(dest)
               File.open(dest, "wb") do |f|
                 f.print(entry.read)
               end
-              FileUtils.chmod(entry.header.mode, dest, verbose: false)
+              FileUtils.chmod(entry.header.mode, dest, verbose: false) if perms
             elsif entry.header.typeflag == "2"
               # handle symlink
               File.symlink(entry.header.linkname, dest)
             else
-              puts "unknown tar entry: #{entry.full_name} type: #{entry.header.typeflag}"
+              Mixlib::Archive::Log.warn "unknown tar entry: #{entry.full_name} type: #{entry.header.typeflag}"
             end
 
             dest = nil
@@ -60,6 +73,7 @@ module Mixlib
         raw = File.open(archive, "rb")
 
         file = if is_gzip_file?(archive)
+                 Mixlib::Archive::Log.debug "gzip file detected"
                  Zlib::GzipReader.wrap(raw)
                else
                  raw

data/lib/mixlib/archive/version.rb

@@ -1,5 +1,5 @@
 module Mixlib
   class Archive
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end

data/mixlib-archive.gemspec

@@ -21,4 +21,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "chefstyle"
+  spec.add_dependency "mixlib-log"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mixlib-archive
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Chef Software, Inc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-13 00:00:00.000000000 Z
+date: 2016-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mixlib-log
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A simple interface to various archive formats
 email:
 - info@chef.io
@@ -104,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: A simple interface to various archive formats