unpack 0.2.0 → 0.2.1

data/lib/unpack.rb

@@ -14,6 +14,7 @@ class Unpack
       :debugger               => false,
       :force_remove           => false,
       :remove                 => false,
+      :to                     => false,
       :absolute_path_to_unrar => "#{File.dirname(__FILE__)}/../bin/unrar"
     }
     
@@ -38,7 +39,7 @@ class Unpack
     args[:to] = args[:to].nil? ? File.dirname(args[:file]) : args[:to]
     
     # Adding the options that is being passed to {it!} directly to {Unpack}
-    this = self.new(:directory => args[:to], :options => {:min_files => 0}.merge(args))
+    this = self.new(:directory => args[:to], :options => {:min_files => 0, :to => true}.merge(args))
     
     # Is the file path absolute ? good, do nothing : get the absolute path
     file = args[:file].match(/^\//) ? args[:file] : File.expand_path(args[:file])
@@ -89,11 +90,12 @@ class Unpack
     @files.each  do |file|
       type = Mimer.identify(file)
       
-      # To what directory want we to unpack the file ? The same as the file : The one that where specified in {initialize}
-      path = @directory == File.dirname(file) ? File.dirname(file) : @directory
+      # Have the user specified a destenation folder to where the files are going to be unpacked?
+      # If so, use that, if not use the current location of the archive file
+      path = self.options[:to] ? @directory : File.dirname(file)
       
       before = Dir.new(path).entries
-
+      
       if type.zip?
         @removeable.merge!(path => {:file_type => 'zip'})
         self.unzip(:path => path, :file => file)

data/spec/spec_helper.rb

@@ -1,5 +1,7 @@
 require 'rspec'
 require 'fileutils'
+require 'digest/md5'
+
 require "#{File.dirname(__FILE__)}/../lib/unpack"
 
 RSpec.configure do |config|

data/spec/unpack_spec.rb

@@ -99,7 +99,19 @@ describe Unpack, "should work with the runner" do
   it "should allways return an array" do
     Unpack.runner!('spec/data/rar_real', :depth => 0).should be_instance_of(Array)
   end
-
+  
+  it "should unpack the archived files in the same folder as they where found" do
+    folder = Digest::MD5.hexdigest(Time.now.to_s)
+    %x{mkdir /tmp/#{folder} && mkdir /tmp/#{folder}/CD1 && mkdir /tmp/#{folder}/CD2}
+    src = File.expand_path(File.dirname(__FILE__) + "/data/o_files/test_package.rar")
+    ["/tmp/#{folder}/CD1", "/tmp/#{folder}/CD2"].each do |f|
+      FileUtils.copy_file(src, "#{f}/test_package.rar")
+    end
+    
+    Unpack.runner!("/tmp/#{folder}", :min_files => 0)
+    
+    %x{cd "/tmp/#{folder}" && ls}.split(/\n/).count.should be(2)
+  end
 end
 
 describe Unpack do

data/unpack.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "unpack"
-  s.version     = "0.2.0"
+  s.version     = "0.2.1"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Linus Oleander"]
   s.email       = ["linus@oleander.nu"]

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: unpack
 version: !ruby/object:Gem::Version 
+  hash: 21
   prerelease: 
-  version: 0.2.0
+  segments: 
+  - 0
+  - 2
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Linus Oleander
@@ -10,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-05 00:00:00 +01:00
+date: 2011-02-07 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,6 +26,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id001
@@ -32,6 +40,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 0
+        - 0
+        - 4
         version: 0.0.4
   type: :runtime
   version_requirements: *id002
@@ -177,17 +190,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.0
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: An automated unrar gem