excavate 0.1.1 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '05638165852fcf0b41aa72e491d285182a11d2b5989cdee78393ff3f8719a017'
-  data.tar.gz: b3a9e906c6dd35274e0e2b7a7e90f5c10ea8447b0f77c0b0cd59b277d224c06d
+  metadata.gz: 4dedf2dff68fab0c162340e9dc591f1675612d2b6f46335c6fe599ecead65434
+  data.tar.gz: 8d8dd45fbe6ba733d4aa759a3f9f1bb5fc457be3fa0ae176b48bc0d1a417c8ec
 SHA512:
-  metadata.gz: 3eea36c08d18780f9131875d3ca78c33bdf558c957425d9b936f08eb1512bb298724f68f418edb3b3db0c941e228e11473826ad6a16b6fcf399935f73be03514
-  data.tar.gz: 371061bead10a3716b931a9877153c3ea47e8666030fbb0dc7885217da32428f7f43298ec0a98a7fc0f2ef2ffd7a51af5e7371eedbee06f19d34b7a5995b8e3d
+  metadata.gz: b3f6c9a0f90d398afe6ee88c64004aaa5aad6ef50382d095e9df67a2841b3ae7c1af46a2f760718837d10350d2de4b90f727b495c2d8fdd6f32ae9dd290b7de1
+  data.tar.gz: c33b1e35ec3c7478b9236ee705f683b937394f495bb60b57e7602841136e951cbd8eee71ceaabf586548218302e6c495010b7a30020726056d6dd3f47e2bd0ff

data/.github/workflows/rspec.yml

@@ -2,7 +2,7 @@ name: rspec
 
 on:
   push:
-    branches: [ master ]
+    branches: [ master, main ]
   pull_request:
 
 jobs:

data/Gemfile

@@ -5,9 +5,7 @@ source "https://rubygems.org"
 gemspec
 
 gem "gem-release"
-
 gem "rake", "~> 13.0"
-
 gem "rspec", "~> 3.2"
 gem "rubocop", "0.75.0"
 gem "rubocop-performance"

data/README.adoc

@@ -1,3 +1,7 @@
+image:https://img.shields.io/gem/v/excavate.svg["Gem Version", link="https://rubygems.org/gems/excavate"]
+// image:https://codeclimate.com/github/fontist/expressir/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/fontist/excavate"]
+image:https://github.com/fontist/excavate/workflows/rspec/badge.svg["Build Status", link="https://github.com/fontist/excavate/actions?workflow=rspec"]
+
 = Excavate: Ruby gem to extract nested archives
 
 Extract nested archives with a single command.
@@ -65,6 +69,19 @@ $ excavate path/to/archive.cab
 ----
 
 
+== Dependencies
+
+Depends on
+https://github.com/fontist/ffi-libarchive-binary[ffi-libarchive-binary] which
+has the following requirements:
+
+* zlib
+* Expat
+* OpenSSL (for Linux only)
+
+These dependencies are generally present on all systems.
+
+
 == Development
 
 We are following Sandi Metz's Rules for this gem, you can read the

data/excavate.gemspec

@@ -27,6 +27,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "arr-pm", "~> 0.0"
+  spec.add_runtime_dependency "ffi-libarchive-binary", "~> 0.0"
   spec.add_runtime_dependency "libmspack", "~> 0.1"
   spec.add_runtime_dependency "ruby-ole", "~> 1.0"
   spec.add_runtime_dependency "rubyzip", "~> 2.3"

data/lib/excavate/archive.rb

@@ -7,6 +7,7 @@ module Excavate
               "msi" => Extractors::OleExtractor,
               "rpm" => Extractors::RpmExtractor,
               "tar" => Extractors::TarExtractor,
+              "pkg" => Extractors::XarExtractor,
               "zip" => Extractors::ZipExtractor }.freeze
 
     def initialize(archive)
@@ -104,6 +105,8 @@ module Excavate
     end
 
     def archive?(file)
+      return false unless File.file?(file)
+
       ext = normalized_extension(file)
       TYPES.key?(ext)
     end

data/lib/excavate/extractors.rb

@@ -6,4 +6,5 @@ require_relative "extractors/ole_extractor"
 require_relative "extractors/rpm_extractor"
 require_relative "extractors/seven_zip_extractor"
 require_relative "extractors/tar_extractor"
+require_relative "extractors/xar_extractor"
 require_relative "extractors/zip_extractor"

data/lib/excavate/extractors/cpio_extractor.rb

@@ -21,6 +21,7 @@ module Excavate
             if entry.directory?
               FileUtils.mkdir_p(path)
             else
+              FileUtils.mkdir_p(File.dirname(path))
               File.write(path, file.read, mode: "wb")
             end
           end
@@ -34,6 +35,7 @@ module Excavate
             if entry.directory?
               FileUtils.mkdir_p(path)
             else
+              FileUtils.mkdir_p(File.dirname(path))
               File.write(path, entry.data, mode: "wb")
             end
           end

data/lib/excavate/extractors/xar_extractor.rb

@@ -0,0 +1,35 @@
+require "ffi-libarchive-binary"
+
+module Excavate
+  module Extractors
+    class XarExtractor < Extractor
+      def extract(target)
+        Dir.chdir(target) do
+          extract_with_libarchive
+          rename_payload(target)
+        end
+      end
+
+      private
+
+      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
+
+      def rename_payload(target)
+        Dir.glob(File.join(target, "**", "Payload")).each do |file|
+          next unless File.file?(file)
+
+          FileUtils.mv(file, "#{file}.cpio.gz")
+        end
+      end
+    end
+  end
+end

data/lib/excavate/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: excavate
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.4
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-05 00:00:00.000000000 Z
+date: 2021-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arr-pm
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.0'
+- !ruby/object:Gem::Dependency
+  name: ffi-libarchive-binary
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
 - !ruby/object:Gem::Dependency
   name: libmspack
   requirement: !ruby/object:Gem::Requirement
@@ -127,6 +141,7 @@ files:
 - lib/excavate/extractors/rpm_extractor.rb
 - lib/excavate/extractors/seven_zip_extractor.rb
 - lib/excavate/extractors/tar_extractor.rb
+- lib/excavate/extractors/xar_extractor.rb
 - lib/excavate/extractors/zip_extractor.rb
 - lib/excavate/file_magic.rb
 - lib/excavate/utils.rb