unpack 0.1.8 → 0.1.9

data/README.markdown

@@ -107,8 +107,7 @@ These are the accessors of the `Container` class.
 
 ## Requirements
 
-The gem is tested in OS X 10.6.6 using Ruby 1.9.2.
-It will not work in 1.8, due to the [new hash syntax](http://blog.peepcode.com/tutorials/2011/rip-ruby-hash-rocket-syntax).
+The gem is tested in OS X 10.6.6 using Ruby 1.9.2 and 1.8.7.
 
 ## Thanks to ...
 

data/lib/unpack.rb

@@ -27,7 +27,7 @@ class Unpack
     # Makes shure that every directory structure looks the same
     @directory = Dir.new(@directory).path rescue nil
     
-    raise Exception.new("You need to specify a valid path") if @directory.nil? or not Dir.exist?(@directory)
+    raise Exception.new("You need to specify a valid path") if @directory.nil? or Dir[@directory].empty?
     raise Exception.new("You need unzip to keep going") if %x{whereis unzip}.empty?
     
     @files = []
@@ -38,7 +38,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}.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])
@@ -52,7 +52,7 @@ class Unpack
   end
   
   def self.runner!(directory = '.', options = {})
-    unpack = Unpack.new(directory: directory, options: options) rescue nil
+    unpack = Unpack.new(:directory => directory, :options => options) rescue nil
     
     # If the initializer raised any excetions
     return [] if unpack.nil?
@@ -70,7 +70,7 @@ class Unpack
       @files << find_file_type(type)
     end
     
-    @files.flatten!.map! {|file| File.absolute_path(file)}
+    @files.flatten!.map! {|file| File.expand_path(file, Dir.pwd)}
   end
   
   def clean!
@@ -96,10 +96,10 @@ class Unpack
 
       if type.zip?
         @removeable.merge!(path => {:file_type => 'zip'})
-        self.unzip(path: path, file: file)
+        self.unzip(:path => path, :file => file)
       elsif type.rar?
         @removeable.merge!(path => {:file_type => 'rar'})
-        self.unrar(path: path, file: file)
+        self.unrar(:path => path, :file => file)
       else
         puts "Something went wrong, the mime type does not match zip or rar" if @options[:debugger]
       end
@@ -144,10 +144,12 @@ class Unpack
     return @removeable if @removeable.first.class == Container
     
     # Removing some non welcome data
-    @removeable.reject!{|item| @removeable[item][:diff].nil? or @removeable[item][:diff].empty?}
+    @removeable.reject! do |item,_|
+      @removeable[item][:diff].nil? or @removeable[item][:diff].empty?
+    end
     
     @removeable = @removeable.map do |value|
-      Container.new(files: value.last[:diff], directory: value.first)
+      Container.new(:files => value.last[:diff], :directory => value.first)
     end
     
     # Never return the hash

data/spec/unpack_spec.rb

@@ -10,15 +10,15 @@ def clear!
     end
   end
    
-  {'some_zip_files.zip' => 'zip_real', 'test_package.rar' => 'rar_real'}.each_pair do |taget|
+  {'some_zip_files.zip' => 'zip_real', 'test_package.rar' => 'rar_real'}.each_pair do |first, last|
 
     # Removes old files in the test directory
-    Dir.glob(File.expand_path(File.dirname(__FILE__) + "/data/#{taget.last}/*")).each do |file|
+    Dir.glob(File.expand_path(File.dirname(__FILE__) + "/data/#{last}/*")).each do |file|
       FileUtils.rm(file) if Mimer.identify(file).text?
     end
 
-    src = File.expand_path(File.dirname(__FILE__) + "/data/o_files/#{taget.first}")
-    dest = File.expand_path(File.dirname(__FILE__) + "/data/#{taget.last}/#{taget.first}")
+    src = File.expand_path(File.dirname(__FILE__) + "/data/o_files/#{first}")
+    dest = File.expand_path(File.dirname(__FILE__) + "/data/#{last}/#{first}")
     FileUtils.copy_file(src, dest)
   end
 
@@ -27,9 +27,9 @@ def clear!
     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}")
+  {'test_package.rar' => 'to', 'some_zip_files.zip' => 'to'}.each do |first,last|
+    src = File.expand_path(File.dirname(__FILE__) + "/data/o_files/#{first}")
+    dest = File.expand_path(File.dirname(__FILE__) + "/data/from/#{first}")
     FileUtils.copy_file(src, dest)
   end
 end
@@ -39,20 +39,20 @@ describe Unpack, "should work with the runner" do
   before(:each) do
     clear!
     @path = File.expand_path('spec/data/rar_real')
-    @unpack = Unpack.runner!('spec/data/rar_real', remove: true, min_files: 0)
+    @unpack = Unpack.runner!('spec/data/rar_real', :remove => true, :min_files => 0)
   end
   
   it "should unpack some files" do
     clear!   
     files = %x{cd #{@path} && ls}.split(/\n/).count
-    Unpack.runner!('spec/data/rar_real', remove: true, min_files: 0)    
+    Unpack.runner!('spec/data/rar_real', :remove => true, :min_files => 0)    
     %x{cd #{@path} && ls}.split(/\n/).count.should_not eq(files)
   end
   
   it "should have 1 directory" do
     @unpack.count.should eq(1)
   end
-  
+
   it "should have 5 new files" do
     @unpack.first.should have(5).files
   end
@@ -65,23 +65,23 @@ describe Unpack, "should work with the runner" do
   
   it "should only contain an existsing directory" do
     directory = @unpack.first.directory
-    Dir.exists?(directory).should be_true
+    Dir[directory].should_not be_empty
   end
   
   it "should not remove old files when the remove param isn't present" do
     clear!
-    Unpack.runner!('spec/data/rar_real', min_files: 0)
+    Unpack.runner!('spec/data/rar_real', :min_files => 0)
     %x{cd #{@path} && ls}.should have(6).split(/\n/)
   end
   
   it "should remove old files if the remove param is present" do
     clear!
-    Unpack.runner!('spec/data/rar_real', min_files: 0, remove: true)
+    Unpack.runner!('spec/data/rar_real', :min_files => 0, :remove => true)
     %x{cd #{@path} && ls}.should have(5).split(/\n/)
   end
   
   it "should not find any files if the {min_files} param is very large" do
-    Unpack.runner!('spec/data/rar_real', min_files: 100).should be_empty
+    Unpack.runner!('spec/data/rar_real', :min_files => 100).should be_empty
   end
   
   it "should return an Exception (not in production) if the path to Unpack.runner! does not exist" do
@@ -97,14 +97,15 @@ describe Unpack, "should work with the runner" do
   end
   
   it "should allways return an array" do
-    Unpack.runner!('spec/data/rar_real', depth: 0).should be_instance_of(Array)
+    Unpack.runner!('spec/data/rar_real', :depth => 0).should be_instance_of(Array)
   end
+
 end
 
 describe Unpack do
   before(:each) do
     clear!
-    @unpack = Unpack.new(directory: File.expand_path('spec/data/rar'))
+    @unpack = Unpack.new(:directory => File.expand_path('spec/data/rar'))
     @unpack.prepare!
   end
   
@@ -157,7 +158,7 @@ describe Unpack do
   end
   
   it "should be possible to set and read options" do
-    @unpack = Unpack.new(directory: File.expand_path('spec/data/rar'), options: {debugger: true})
+    @unpack = Unpack.new(:directory => File.expand_path('spec/data/rar'), :options => {:debugger => true})
     @unpack.options[:debugger].should be_true
   end
 end
@@ -168,20 +169,20 @@ describe Unpack, "should work with options" do
   end
   
   it "should not return any files when min is set to 0" do
-    @unpack = Unpack.new(directory: File.expand_path('spec/data/rar'), options: {depth: 0})
+    @unpack = Unpack.new(:directory => File.expand_path('spec/data/rar'), :options => {:depth => 0})
     @unpack.prepare!
     @unpack.should have(0).files
   end
   
   it "should return subtitles rar files when min files is set to o" do
-    @unpack = Unpack.new(directory: File.expand_path('spec/data/rar'), options: {min_files: 0})
+    @unpack = Unpack.new(:directory => File.expand_path('spec/data/rar'), :options => {:min_files => 0})
     @unpack.prepare!
     @unpack.clean!
     @unpack.files.reject {|file| ! file.match(/\_subtitle\_/) }.count.should > 0
   end
   
   it "should access some really deep files" do
-    @unpack = Unpack.new(directory: File.expand_path('spec/data/rar'), options: {depth: 100})
+    @unpack = Unpack.new(:directory =>File.expand_path('spec/data/rar'), :options => {:depth => 100})
     @unpack.prepare!
     @unpack.clean!
     @unpack.files.reject {|file| ! file.match(/\_not\_/) }.count.should > 0
@@ -192,7 +193,7 @@ describe Unpack,"should work with zip files" do
   before(:all) do
     clear!
     @path = File.expand_path('spec/data/zip_real')
-    @unpack = Unpack.new(directory: @path, options: {min_files: 1})
+    @unpack = Unpack.new(:directory => @path, :options => {:min_files => 1})
     @unpack.prepare!
     @unpack.clean!
   end
@@ -238,7 +239,7 @@ describe Unpack, "should work on real files" do
   before(:each) do
     clear!
     @path = File.expand_path('spec/data/rar_real')
-    @unpack = Unpack.new(directory: @path, options: {min_files: 0})
+    @unpack = Unpack.new(:directory => @path, :options => {:min_files => 0})
     @unpack.prepare!
     @unpack.clean!
     @unpack.unpack!
@@ -258,19 +259,19 @@ end
 describe Unpack, "should work with all kind of paths" do
   it "should raise an exception if an invalid path is being used" do
     lambda{
-      Unpack.new(directory: "/some/non/existing/dir")
+      Unpack.new(:directory => "/some/non/existing/dir")
     }.should raise_error(Exception)
   end
   
   it "should work with a relative path" do
     lambda{
-      Unpack.new(directory: "spec")
+      Unpack.new(:directory => "spec")
     }.should_not raise_error(Exception)
   end
   
   it "should not work with an incorect relative path" do
     lambda{
-      Unpack.new(directory: "spec/random")
+      Unpack.new(:directory => "spec/random")
     }.should raise_error(Exception)
   end
 end
@@ -285,7 +286,7 @@ describe Unpack, "should be able to unpack" do
   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)
+      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
@@ -294,7 +295,7 @@ describe Unpack, "should be able to unpack" do
   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')
+      Unpack.it!(:file => "spec/data/from/#{inner}", :to => 'spec/data/to')
       %x{cd #{@path} && ls}.split(/\n/).count.should_not eq(files)
       clear!
     end
@@ -303,7 +304,7 @@ describe Unpack, "should be able to unpack" do
   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}")
+      Unpack.it!(:file => "spec/data/from/#{inner}")
       %x{cd #{@from} && ls}.split(/\n/).count.should_not eq(files)
       clear!
     end
@@ -311,20 +312,20 @@ describe Unpack, "should be able to unpack" do
   
   it "should raise an error when the path does not exist" do
     lambda{
-      Unpack.it!(file: "some/random/folder")
+      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)
+    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
+    Unpack.it!(:file => "spec/data/from/test_package.rar").should have(5).files
   end
   
   it "should contain the right directory when defining a destination path" do
-    Unpack.it!(file: "spec/data/from/test_package.rar", to: 'spec/data/to').directory.should match(/spec\/data\/to/)
+    Unpack.it!(:file => "spec/data/from/test_package.rar", :to => 'spec/data/to').directory.should match(/spec\/data\/to/)
   end
 end

data/unpack.gemspec

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

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: unpack
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 8
-  version: 0.1.8
+  prerelease: 
+  version: 0.1.9
 platform: ruby
 authors: 
 - Linus Oleander
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-03 00:00:00 +01:00
+date: 2011-02-05 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,8 +21,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id001
@@ -38,10 +32,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 0
-        - 4
         version: 0.0.4
   type: :runtime
   version_requirements: *id002
@@ -192,21 +182,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: An automated unrar gem