unpack 0.1.4 → 0.1.6

data/lib/unpack.rb

@@ -3,7 +3,7 @@ require 'unpack/container'
 require 'fileutils'
 
 class Unpack
-  attr_accessor :files, :options
+  attr_accessor :files, :options, :directory, :removeable
   
   def initialize(args)
     args.keys.each { |name| instance_variable_set "@" + name.to_s, args[name] }
@@ -29,6 +29,26 @@ class Unpack
     
     raise Exception.new("You need to specify a valid path") if @directory.nil? or not Dir.exist?(@directory)
     raise Exception.new("You need unzip to keep going") if %x{whereis unzip}.empty?
+    
+    @files = []
+  end
+  
+  def self.it!(args)
+    # If no to argument is given, file will be unpacked in the same dir
+    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))
+    
+    # Is the file path absolute ? good, do nothing : get the absolute path
+    file = args[:file].match(/^\//) ? args[:file] : File.expand_path(args[:file])
+    
+    this.files << file
+    this.unpack!
+    this.wipe! if this.options[:remove]
+    
+    # Only one files has been unpacked, that is why we select the first object in the list
+    this.diff.first
   end
   
   def self.runner!(directory = '.', options = {})
@@ -69,7 +89,10 @@ class Unpack
   def unpack!
     @files.each  do |file|
       type = Mimer.identify(file)
-      path = File.dirname(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
+      
       before = Dir.new(path).entries
 
       if type.zip?

data/spec/unpack_spec.rb

@@ -2,6 +2,14 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper.rb')
 
 # Preparing the file structure 
 def clear!
+  
+  # Removes old files in the test directory
+  ['to', 'from'].each do |folder|
+    Dir.glob(File.expand_path(File.dirname(__FILE__) + "/data/#{folder}/*")).each do |file|
+      FileUtils.rm(file)
+    end
+  end
+   
   {'some_zip_files.zip' => 'zip_real', 'test_package.rar' => 'rar_real'}.each_pair do |taget|
 
     # Removes old files in the test directory
@@ -18,8 +26,15 @@ def clear!
   Dir.glob(File.expand_path(File.dirname(__FILE__) + "/data/movie_to/*")).each do |file|
     FileUtils.rm(file) if Mimer.identify(file).text?
   end
+  
+  {'test_package.rar' => 'to', 'some_zip_files.zip' => 'to'}.each_pair do |taget|
+    src = File.expand_path(File.dirname(__FILE__) + "/data/o_files/#{taget.first}")
+    dest = File.expand_path(File.dirname(__FILE__) + "/data/from/#{taget.first}")
+    FileUtils.copy_file(src, dest)
+  end
 end
 
+
 describe Unpack, "should work with the runner" do
   before(:each) do
     clear!
@@ -258,4 +273,54 @@ describe Unpack, "should work with all kind of paths" do
       Unpack.new(directory: "spec/random")
     }.should raise_error(Exception)
   end
+end
+
+describe Unpack, "should be able to unpack" do
+  before(:each) do
+    clear!
+    @path = File.expand_path('spec/data/to/')
+    @from = File.expand_path('spec/data/from/')
+  end
+  
+  it "should be able to unpack an unknown file from one dir to a nother" do
+    ['some_zip_files.zip', "test_package.rar"].each do |inner|
+      files = %x{cd #{@path} && ls}.split(/\n/).count
+      Unpack.it!(file: File.expand_path("spec/data/from/#{inner}"), to: @path)
+      %x{cd #{@path} && ls}.split(/\n/).count.should_not eq(files)
+      clear!
+    end
+  end
+  
+  it "should be able to unpack relative files" do
+    ['some_zip_files.zip', "test_package.rar"].each do |inner|
+      files = %x{cd #{@path} && ls}.split(/\n/).count
+      Unpack.it!(file: "spec/data/from/#{inner}", to: 'spec/data/to')
+      %x{cd #{@path} && ls}.split(/\n/).count.should_not eq(files)
+      clear!
+    end
+  end
+  
+  it "should be able to unpack to the same folder" do
+    ['some_zip_files.zip', "test_package.rar"].each do |inner|
+      files = %x{cd #{@from} && ls}.split(/\n/).count
+      Unpack.it!(file: "spec/data/from/#{inner}")
+      %x{cd #{@from} && ls}.split(/\n/).count.should_not eq(files)
+      clear!
+    end
+  end
+  
+  it "should raise an error when the path does not exist" do
+    lambda{
+      Unpack.it!(file: "some/random/folder")
+    }.should raise_error(Exception)
+  end
+  
+  it "should remove the old archive files" do
+    Unpack.it!(file: "spec/data/from/test_package.rar", remove: true)
+    %x{cd #{@from} && ls | grep test_package.rar}.should be_empty
+  end
+  
+  it "should have some unarchived files" do
+    Unpack.it!(file: "spec/data/from/test_package.rar").should have(5).files
+  end
 end

data/unpack.gemspec

@@ -3,13 +3,13 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "unpack"
-  s.version     = "0.1.4"
+  s.version     = "0.1.6"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Linus Oleander"]
   s.email       = ["linus@oleander.nu"]
   s.homepage    = "https://github.com/oleander/Unpack"
   s.summary     = %q{An automated unrar gem}
-  s.description = %q{An automated unpacking tool for Mac OS X, using Ruby 1.9.2}
+  s.description = %q{An automated unpacking tool for *nix, using Ruby 1.9.2}
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 6
+  version: 0.1.6
 platform: ruby
 authors: 
 - Linus Oleander
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-29 00:00:00 +01:00
+date: 2011-01-30 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -45,7 +45,7 @@ dependencies:
         version: 0.0.4
   type: :runtime
   version_requirements: *id002
-description: An automated unpacking tool for Mac OS X, using Ruby 1.9.2
+description: An automated unpacking tool for *nix, using Ruby 1.9.2
 email: 
 - linus@oleander.nu
 executables: 
@@ -63,6 +63,13 @@ files:
 - bin/unrar
 - lib/unpack.rb
 - lib/unpack/container.rb
+- spec/data/from/110_real_.file.rar
+- spec/data/from/120_real_.file.rar
+- spec/data/from/167_real_.file.rar
+- spec/data/from/777_real_.file.rar
+- spec/data/from/918_real_.file.rar
+- spec/data/from/some_zip_files.zip
+- spec/data/from/test_package.rar
 - spec/data/o_files/some_zip_files.zip
 - spec/data/o_files/test_package.rar
 - spec/data/rar/110_accessible_.rar
@@ -166,11 +173,7 @@ files:
 - spec/data/rar/subdir/22_subtitle_.rar
 - spec/data/rar/subdir/483_subtitle_.rar
 - spec/data/rar/subdir/639_subtitle_.rar
-- spec/data/rar_real/110_real_.file.rar
-- spec/data/rar_real/120_real_.file.rar
-- spec/data/rar_real/167_real_.file.rar
-- spec/data/rar_real/777_real_.file.rar
-- spec/data/rar_real/918_real_.file.rar
+- spec/data/rar_real/test_package.rar
 - spec/data/zip_real/some_zip_files.zip
 - spec/spec_helper.rb
 - spec/unpack_spec.rb
@@ -208,6 +211,13 @@ signing_key:
 specification_version: 3
 summary: An automated unrar gem
 test_files: 
+- spec/data/from/110_real_.file.rar
+- spec/data/from/120_real_.file.rar
+- spec/data/from/167_real_.file.rar
+- spec/data/from/777_real_.file.rar
+- spec/data/from/918_real_.file.rar
+- spec/data/from/some_zip_files.zip
+- spec/data/from/test_package.rar
 - spec/data/o_files/some_zip_files.zip
 - spec/data/o_files/test_package.rar
 - spec/data/rar/110_accessible_.rar
@@ -311,11 +321,7 @@ test_files:
 - spec/data/rar/subdir/22_subtitle_.rar
 - spec/data/rar/subdir/483_subtitle_.rar
 - spec/data/rar/subdir/639_subtitle_.rar
-- spec/data/rar_real/110_real_.file.rar
-- spec/data/rar_real/120_real_.file.rar
-- spec/data/rar_real/167_real_.file.rar
-- spec/data/rar_real/777_real_.file.rar
-- spec/data/rar_real/918_real_.file.rar
+- spec/data/rar_real/test_package.rar
 - spec/data/zip_real/some_zip_files.zip
 - spec/spec_helper.rb
 - spec/unpack_spec.rb