excavate 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e470dda7c9344874bb4cf08f4a769817036ad080139a88047042d402e9d5acec
-  data.tar.gz: 4428084b936ada2dd5ed5179007a73f150abe96763c7df117718d685d6384447
+  metadata.gz: fe53a363bd11b14249732d9c553b9efc00a4a9ab0ac156d90ea48afac366607e
+  data.tar.gz: af6bac0b0faace666c557fa4c66f32ef31a659110629916ac82a74172ad2c448
 SHA512:
-  metadata.gz: f07491b7d61cd96023cf0ffd2054ce0484f4cba47165cd3bfc1e06c4c98678daa79dd50e54331d5c8c33435028e329751cc6a574d1d37e865caa6d468f66d043
-  data.tar.gz: f2bd8e1666a1d86cad6e33ae7b6a6861c53c990552710b2f3b828a2cb056c127e92ed31efa46ca2ce96ce19c9eab68819d814373eba01fb8b7b2240b55d4a0ad
+  metadata.gz: 974a4e58890cc0d2b4a472d5a8d3a580ffb1a6bdc47f7e41c1e212692d636936921718be201c320069eefd7e6677b91266fafedbfcf393bfafbb714dede984cf
+  data.tar.gz: 0634316b5893c0a58bba0f1d0e756ccedbadd5061acd344b2c3d0c93810f5363a9cfe5cf4220454884a07c1a81f537b74e0abca2f86aa04d619bebb72021c686

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

@@ -5,15 +5,29 @@ module Excavate
     class XarExtractor < Extractor
       def extract(target)
         Dir.chdir(target) do
-          flags = ::Archive::EXTRACT_PERM
-          reader = ::Archive::Reader.open_filename(@archive)
+          extract_with_libarchive
+          rename_payload(target)
+        end
+      end
 
-          reader.each_entry do |entry|
-            reader.extract(entry, flags.to_i)
-          end
+      private
 
-          reader.close
+      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)
+        payload_path = File.join(target, "Payload")
+        return unless File.exist?(payload_path)
+
+        FileUtils.mv(payload_path, "#{payload_path}.cpio.gz")
       end
     end
   end

data/lib/excavate/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: excavate
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Ribose Inc.