unpacker 0.1.0 → 0.2.0

data/Rakefile

@@ -11,6 +11,7 @@ begin
     gem.homepage = "http://github.com/underlog/unpacker"
     gem.authors = ["Petyo Ivanov"]
     gem.add_development_dependency "rspec", ">= 1.2.9"
+    gem.add_dependency "shellshot"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

data/lib/unpacker.rb

@@ -1,17 +1,28 @@
+require 'shellshot'
 require 'fileutils'
 require 'tmpdir'
 
 module Unpacker
 
   class UnrecognizedArchiveError < StandardError; end
-  class UnpackedFailedError < StandardError; end
 
   SUPPORTED_FILEEXTS = %w[tar rar zip gz bz tgz bgz tar]
 
-  def self.unpack(file, tmpdir = "/tmp", &block) 
+  def self.unpack(file, tmpdir = "/tmp", &block)
     Dir.mktmpdir 'unpacker' do |dir|
-      cmd = command_by_file_ext(file)% [file, dir]
-      system("#{cmd} 1>/dev/null") or raise UnrecognizedArchiveError($?)
+      case file
+      when /rar$/
+        Shellshot.exec [ "unrar", "x", "-y", file, dir ], :stdout => false
+      when /(tar|tgz|tar\.gz|tar\.bz|tbz)$/
+        Shellshot.exec [ "tar", "xf", file, "--directory", dir ], :stdout => false
+      when /zip$/
+        Shellshot.exec [ "unzip", file, "-d", dir ], :stdout => false
+      when /gz$/
+        Shellshot.exec [ "gunzip", "-c", file ], :stdout => File.join(dir, "gz-contents")
+      else
+        raise UnrecognizedArchiveError
+      end
+
       block.call(Dir.new(dir))
     end
   end
@@ -21,85 +32,23 @@ module Unpacker
   end
 
   def self.valid?(file_path, file_name = file_path)
-    cmd = test_cmd_by_file_ext(file_name)% file_path
-    system("#{cmd} 1>/dev/null 2>/dev/null")
-  end
-
-  # :stopdoc:
-  VERSION = '1.0.1'
-  LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
-  PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
-  # :startdoc:
-
-  # Returns the version string for the library.
-  #
-  def self.version
-    VERSION
-  end
-
-  # Returns the library path for the module. If any arguments are given,
-  # they will be joined to the end of the libray path using
-  # <tt>File.join</tt>.
-  #
-  def self.libpath( *args )
-    args.empty? ? LIBPATH : ::File.join(LIBPATH, args.flatten)
-  end
-
-  # Returns the lpath for the module. If any arguments are given,
-  # they will be joined to the end of the path using
-  # <tt>File.join</tt>.
-  #
-  def self.path( *args )
-    args.empty? ? PATH : ::File.join(PATH, args.flatten)
-  end
-
-  # Utility method used to require all files ending in .rb that lie in the
-  # directory below this file that has the same name as the filename passed
-  # in. Optionally, a specific _directory_ name can be passed in such that
-  # the _filename_ does not have to be equivalent to the directory.
-  #
-  def self.require_all_libs_relative_to( fname, dir = nil )
-    dir ||= ::File.basename(fname, '.*')
-    search_me = ::File.expand_path(
-        ::File.join(::File.dirname(fname), dir, '**', '*.rb'))
-
-    Dir.glob(search_me).sort.each {|rb| require rb}
-  end
-
-  private
-
-  def self.test_cmd_by_file_ext(file_name)
-    case file_name
-    when /rar$/
-      'unrar t "%s"'
-    when /(tar|tar\.bz|tbz)$/
-      'tar tf "%s"'
-    when /zip$/
-      'zip -T "%s"'
-    when /gz|tgz$/
-      'gunzip -t "%s"'
-    else
-      raise UnrecognizedArchiveError
-    end
-  end
-
-  def self.command_by_file_ext(file_name)
-    case file_name
-    when /rar$/
-      'unrar x -y "%s" "%s"'
-    when /(tar|tgz|tar\.gz|tar\.bz|tbz)$/
-      'tar xf "%s" --directory "%s"'
-    when /zip$/
-      'unzip "%s" -d "%s"'
-    when /gz$/
-      '(gunzip -c "%s" > "%s/gz-contents")'
-    else
-      raise UnrecognizedArchiveError
-    end
+    cmd = case file_name
+          when /rar$/
+            [ 'unrar', 't', file_path ]
+          when /(tar|tar\.bz|tbz)$/
+            [ 'tar', 'tf', file_path ]
+          when /zip$/
+            [ 'zip', '-T', file_path ]
+          when /gz|tgz$/
+            [ 'gunzip', '-t', file_path ]
+          else
+            raise UnrecognizedArchiveError
+          end
+    Shellshot.exec cmd, :stdall => false
+    true
+  rescue
+    false
   end
 
 end  # module Unpacker
 
-Unpacker.require_all_libs_relative_to(__FILE__)
-
-# EOF

data/spec/spec_helper.rb

@@ -2,6 +2,7 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'unpacker'
 require 'spec'
+require 'ruby-debug'
 require 'spec/autorun'
 
 Dir[ File.join(File.dirname(__FILE__), 'matchers/*') ].each do |matcher|

data/unpacker.gemspec

@@ -0,0 +1,82 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{unpacker}
+  s.version = "0.2.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Petyo Ivanov"]
+  s.date = %q{2010-04-02}
+  s.default_executable = %q{unpacker}
+  s.description = %q{The tool relies on the presence of the command-line tools.}
+  s.email = %q{underlog@gmail.com}
+  s.executables = ["unpacker"]
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README.rdoc"
+  ]
+  s.files = [
+    ".bnsignore",
+     ".document",
+     ".gitignore",
+     "History.txt",
+     "LICENSE",
+     "README.rdoc",
+     "Rakefile",
+     "VERSION",
+     "bin/unpacker",
+     "lib/unpacker.rb",
+     "spec/fixtures/archive-contents/sample-file",
+     "spec/fixtures/file.rar",
+     "spec/fixtures/file.tar",
+     "spec/fixtures/file.tar.bz",
+     "spec/fixtures/file.tar.gz",
+     "spec/fixtures/file.tbz",
+     "spec/fixtures/file.tgz",
+     "spec/fixtures/file.zip",
+     "spec/fixtures/invalid-file.gz",
+     "spec/fixtures/invalid-file.rar",
+     "spec/fixtures/invalid-file.tar.gz",
+     "spec/fixtures/invalid-file.zip",
+     "spec/fixtures/lipsum.txt.gz",
+     "spec/matchers/unpacked_correctly.rb",
+     "spec/matchers/valid_archive.rb",
+     "spec/spec.opts",
+     "spec/spec_helper.rb",
+     "spec/unpacker_spec.rb",
+     "test/test_unpacker.rb",
+     "unpacker.gemspec"
+  ]
+  s.homepage = %q{http://github.com/underlog/unpacker}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.6}
+  s.summary = %q{Abstraction for extracting various archives}
+  s.test_files = [
+    "spec/matchers/unpacked_correctly.rb",
+     "spec/matchers/valid_archive.rb",
+     "spec/spec_helper.rb",
+     "spec/unpacker_spec.rb",
+     "test/test_unpacker.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_runtime_dependency(%q<shellshot>, [">= 0"])
+    else
+      s.add_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_dependency(%q<shellshot>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<rspec>, [">= 1.2.9"])
+    s.add_dependency(%q<shellshot>, [">= 0"])
+  end
+end
+

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Petyo Ivanov
@@ -31,6 +31,18 @@ dependencies:
         version: 1.2.9
   type: :development
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: shellshot
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id002
 description: The tool relies on the presence of the command-line tools.
 email: underlog@gmail.com
 executables: 
@@ -70,6 +82,7 @@ files:
 - spec/spec_helper.rb
 - spec/unpacker_spec.rb
 - test/test_unpacker.rb
+- unpacker.gemspec
 has_rdoc: true
 homepage: http://github.com/underlog/unpacker
 licenses: []