mundane 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34457acc6048618f2422f176abb24819b7425880
-  data.tar.gz: 5f182b1308a6698ce1176d0aa111565c66f96c66
+  metadata.gz: a2f884eb09a064e4a09eeeba3ffaf1521a9faedc
+  data.tar.gz: 5526ff7375980336cb4c36516304dec0415bf225
 SHA512:
-  metadata.gz: 9da5d04fcb12ee5093dd53b8ab46667345d4594ec8ebfe8da8fec1f96e71ca301d0a168318c290a5e83c1dd201790163c72c52057ed4c47a77348654e3fe0115
-  data.tar.gz: 830a765dcafc0e0e275cbd7c68a686b681d0ca1cffab08fd00c473373bde98a09a35321fb2200063052ca916493bef1f6af963c40fffc592068038a170108b28
+  metadata.gz: 3ab03630bc0aa83ec2b3b163f048ad359f3023b79b8fd5a78b225eef6774b17360274dfb5a11653da5879cbcef18e0d41173de866f60e513036f308b3fef4b59
+  data.tar.gz: f215cd036269ceae089f114238e4320e979db4992b8df529572ad716fa90d6d06b8482544f75f53682e2a7409dc8e431f6f2c5eb00fc8a5b6ff85bdc5468a75e

data/lib/mundane.rb

@@ -1,4 +1,3 @@
-#require 'pry'
 require 'zip'
 
 require 'mundane/version'

data/lib/mundane/algos/zips_to_files.rb

@@ -16,25 +16,34 @@ module Mundane
     
     def self.decompress_files_and_dump_them_to_out(files)
       incomplete_extractions = 0
+      all_files_were_archives = true
       
       # decompress each file in the list
       files.each do |zip|
                                              # TODO:  next if zip.extension != 'zip'
-        Zip::File.open(zip) do |archive|
-          archive.each do |f|
-            output_path = "out/#{f.name}"
-            if File.exists? output_path          # don't auto-overwrite anything...
-              puts "#{output_path} ALREADY EXISTED, SKIPPING FILE.  DELETE MANUALLY IF NEEDED =/"
-              incomplete_extractions += 1
-              next
+        begin
+          Zip::File.open(zip) do |archive|
+            archive.each do |f|
+              output_path = "out/#{f.name}"
+              if File.exists? output_path          # don't auto-overwrite anything...
+                puts "#{output_path} ALREADY EXISTED, SKIPPING FILE."
+                incomplete_extractions += 1
+                next
+              end
+              
+              FileUtils.mkdir_p File.dirname(output_path)
+              f.extract output_path
             end
-            f.extract output_path
           end
+        rescue
+          # skip the file if it can't be opened like a zip
+          all_files_were_archives = false
         end
 
       end
       
       puts "\nOperation terminated, there were #{incomplete_extractions} incomplete extractions." if incomplete_extractions > 0
+      puts "Not all files were valid archives" unless all_files_were_archives
     end
     
   end

data/lib/mundane/version.rb

@@ -1,3 +1,3 @@
 module Mundane
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/spec/spec_helper.rb

@@ -23,7 +23,13 @@ def drop_dummy_zip_file
   # This string was coppied from a hex editor (bless) on linux
   byte_array_of_zip_file = "50 4B 03 04 0A 03 00 00 00 00 9A 85 4C 43 05 40 6D 5B 08 00 00 00 08 00 00 00 01 00 00 00 61 68 65 6C 6C 6F 20 61 0A 50 4B 03 04 0A 03 00 00 00 00 B8 85 4C 43 C6 13 40 70 08 00 00 00 08 00 00 00 01 00 00 00 62 68 65 6C 6C 6F 20 62 0A 50 4B 01 02 3F 03 0A 03 00 00 00 00 9A 85 4C 43 05 40 6D 5B 08 00 00 00 08 00 00 00 01 00 00 00 00 00 00 00 00 00 20 80 A4 81 00 00 00 00 61 50 4B 01 02 3F 03 0A 03 00 00 00 00 B8 85 4C 43 C6 13 40 70 08 00 00 00 08 00 00 00 01 00 00 00 00 00 00 00 00 00 20 80 A4 81 27 00 00 00 62 50 4B 05 06 00 00 00 00 02 00 02 00 5E 00 00 00 4E 00 00 00 00 00"
   bin_format = byte_array_of_zip_file.split.map {|s| s.to_i(16).chr}
-  File.binwrite("mine_embedded.zip", bin_format.join)
+  File.binwrite("embedded.zip", bin_format.join)
+end
+
+def drop_dummy_zip_file_with_folders
+  byte_array_of_zip_file = "50 4B 03 04 0A 03 00 00 00 00 EA 72 4D 43 C6 13 40 70 08 00 00 00 08 00 00 00 05 00 00 00 62 2E 74 78 74 68 65 6C 6C 6F 20 62 0A 50 4B 03 04 14 03 00 00 00 00 80 72 4D 43 00 00 00 00 00 00 00 00 00 00 00 00 09 00 00 00 66 6F 6C 64 65 72 5F 61 2F 50 4B 03 04 0A 03 00 00 00 00 80 72 4D 43 05 40 6D 5B 08 00 00 00 08 00 00 00 0E 00 00 00 66 6F 6C 64 65 72 5F 61 2F 61 2E 74 78 74 68 65 6C 6C 6F 20 61 0A 50 4B 01 02 3F 03 0A 03 00 00 00 00 EA 72 4D 43 C6 13 40 70 08 00 00 00 08 00 00 00 05 00 00 00 00 00 00 00 00 00 20 80 A4 81 00 00 00 00 62 2E 74 78 74 50 4B 01 02 3F 03 14 03 00 00 00 00 80 72 4D 43 00 00 00 00 00 00 00 00 00 00 00 00 09 00 00 00 00 00 00 00 00 00 10 80 ED 41 2B 00 00 00 66 6F 6C 64 65 72 5F 61 2F 50 4B 01 02 3F 03 0A 03 00 00 00 00 80 72 4D 43 05 40 6D 5B 08 00 00 00 08 00 00 00 0E 00 00 00 00 00 00 00 00 00 20 80 A4 81 52 00 00 00 66 6F 6C 64 65 72 5F 61 2F 61 2E 74 78 74 50 4B 05 06 00 00 00 00 03 00 03 00 A6 00 00 00 86 00 00 00 00 00"
+  bin_format = byte_array_of_zip_file.split.map {|s| s.to_i(16).chr}
+  File.binwrite("embedded_with_folders.zip", bin_format.join)
 end
 
 def count_of_files_in(directory_path)

data/spec/unit/mundane_spec.rb

@@ -40,6 +40,21 @@ describe "test the algos" do
     
     it 'should make 2 files in the out folder' do
       drop_dummy_zip_file
+
+      Mundane.zips_to_files
+      count_of_files_in(fake_out_directory).should be 2
+    end
+    
+    it "should work on zip archives that have a folder in them" do
+      drop_dummy_zip_file_with_folders
+      
+      Mundane.zips_to_files
+      count_of_files_in(fake_out_directory).should be 2
+    end
+    
+    it "should ignore files that aren't really archives" do
+      drop_dummy_zip_file
+      drop_dummy_files_in_working_directory
       
       Mundane.zips_to_files
       count_of_files_in(fake_out_directory).should be 2

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mundane
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - n-jax