dwc-archive 0.1.5 → 0.1.6

data/VERSION

@@ -1 +1 @@
-0.1.5
+0.1.6

data/lib/dwc-archive/expander.rb

@@ -28,18 +28,23 @@ class DarwinCore
     end
     
     private
+
+    def esc(a_str)
+      "'" + a_str.gsub(92.chr, '\\\\\\').gsub("'", "\\\\'") + "'"
+    end
+
     def get_unpacker
-      file_type = IO.popen("file -z " + @archive_path).read
+      file_type = IO.popen("file -z " + esc(@archive_path)).read
       
       if file_type.match(/tar.*gzip/i)
         return proc do |tmp_path, archive_path| 
           FileUtils.mkdir tmp_path
-          system("tar -zxf #{archive_path} -C #{tmp_path} > /dev/null 2>&1")
+          system("tar -zxf #{esc(archive_path)} -C #{tmp_path} > /dev/null 2>&1")
         end
       end
 
       if file_type.match(/Zip/)
-        return proc { |tmp_path, archive_path| system("unzip -qq -d #{tmp_path} #{archive_path} > /dev/null 2>&1") }
+        return proc { |tmp_path, archive_path| system("unzip -qq -d #{tmp_path} #{esc(archive_path)} > /dev/null 2>&1") }
       end
       
       return nil

data/spec/lib/dwc-archive_spec.rb

@@ -29,5 +29,12 @@ describe DarwinCore do
       file = File.join(@file_dir, 'invalid.tar.gz')
       lambda { DarwinCore.new(file) }.should raise_error(DarwinCore::InvalidArchiveError)
     end
+
+    it "should work with files that have non-alfanumeric characters and spaces" do
+      file = File.join(@file_dir, 'file with characters(3).gz')
+      dwc = DarwinCore.new(file)
+      dwc.archive.valid?.should be_true
+    end
+
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 5
-  version: 0.1.5
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Dmitry Mozzherin
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-28 00:00:00 -04:00
+date: 2010-05-06 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -75,6 +75,7 @@ files:
 - spec/files/data.tar.gz
 - spec/files/data.zip
 - spec/files/eml.xml
+- spec/files/file with characters(3).gz
 - spec/files/invalid.tar.gz
 - spec/files/meta.xml
 - spec/files/minimal.tar.gz