ffi-libarchive 0.1.1 → 0.1.2

data/History.txt

@@ -1,3 +1,7 @@
+== 0.1.2 / 2011-04-12
+* Writer::add_entry sets content size
+* Modify usage of callbacks and FFI::Buffer to work with rubinius
+
 == 0.1.1 / 2011-04-11
 * Fix loading of library
 

data/lib/ffi-libarchive/archive.rb

@@ -2,14 +2,6 @@ require 'ffi'
 
 module Archive
 
-    module LibC
-        extend FFI::Library
-        ffi_lib FFI::Library::LIBC
-
-        attach_variable :errno, :int
-        attach_function :strerror, [:int], :string
-    end
-
     module C
         def self.attach_function_maybe *args
             attach_function(*args)
@@ -43,7 +35,9 @@ module Archive
         callback :archive_open_callback, [:pointer, :pointer], :int
         callback :archive_write_callback, [:pointer, :pointer, :pointer, :size_t], :int
         callback :archive_close_callback, [:pointer, :pointer], :int
-        attach_function :archive_write_open, [:pointer, :pointer, :archive_open_callback, :archive_write_callback, :archive_close_callback], :int
+        # TODO: the following function is the real definition but uses multiple callbacks. This implies that it will not work with Rubinius (currently), but luckily we only need the write-callback actually.
+        #attach_function :archive_write_open, [:pointer, :pointer, :archive_open_callback, :archive_write_callback, :archive_close_callback], :int
+        attach_function :archive_write_open, [:pointer, :pointer, :pointer, :archive_write_callback, :pointer], :int
         # TODO: catch errors if not defined
         attach_function :archive_write_set_compression_none, [:pointer], :int
         attach_function_maybe :archive_write_set_compression_gzip, [:pointer], :int

data/lib/ffi-libarchive/entry.rb

@@ -185,7 +185,7 @@ module Archive
             end
 
             stat = Archive::Stat::ffi_libarchive_create_lstat(filename)
-            raise Error, "Copy stat failed: #{LibC::strerror(LibC::errno)}" if stat.null?
+            raise Error, "Copy stat failed: #{Archive::Stat::ffi_error}" if stat.null?
             result = C::archive_entry_copy_stat(entry, stat)
         ensure
             Archive::Stat::ffi_libarchive_free_stat(stat)
@@ -210,7 +210,7 @@ module Archive
             end
 
             stat = Archive::Stat::ffi_libarchive_create_stat(filename)
-            raise Error, "Copy stat failed: #{LibC::strerror(LibC::errno)}" if stat.null?
+            raise Error, "Copy stat failed: #{Archive::Stat::ffi_error}" if stat.null?
             result = C::archive_entry_copy_stat(entry, stat)
         ensure
             Archive::Stat::ffi_libarchive_free_stat(stat)

data/lib/ffi-libarchive/reader.rb

@@ -46,9 +46,9 @@ module Archive
                 raise Error, @archive if C::archive_read_open_filename(archive, params[:file_name], 1024) != C::OK
             elsif params[:memory]
                 str = params[:memory]
-                @data = FFI::MemoryPointer.new str.size
-                @data.put_bytes 0, str
-                raise Error, @archive if C::archive_read_open_memory(archive, @data, @data.size) != C::OK
+                @data = FFI::MemoryPointer.new(str.size + 1)
+                @data.write_string str, str.size
+                raise Error, @archive if C::archive_read_open_memory(archive, @data, str.size) != C::OK
             end
         rescue
             close
@@ -101,7 +101,7 @@ module Archive
                 block = data.method :concat
             end
 
-            buffer = FFI::Buffer.alloc_out(size)
+            buffer = FFI::MemoryPointer.new(size)
             len = 0
             while (n = C::archive_read_data(archive, buffer, size)) > 0
                 case n

data/lib/ffi-libarchive/stat.rb

@@ -7,6 +7,8 @@ module Archive
             builder.include 'stdlib.h'
             builder.include 'sys/types.h'
             builder.include 'sys/stat.h'
+            builder.include 'string.h'
+            builder.include 'errno.h'
             builder.c %q{
                  void* ffi_libarchive_create_stat(const char* filename) {
                      struct stat* s = malloc(sizeof(struct stat));
@@ -26,6 +28,11 @@ module Archive
                      free((struct stat*)s);
                  }
             }
+            builder.c %q{
+                 const char* ffi_error() {
+                     return strerror(errno);
+                 }
+            }
         end
     end
 end

data/lib/ffi-libarchive/writer.rb

@@ -58,9 +58,12 @@ module Archive
             if params[:file_name]
                 raise Error, @archive if C::archive_write_open_filename(archive, params[:file_name]) != C::OK
             elsif params[:memory]
+                if C::archive_write_get_bytes_in_last_block(@archive) == -1
+                    C::archive_write_set_bytes_in_last_block(archive, 1)
+                end
                 @data = write_callback params[:memory]
                 raise Error, @archive if C::archive_write_open(archive, nil,
-                                                               method(:open_callback),
+                                                               nil,
                                                                @data,
                                                                nil) != C::OK
             end
@@ -69,14 +72,6 @@ module Archive
             raise
         end
 
-        def open_callback archive, client
-            if C::archive_write_get_bytes_in_last_block(archive) == -1
-                C::archive_write_set_bytes_in_last_block(archive, 1)
-            end
-            C::OK
-        end
-        private :open_callback
-
         def write_callback data
             Proc.new { |ar, client, buffer, length|
                 data.concat buffer.get_bytes(0,length)
@@ -104,8 +99,14 @@ module Archive
 
             entry = Entry.new
             data = yield entry
-            write_header entry
-            write_data data if data
+            if data
+                entry.size = data.size
+                write_header entry
+                write_data data
+            else
+                write_header entry
+            end
+            nil
         ensure
             entry.close
         end

data/version.txt

@@ -1 +1 @@
-0.1.1
+0.1.2

metadata

@@ -2,7 +2,7 @@
 name: ffi-libarchive
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Frank Fischer
@@ -10,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-11 00:00:00 +02:00
-default_executable: 
+date: 2011-04-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ffi
@@ -45,7 +44,6 @@ extra_rdoc_files:
 - History.txt
 - bin/ffi-libarchive-ruby
 files: 
-- .bnsignore
 - History.txt
 - README.md
 - Rakefile
@@ -56,13 +54,11 @@ files:
 - lib/ffi-libarchive/reader.rb
 - lib/ffi-libarchive/stat.rb
 - lib/ffi-libarchive/writer.rb
-- test.tgz
 - test/data/test.tar.gz
 - test/sets/ts_read.rb
 - test/sets/ts_write.rb
 - test/test_ffi-libarchive.rb
 - version.txt
-has_rdoc: true
 homepage: http://darcsden.com/lyro/ffi-libarchive
 licenses: []
 
@@ -87,7 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: ffi-libarchive
-rubygems_version: 1.6.2
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: An ffi binding to libarchive.

data/.bnsignore

@@ -1,20 +0,0 @@
-# The list of files that should be ignored by Mr Bones.
-# Lines that start with '#' are comments.
-#
-# A .gitignore file can be used instead by setting it as the ignore
-# file in your Rakefile:
-#
-#   Bones {
-#     ignore_file  '.gitignore'
-#   }
-#
-# For a project with a C extension, the following would be a good set of
-# exclude patterns (uncomment them if you want to use them):
-# *.[oa]
-# *~
-_darcs
-announcement.txt
-coverage
-doc
-pkg
-*.rbc