poise-archive 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 91ccb73c49f6703d1836d4ea834300556e636022
-  data.tar.gz: 98c56241ab537943ca0a6e4b5e0c7490a0fb5fdf
+  metadata.gz: cfaafe9923ce43911a655e20b02ab6dd00cb7048
+  data.tar.gz: 80cc2672a626c92f4448b5936d5d10a51420c73c
 SHA512:
-  metadata.gz: e3a403715a2874abda4d9382226b234dcacafb93799cdf5ff69b2b4a6c0e788134301fd9c4c51370462cc64a6441d4cfe91bdcbebdf7ba3844b72202ad47ebb7
-  data.tar.gz: 1cf28ee3de172108eebaf3e9f408c8245e846d8f2c98dac4da3c26894d24d1f5e6dc69c50bef2404871360783322635e5ba55a2e5051bfaee045d5efa83c3ba6
+  metadata.gz: 6f46fc0af69806f98c569071ffd083f377614eae6ef598be79691957b709506cda3e5f719523f27cc00b164c0b3d9cbf611e147ac76aaacf8fb633c07f1f9f3b
+  data.tar.gz: b482be77a33a595e75f4a9d6ce56126cee7c7e452132c0a3e127bf8ed8834439abe2e00970878a6cb7ed31e702b303f384e68089aade9f6b286370ae78c07100

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Poise-Archive Changelog
 
+## v1.1.2
+
+* Fix compat with older Ruby that doesn't include `Entry#symlink?`.
+
 ## v1.1.1
 
 * Fix GNU tar longlink extension.

data/lib/poise_archive/archive_providers/tar.rb

@@ -47,23 +47,11 @@ module PoiseArchive
       #
       # @return [void]
       def unpack_tar
-        entry_name = nil
-        tar_each do |entry|
-          if entry.full_name == TAR_LONGLINK
-            # Stash the longlink name so it will be used for the next entry.
-            entry_name = entry.read.strip
-            # And then skip forward because this isn't a real block.
-            next
-          end
-          # For entries not preceded by a longlink block, use the normal name.
-          entry_name ||= entry.full_name
-          # Process strip_components by mangling the name.
-          parsed_name = entry_name.split(/\//).drop(new_resource.strip_components).join('/')
-          # Reset entry_name for the next entry.
-          entry_name = nil
+        tar_each_with_longlink do |entry|
+          entry_name = entry.full_name.split(/\//).drop(new_resource.strip_components).join('/')
           # If strip_components wiped out the name, don't process this entry.
-          next if parsed_name.empty?
-          dest = ::File.join(new_resource.destination, parsed_name)
+          next if entry_name.empty?
+          dest = ::File.join(new_resource.destination, entry_name)
           if entry.directory?
             Dir.mkdir(dest, entry.header.mode)
           elsif entry.file?
@@ -72,7 +60,7 @@ module PoiseArchive
                 dest_f.write(buf)
               end
             end
-          elsif entry.symlink?
+          elsif entry.header.typeflag == '2' # symlink? is new in Ruby 2.0, apparently.
             ::File.symlink(entry.header.linkname, dest)
           else
             raise RuntimeError.new("Unknown tar entry type #{entry.header.typeflag.inspect} in #{new_resource.path}")
@@ -81,6 +69,25 @@ module PoiseArchive
         end
       end
 
+      def tar_each_with_longlink(&block)
+        entry_name = nil
+        tar_each do |entry|
+          if entry.full_name == TAR_LONGLINK
+            # Stash the longlink name so it will be used for the next entry.
+            entry_name = entry.read.strip
+            # And then skip forward because this isn't a real block.
+            next
+          end
+          # For entries not preceded by a longlink block, use the normal name.
+          entry_name ||= entry.full_name
+          # Make the entry return the correct name.
+          entry.define_singleton_method(:full_name) { entry_name }
+          block.call(entry)
+          # Reset entry_name for the next entry.
+          entry_name = nil
+        end
+      end
+
       # Sequence the opening, iteration, and closing.
       #
       # @param block [Proc] Block to process each tar entry.

data/lib/poise_archive/version.rb

@@ -16,5 +16,5 @@
 
 
 module PoiseArchive
-  VERSION = '1.1.1'
+  VERSION = '1.1.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: poise-archive
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Noah Kantrowitz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-01 00:00:00.000000000 Z
+date: 2016-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: halite