epitools 0.4.35 → 0.4.36

data/VERSION

@@ -1 +1 @@
-0.4.35
+0.4.36

data/epitools.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{epitools}
-  s.version = "0.4.35"
+  s.version = "0.4.36"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["epitron"]
-  s.date = %q{2011-05-20}
+  s.date = %q{2011-05-23}
   s.description = %q{Miscellaneous utility libraries to make my life easier.}
   s.email = %q{chris@ill-logic.com}
   s.extra_rdoc_files = [
@@ -24,6 +24,7 @@ Gem::Specification.new do |s|
     "VERSION",
     "epitools.gemspec",
     "lib/epitools.rb",
+    "lib/epitools/autoloads.rb",
     "lib/epitools/basetypes.rb",
     "lib/epitools/browser.rb",
     "lib/epitools/browser/cache.rb",
@@ -48,6 +49,7 @@ Gem::Specification.new do |s|
     "spec/basetypes_spec.rb",
     "spec/browser_spec.rb",
     "spec/clitools_spec.rb",
+    "spec/colored_spec.rb",
     "spec/lcs_spec.rb",
     "spec/numwords_spec.rb",
     "spec/path_spec.rb",
@@ -62,7 +64,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/epitron/epitools}
   s.licenses = ["WTFPL"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.7.2}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{NOT UTILS... METILS!}
 
   if s.respond_to? :specification_version then

data/lib/epitools.rb

@@ -1,11 +1,7 @@
-autoload :Path,     'epitools/path'
-autoload :Browser,  'epitools/browser'
-autoload :Rash,     'epitools/rash'
-autoload :Ratio,    'epitools/ratio'
-autoload :Sys,      'epitools/sys'
+require 'pp'
+require 'set'
 
 class Object
-
   unless defined?(__DIR__)
     # 
     # This method is convenience for the `File.expand_path(File.dirname(__FILE__))` idiom.
@@ -17,9 +13,9 @@ class Object
       ::File.expand_path(::File.join(dir, *args.map{|a| a.to_s}))
     end
   end
-  
 end
 
+## Pretty error messages
 require_wrapper = proc do |mod|
   #p [:loading, mod]
   begin
@@ -29,7 +25,9 @@ require_wrapper = proc do |mod|
   end
 end
 
+## Require the tools
 %w[
+  autoloads
   basetypes 
   niceprint
   string_to_proc

data/lib/epitools/autoloads.rb

@@ -0,0 +1,26 @@
+## Standard library
+autoload :URI,        'uri'
+autoload :CGI,        'cgi'
+autoload :Base64,     'base64'
+autoload :JSON,       'json'
+autoload :Zlib,       'zlib'
+autoload :FileUtils,  'fileutils'
+autoload :Tempfile,   'tempfile'
+autoload :BigDecimal, 'bigdecimal'
+
+module Digest
+  autoload :SHA1,     'digest/sha1'
+  autoload :SHA2,     'digest/sha2'
+  autoload :MD5,      'digest/md5'
+end
+
+## Nonstandard library
+autoload :Path,     'epitools/path'
+autoload :Browser,  'epitools/browser'
+autoload :Rash,     'epitools/rash'
+autoload :Ratio,    'epitools/ratio'
+autoload :Sys,      'epitools/sys'
+autoload :ProgressBar,  'epitools/progressbar'
+
+
+

data/lib/epitools/basetypes.rb

@@ -1,14 +1,4 @@
-require 'pp'
-
-autoload :URI, 'uri'
-autoload :CGI, 'cgi'
-autoload :Base64, 'base64'
-module Digest
-  autoload :MD5, 'digest/md5'
-  autoload :SHA1, 'digest/sha1'
-end
-autoload :JSON, 'json'
-
+require 'epitools'
 
 ## Alias "Enumerator" to "Enum"
 

data/lib/epitools/browser.rb

@@ -1,5 +1,5 @@
+require 'epitools'
 require 'mechanize'
-require 'epitools/basetypes'
 require 'epitools/browser/cache'
 require 'epitools/browser/mechanize_progressbar'
 
@@ -7,35 +7,9 @@ require 'epitools/browser/mechanize_progressbar'
 #require 'socksify'
 class SOCKSError < Exception; end # :nodoc:
 
-# TODO: Put options here.
-=begin
-class BrowserOptions < OpenStruct
-
-  DEFAULTS = {
-    :delay => 1,
-    :delay_jitter => 0.2,
-    :use_cache => true,
-    :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
-      else
-        raise "Unknown option: #{key}"
-      end
-    end
-  end
-  
-end
-=end
-
-# Monkeypatches!
+#
+# Slightly more intelligent `Mechanize::File`s
+#
 class Mechanize::File
   def content_type
     response['content-type']
@@ -78,7 +52,6 @@ class Browser
     init_agent!
     init_cache!
   end
-                                        
 
   def init_agent!
     @agent = Mechanize.new do |a|
@@ -91,7 +64,6 @@ class Browser
     load_cookies!
   end
 
-
   def delay(override_delay=nil, override_jitter=nil)
     elapsed   = Time.now - @last_get
     jitter    = rand * (override_jitter || @delay_jitter)
@@ -103,13 +75,11 @@ class Browser
     end
   end
 
-
   def init_cache!
     # TODO: Rescue "couldn't load" exception and disable caching
     @cache = Cache.new(agent) if @use_cache
   end
 
-
   def load_cookies!
     if File.exists? @cookie_file
       agent.cookie_jar.load @cookie_file
@@ -118,19 +88,15 @@ 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
@@ -138,7 +104,6 @@ class Browser
       true
     end
   end    
-
   
   def cache_put(page, url)
     if cache.valid_page?(page)
@@ -193,6 +158,7 @@ class Browser
       puts "  |_ ERROR: #{e.inspect} -- retrying"
       delay(5)
       retry
+      
 =begin      
     rescue Mechanize::ResponseCodeError => e
       
@@ -231,3 +197,33 @@ class Browser
   
 end
 
+
+# TODO: Put options here.
+=begin
+class BrowserOptions < OpenStruct
+
+  DEFAULTS = {
+    :delay => 1,
+    :delay_jitter => 0.2,
+    :use_cache => true,
+    :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
+      else
+        raise "Unknown option: #{key}"
+      end
+    end
+  end
+  
+end
+=end
+
+

data/lib/epitools/browser/mechanize_progressbar.rb

@@ -1,4 +1,4 @@
-require 'epitools/progressbar'
+require 'epitools'
 
 #
 # Mechanize Progress Bar extension

data/lib/epitools/clitools.rb

@@ -1,4 +1,4 @@
-require 'epitools/colored'
+require 'epitools'
 
 class String
 

data/lib/epitools/colored.rb

@@ -35,6 +35,7 @@ module Colored
     'yellow'  => 33,
     'blue'    => 34,
     'magenta' => 35,
+    'purple'  => 35,
     'cyan'    => 36,
     'white'   => 37
   }
@@ -72,7 +73,8 @@ module Colored
   VALID_COLORS = Set.new(
     COLORS.keys +
     COLORS.map { |k,v| "light_#{k}" } +
-    COLORS.map { |k,v| "bold_#{k}"  }
+    COLORS.map { |k,v| "bright_#{k}"  } +
+    ["grey", "gray"]
   )
   
   COLORS.each do |color, value|
@@ -88,6 +90,10 @@ module Colored
       colorize(self, :foreground => color, :extra => 'bold')
     end
 
+    define_method("bright_#{color}") do
+      colorize(self, :foreground => color, :extra => 'bold')
+    end
+
     COLORS.each do |highlight, value|
       next if color == highlight
 
@@ -102,6 +108,9 @@ module Colored
     end
   end
 
+  alias_method :gray, :light_black
+  alias_method :grey, :light_black
+  
   EXTRAS.each do |extra, value|
     next if extra == 'clear'
     define_method(extra) do 
@@ -210,7 +219,7 @@ module Colored
   def valid_tag?(tag)
     VALID_COLORS.include?(tag) or
     (
-      string =~ /^\d+$/ and
+      tag =~ /^\d+$/ and
       BBS_COLOR_TABLE.include?(tag.to_i)
     )
   end

data/lib/epitools/hexdump.rb

@@ -1,4 +1,4 @@
-require 'colored'
+require 'epitools'
 
 ASCII_PRINTABLE = (33..126)
 

data/lib/epitools/numwords.rb

@@ -1,6 +1,4 @@
-require 'epitools/basetypes'
-require 'bigdecimal'
-require 'set'
+require 'epitools'
 
 #
 # Allow numbers to be converted into words, or exprssed more easily with words.
@@ -118,7 +116,7 @@ class Numeric
       factor    = 10**pow
       
       if is_a?(Float) 
-        (BigDecimal(to_s) * factor).to_i
+        (BigDecimal.new(to_s) * factor).to_i
       else
         self * factor
       end

data/lib/epitools/path.rb

@@ -1,14 +1,4 @@
-require 'epitools/basetypes'
-
-autoload :FileUtils,  'fileutils'
-autoload :Tempfile,   'tempfile'
-autoload :URI,        'uri'
-module Digest
-  autoload :SHA1,     'digest/sha1'
-  autoload :SHA2,     'digest/sha2'
-  autoload :MD5,      'digest/md5'
-end
-
+require 'epitools'
 
 class Path
   

data/lib/epitools/permutations.rb

@@ -1,4 +1,4 @@
-require 'epitools/basetypes'
+require 'epitools'
 
 class Array
   

data/lib/epitools/pretty_backtrace.rb

@@ -1,6 +1,4 @@
-require 'pp'
-require 'rubygems'
-require 'colorize'
+require 'epitools'
 
 # TODO: Pick a backtrace format. (Also, add a method to replace default backtracer.)
 # TODO: This chould be in a class.
@@ -71,7 +69,7 @@ end
 
 def color_backtrace_2(lines, options={})
 
-  groups = lines.reverse.split_when { |line,nextline| line.path != nextline.path }
+  groups = lines.reverse.split_at { |line,nextline| line.path != nextline.path }
 
   if options[:no_gems]
     groups = groups.split_when { |a, nexta| a.first.gem? != nexta.first.gem? }
@@ -253,7 +251,13 @@ if $0 == __FILE__
       /usr/local/lib/site_ruby/1.8/rubygems/custom_require.rb:27:in `gem_original_require'
       /usr/local/lib/site_ruby/1.8/rubygems/custom_require.rb:27:in `require'
       script/server:3
-  }.split("\n").select{|line| line.any?}
+  }.lines
+  
+  begin
+    String.new nil
+  rescue => e
+    backtrace = e.backtrace
+  end
   
   lines = parse_lines(backtrace)
   #debug_backtrace(lines)

data/lib/epitools/rails.rb

@@ -1,3 +1,5 @@
+require 'epitools'
+
 if defined? Rails
   
   class ActiveRecord::Base

data/lib/epitools/ratio.rb

@@ -1,4 +1,8 @@
-
+#
+# The ratio between two numbers (eg: 2:1, 3:4)
+#
+# Can be compared, added, "percent"ed, "to_f"ed, and displayed. 
+#
 class Ratio
 
   include Comparable
@@ -13,16 +17,25 @@ class Ratio
     new(*args)
   end
 
+  #
+  # `first` is the top part of the ratio, `last` is the bottom (eg: `first/last`)
+  #
   def initialize(first, last=1)
     @first = first
     @last = last
   end
 
+  #
+  # Returns a string representation: "a/b"
+  #
   def to_s
     "#{@first}/#{@last}"
   end
   alias_method :ratio, :to_s
 
+  #
+  # Returns the ratio as a float. (eg: Ratio[1,2].to_f == 0.5)
+  #
   def to_f
     if @last == 0
       0.0
@@ -31,18 +44,35 @@ class Ratio
     end
   end
 
+  #
+  # Returns a string representing the number in percent
+  #
   def percent
     "%0.1f%" % (to_f * 100)
   end
   alias_method :to_percent, :percent
 
+  #
+  # "#<Ratio: 1/2>"
+  #
   def inspect
     "#<Ratio: #{to_s}>"
   end
 
+  #
+  # Adds together the tops and bottoms of the ratios.
+  #
+  # Example: For the ratios `a/c` and `b/d`, returns `a+b/c+d`
+  #
   def +(other)
     Ratio.new( first+other.first, last+other.last)
   end
 
 end
 
+#
+# Function-style wrapper
+#
+def Ratio(*args)
+  Ratio.new(*args)
+end

data/lib/epitools/sys.rb

@@ -1,4 +1,4 @@
-require 'epitools/basetypes'
+require 'epitools'
 
 #
 # Cross-platform operating system functions.

data/lib/epitools/zopen.rb

@@ -1,10 +1,10 @@
-require 'zlib'
+require 'epitools'
 
 #
 # A mutation of "open" that lets you read/write gzip files, as well as
 # regular files.
 #
-# (NOTE: gzip detection is purely based on the filename.)
+# (NOTE: gzip detection is based on the filename, not the contents.)
 #
 # It accepts a block just like open()!
 #
@@ -12,7 +12,7 @@ require 'zlib'
 #    zopen("test.txt")          #=> #<File:test.txt>
 #    zopen("test.txt.gz")       #=> #<Zlib::GzipReader:0xb6c79424>
 #    zopen("otherfile.gz", "w") #=> #<Zlib::GzipWriter:0x7fe30448>>
-#    zopen("test.txt.gz") { |f| f.read } # reads the contents of the .gz file, then closes the file automatically.
+#    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")
 

data/spec/basetypes_spec.rb

@@ -1,4 +1,4 @@
-require 'epitools/basetypes'
+require 'epitools'
 
 describe Object do
 

data/spec/colored_spec.rb

@@ -0,0 +1,29 @@
+require 'epitools'
+
+describe "Colored strings" do
+  
+  it "has string methods" do
+    s = "string"
+    s.should respond_to(:blue)
+    s.should respond_to(:light_blue)
+    s.should respond_to(:bright_blue)
+    s.should respond_to(:grey)
+    s.should respond_to(:gray)
+    s.should respond_to(:purple)
+    s.should respond_to(:magenta)
+    lambda { s.light_blue }.should_not raise_error
+  end    
+  
+  it "can do bbs colors" do
+    "<5>yay".colorize.should == "yay".magenta
+  end
+  
+  it "can do tagged colors" do
+    "<blue>hello".colorize.should == "hello".blue
+    "<magenta>hello".colorize.should == "<purple>hello".colorize
+    "<gray>hello".colorize.should == "<light_black>hello".colorize
+    lambda { "</blue>".colorize }.should raise_error
+  end    
+  
+end
+

data/spec/numwords_spec.rb

@@ -1,4 +1,4 @@
-require 'epitools/numwords'
+require 'epitools'
 
 describe Numeric do
   

data/spec/ratio_spec.rb

@@ -21,4 +21,9 @@ describe Ratio do
     @b.percent.should == "50.0%"
   end
 
+  it "uses the function-style wrapper" do
+    Ratio(1,2).should == Ratio[1,2]
+    Ratio(1,2).should == Ratio.new(1,2)
+  end
+  
 end

data/spec/sys_spec.rb

@@ -1,4 +1,4 @@
-require 'epitools/sys'
+require 'epitools'
 
 describe Sys::ProcessInfo do
 

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: epitools
 version: !ruby/object:Gem::Version 
-  hash: 73
   prerelease: 
-  segments: 
-  - 0
-  - 4
-  - 35
-  version: 0.4.35
+  version: 0.4.36
 platform: ruby
 authors: 
 - epitron
@@ -15,7 +10,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-20 00:00:00 Z
+date: 2011-05-23 00:00:00 -04:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -25,11 +21,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        - 2
-        - 0
         version: 2.2.0
   type: :development
   version_requirements: *id001
@@ -41,11 +32,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
         version: 1.0.0
   type: :development
   version_requirements: *id002
@@ -57,9 +43,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id003
@@ -80,6 +63,7 @@ files:
 - VERSION
 - epitools.gemspec
 - lib/epitools.rb
+- lib/epitools/autoloads.rb
 - lib/epitools/basetypes.rb
 - lib/epitools/browser.rb
 - lib/epitools/browser/cache.rb
@@ -104,6 +88,7 @@ files:
 - spec/basetypes_spec.rb
 - spec/browser_spec.rb
 - spec/clitools_spec.rb
+- spec/colored_spec.rb
 - spec/lcs_spec.rb
 - spec/numwords_spec.rb
 - spec/path_spec.rb
@@ -114,6 +99,7 @@ files:
 - spec/spec_helper.rb
 - spec/sys_spec.rb
 - spec/zopen_spec.rb
+has_rdoc: true
 homepage: http://github.com/epitron/epitools
 licenses: 
 - WTFPL
@@ -127,23 +113,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: NOT UTILS... METILS!