epitools 0.4.37 → 0.4.38

data/VERSION

@@ -1 +1 @@
-0.4.37
+0.4.38

data/epitools.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{epitools}
-  s.version = "0.4.37"
+  s.version = "0.4.38"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["epitron"]
-  s.date = %q{2011-05-29}
+  s.date = %q{2011-06-07}
   s.description = %q{Miscellaneous utility libraries to make my life easier.}
   s.email = %q{chris@ill-logic.com}
   s.extra_rdoc_files = [

data/lib/epitools.rb

@@ -2,6 +2,7 @@ require 'pp'
 require 'set'
 
 class Object
+
   unless defined?(__DIR__)
     # 
     # This method is convenience for the `File.expand_path(File.dirname(__FILE__))` idiom.
@@ -13,8 +14,64 @@ class Object
       ::File.expand_path(::File.join(dir, *args.map{|a| a.to_s}))
     end
   end
+  
+  #
+  # 'autoreq' is a replacement for autoload that can load gems.
+  #
+  # Usage:
+  #    autoreq :Constant, 'thing-to-require'
+  #    autoreq :Constant, 'thing-to-require'
+  #    autoreq :OtherConstant do
+  #      gem 'somegem', '~> 1.2'
+  #      require 'somegem'
+  #    end
+  #
+  def autoreq(const, path=nil, &block)
+    raise "Error: autoreq must be supplied with a file to load, or a block." unless !!path ^ block_given?
+    
+    if block_given?
+      Module.autoreqs[const] = block
+    else
+      Module.autoreqs[const] = path
+    end
+  end
+  
+end
+
+#
+# Patch 'Module#const_missing' to support 'autoreq'
+#
+class Module
+
+  @@autoreq_searching_for = nil
+  
+  alias const_missing_without_autoreq const_missing
+  
+  def const_missing(const)
+    return if const == @@autoreq_searching_for
+    
+    if thing = autoreqs[const]
+      case thing
+      when String, Symbol
+        require thing
+      when Proc
+        Object.class_eval(&thing)
+      else
+        raise "Error: Don't know how to autoload a #{thing.class}: #{thing.inspect}"
+      end
+    end
+    
+    @@autoreq_searching_for = const
+    const_get(const) || const_missing_without_autoreq(const)
+  end
+  
+  def autoreqs
+    @@autoreqs ||= {}
+  end
+  
 end
 
+
 ## Pretty error messages
 require_wrapper = proc do |mod|
   #p [:loading, mod]

data/lib/epitools/autoloads.rb

@@ -23,5 +23,6 @@ autoload :Ratio,    'epitools/ratio'
 autoload :Sys,      'epitools/sys'
 autoload :ProgressBar,  'epitools/progressbar'
 
-
+## Gems
+autoreq :MimeMagic, 'mimemagic'
 

data/lib/epitools/basetypes.rb

@@ -483,7 +483,7 @@ module Enumerable
   def foldl(methodname=nil, &block)
     result = nil
 
-    raise "Error: pass a parameter OR a block, not both!" if methodname and block
+    raise "Error: pass a parameter OR a block, not both!" unless !!methodname ^ block_given?
       
     if methodname
       
@@ -842,6 +842,19 @@ class Object
   end
 end
 
+unless IO.respond_to? :copy_stream
+  
+  class IO
+    
+    def self.copy_stream(input, output)
+      while chunk = input.read(8192)
+        output.write(chunk)
+      end
+    end
+    
+  end
+  
+end
 
 #
 # Emit a quick debug message (only if $DEBUG is true)
@@ -856,3 +869,5 @@ def dmsg(msg)
     end
   end
 end
+
+

data/lib/epitools/browser.rb

@@ -133,7 +133,7 @@ class Browser
     #end
 
     # Determine the cache setting
-    use_cache = options[:use_cache] || options[:cache] || options[:cached] || @use_cache
+    use_cache = (options[:cached] == false) ? false : @use_cache
 
     cached_already = cache.include?(url)
 

data/lib/epitools/clitools.rb

@@ -67,6 +67,8 @@ def lesspipe(*args)
       yield less
     end
   end
+
+rescue Errno::EPIPE
 end
 
 

data/lib/epitools/path.rb

@@ -22,6 +22,9 @@ class Path
     end      
   end
 
+  #
+  # TODO: Remove the tempfile when the Path object is garbage collected or freed.
+  #
   def self.tmpfile(prefix="tmp")
     path = Path[ Tempfile.new(prefix).path ]
     yield path if block_given?
@@ -111,7 +114,6 @@ class Path
     end
   end
 
-  
   ## getters
    
   # The directories in the path, split into an array. (eg: ['usr', 'src', 'linux'])
@@ -153,6 +155,11 @@ class Path
     end
   end
 
+  def exts
+    extensions = basename.split('.')[1..-1]
+    extensions += [@ext] if @ext
+    extensions
+  end
   
   ## fstat info
   
@@ -245,6 +252,8 @@ class Path
       File.open(path, mode)
     end
   end
+  alias_method :io, :open
+  alias_method :stream, :open
   
   def read(length=nil, offset=nil)
     File.read(path, length, offset)
@@ -373,10 +382,63 @@ class Path
   def md5
     Digest::MD5.file(self).hexdigest
   end
-  
   alias_method :md5sum, :md5
 
   
+  # http://ruby-doc.org/stdlib/libdoc/zlib/rdoc/index.html
+  
+  def gzip
+    gz_filename = self.with(:filename=>filename+".gz")
+    
+    raise "#{gz_filename} already exists" if gz_filename.exists? 
+  
+    open("rb") do |input|    
+      Zlib::GzipWriter.open(gz_filename) do |gzip|
+        IO.copy_stream(input, gzip)
+      end
+    end
+    
+    gz_filename
+  end
+  
+  def gzip!
+    gzipped = self.gzip
+    self.rm
+    self.path = gzipped.path
+  end
+  
+  def gunzip
+    raise "Not a .gz file" unless ext == "gz"
+
+    gunzipped = self.with(:ext=>nil)
+    
+    gunzipped.open("wb") do |out|
+      Zlib::GzipReader.open(self) do |gunzip|
+        IO.copy_stream(gunzip, out)
+      end
+    end
+    
+    gunzipped
+  end
+
+  def gunzip!
+    gunzipped = self.gunzip
+    self.rm
+    self.path = gunzipped.path
+  end
+
+  #
+  # Return the IO object for this file.
+  #
+  def io
+    open
+  end
+  alias_method :stream, :io
+  
+  def =~(pattern)
+    path =~ pattern
+  end
+  
   ## Class method versions of FileUtils-like things
   
   %w[
@@ -394,9 +456,40 @@ class Path
       end
     }
   end
+
+  
+  # Mimetype finding and magic (requires 'mimemagic' gem)
+
+  #
+  # Find the file's mimetype (first from file extension, then by magic)
+  #  
+  def mimetype
+    mimetype_from_ext || magic
+  end
+  alias_method :identify, :mimetype
+    
+  #
+  # Find the file's mimetype (only using the file extension)
+  #  
+  def mimetype_from_ext
+    MimeMagic.by_extension(ext)
+  end
+  
+  #
+  # Find the file's mimetype (by magic)
+  #  
+  def magic
+    open { |io| MimeMagic.by_magic(io) }
+  end
+  
+  def ext_by_magic
+    # TODO: return the extension for the mime type.
+    raise NotImplementedError
+  end
   
 end
 
+
 #
 # A wrapper for URL objects
 #

data/lib/epitools/zopen.rb

@@ -14,11 +14,12 @@ require 'epitools'
 #    zopen("otherfile.gz", "w") #=> #<Zlib::GzipWriter:0x7fe30448>>
 #    zopen("test.txt.gz") { |f| f.read } # read the contents of the .gz file, then close the file handle automatically.
 #
-def zopen(filename, mode="r")
+def zopen(path, mode="r")
 
-  file = open(filename, mode)
+  path = Path[path] unless path.is_a? Path
+  file = path.open(mode)
   
-  if filename =~ /\.gz$/
+  if path.ext == "gz"
     case mode
     when "r", "rb"
       file = Zlib::GzipReader.new(file) 

data/spec/basetypes_spec.rb

@@ -287,6 +287,8 @@ describe Enumerable do
     a = [1,2,3,4]
     a.foldl(:+).should == a.sum
     %w[hi there].foldl(:+).should == "hithere"
+
+    [ [1],[2],[3],[4] ].foldl(:+).should == [1,2,3,4] 
   end
   
   it "powersets" do

data/spec/path_spec.rb

@@ -1,5 +1,4 @@
-require 'epitools/permutations'
-require 'epitools/path'
+require 'epitools'
 
 describe Path do
   
@@ -216,4 +215,38 @@ describe Path do
     path.sha1.should == Path.sha1(path)
   end
   
+  it "gzips and gunzips" do
+    path = Path.tmpfile
+    500.times { path << "whee" }
+    
+    path.ext.should_not == "gz"
+    gzipped = path.gzip
+    
+    before = path.size
+    after = gzipped.size
+    before.should > after
+    gzipped.ext.should == "gz"
+    
+    gunzipped = gzipped.gunzip
+    gunzipped.size.should == before
+    gunzipped.should == path
+  end
+  
+  it "exts" do
+    path = Path["file.tar.gz"]
+    path.ext.should == "gz"
+    path.exts.should == ["tar", "gz"]
+  end
+  
+  it "ios and streams" do
+    path = Path.tmpfile
+    f = open(path)
+    f.inspect.should == path.io.inspect
+    f.inspect.should == path.stream.inspect
+  end
+  
+  it "mimes" do
+    Path[__FILE__].mimetype == "application/x-ruby"
+  end
+  
 end

metadata

@@ -2,7 +2,7 @@
 name: epitools
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.4.37
+  version: 0.4.38
 platform: ruby
 authors: 
 - epitron
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-29 00:00:00 -04:00
+date: 2011-06-07 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency