epitools 0.4.34 → 0.4.35

data/VERSION

@@ -1 +1 @@
-0.4.34
+0.4.35

data/epitools.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{epitools}
-  s.version = "0.4.34"
+  s.version = "0.4.35"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["epitron"]
-  s.date = %q{2011-05-18}
+  s.date = %q{2011-05-20}
   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

@@ -1,3 +1,9 @@
+autoload :Path,     'epitools/path'
+autoload :Browser,  'epitools/browser'
+autoload :Rash,     'epitools/rash'
+autoload :Ratio,    'epitools/ratio'
+autoload :Sys,      'epitools/sys'
+
 class Object
 
   unless defined?(__DIR__)
@@ -27,8 +33,6 @@ end
   basetypes 
   niceprint
   string_to_proc
-  ratio
-  path
   zopen
   colored
   clitools
@@ -37,3 +41,4 @@ end
 ].each do |mod|
   require_wrapper.call mod
 end
+

data/lib/epitools/basetypes.rb

@@ -1,6 +1,16 @@
 require 'pp'
 
-# Alias "Enumerator" to "Enum"
+autoload :URI, 'uri'
+autoload :CGI, 'cgi'
+autoload :Base64, 'base64'
+module Digest
+  autoload :MD5, 'digest/md5'
+  autoload :SHA1, 'digest/sha1'
+end
+autoload :JSON, 'json'
+
+
+## Alias "Enumerator" to "Enum"
 
 if RUBY_VERSION["1.8"]
   require 'enumerator' 
@@ -16,6 +26,7 @@ unless defined? Enum
 end
 
 class Object
+  
   #
   # Slightly gross hack to add a class method.
   #
@@ -46,6 +57,8 @@ end
 class Numeric
   def integer?; true; end
 
+  def truthy?; self > 0; end
+
   def commatize  
     to_s.gsub(/(\d)(?=\d{3}+(?:\.|$))(\d{3}\..*)?/,'\1,\2')
   end
@@ -88,6 +101,18 @@ class String
     strip.size == 0
   end
 
+  #
+  # Does this string contain something that means roughly "true"?
+  #
+  def truthy?
+    case strip.downcase
+    when "1", "true", "yes", "on", "enabled", "affirmative"
+      true
+    else
+      false
+    end
+  end
+
   #
   # Convert \r\n to \n
   #
@@ -113,7 +138,8 @@ class String
   # Like #lines, but skips empty lines and removes \n's.
   #
   def nice_lines
-    split("\n").select{|l| not l.blank? }
+    # note: $/ is the platform's newline separator
+    split($/).select{|l| not l.blank? }
   end
   
   alias_method :clean_lines, :nice_lines
@@ -129,7 +155,6 @@ class String
   # Convert non-URI characters into %XXes.
   #
   def urlencode
-    require 'uri' unless defined? URI
     URI.escape(self)
   end
   
@@ -137,7 +162,6 @@ class String
   # Convert an URI's %XXes into regular characters.
   #
   def urldecode
-    require 'uri' unless defined? URI
     URI.unescape(self)
   end
 
@@ -145,15 +169,20 @@ class String
   # Convert a query string to a hash of params
   #
   def to_params
-    require 'cgi' unless defined? CGI
-    CGI.parse(self).map_values{|v| v.is_a?(Array) and v.size == 1 ? v.first : v }
+    CGI.parse(self).map_values do |v|
+      # CGI.parse wraps every value in an array. Unwrap them!
+      if v.is_a?(Array) and v.size == 1
+        v.first
+      else
+        v 
+      end
+    end      
   end
   
   #
   # Decode a mime64/base64 encoded string
   #
   def decode64
-    require 'base64' unless defined? Base64
     Base64.decode64 self
   end
   
@@ -161,7 +190,6 @@ class String
   # Encode into a mime64/base64 string
   #
   def encode64
-    require 'base64' unless defined? Base64
     Base64.encode64 self
   end
   alias_method :base64, :encode64
@@ -170,7 +198,6 @@ class String
   # MD5 the string
   #  
   def md5
-    require 'digest/md5' unless defined? Digest::MD5
     Digest::MD5.hexdigest self
   end
   
@@ -178,7 +205,6 @@ class String
   # SHA1 the string
   #  
   def sha1
-    require 'digest/sha1' unless defined? Digest::SHA1
     Digest::SHA1.hexdigest self
   end
   
@@ -199,7 +225,6 @@ class String
   # Parse object as JSON
   #
   def from_json
-    require 'json' unless defined? JSON
     JSON.parse self
   end
   
@@ -224,9 +249,9 @@ class Integer
   # Convert the number to an array of bits (least significant digit first, or little-endian).
   #
   def to_bits
+    # TODO: Why does thos go into an infinite loop in 1.8.7?
     ("%b" % self).chars.to_a.reverse.map(&:to_i)
   end
-  
   alias_method :bits, :to_bits
   
 end
@@ -242,7 +267,7 @@ end
   
   klass.class_eval do
     
-    alias_method :bit, :[]
+    alias_method :bit, :"[]"
     
     #
     # Extends [] so that Integers can be sliced as if they were arrays.
@@ -250,9 +275,9 @@ end
     def [](arg)
       case arg
       when Integer
-        bit(arg)
+        self.bit(arg)
       when Range
-        bits[arg]
+        self.bits[arg]
       end
     end
     
@@ -828,3 +853,16 @@ class Object
 end
 
 
+#
+# Emit a quick debug message (only if $DEBUG is true)
+#
+def dmsg(msg)
+  if $DEBUG
+    case msg
+    when String
+      puts msg
+    else
+      puts msg.inspect
+    end
+  end
+end

data/lib/epitools/browser.rb

@@ -1,9 +1,5 @@
 require 'mechanize'
-require 'uri'
-require 'fileutils'
-require 'json'
-
-require 'epitools'
+require 'epitools/basetypes'
 require 'epitools/browser/cache'
 require 'epitools/browser/mechanize_progressbar'
 

data/lib/epitools/browser/cache.rb

@@ -1,22 +1,6 @@
 require 'mechanize'
 require 'sqlite3'
 
-#
-# Emit a quick debug message (only if $DEBUG is true)
-#
-def dmsg(msg)
-  
-  if $DEBUG
-    case msg
-      when String
-        puts msg
-      else
-        puts msg.inspect
-    end
-  end
-  
-end
-
 class Browser
   
   #
@@ -193,6 +177,7 @@ class Browser
     end
   
     def delete!
+      db.close
       File.unlink @filename  
     end
   

data/lib/epitools/path.rb

@@ -1,6 +1,14 @@
 require 'epitools/basetypes'
-require 'fileutils'
-require 'uri'
+
+autoload :FileUtils,  'fileutils'
+autoload :Tempfile,   'tempfile'
+autoload :URI,        'uri'
+module Digest
+  autoload :SHA1,     'digest/sha1'
+  autoload :SHA2,     'digest/sha2'
+  autoload :MD5,      'digest/md5'
+end
+
 
 class Path
   
@@ -25,20 +33,36 @@ class Path
   end
 
   def self.tmpfile(prefix="tmp")
-    require 'tempfile' unless defined? Tempfile
     path = Path[ Tempfile.new(prefix).path ]
     yield path if block_given?
     path
   end
-
   alias_class_method :tempfile, :tmpfile  
-
   
   def self.home
     Path[ENV['HOME']]
   end
   
-
+  def self.pwd
+    File.expand_path Dir.pwd
+  end
+  
+  def self.pushd
+    @@dir_stack ||= []
+    @@dir_stack.push pwd
+  end
+  
+  def self.popd
+    @@dir_stack ||= [pwd]
+    @@dir_stack.pop
+  end
+  
+  def self.cd(dest); Dir.chdir(dest); end
+  
+  def self.ls(path); Path[path].ls  end
+  
+  def self.ls_r(path); Path[path].ls_r; end
+  
   ## setters
   
   attr_writer :base
@@ -231,9 +255,10 @@ class Path
     File.read(path, length, offset)
   end
   
-  def ls
-    Path[File.join(path, "*")]
-  end
+  def ls; Path[File.join(path, "*")]; end
+
+  def ls_r; Path[File.join(path, "**/*")]; end
+
   
   ## modifying files
 
@@ -265,7 +290,11 @@ class Path
   end
   
   #
-  # Rename
+  # Examples:
+  #   Path["SongySong.mp3"].rename(:basename=>"Songy Song")
+  #   Path["Songy Song.mp3"].rename(:ext=>"aac")
+  #   Path["Songy Song.aac"].rename(:dir=>"/music2")
+  #   Path["/music2/Songy Song.aac"].exists? #=> true
   #  
   def rename(options)
     raise "Options must be a Hash" unless options.is_a? Hash
@@ -276,11 +305,13 @@ class Path
     
     self.path = dest.path # become dest
   end
-  
-  def rename_to(dest)
-    rename :path=>dest
+
+  #
+  # Renames the file the specified full path (like Dir.rename.)
+  #  
+  def rename_to(path)
+    rename :path=>path
   end
-  
   alias_method :move,       :rename
   alias_method :ren,        :rename  
 
@@ -288,6 +319,10 @@ class Path
     File.unlink(self)
   end
   alias_method :"unlink!", :"delete!"
+
+  def mkdir
+    
+  end
   
   def mkdir_p
     if exists?
@@ -309,21 +344,24 @@ class Path
     end
   end
   
+  def truncate
+    File.truncate(self)
+  end
+  
+    
+  
   
   ## Checksums
   
   def sha1
-    require 'digest/sha1' unless defined? Digest::SHA1
     Digest::SHA1.file(self).hexdigest
   end
   
   def sha2
-    require 'digest/sha2' unless defined? Digest::SHA2
     Digest::SHA2.file(self).hexdigest
   end
   
   def md5
-    require 'digest/md5' unless defined? Digest::MD5
     Digest::MD5.file(self).hexdigest
   end
   

data/lib/epitools/permutations.rb

@@ -2,7 +2,7 @@ require 'epitools/basetypes'
 
 class Array
   
-  alias_method :multiply_without_permutations, :*
+  alias_method :mult, :"*"
   
   #
   # Overloaded * operator.
@@ -23,7 +23,7 @@ class Array
       end
       result
     else
-      send(:multiply_without_permutations, other)
+      send(:mult, other)
     end
   end
   

data/lib/epitools/sys.rb

@@ -1,3 +1,5 @@
+require 'epitools/basetypes'
+
 #
 # Cross-platform operating system functions.
 # Includes: process listing, platform detection, etc.
@@ -322,7 +324,7 @@ module Sys
   # eg: {"eth0"=>"192.168.1.101"}
   #
   def self.interfaces_linux
-    sections = `ifconfig`.split(/^(?=Link encap:Ethernet)/)
+    sections = `/sbin/ifconfig`.split(/^(?=Link encap:Ethernet)/)
     sections_with_relevant_ip = sections.select {|i| i =~ /inet/ }
 
     device_ips = {}
@@ -335,6 +337,23 @@ module Sys
     device_ips
   end
   
+  #
+  # Windows: Return a hash of (device name, IP address) pairs.
+  #
+  def self.interfaces_windows
+    result = {}
+    `ipconfig`.split_before(/^\w.+:/).each do |chunk|
+      chunk.grep(/^Ethernet adapter (.+):\s*$/) do
+        name = $1
+        chunk.grep(/IPv[46] Address[\.\ ]+: (.+)$/) do
+          address = $1.strip
+          result[name] = address
+        end
+      end
+    end
+    result
+  end
+  
   #-----------------------------------------------------------------------------
 
   cross_platform_method :browser_open

data/spec/basetypes_spec.rb

@@ -331,7 +331,9 @@ describe Hash do
   
   it "to_querys" do
     # this will probably fail half the time in Ruby 1.8 because the hash order is random
-    {:donkeys=>7, :stubborn=>true}.to_query.should == "donkeys=7&stubborn=true"
+    params = {"donkeys"=>"7", "stubborn"=>"true"}
+    params.to_query.to_params.should == params
+    params.to_query.in?(["donkeys=7&stubborn=true", "stubborn=true&donkeys=7"]).should == true
   end
   
 end
@@ -352,13 +354,13 @@ describe "truthiness" do
     {
       # truthy things
       true => [
-        "asdf", 1, 1.7, :blah, true, [1,2,3], Enumerator.new([1,2,3], :each),
+        "yes", "on", "1", "Enabled", 1, 1.7, :blah, true, [1,2,3], Enumerator.new([1,2,3], :each),
         1938389127239847129803741980237498012374,
       ],
       
       # untruthy things
       false => [
-        "", " ", 0, 0.0, false, nil, [], Enumerator.new([], :each),
+        "", " ", "asdf", 0, 0.0, false, nil, [], Enumerator.new([], :each),
       ]
     }.each do |truthiness, objs|
       objs.each { |obj| obj.truthy?.should == truthiness }

data/spec/browser_spec.rb

@@ -51,6 +51,10 @@ describe Browser::Cache do
     @cache = Browser::Cache.new(@agent)
   end
 
+  after :all do
+    @cache.delete!
+  end
+
   def new_page(body, url)
     Mechanize::Page.new(
       URI.parse(url),
@@ -61,10 +65,6 @@ describe Browser::Cache do
     )
   end
 
-  after :all do
-    @cache.delete!
-  end
-
   it "writes and reads" do
     body = "Blah blah blah."
     url  = "http://example.com/url.html"

data/spec/sys_spec.rb

@@ -7,10 +7,12 @@ describe Sys::ProcessInfo do
     proc { Sys.linux? }.should_not raise_error
     proc { Sys.mac? }.should_not raise_error
     proc { Sys.darwin? }.should_not raise_error
+    proc { Sys.windows? }.should_not raise_error
 
     %w[Linux Windows Darwin].include?(Sys.os).should == true
     
-    ( (Sys.linux? and not Sys.mac?) or (Sys.mac? and not Sys.linux?) ).should == true
+    truths = [:linux?, :mac?, :windows?].map{|sys| Sys.send(sys)}
+    truths.count(true).should == 1
   end
     
   
@@ -61,7 +63,7 @@ describe Sys::ProcessInfo do
   end
   
   specify "interfaces" do
-    Sys.interfaces.should_not be_nil
+    Sys.interfaces.should_not be_blank
   end
   
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: epitools
 version: !ruby/object:Gem::Version 
-  hash: 75
+  hash: 73
   prerelease: 
   segments: 
   - 0
   - 4
-  - 34
-  version: 0.4.34
+  - 35
+  version: 0.4.35
 platform: ruby
 authors: 
 - epitron
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-18 00:00:00 Z
+date: 2011-05-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec