ffi_libarchive 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea40988e363101b31876efb5e4e8d5cc7f22d100041b6a12d1b05d9477c5e355
-  data.tar.gz: 19bd4862747b5e030cd69b85a564bb08e89c5f8cf25829a07a566ddae70990f0
+  metadata.gz: 21492e6683b6460c603231a3825914b51bfe4b8507b1bf4b952e40af0d3665c6
+  data.tar.gz: 53d12a414f22d5a8d9a55b57dbb1ba70c8996bfd7f63f8d5563a3eaf45d94675
 SHA512:
-  metadata.gz: 80e6d241c8ac6daa7fa5a51cd2654a43f6d82b5d3de682f1c32b04d721f6124702d440c29953147a2dcc3e960b87fabc5cf643886a7b8f6a20dcdf07d282db0b
-  data.tar.gz: 5bc8f0906c6cef9119c92a711761e6396cd9c4bf212188eb84bd67f1a957ceae281853f3a2c486708f763c2024a1f2a4f739a0a5a5c47ffea9056375505023dd
+  metadata.gz: '08f3839842727213f59b4ff5e6a63f42e21311217304403ff93afa184ec0be04256e2f233727f7c411549fc1daf8fdcba2dabad11823b235c6aed2f39d87a948'
+  data.tar.gz: 9a8ad741321c67a313dfc5fa00ca09e9c5842638850219009cff0ed742771ee018168e4c44171f0c013be78df4f9d65e33f10be389ef3c37b9273372689dc9ed

data/lib/ffi_libarchive/reader.rb

@@ -168,6 +168,13 @@ module Archive
       end
     end
 
+    def close
+      super
+      @read_callback = nil
+      @skip_callback = nil
+      @seek_callback = nil
+    end
+
     protected
 
     def init_compression(command)
@@ -196,7 +203,7 @@ module Archive
     end
 
     def init_for_stream(reader)
-      read_callback = proc do |_ar, _client_data, buffer|
+      @read_callback = proc do |_ar, _client_data, buffer|
         # @type [String]
         data = reader.call
 
@@ -207,16 +214,16 @@ module Archive
           0
         end
       end
-      raise Error, self if C.archive_read_set_read_callback(archive, read_callback) != C::OK
+      raise Error, self if C.archive_read_set_read_callback(archive, @read_callback) != C::OK
 
       if reader.respond_to?(:skip)
-        skip_callback = proc { |_ar, _client_data, request| reader.skip(request) }
-        raise Error, self if C.archive_read_set_skip_callback(archive, skip_callback) != C::OK
+        @skip_callback = proc { |_ar, _client_data, request| reader.skip(request) }
+        raise Error, self if C.archive_read_set_skip_callback(archive, @skip_callback) != C::OK
       end
 
       if reader.respond_to?(:seek)
-        seek_callback = proc { |_ar, _client_data, offset, whence| reader.seek(offset, whence) }
-        raise Error, self if C.archive_read_set_seek_callback(archive, seek_callback) != C::OK
+        @seek_callback = proc { |_ar, _client_data, offset, whence| reader.seek(offset, whence) }
+        raise Error, self if C.archive_read_set_seek_callback(archive, @seek_callback) != C::OK
       end
 
       # Required or open1 will segfault, even though the callback data is not used.

data/lib/ffi_libarchive/writer.rb

@@ -139,6 +139,11 @@ module Archive
       raise Error, self if C.archive_write_header(archive, entry.entry) != C::OK
     end
 
+    def close
+      super
+      @write_callback = nil
+    end
+
     protected
 
     def init_compression(compression)
@@ -166,13 +171,13 @@ module Archive
     def init_for_memory(memory)
       C.archive_write_set_bytes_in_last_block(archive, 1) if C.archive_write_get_bytes_in_last_block(archive) < 0
 
-      write_callback = proc do |_ar, _client_data, buffer, length|
+      @write_callback = proc do |_ar, _client_data, buffer, length|
         memory << buffer.get_bytes(0, length)
         length
       end
 
       null_ptr = FFI::Pointer::NULL
-      raise Error, self if C.archive_write_open(archive, null_ptr, null_ptr, write_callback, null_ptr) != C::OK
+      raise Error, self if C.archive_write_open(archive, null_ptr, null_ptr, @write_callback, null_ptr) != C::OK
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ffi_libarchive
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - John Bellone
@@ -85,7 +85,9 @@ dependencies:
         version: '0'
 description: |-
   This library provides Ruby FFI bindings to the well-known [libarchive library](https://www.libarchive.org/).
-   *NOTE* This gem is refactored / optimized version of [ffi-libarchive](https://rubygems.org/gems/ffi-libarchive) with more tests to cover almost use-cases.
+
+
+  *NOTE* This gem is refactored / optimized version of [ffi-libarchive](https://rubygems.org/gems/ffi-libarchive) with more tests to cover almost use-cases.
 email:
 - jbellone@bloomberg.net
 - jamie@vialstudios.com