excavate 0.3.2 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa5e513f27e2996c18e3b006569540ec1c06c8b178460e2241a891e42fddcfda
-  data.tar.gz: 3a0c7b6f1829f2a1d2ff4645d8b40d677a54b693351a883b53b2feb47d29b9b3
+  metadata.gz: 7a8ee881421934ef0e3333fe045b1af9d8925b93930fe2f7fd136254ff308382
+  data.tar.gz: 9ca82179fdc265ba891c262f95d200c73bf2376399abd106135a6dcc8e2479e5
 SHA512:
-  metadata.gz: 7176e3bb221ef27aa16bb666f278d2081030c28778380fa40b5cdd44737fef9b5a76e9f7b7475dfaceaf33583b7caea80590f39e3a2a5f614f9a957baf082af8
-  data.tar.gz: '0359c8ea5ac50e2ad79c8c453b81a5dea7c2a11c1c1e9accf0844aa5f6ea110a3cfe692819c8c786c45a1191cce2d26259135832238fb268a31e913696cac951'
+  metadata.gz: 85d30df5e364ea3207a28a10cdf28dbe7020bf03af32661a43d925aaf29b2413995dd7eab0184e881e06b3910098d11018e1bc22f718e82e75c277d01459e28b
+  data.tar.gz: bfea734b56d0e83574d97ce009555cac2130ee13c1a35e83c331579718d5619ae956adba4479c0d2748d416083be269b6e88092bb39d47ed733aa3bbadbd3c81

data/.gitignore

@@ -1,5 +1,6 @@
 /.bundle/
 /.yardoc
+/.vscode
 /_yardoc/
 /coverage/
 /doc/

data/excavate.gemspec

@@ -2,6 +2,8 @@
 
 require_relative "lib/excavate/version"
 
+# rubocop:disable Metrics/BlockLength
+
 Gem::Specification.new do |spec|
   spec.name          = "excavate"
   spec.version       = Excavate::VERSION
@@ -35,11 +37,13 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "libmspack", "~> 0.1"
   spec.add_runtime_dependency "ruby-ole", "~> 1.0"
   spec.add_runtime_dependency "rubyzip", "~> 2.3"
+  spec.add_runtime_dependency "seven-zip", "~> 1.4"
   spec.add_runtime_dependency "thor", "~> 1.0"
 
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "rubocop", "~> 1.7"
   spec.add_development_dependency "rubocop-performance", "~> 1.15"
-
   spec.metadata["rubygems_mfa_required"] = "false"
 end
+
+# rubocop:enable Metrics/BlockLength

data/lib/excavate/archive.rb

@@ -184,6 +184,12 @@ module Excavate
       FileUtils.cp(archive, target)
     end
 
+    def may_be_nested_cab?(extension, message)
+      extension == "exe" &&
+        message.start_with?("Invalid file format",
+                            "Unrecognized archive format")
+    end
+
     def extract_once(archive, target)
       extension = normalized_extension(archive)
       extractor_class = TYPES[extension]
@@ -193,8 +199,7 @@ module Excavate
 
       extractor_class.new(archive).extract(target)
     rescue StandardError => e
-      raise unless extension == "exe" &&
-        e.message.start_with?("Invalid file format")
+      raise unless may_be_nested_cab?(extension, e.message)
 
       Extractors::CabExtractor.new(archive).extract(target)
     end
@@ -235,6 +240,8 @@ module Excavate
       return false unless File.file?(file)
 
       ext = normalized_extension(file)
+      return false if ext == "gz" && FileMagic.detect(file) != :gzip
+
       TYPES.key?(ext)
     end
   end

data/lib/excavate/extractors/seven_zip_extractor.rb

@@ -1,24 +1,15 @@
-require "ffi-libarchive-binary"
+require "seven_zip_ruby"
 
 module Excavate
   module Extractors
     class SevenZipExtractor < Extractor
       def extract(target)
         Dir.chdir(target) do
-          extract_with_libarchive
+          File.open(@archive, "rb") do |file|
+            SevenZipRuby::Reader.extract_all(file, target)
+          end
         end
       end
-
-      def extract_with_libarchive
-        flags = ::Archive::EXTRACT_PERM
-        reader = ::Archive::Reader.open_filename(@archive)
-
-        reader.each_entry do |entry|
-          reader.extract(entry, flags.to_i)
-        end
-
-        reader.close
-      end
     end
   end
 end

data/lib/excavate/file_magic.rb

@@ -9,9 +9,15 @@ module Excavate
     end
 
     def detect
-      case File.read(@path, 8, mode: "rb")
+      beginning = File.read(@path, 8, mode: "rb")
+      case beginning
       when "MSCF\x00\x00\x00\x00".force_encoding("BINARY")
         :cab
+      else
+        case beginning.byteslice(0, 2)
+        when "\x1F\x8B".force_encoding("BINARY")
+          :gzip
+        end
       end
     end
   end

data/lib/excavate/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Excavate
-  VERSION = "0.3.2"
+  VERSION = "0.3.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: excavate
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.4
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-10-26 00:00:00.000000000 Z
+date: 2023-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arr-pm
@@ -100,6 +100,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.3'
+- !ruby/object:Gem::Dependency
+  name: seven-zip
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -201,7 +215,7 @@ metadata:
   source_code_uri: https://github.com/fontist/excavate
   changelog_uri: https://github.com/fontist/excavate
   rubygems_mfa_required: 'false'
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -216,8 +230,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key: 
+rubygems_version: 3.4.10
+signing_key:
 specification_version: 4
 summary: Extract nested archives with a single command.
 test_files: []