epitools 0.5.98 → 0.5.99

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e874e17952a2226053ebe922c41e3718b33fd135
-  data.tar.gz: 1164a96660ee0873fb668a8d2709c203f8d06a79
+  metadata.gz: 0cbf9aff2ad00720845a3bce7605343ff4b0a88e
+  data.tar.gz: cb8e34cb49a1bb091d60fcfecdfdf1b5006915ac
 SHA512:
-  metadata.gz: 73d5353a6689ac9d7cca3937cf4ae2f3230dc8994a0fad2cf38f837575a28d8d216b131d694cb94b519276609150ba9830905e3eabbe6a57068beb667ab01969
-  data.tar.gz: f42fb7a5392544870b3db6d96e58e67a387a41933361bef51c6f514c3d82ddbacd2222b2c3c69d3acfb4453488abdc97e50fe658b0ccf946f6336864f700ea1b
+  metadata.gz: 0fa9bcbf1d0275b21648d52ee0959250e517861e8b1a4b8acc9b44eba3b9e259d2ac3df83876af1736ae0ac8a564435662da7254bceb9c4f49340e611ac75e14
+  data.tar.gz: 6e51f33d5942756afaa8b90089a5657ed252940c59b4c95f6fb92245faed39ca59ebed6187064d0f287490fbb33099b76afb67481a5980efa61ce0aa7b76beb6

data/VERSION

@@ -1 +1 @@
-0.5.98
+0.5.99

data/lib/epitools/autoloads.rb

@@ -17,8 +17,9 @@ autoload :Timeout,    'timeout'
 autoload :Find,       'find'
 autoload :Benchmark,  'benchmark'
 autoload :Tracer,     'tracer'
-autoload :CSV,        'csv'
 autoload :Shellwords, 'shellwords'
+autoload :PTY,        'pty'
+autoload :CSV,        'csv'
 autoload :SDBM,       'sdbm'
 
 module Digest

data/lib/epitools/browser.rb

@@ -18,7 +18,7 @@ class Mechanize::File
     response['content-type']
   end
 end
-  
+
 
 #
 # A mechanize class that emulates a web-browser, with cache and everything.
@@ -43,8 +43,9 @@ class Browser
     @use_cache    = !!(options[:cache] || options[:cached] || options[:use_cache])
     @use_logs     = options[:logs]           || false
     @cookie_file  = options[:cookiefile]     || "cookies.txt"
-    
-    # TODO: @progress, @user_agent, @logfile, @cache_file (default location: ~/.epitools?) 
+    @cache_file   = options[:cache_file]     || "browser-cache.db"
+
+    # TODO: @progress, @user_agent, @logfile, @cache_file (default location: ~/.epitools?)
 
     if options[:proxy]
       host, port = options[:proxy].split(':')
@@ -59,7 +60,7 @@ class Browser
   def init_agent!
     @agent = Mechanize.new do |a|
       # ["Mechanize", "Mac Mozilla", "Linux Mozilla", "Windows IE 6", "iPhone", "Linux Konqueror", "Windows IE 7", "Mac FireFox", "Mac Safari", "Windows Mozilla"]
-      a.max_history = 10 
+      a.max_history = 10
       a.user_agent_alias = "Windows IE 7"
       a.log = Logger.new "mechanize.log" if @use_logs
     end
@@ -80,7 +81,7 @@ class Browser
 
   def init_cache!
     # TODO: Rescue "couldn't load" exception and disable caching
-    @cache = Cache.new(agent) if @use_cache
+    @cache = Cache.new(@cache_file, agent) if @use_cache
   end
 
   def load_cookies!
@@ -91,23 +92,23 @@ class Browser
       false
     end
   end
-  
+
   def save_cookies!
     agent.cookie_jar.save_as @cookie_file
     true
   end
-  
+
   def relative?(url)
     not url[ %r{^https?://} ]
   end
-  
+
   def cacheable?(page)
     case page.content_type
     when %r{^(text|application)}
       true
     end
-  end    
-  
+  end
+
   def cache_put(page, url)
     if cache.valid_page?(page)
       if page.content_type =~ %r{(^text/|^application/javascript|javascript)}
@@ -117,9 +118,9 @@ class Browser
     end
   end
 
-  
+
   #
-  # Retrieve an URL, and return a Mechanize::Page instance (which acts a 
+  # Retrieve an URL, and return a Mechanize::Page instance (which acts a
   # bit like a Nokogiri::HTML::Document instance.)
   #
   # Options:
@@ -128,7 +129,7 @@ class Browser
   def get(url, options={})
 
     # TODO: Have a base-URL option
-    
+
     #if relative?(url)
     #  url = URI.join("http://base-url/", url).to_s
     #end
@@ -140,13 +141,13 @@ class Browser
 
     puts
     puts "[ GET #{url} (using cache: #{!!use_cache}) ]"
-    
+
     delay unless cached_already
     max_retries = 4
     retries = 0
 
     begin
-      
+
       if use_cache and page = cache.get(url)
         puts "  |_ cached (#{page.content_type})"
       else
@@ -165,11 +166,11 @@ class Browser
 
       puts "  |_ ERROR: #{e.inspect} -- retrying"
       delay(5)
-      retry 
-      
-=begin      
+      retry
+
+=begin
     rescue Mechanize::ResponseCodeError => e
-      
+
       case e.response_code
         when "401" #=> Net::HTTPUnauthorized
           p e
@@ -193,7 +194,7 @@ class Browser
     page
   end
 
-  
+
   #
   # Delegate certain methods to @agent
   #
@@ -202,7 +203,7 @@ class Browser
       agent.send(meth, *args)
     end
   end
-  
+
 end
 
 
@@ -217,11 +218,11 @@ class BrowserOptions < OpenStruct
     :use_logs => false,
     :cookie_file => "cookies.txt"
   }
-  
+
   def initialize(extra_opts)
-    
+
     @opts = DEFAULTS.dup
-    
+
     for key, val in opts
       if key.in? DEFAULTS
         @opts[key] = val
@@ -230,7 +231,7 @@ class BrowserOptions < OpenStruct
       end
     end
   end
-  
+
 end
 =end
 

data/lib/epitools/browser/cache.rb

@@ -2,51 +2,51 @@ require 'mechanize'
 require 'sqlite3'
 
 class Browser
-  
+
   #
   # An SQLite3-backed browser cache (with gzip compressed pages)
   #
   class Cache
-  
+
     include Enumerable
-  
+
     attr_reader :db, :agent
-  
-    def initialize(agent, filename="browsercache.db")
+
+    def initialize(filename="browsercache.db", agent=nil)
       @agent    = agent
       @filename = filename
-  
+
       @db = SQLite3::Database.new(filename)
       @db.busy_timeout(50)
-  
+
       create_tables
     end
-  
+
     def inspect
       "#<Browser::Cache filename=#{@filename.inspect}, count=#{count}, size=#{File.size @filename} bytes>"
     end
-  
+
     def count
       db.execute("SELECT COUNT(1) FROM cache").first.first.to_i
     end
-    
+
     alias_method :size, :count
-  
+
     def valid_page?(page)
       [:body, :content_type, :uri].all?{|m| page.respond_to? m }
     end
-       
-    
+
+
     def put(page, original_url=nil, options={})
       dmsg [:put, original_url]
-  
-      raise "Invalid page" unless valid_page?(page) 
-  
+
+      raise "Invalid page" unless valid_page?(page)
+
       url = page.uri.to_s
-  
+
       dmsg [:page_uri, url]
       dmsg [:original_url, url]
-  
+
       if url != original_url
         # redirect original_url to url
         expire(original_url) if options[:overwrite]
@@ -58,7 +58,7 @@ class Browser
           url
         )
       end
-  
+
       #compressed_body = page.body
       compressed_body = Zlib::Deflate.deflate(page.body)
 
@@ -70,23 +70,23 @@ class Browser
         SQLite3::Blob.new( compressed_body  ),
         nil
       )
-  
+
       true
-      
+
     rescue SQLite3::SQLException => e
       p [:exception, e]
       false
     end
-  
+
     def row_to_page(row)
       url, content_type, compressed_body, redirect = row
-  
+
       if redirect
         get(redirect)
       else
         #body = compressed_body
         body = Zlib::Inflate.inflate(compressed_body)
-  
+
         if content_type =~ %r{^(text/html|text/xml|application/xhtml\+xml)}i
           Mechanize::Page.new(
             #initialize(uri=nil, response=nil, body=nil, code=nil, mech=nil)
@@ -105,10 +105,10 @@ class Browser
             nil
           )
         end
-            
+
       end
     end
-  
+
     def pages_via_sql(*args, &block)
       dmsg [:pages_via_sql, args]
       if block_given?
@@ -119,27 +119,27 @@ class Browser
         db.execute(*args).map{|row| row_to_page(row) }
       end
     end
-  
+
     def grep(pattern, &block)
       pages_via_sql("SELECT * FROM cache WHERE url like '%#{pattern}%'", &block)
     end
-  
+
     def get(url)
       pages = pages_via_sql("SELECT * FROM cache WHERE url = ?", url.to_s)
-      
+
       if pages.any?
         pages.first
       else
         nil
       end
     end
-  
+
     def includes?(url)
       db.execute("SELECT url FROM cache WHERE url = ?", url.to_s).any?
     end
-  
+
     alias_method :include?, :includes?
-  
+
     def urls(pattern=nil)
       if pattern
         rows = db.execute("SELECT url FROM cache WHERE url LIKE '%#{pattern}%'")
@@ -148,54 +148,54 @@ class Browser
       end
       rows.map{|row| row.first}
     end
-  
+
     def clear(pattern=nil)
       if pattern
         db.execute("DELETE FROM cache WHERE url LIKE '%#{pattern}%'")
       else
-        db.execute("DELETE FROM cache") 
+        db.execute("DELETE FROM cache")
       end
     end
-  
+
     def each(&block)
       pages_via_sql("SELECT * FROM cache", &block)
     end
-  
+
     def each_url
       db.execute("SELECT url FROM cache") do |row|
         yield row.first
       end
     end
-  
+
     def expire(url)
       db.execute("DELETE FROM cache WHERE url = ?", url)
     end
-  
+
     def recreate_tables
       drop_tables rescue nil
       create_tables
     end
-  
+
     def delete!
       db.close
-      File.unlink @filename  
+      File.unlink @filename
     end
-  
+
   private
-  
+
     def list_tables
       db.execute("SELECT name FROM SQLITE_MASTER WHERE type='table'")
     end
-  
+
     def create_tables
       db.execute("CREATE TABLE IF NOT EXISTS cache ( url varchar(2048), content_type varchar(255), body blob, redirect varchar(2048) )")
       db.execute("CREATE UNIQUE INDEX IF NOT EXISTS url_index ON cache ( url )")
     end
-  
+
     def drop_tables
       db.execute("DROP TABLE cache")
     end
-  
+
   end
-  
+
 end

data/lib/epitools/clitools.rb

@@ -14,7 +14,7 @@
 # * Allow colour
 # * Don't wrap lines longer than the screen
 # * Quit immediately (without paging) if there's less than one screen of text.
-# 
+#
 # You can change these options by passing a hash to `lesspipe`, like so:
 #
 #   lesspipe(:wrap=>false) { |less| less.puts essay.to_s }
@@ -30,9 +30,9 @@ def lesspipe(*args)
   else
     options = {}
   end
-  
+
   output = args.first if args.any?
-  
+
   params = []
   params << "-R" unless options[:color] == false
   params << "-S" unless options[:wrap] == true
@@ -42,7 +42,7 @@ def lesspipe(*args)
     $stderr.puts "Seeking to end of stream..."
   end
   params << "-X"
-  
+
   IO.popen("less #{params * ' '}", "w") do |less|
     if output
       less.puts output
@@ -50,7 +50,7 @@ def lesspipe(*args)
       yield less
     end
   end
-  
+
 rescue Errno::EPIPE, Interrupt
   # less just quit -- eat the exception.
 end
@@ -74,14 +74,14 @@ end
 def cmd(*args)
 
   cmd_args = []
-  
+
   for arg in args
-    
+
     case arg
-      
+
       when Array
         cmd_literals = arg.shift.split(/\s+/)
-        
+
         for cmd_literal in cmd_literals
           if cmd_literal == "?"
             raise "Not enough substitution arguments" unless cmd_args.any?
@@ -90,22 +90,22 @@ def cmd(*args)
             cmd_args << cmd_literal
           end
         end
-        
+
         raise "More parameters than ?'s in cmd string" if arg.any?
-        
+
       when String
         cmd_args << arg
-        
+
       else
         cmd_args << arg.to_s
-        
+
     end
-    
-  end        
+
+  end
 
   p [:cmd_args, cmd_args] if $DEBUG
-  
-  system(*cmd_args)    
+
+  system(*cmd_args)
 end
 
 
@@ -126,11 +126,11 @@ def prompt(message="Are you sure?", options="Yn")
   default = defaults.first
 
   loop do
-  
+
     print "#{message} (#{optstring}) "
-    
+
     response = STDIN.gets.strip.downcase
-    
+
     case response
     when *opts
       return response
@@ -139,13 +139,13 @@ def prompt(message="Are you sure?", options="Yn")
     else
       puts "  |_ Invalid option: #{response.inspect}. Try again."
     end
-    
+
   end
 end
 
 
 #
-# Automatically install a required commandline tool using the platform's package manager (incomplete -- only supports debian :) 
+# Automatically install a required commandline tool using the platform's package manager (incomplete -- only supports debian :)
 #
 # * apt-get on debian/ubuntu
 # * yum on fedora
@@ -154,7 +154,7 @@ end
 #
 def autoinstall(*packages)
   all_packages_installed = packages.all? { |pkg| Path.which pkg }
-  
+
   unless all_packages_installed
     cmd(["sudo apt-get install ?", packages.join(' ')])
   end
@@ -170,24 +170,40 @@ def sudoifnotroot
   end
 end
 
+#
+# Lookup GeoIP information (city, state, country, etc.) for an IP address or hostname
+#
+# (Note: Must be able to find one of /usr/share/GeoIP/GeoIP{,City}.dat, or specified manually
+#        as (an) extra argument(s).)
+#
+def geoip(addr, city_data='/usr/share/GeoIP/GeoIPCity.dat', country_data='/usr/share/GeoIP/GeoIP.dat')
+  (
+    $geoip ||= begin
+      if city_data and File.exists? city_data
+        geo = GeoIP.new city_data
+        proc { |addr| geo.city(addr) }
 
-GEOIP_COUNTRY_DATA = '/usr/share/GeoIP/GeoIP.dat'
-GEOIP_CITY_DATA    = '/usr/share/GeoIP/GeoIPCity.dat'
+      elsif country_data and File.exists? country_data
+        geo = GeoIP.new country_data
+        proc { |addr| geo.country(addr) }
 
-def geoip(addr)
-  $geoip ||= begin
-    if File.exists? GEOIP_CITY_DATA
-      geo = GeoIP.new GEOIP_CITY_DATA
-      proc { |addr| geo.city(addr) }
+      else
+        raise "Can't find GeoIP data files."
+      end
+    end
+  ).call(addr)
+end
 
-    elsif File.exists? GEOIP_COUNTRY_DATA
-      geo = GeoIP.new GEOIP_COUNTRY_DATA
-      proc { |addr| geo.country(addr) }
 
-    else
-      raise "Can't find GeoIP data in /usr/share/GeoIP."
+#
+# Search the PATH environment variable for binaries, returning the first one that exists
+#
+def which(*bins)
+  bins.flatten.each do |bin|
+    ENV["PATH"].split(":").each do |dir|
+      full_path = File.join(dir, bin)
+      return full_path if File.exists? full_path
     end
   end
-
-  $geoip.call(addr)
+  nil
 end

data/lib/epitools/core_ext/enumerable.rb

@@ -178,6 +178,35 @@ module Enumerable
 
   alias_method :cut_between, :split_between
 
+
+  #
+  # Map elements of this Enumerable in parallel using a pool full of Threads
+  #
+  # eg: repos.parallel_map { |repo| system "git pull #{repo}" }
+  #
+  def parallel_map(num_workers=8, &block)
+    require 'thread'
+
+    queue = Queue.new
+    each { |e| queue.push e }
+
+    Enumerator.new do |y|
+      workers = (0...num_workers).map do
+        Thread.new do
+          begin
+            while e = queue.pop(true)
+              y << block.call(e)
+            end
+          rescue ThreadError
+          end
+        end
+      end
+
+      workers.map(&:join)
+    end
+  end
+
+
   #
   # Sum the elements
   #

data/lib/epitools/core_ext/matrix.rb

@@ -51,15 +51,15 @@ class Matrix
   alias_method :draw, :print
 
   #
-  # Allow mathematical operations (*, /, +, -) with a regular number on the right side.
+  # Allow mathematical operations (*, /, +, -) with a scalar (integer or float) on the right side.
   #
   # eg: Matrix.zero(3) + 5
   #
-  %w[* / + -].each do |op|
+  %i[* / + -].each do |op|
     class_eval %{
       def #{op}(other)
         case other
-        when Fixnum, Float
+        when Numeric
           map { |e| e #{op} other }
         else
           super(other)

data/lib/epitools/core_ext/numbers.rb

@@ -30,13 +30,13 @@ class Numeric
   #
   # Examples:
   #    234234234523.clamp(0..100)   #=> 100
-  #    12.clamp(0..100)             #=> 12  
+  #    12.clamp(0..100)             #=> 12
   #    -38817112.clamp(0..100)      #=> 0
   #
   def clamp(range)
     if self < range.first
       range.first
-    elsif self >= range.last 
+    elsif self >= range.last
       if range.exclude_end?
         range.last - 1
       else
@@ -51,7 +51,7 @@ class Numeric
   # Time methods
   #
   {
-  
+
     'second'  => 1,
     'minute'  => 60,
     'hour'    => 60 * 60,
@@ -59,23 +59,23 @@ class Numeric
     'week'    => 60 * 60 * 24 * 7,
     'month'   => 60 * 60 * 24 * 30,
     'year'    => 60 * 60 * 24 * 365,
-    
+
   }.each do |unit, scale|
     define_method(unit)     { self * scale }
     define_method(unit+'s') { self * scale }
   end
-  
+
   def ago
     Time.now - self
   end
-  
+
   def from_now
     Time.now + self
   end
 
   #
-  # If `n.times` is like `each`, `n.things` is like `map`. Return 
-  #  
+  # If `n.times` is like `each`, `n.things` is like `map`. Return
+  #
   def things(&block)
     if block_given?
       Array.new(self, &block)
@@ -255,25 +255,25 @@ class Integer
   def to_hex
     "%0.2x" % self
   end
-    
+
   #
   # 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?
+    # TODO: Why does this go into an infinite loop in 1.8.7?
     ("%b" % self).chars.to_a.reverse.map(&:to_i)
   end
   alias_method :bits, :to_bits
-  
+
   #
   # Cached constants for base62 encoding
   #
-  BASE62_DIGITS   = ['0'..'9', 'A'..'Z', 'a'..'z'].map(&:to_a).flatten 
+  BASE62_DIGITS   = ['0'..'9', 'A'..'Z', 'a'..'z'].map(&:to_a).flatten
   BASE62_BASE     = BASE62_DIGITS.size
 
   #
   # Convert a number to a string representation (in "base62" encoding).
-  # 
+  #
   # Base62 encoding represents the number using the characters: 0..9, A..Z, a..z
   #
   # It's the same scheme that url shorteners and YouTube uses for their
@@ -283,16 +283,16 @@ class Integer
     result = []
     remainder = self
     max_power = ( Math.log(self) / Math.log(BASE62_BASE) ).floor
-    
+
     max_power.downto(0) do |power|
       divisor = BASE62_BASE**power
-      #p [:div, divisor, :rem, remainder]      
+      #p [:div, divisor, :rem, remainder]
       digit, remainder = remainder.divmod(divisor)
       result << digit
     end
-    
+
     result << remainder if remainder > 0
-    
+
     result.map{|digit| BASE62_DIGITS[digit]}.join ''
   end
 
@@ -312,7 +312,7 @@ class Integer
 
     loop do
       if current.prime?
-        result << current 
+        result << current
         return result if result.size >= self
       end
       current += 1
@@ -324,7 +324,7 @@ class Integer
   #
   def factors
     Prime # autoload the prime module
-    prime_division.map { |n,count| [n]*count }.flatten 
+    prime_division.map { |n,count| [n]*count }.flatten
   end
 
   #
@@ -352,32 +352,33 @@ class Integer
 end
 
 #
-# Monkeypatch [] into Bignum and Fixnum using class_eval.
+# Adds integer silcing (returning the bits) and raw-bytes
 #
 # (This is necessary because [] is defined directly on the classes, and a mixin
 #  module will still be overridden by Big/Fixnum's native [] method.)
 #
-[Bignum, Fixnum].each do |klass|
-  
+(RUBY_VERSION >= "2.4" ? [Integer] : [Bignum, Fixnum]).each do |klass|
   klass.class_eval do
-    
+
     alias_method :bit, :"[]"
-    
+
     #
-    # Extends [] so that Integers can be sliced as if they were arrays.
+    # Slice the bits of an integer by passing a range (eg: 1217389172842[0..5] #=> [0, 1, 0, 1, 0, 1])
     #
     def [](arg)
       case arg
       when Integer
-        self.bit(arg)
+        bit(arg)
       when Range
-        self.bits[arg]
+        bits[arg]
       end
     end
-    
+
     #
     # Convert the integer into its sequence of bytes (little endian format: lowest-order-byte first)
     #
+    # TODO: This could be made much more efficient!
+    #
     def bytes
       nbytes = (bit_length / 8.0).ceil
 
@@ -386,6 +387,9 @@ end
       end
     end
 
+    def big_endian_bytes
+      bytes.reverse
+    end
   end
 end
 
@@ -415,7 +419,7 @@ class Time
   def in_words
     delta   = (Time.now-self).to_i
     a       = delta.abs
-    
+
     amount  = case a
       when 0
         'just now'
@@ -436,16 +440,16 @@ class Time
       else
         "year".amount(a/1.year)
     end
-    
+
     if delta < 0
       amount += " from now"
     elsif delta > 0
       amount += " ago"
     end
-    
+
     amount
   end
-  
+
 end
 
 

data/lib/epitools/minimal.rb

@@ -173,6 +173,9 @@ class Object
   end
   alias_method :fap, :self
 
+  def ancestors
+    self.class.ancestors
+  end
 end
 
 

data/lib/epitools/path.rb

@@ -123,6 +123,14 @@ class Path
   ###############################################################################
 
   def initialize(newpath, hints={})
+    if hints[:unlink_when_garbage_collected]
+      backup_path = path.dup
+      puts "unlinking #{backup_path} after gc!"
+      ObjectSpace.define_finalizer self do |object_id|
+        File.unlink backup_path
+      end
+    end
+
     send("path=", newpath, hints)
   end
 
@@ -583,6 +591,28 @@ class Path
     end
   end
 
+  def media_tags
+    require 'taglib'
+
+    tags = nil
+
+    TagLib::FileRef.open(path) do |fileref|
+      unless fileref.null?
+        tags = fileref.tag
+        result = {}
+        getters = tags.class.instance_methods(false).group_by {|m| m[/^.+[^=]/] }.map { |k,vs| vs.size == 2 ? k.to_sym : nil }.compact
+        getters.each do |getter|
+          tags[getter] = tags.public_send(getter)
+        end
+      end
+    end
+
+    tags
+  end
+
+  alias_method :id3, :media_tags
+  alias_method :id3tags, :media_tags
+
   #
   # Retrieve one of this file's xattrs
   #
@@ -969,10 +999,12 @@ class Path
     if dest.startswith("/")
       Path.ln_s(self, dest)
     else
-      Path.ln_s(self, self / dest )
+      Path.ln_s(self, self / dest)
     end
   end
 
+  alias_method :symlink_to, :ln_s
+
   ## Owners and permissions
 
   def chmod(mode)
@@ -1054,7 +1086,7 @@ class Path
     Zlib.deflate(read, level)
   end
   alias_method :gzip, :deflate
-  
+
 
   #
   # gunzip the file, returning the result as a string
@@ -1270,21 +1302,24 @@ class Path
   # TODO: Remove the tempfile when the Path object is garbage collected or freed.
   #
   def self.tmpfile(prefix="tmp")
-    path = Path[ Tempfile.new(prefix).path ]
+    path = Path.new Tempfile.new(prefix).path, unlink_when_garbage_collected: true
     yield path if block_given?
     path
   end
   alias_class_method :tempfile, :tmpfile
   alias_class_method :tmp,      :tmpfile
 
+
+  #
+  # Create a uniqely named directory in /tmp
+  #
   def self.tmpdir(prefix="tmp")
     t = tmpfile
-
-    # FIXME: These operations should be atomic
-    t.rm; t.mkdir
-
+    t.rm; t.mkdir # FIXME: These two operations should be made atomic
     t
   end
+  alias_class_method :tempdir, :tmpdir
+
 
   def self.home
     Path[ENV['HOME']]

data/spec/browser_spec.rb

@@ -11,7 +11,7 @@ end
 describe Browser do
 
   before :all do
-    @browser = Browser.new
+    @browser = Browser.new use_cache: true
   end
 
   after :all do
@@ -23,16 +23,16 @@ describe Browser do
     page = @browser.get(url)
     @browser.cache.get(url).should_not == nil
   end
-  
+
   it "googles" do
     page = @browser.get("http://google.com")
     page.body["Feeling Lucky"].should_not be_empty
   end
-  
+
   it "googles (cached)" do
     lambda{ @browser.get("http://google.com").body }.should_not raise_error
   end
-  
+
   it "delegates" do
     lambda{ @browser.head("http://google.com").body }.should_not raise_error
     @browser.respond_to?(:post).should == true
@@ -46,9 +46,10 @@ end
 describe Browser::Cache do
 
   before :all do
+    cache_file = "temp-cache.db"
     @agent = Mechanize.new
-    Browser::Cache.new(@agent).delete!
-    @cache = Browser::Cache.new(@agent)
+    Browser::Cache.new(cache_file, @agent).delete!
+    @cache = Browser::Cache.new(cache_file, @agent)
   end
 
   after :all do

data/spec/clitools_spec.rb

@@ -1,30 +1,46 @@
+require 'epitools/minimal'
 require 'epitools/clitools'
 
-describe String do
+describe Object do
 
-  it "highlights" do
-    color = :light_yellow
-    highlighted = "xxx#{"match".send(color)}zzz"
+  # it "'highlight's" do
+  #   color = :light_yellow
+  #   highlighted = "xxx#{"match".send(color)}zzz"
 
-    "xxxmatchzzz".highlight(/match/, color).should   == highlighted
-    "xxxmatchzzz".highlight("match", color).should   == highlighted
-    "xxxmatchzzz".highlight(/m.+h/, color).should    == highlighted
-    "xxxmatchzzz".highlight(/MATCH/i, color).should  == highlighted
-  end
+  #   "xxxmatchzzz".highlight(/match/, color).should   == highlighted
+  #   "xxxmatchzzz".highlight("match", color).should   == highlighted
+  #   "xxxmatchzzz".highlight(/m.+h/, color).should    == highlighted
+  #   "xxxmatchzzz".highlight(/MATCH/i, color).should  == highlighted
+  # end
 
-  it "highlights with a block" do
-    result = "xxxmatchxxx".highlight(/match/) { |match| "<8>#{match}</8>" }
-    result.should == "xxx<8>match</8>xxx"
-  end
-  
-  it "cmds" do
+  # it "'highlight's with a block" do
+  #   result = "xxxmatchxxx".highlight(/match/) { |match| "<8>#{match}</8>" }
+  #   result.should == "xxx<8>match</8>xxx"
+  # end
+
+  it "'cmd's" do
     cmd( ['test -f ?', __FILE__] ).should == true
     cmd( ['test -d ?', __FILE__] ).should == false
-    cmd( "test", "-f", __FILE__ ).should == true 
+    cmd( "test", "-f", __FILE__ ).should == true
     cmd( "test", "-d", __FILE__ ).should == false
-    
-    lambda { cmd( ["test -f ? ?", __FILE__] ) }.should raise_error  # too many ?'s
-    lambda { cmd( ["test -f", __FILE__] ) }.should raise_error      # too few ?'s
+
+    -> { cmd( ["test -f ? ?", __FILE__] ) }.should raise_error(TypeError) # more ?'s than args
+    -> { cmd( ["test -f", __FILE__] ) }.should raise_error(RuntimeError)  # more args than ?'s
+  end
+
+  it "'which'es" do
+    which("totally nonexistant", "probably nonexistant", "ls", "df").should_not == nil
+    which("totally nonexistant", "probably nonexistant").should == nil
+    which("ls", "df").should =~ /\/ls$/
   end
-    
+
+  it "'geoip's" do
+    geoip("128.100.100.128").country_name.should == "Canada"
+
+    -> { geoip("butt"*20) }.should raise_error(SocketError)
+
+    $geoip = nil
+    -> { geoip("8.8.4.4", nil, nil) }.should raise_error(RuntimeError)
+  end
+
 end

data/spec/core_ext_spec.rb

@@ -28,13 +28,13 @@ describe Object do
 
     lambda {
       time("time test") { raise "ERROR" }
-    }.should raise_error
+    }.should raise_error(RuntimeError)
   end
 
   it "benches" do
     lambda { bench { rand }                 }.should_not raise_error
     lambda { bench(20) { rand }             }.should_not raise_error
-    lambda { bench                          }.should raise_error
+    lambda { bench                          }.should raise_error(RuntimeError)
     lambda { bench(:rand => proc { rand }, :notrand => proc { 1 })        }.should_not raise_error
     lambda { bench(200, :rand => proc { rand }, :notrand => proc { 1 })   }.should_not raise_error
   end
@@ -49,15 +49,15 @@ describe Object do
     s.try(:c).should == nil
 
     lambda { s.try(:c) }.should_not raise_error
-    lambda { s.c }.should raise_error
+    lambda { s.c }.should raise_error(NoMethodError)
 
     def s.test(a); a; end
 
-    s.test(1).should                == 1
-    s.try(:test, 1).should          == 1
+    s.test(1).should       == 1
+    s.try(:test, 1).should == 1
 
-    lambda { s.test }.should raise_error
-    lambda { s.try(:test) }.should raise_error
+    lambda { s.test }.should raise_error(ArgumentError)
+    lambda { s.try(:test) }.should raise_error(ArgumentError)
 
     def s.blocky; yield; end
 

data/spec/path_spec.rb

@@ -234,7 +234,7 @@ describe Path do
 
     path.touch
     lambda { path.rename(:ext=>".dat") }.should raise_error
-    
+
     dest.rm
     path.rename!(:ext=>".dat")
     path.to_s.should_not == old_name
@@ -483,16 +483,15 @@ describe Path do
   end
 
   it 'symlinks relative dirs' do
-    raise "Path.ln_s arguments are backwards. It needs to be something easier to remember, like 'Path#symlink_to'"
     tmpdir = Path.tmpdir
 
     symlink = (tmpdir/"a_new_link")
-    symlink.ln_s "../../etc/passwd"
+    Path["../../etc/passwd"].ln_s symlink
 
     symlink.symlink?.should == true
 
     symlink.rm
-    dir.rm
+    tmpdir.rm
   end
 
   it 'swaps two files' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: epitools
 version: !ruby/object:Gem::Version
-  version: 0.5.98
+  version: 0.5.99
 platform: ruby
 authors:
 - epitron
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-27 00:00:00.000000000 Z
+date: 2017-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -124,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 3
 summary: Not utils... METILS!