archive 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eea58532ddc940adf915b551058677861c5c6f1f
-  data.tar.gz: c726a2100a1da44625735183dab2ebc5ede03281
+  metadata.gz: 5be52d8c272d2e8546d7c34358ede9900cc0c0e4
+  data.tar.gz: 9f8ac042c7698d9f9303f625631578fc05778146
 SHA512:
-  metadata.gz: 46db2088dd9999ab72eacb831f09ddd0114a4eb8b93b12436958355d1f15ae77a03f4b8c6cee6a2570b59d3897b50f49bf86950d0e7e3d04ab3ee70c87e93b99
-  data.tar.gz: 3f7c3c403a87b5a2316367a57f65b32308130250089893953a840ae1f23398a3a0cd375a4d244e79a274add1622df2e770ae29bba15692a78015fdf53a112119
+  metadata.gz: 98046ff9e54c3895f952a3b6ada2074e87dd511258540afdd441d5cb4fa7cedc40c10d709b5d107a2050c5117bc8e4c55204714af9e24136e06a904c5a3d2664
+  data.tar.gz: 87a51152ffe72b9faa5fdb266dbee868d418759724b16c7751368b678887e05a6b329435623c1395fcf09446a12e193440c582e91b278866919894e64d2db50a

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.0.4 (10/10/2013)
+  * Several fixes around hardlinks.
+  * Better support for OS X! Will use homebrew or macports' libarchive if
+    available so you can use a recent version.
 # 0.0.3 (09/15/2013)
   * ISO support on linux systems -- Thanks David Lutterkort!
 # 0.0.2 (05/02/2013)

data/README.md

@@ -9,7 +9,7 @@ common subset of archive types:
   * gzipped
   * bzip2'd
 * zip (uncompressed, binary-only)
-* iso9660 (read-only, and not on OS X)
+* iso9660 (read-only)
 
 ## Installation
 
@@ -66,7 +66,7 @@ Tests require bundler. Run `bundle exec rake test` to run the tests.
 
 We have verified that archive works as intended on these platforms:
 
-* Mac OS X 10.8, 10.9 (Except iso format)
+* Mac OS X 10.8, 10.9 (see notes on ISO support)
 * Ubuntu Linux 12.04 LTS
 * FreeBSD 9
 
@@ -76,18 +76,23 @@ And these Rubies:
 * 2.0.0
 * JRuby 1.7 with Java 7
 
-It does not work on these platforms:
+Notes about the following platforms:
 
-* On OS X iso formats are unsupported. The version of libarchive distributed
-  with both 10.8 and 10.9 seems to have trouble with all iso derivatives.
-  Patches welcome for fixes!
+* On OS X iso formats are only supported if you have a 3.x version of
+  libarchive, which OS X doesn't ship with. The code makes an attempt to pick
+  the latest homebrew or macports libarchive, so if you use that packaging
+  system, you can `brew install libarchive` or `port install libarchive` and it
+  will "just work".
+  * Alternatively, you can set `LIBARCHIVE_PATH` in your environment to your
+    own build of libarchive 3.x which will also resolve this issue.
 
 * SmartOS "base64 1.9.1". The version of libarchive they distribute via pkgsrc
 	is broken, see this URL: 
 
   http://freebsd.1045724.n5.nabble.com/Extracting-tgz-file-Attempt-to-write-to-an-empty-file-td3910927.html
 
-  Regardless, installing a newer libarchive by hand will likely fix this issue.
+  Regardless, installing a newer libarchive by hand and setting
+  `LIBARCHIVE_PATH` in your environment will likely fix this issue.
 
 Please let us know if your operating system isn't working! It'll likely
 complain about a part of a structure in a syscall called `stat` which varies

data/lib/archive/extract.rb

@@ -75,17 +75,24 @@ module Archive # :nodoc:
         entry_pointer = @entry.get_pointer(0)
 
         full_path = File.join(@dir, LibArchive.archive_entry_pathname(entry_pointer))
-        LibArchive.archive_entry_set_pathname(entry_pointer, full_path)
-
-        # TODO return value maybe?
+        LibArchive.archive_entry_set_pathname(entry_pointer, File.expand_path(full_path))
         puts LibArchive.archive_entry_pathname(entry_pointer) if verbose
 
-        if ((result = LibArchive.archive_write_header(@out, entry_pointer)) != LibArchive::ARCHIVE_OK)
-          raise LibArchive.archive_error_string(@out)
+        if hardlink_path = LibArchive.archive_entry_hardlink(entry_pointer)
+          begin
+            File.link(File.expand_path(hardlink_path, @dir), full_path)
+          rescue Errno::EEXIST
+            File.unlink(full_path)
+            retry
+          end
+        else
+          if ((result = LibArchive.archive_write_header(@out, entry_pointer)) != LibArchive::ARCHIVE_OK)
+            raise LibArchive.archive_error_string(@out)
+          end
+
+          unpack_loop
         end
 
-        unpack_loop
-
         LibArchive.archive_write_finish_entry(@out)
       end
     end

data/lib/archive/libarchive.rb

@@ -78,6 +78,9 @@ module Archive # :nodoc:
     #--
     # this is necessary to pass rdoc's coverage tests
     #++
+    module RbConfig # :nodoc:
+    end
+
     module FFI # :nodoc:
       module Library # :nodoc:
       end
@@ -97,7 +100,7 @@ module Archive # :nodoc:
       def self.stat(*args) # :nodoc:
         stat64(*args)
       end
-    elsif RbConfig::CONFIG['host_os'] =~ /linux/
+    elsif ::RbConfig::CONFIG['host_os'] =~ /linux/
       attach_function :__xstat, [:int, :string, :pointer], :int
       def self.stat(*args) # :nodoc:
         __xstat(0, *args)
@@ -106,7 +109,22 @@ module Archive # :nodoc:
       attach_function :stat, [:string, :pointer], :int
     end
 
-    ffi_lib 'archive'
+
+    if ENV["LIBARCHIVE_PATH"]
+      ffi_lib ENV["LIBARCHIVE_PATH"]
+    elsif ::FFI::Platform.mac? and File.directory?('/usr/local/Cellar/libarchive')
+      latest = Dir['/usr/local/Cellar/libarchive/*'].
+        select { |x| File.directory?(x) }.
+        map { |x| File.basename(x) }.
+        sort.
+        last
+
+      ffi_lib "/usr/local/Cellar/libarchive/#{latest}/lib/libarchive.dylib"
+    elsif ::FFI::Platform.mac? and File.exist?('/opt/local/lib/libarchive.dylib')
+      ffi_lib '/opt/local/lib/libarchive.dylib'
+    else
+      ffi_lib 'archive'
+    end
 
     ARCHIVE_OK      = 0     # :nodoc:
     ARCHIVE_EOF     = 1     # :nodoc:
@@ -128,18 +146,12 @@ module Archive # :nodoc:
     attach_function :archive_read_support_format_tar, [:pointer], :void
     attach_function :archive_read_support_format_gnutar, [:pointer], :void
     attach_function :archive_read_support_format_zip, [:pointer], :void
-
-    unless ::FFI::Platform.mac?
-      attach_function :archive_read_support_format_iso9660, [:pointer], :void
-    end
+    attach_function :archive_read_support_format_iso9660, [:pointer], :void
 
     def self.enable_input_formats(arg) # :nodoc:
       archive_read_support_format_gnutar(arg)
       archive_read_support_format_zip(arg)
-      archive_read_support_format_zip(arg)
-      unless ::FFI::Platform.mac?
-        archive_read_support_format_iso9660(arg)
-      end
+      archive_read_support_format_iso9660(arg)
       enable_input_compression(arg)
     end
 
@@ -225,6 +237,7 @@ module Archive # :nodoc:
     attach_function :archive_write_data, [:pointer, :pointer, :size_t], :void
 
     attach_function :archive_entry_pathname, [:pointer], :string
+    attach_function :archive_entry_hardlink, [:pointer], :string
     attach_function :archive_entry_set_pathname, [:pointer, :string], :void
   end
 end

data/lib/archive/version.rb

@@ -1,3 +1,3 @@
 module Archive
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: archive
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Erik Hollensbe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-15 00:00:00.000000000 Z
+date: 2013-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -176,7 +176,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.1.8
 signing_key: 
 specification_version: 4
 summary: Simple library to manage tar and zip archives with libarchive and FFI