ffi-libarchive 1.0.17 → 1.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 27c509a1d26618d51623cca95acc84cfeb8c804bdf818b999c8d10ac173a99ae
-  data.tar.gz: 7d2a2184aa944ff1e91917be83e58be06d1df592154ce1a1bc33c8c1a6e1dd5e
+  metadata.gz: c36407f25d172183c558945197b30ab3de6ce623da69bcb95cd64eef1776ca6e
+  data.tar.gz: 6205aba975a305bef359027e6337c80829d2409dd25028ce4562af61e3d58e84
 SHA512:
-  metadata.gz: e6ba3e6ccb7c1ce9656a6bf399e4d6050bf9b8bc813d4eb6f9435c0be177dda9c861d9387913e8220eb7e27067ce93cbd891f221efcdc62c11e61f0b9284b055
-  data.tar.gz: 84bec17cb6e83978bd5241c116668ade6e4b2cf25595bdd44f10267c8274f42eaec00ec9719ecec2020cc1d927c13d55c437de89f4b5a8c387ed1ee1083b3797
+  metadata.gz: e2378c1c786464e9d5b77b6d27f97f5171349f6c5b37a3bccbbe4b597b98cefc972e27a89e22e7232d3554128e8929b296398fa04678d7943aa5e1ed32db6111
+  data.tar.gz: 0b30a8db432b3d7e8bb55b64fc284c9e74a343e67812aba08eee46ea15493e8a4998326aa9bbf258eeafe165bf01d90be60d7bb3ec4d430ffe9d19801bf73f19

data/lib/ffi-libarchive/archive.rb

@@ -12,11 +12,17 @@ module Archive
 
     attach_function :archive_version_number, [], :int
     attach_function :archive_version_string, [], :string
-    attach_function :archive_error_string, [:pointer], :string
+
+    attach_function :archive_compression, [:pointer], :int
+    attach_function :archive_compression_name, [:pointer], :string
     attach_function :archive_errno, [:pointer], :int
+    attach_function :archive_error_string, [:pointer], :string
+    attach_function :archive_format, [:pointer], :int
+    attach_function :archive_format_name, [:pointer], :string
 
     attach_function :archive_read_new, [], :pointer
     attach_function :archive_read_open_filename, %i{pointer string size_t}, :int
+    attach_function :archive_read_open_fd, %i{pointer int size_t}, :int
     attach_function :archive_read_open_memory, %i{pointer pointer size_t}, :int
     attach_function :archive_read_open1, [:pointer], :int
     attach_function :archive_read_support_compression_program, %i{pointer string}, :int
@@ -284,6 +290,10 @@ module Archive
     Reader.open_filename file_name, command, &block
   end
 
+  def self.read_open_fd(fd, command = nil, &block)
+    Reader.open_fd fd, command, &block
+  end
+
   def self.read_open_memory(string, command = nil, &block)
     Reader.open_memory string, command, &block
   end
@@ -355,6 +365,14 @@ module Archive
     end
     protected :archive
 
+    def compression
+      C.archive_compression(@archive)
+    end
+
+    def compression_name
+      C.archive_compression_name(@archive)
+    end
+
     def error_string
       C.archive_error_string(@archive)
     end
@@ -362,5 +380,13 @@ module Archive
     def errno
       C.archive_errno(@archive)
     end
+
+    def format
+      C.archive_format(@archive)
+    end
+
+    def format_name
+      C.archive_format_name(@archive)
+    end
   end
 end

data/lib/ffi-libarchive/reader.rb

@@ -2,16 +2,29 @@ module Archive
   class Reader < BaseArchive
     private_class_method :new
 
-    def self.open_filename(file_name, command = nil)
+    def self.open_filename(file_name, command = nil, strip_components: 0)
       if block_given?
-        reader = open_filename file_name, command
+        reader = open_filename file_name, command, strip_components: strip_components
         begin
           yield reader
         ensure
           reader.close
         end
       else
-        new file_name: file_name, command: command
+        new file_name: file_name, command: command, strip_components: strip_components
+      end
+    end
+
+    def self.open_fd(fd, command = nil, strip_components: 0)
+      if block_given?
+        reader = open_fd fd, command, strip_components: strip_components
+        begin
+          yield reader
+        ensure
+          reader.close
+        end
+      else
+        new fd: fd, command: command, strip_components: strip_components
       end
     end
 
@@ -41,9 +54,19 @@ module Archive
       end
     end
 
+    attr_reader :strip_components
+
     def initialize(params = {})
       super C.method(:archive_read_new), C.method(:archive_read_finish)
 
+      if params[:strip_components]
+        raise ArgumentError, "Expected Integer as strip_components" unless params[:strip_components].is_a?(Integer)
+
+        @strip_components = params[:strip_components]
+      else
+        @strip_components = 0
+      end
+
       if params[:command]
         cmd = params[:command]
         raise Error, @archive if C.archive_read_support_compression_program(archive, cmd) != C::OK
@@ -56,6 +79,8 @@ module Archive
       case
       when params[:file_name]
         raise Error, @archive if C.archive_read_open_filename(archive, params[:file_name], 1024) != C::OK
+      when params[:fd]
+        raise Error, @archive if C.archive_read_open_fd(archive, params[:fd], 1024) != C::OK
       when params[:memory]
         str = params[:memory]
         @data = FFI::MemoryPointer.new(str.bytesize + 1)
@@ -131,12 +156,16 @@ module Archive
 
     def each_entry
       while (entry = next_header)
+        next if strip_entry_components!(entry).nil?
+
         yield entry
       end
     end
 
     def each_entry_with_data(_size = C::DATA_BUFFER_SIZE)
       while (entry = next_header)
+        next if strip_entry_components!(entry).nil?
+
         yield entry, read_data
       end
     end
@@ -171,5 +200,57 @@ module Archive
         raise Error, @archive if C.archive_read_data_into_fd(archive, fd) != C::OK
       end
     end
+
+    private
+
+    #
+    # See:
+    #   1. https://github.com/libarchive/libarchive/blob/6a9dcf9fc429e2dc9fb08e669bf7b0bed4d5edf9/tar/read.c#L346
+    #   2. https://github.com/libarchive/libarchive/blob/a11f15860ae39ecdc8173243a211cdafc8ac893c/tar/util.c#L523-L535
+    #   3. https://github.com/libarchive/libarchive/blob/a11f15860ae39ecdc8173243a211cdafc8ac893c/tar/util.c#L554-L560
+    #
+    # @param entry [Archive::Entry]
+    #
+    # @return [Archive::Entry, nil] entry stripped or nil if entry is no longer relevant due to stripping
+    #
+    def strip_entry_components!(entry)
+      if strip_components > 0
+        name = entry.pathname
+        original_name = name.dup
+        hardlink_name = entry.hardlink
+        original_hardlink_name = hardlink_name.dup
+
+        strip_path_components!(name)
+        return if name.empty?
+
+        unless hardlink_name.nil?
+          strip_path_components!(hardlink_name)
+          return if hardlink_name.empty?
+        end
+
+        if name != original_name
+          entry.copy_pathname(name)
+        end
+        entry.copy_hardlink(hardlink_name) if hardlink_name != original_hardlink_name
+      end
+
+      entry
+    end
+
+    #
+    # @param path [String]
+    #
+    # @return [String]
+    #
+    def strip_path_components!(path)
+      if strip_components > 0
+        is_dir = path.end_with?("/")
+        updated_path = path.split("/").drop(strip_components).join("/")
+        updated_path = is_dir && updated_path != "" ? updated_path + "/" : updated_path
+        path.gsub!(path, updated_path)
+      else
+        path
+      end
+    end
   end
 end

data/lib/ffi-libarchive/version.rb

@@ -1,3 +1,3 @@
 module Archive
-  VERSION = "1.0.17".freeze
+  VERSION = "1.1.13".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ffi-libarchive
 version: !ruby/object:Gem::Version
-  version: 1.0.17
+  version: 1.1.13
 platform: ruby
 authors:
 - John Bellone
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-10 00:00:00.000000000 Z
+date: 2023-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -26,20 +26,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: A Ruby FFI binding to libarchive.
 email:
 - jbellone@bloomberg.net
@@ -69,7 +55,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="