archive 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03fd0b29dfe98ee0c8545cb831b85d56b62cf0f9
-  data.tar.gz: 7063adf82e2d6338c486670d91a87176d5b28d70
+  metadata.gz: 8573b5dc0a8783ecd5519bef313fab1a86ce6920
+  data.tar.gz: 59a004ca0682e4601c730cd4a753b5a1e0bd33fa
 SHA512:
-  metadata.gz: 180d415f4639a31f50e2f90320e7c3af03bd3bad1495420a234d80064358e9f1f4176ebd76d8508c73b5dd1c4d19757570bd66e498628cd37e9b6699494d399f
-  data.tar.gz: 7d45612e9ee2e07b240a0c0b2008ff2ae7fd291fa7443c0f65a82fe2e716421ca366c4a5a367ca0b19b2fb188247277711460456a12500487dd93d82b68cacc4
+  metadata.gz: 9ac13f3f8b58920f3e99e4996634cfe3321610a8063e1aff7913f1c374a975f0c3659da773edfe522e1e16e540d435d5749d60c55abf7f537f9bedff8a724f84
+  data.tar.gz: 1efd78f10a7c0eba26889a04bc4b3fd40d5b573499a96c8e62d66f458b3380c368654e584f482f8ded6d3cdcd2e98a1d9cfaa2efa96bbb415e0c86052db4aa51

data/CHANGELOG.md

@@ -0,0 +1,6 @@
+# 0.0.2 (05/02/2013)
+  * Better memory management; heap corruption issue that wasn't showing up in tests.
+  * Fixes for FreeBSD 9
+  * Ensure Archive.get_files is protected properly (injekt)
+# 0.0.1 (04/26/2013)
+  * First release!

data/README.md

@@ -67,6 +67,7 @@ We have verified that archive works as intended on these platforms:
 
 * Mac OS X 10.8
 * Ubuntu Linux 12.04 LTS
+* FreeBSD 9
 
 And these Rubies:
 
@@ -74,10 +75,19 @@ And these Rubies:
 * 2.0.0
 * JRuby 1.7 with Java 7
 
+It does not work on these platforms:
+
+* 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.
+
 Please let us know if your operating system isn't working! It'll likely
-complain about a call called `stat` which varies wildly on different POSIX
-systems. We just need to know what platform you're on and how we can install it
-ourselves to move forward. Thanks!
+complain about a part of a structure in a syscall called `stat` which varies
+wildly on different POSIX systems. We just need to know what platform you're on
+and how we can install it ourselves to move forward. Thanks!
 
 ## Contributing
 

data/lib/archive.rb

@@ -60,20 +60,24 @@ module Archive
     Archive::Compress.new(filename, args).compress(get_files(dir), true)
   end
 
-  protected
+  class << self
 
-  #
-  # Finds the files for the dir passed to ::compress.
-  #
-  def self.get_files(dir)
-    require 'find'
+    protected
+
+    #
+    # Finds the files for the dir passed to ::compress.
+    #
+    def get_files(dir)
+      require 'find'
+
+      files = []
 
-    files = []
+      Find.find(dir) do |path|
+        files.push(path) if File.file?(path)
+      end
 
-    Find.find(dir) do |path|
-      files.push(path) if File.file?(path)
+      return files
     end
 
-    return files
   end
 end

data/lib/archive/extract.rb

@@ -93,8 +93,8 @@ module Archive # :nodoc:
     def unpack_loop # :nodoc:
       loop do
         buffer = FFI::MemoryPointer.new :pointer, 1
-        size   = FFI::MemoryPointer.new :size_t
-        offset = FFI::MemoryPointer.new :long_long
+        size   = FFI::MemoryPointer.new :ulong_long, 1
+        offset = FFI::MemoryPointer.new :long_long, 1
 
         result = LibArchive.archive_read_data_block(@in, buffer, size, offset)
 
@@ -104,7 +104,7 @@ module Archive # :nodoc:
           raise LibArchive.archive_error_string(@in)
         end
 
-        result = LibArchive.archive_write_data_block(@out, buffer.get_pointer(0), size.read_ulong_long, offset.read_long_long);
+        result = LibArchive.archive_write_data_block(@out, buffer.read_pointer, size.read_ulong_long, offset.read_long_long);
 
         if result != LibArchive::ARCHIVE_OK
           raise LibArchive.archive_error_string(@out)

data/lib/archive/libarchive.rb

@@ -33,6 +33,27 @@ module Archive # :nodoc:
         :st_lspare, :long,
         :st_qspare, :long_long
       )
+    elsif ::FFI::Platform.bsd?
+      layout(
+        :st_dev, :dev_t,
+        :st_ino, :ino_t,
+        :st_mode, :mode_t,
+        :st_nlink, :nlink_t,
+        :st_uid, :uid_t,
+        :st_gid, :gid_t,
+        :st_rdev, :dev_t,
+        :st_atimespec, Timespec,
+        :st_mtimespec, Timespec,
+        :st_ctimespec, Timespec,
+        :st_size, :off_t,
+        :st_blocks, :long_long,
+        :st_blksize, :ulong_long,
+        :st_flags, :ulong,
+        :st_gen, :ulong,
+        :st_lspare, :long,
+        :st_birthtimespec, Timespec,
+        :st_qspare, :long_long
+      )
     else
       layout(
         :st_dev, :dev_t,
@@ -46,7 +67,7 @@ module Archive # :nodoc:
         :st_mtimespec, Timespec,
         :st_ctimespec, Timespec,
         :st_size, :off_t,
-        :st_blocks, :quad_t,
+        :st_blocks, :blkcnt_t,
         :st_blksize, :ulong,
         :st_flags, :ulong,
         :st_gen, :ulong

data/lib/archive/version.rb

@@ -1,3 +1,3 @@
 module Archive
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: archive
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Erik Hollensbe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-26 00:00:00.000000000 Z
+date: 2013-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -144,6 +144,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- CHANGELOG.md
 - Gemfile
 - Guardfile
 - LICENSE.txt
@@ -155,7 +156,6 @@ files:
 - lib/archive/extract.rb
 - lib/archive/libarchive.rb
 - lib/archive/version.rb
-- test.rb
 homepage: https://github.com/erikh/archive
 licenses:
 - MIT

data/test.rb

@@ -1,4 +0,0 @@
-require 'archive'
-
-Dir.chdir("test/data")
-Archive.compress_and_print("test.tar.gz", "libarchive")