epitools 0.2.1 → 0.3.0

data/Rakefile

@@ -1,38 +1,48 @@
-#!/usr/bin/ruby
 require 'rubygems'
+
+#require 'bundler'
+#begin
+#  Bundler.setup(:default, :development)
+#rescue Bundler::BundlerError => e
+#  $stderr.puts e.message
+#  $stderr.puts "Run `bundle install` to install missing gems"
+#  exit e.status_code
+#end
+
 require 'rake'
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "epitools"
-    gem.summary = %Q{NOT UTILS... METILS!}
-    gem.description = %Q{Miscellaneous utility libraries to make my life easier.}
-    gem.email = "chris@ill-logic.com"
-    gem.homepage = "http://github.com/epitron/epitools"
-    gem.authors = ["epitron"]
-    gem.add_development_dependency "rspec", ">= 1.2.9"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
+require 'jeweler'
+Jeweler::Tasks.new do |gem|
+  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
+  gem.name = "epitools"
+  gem.summary = %Q{NOT UTILS... METILS!}
+  gem.description = %Q{Miscellaneous utility libraries to make my life easier.}
+  gem.email = "chris@ill-logic.com"
+  gem.homepage = "http://github.com/epitron/epitools"
+  gem.authors = ["epitron"]
+  gem.license = "WTFPL"
+
+  # Include your dependencies below. Runtime dependencies are required when using your gem,
+  # and development dependencies are only needed for development (ie running rake tasks, tests, etc)
+  #  gem.add_runtime_dependency 'jabber4r', '> 0.1'
+  #  gem.add_development_dependency 'rspec', '> 1.2.3'
+  gem.add_development_dependency "rspec", "~> 2.2.0"
+  gem.add_development_dependency "mechanize", "~> 1.0.0"
+  gem.add_development_dependency "sqlite3-ruby"
 end
+Jeweler::RubygemsDotOrgTasks.new
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
+require 'rspec/core'
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern = FileList['spec/**/*_spec.rb']
 end
 
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
+RSpec::Core::RakeTask.new(:rcov) do |spec|
   spec.pattern = 'spec/**/*_spec.rb'
   spec.rcov = true
 end
 
-task :spec => :check_dependencies
-
 task :default => :spec
 
 require 'rake/rdoctask'

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.3.0

data/epitools.gemspec

@@ -1,76 +1,78 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{epitools}
-  s.version = "0.2.1"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["epitron"]
-  s.date = %q{2010-10-19}
+  s.date = %q{2010-12-02}
   s.description = %q{Miscellaneous utility libraries to make my life easier.}
   s.email = %q{chris@ill-logic.com}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
+    "README.rdoc"
   ]
   s.files = [
     ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "epitools.gemspec",
-     "lib/epitools.rb",
-     "lib/epitools/basetypes.rb",
-     "lib/epitools/browser.rb",
-     "lib/epitools/browser/browser_cache.rb",
-     "lib/epitools/browser/mechanize_progressbar.rb",
-     "lib/epitools/hexdump.rb",
-     "lib/epitools/http.rb",
-     "lib/epitools/lcs.rb",
-     "lib/epitools/metaclass.rb",
-     "lib/epitools/niceprint.rb",
-     "lib/epitools/permutations.rb",
-     "lib/epitools/pretty_backtrace.rb",
-     "lib/epitools/progressbar.rb",
-     "lib/epitools/rails.rb",
-     "lib/epitools/rash.rb",
-     "lib/epitools/ratio.rb",
-     "lib/epitools/string_to_proc.rb",
-     "lib/epitools/sys.rb",
-     "lib/epitools/zopen.rb",
-     "spec/basetypes_spec.rb",
-     "spec/browser_spec.rb",
-     "spec/lcs_spec.rb",
-     "spec/metaclass_spec.rb",
-     "spec/permutations_spec.rb",
-     "spec/rash_spec.rb",
-     "spec/ratio_spec.rb",
-     "spec/spec.opts",
-     "spec/spec_helper.rb",
-     "spec/sys_spec.rb",
-     "spec/zopen_spec.rb"
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "epitools.gemspec",
+    "lib/epitools.rb",
+    "lib/epitools/basetypes.rb",
+    "lib/epitools/browser.rb",
+    "lib/epitools/browser/browser_cache.rb",
+    "lib/epitools/browser/mechanize_progressbar.rb",
+    "lib/epitools/hexdump.rb",
+    "lib/epitools/highlight.rb",
+    "lib/epitools/http.rb",
+    "lib/epitools/lcs.rb",
+    "lib/epitools/metaclass.rb",
+    "lib/epitools/niceprint.rb",
+    "lib/epitools/permutations.rb",
+    "lib/epitools/pretty_backtrace.rb",
+    "lib/epitools/progressbar.rb",
+    "lib/epitools/rails.rb",
+    "lib/epitools/rash.rb",
+    "lib/epitools/ratio.rb",
+    "lib/epitools/string_to_proc.rb",
+    "lib/epitools/sys.rb",
+    "lib/epitools/zopen.rb",
+    "spec/basetypes_spec.rb",
+    "spec/browser_spec.rb",
+    "spec/highlight_spec.rb",
+    "spec/lcs_spec.rb",
+    "spec/metaclass_spec.rb",
+    "spec/permutations_spec.rb",
+    "spec/rash_spec.rb",
+    "spec/ratio_spec.rb",
+    "spec/spec.opts",
+    "spec/spec_helper.rb",
+    "spec/sys_spec.rb",
+    "spec/zopen_spec.rb"
   ]
   s.homepage = %q{http://github.com/epitron/epitools}
-  s.rdoc_options = ["--charset=UTF-8"]
+  s.licenses = ["WTFPL"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{NOT UTILS... METILS!}
   s.test_files = [
     "spec/basetypes_spec.rb",
-     "spec/browser_spec.rb",
-     "spec/lcs_spec.rb",
-     "spec/metaclass_spec.rb",
-     "spec/permutations_spec.rb",
-     "spec/rash_spec.rb",
-     "spec/ratio_spec.rb",
-     "spec/spec_helper.rb",
-     "spec/sys_spec.rb",
-     "spec/zopen_spec.rb"
+    "spec/browser_spec.rb",
+    "spec/highlight_spec.rb",
+    "spec/lcs_spec.rb",
+    "spec/metaclass_spec.rb",
+    "spec/permutations_spec.rb",
+    "spec/rash_spec.rb",
+    "spec/ratio_spec.rb",
+    "spec/spec_helper.rb",
+    "spec/sys_spec.rb",
+    "spec/zopen_spec.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -78,12 +80,18 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_development_dependency(%q<rspec>, ["~> 2.2.0"])
+      s.add_development_dependency(%q<mechanize>, ["~> 1.0.0"])
+      s.add_development_dependency(%q<sqlite3-ruby>, [">= 0"])
     else
-      s.add_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_dependency(%q<rspec>, ["~> 2.2.0"])
+      s.add_dependency(%q<mechanize>, ["~> 1.0.0"])
+      s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
     end
   else
-    s.add_dependency(%q<rspec>, [">= 1.2.9"])
+    s.add_dependency(%q<rspec>, ["~> 2.2.0"])
+    s.add_dependency(%q<mechanize>, ["~> 1.0.0"])
+    s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
   end
 end
 

data/lib/epitools.rb

@@ -1,6 +1,15 @@
 __DIR__ = File.dirname(__FILE__)
 
+require_wrapper = proc do |mod|
+  begin
+    require File.join(__DIR__, "epitools", mod)
+  rescue LoadError => e
+    puts "* Error loading epitools/#{mod}: #{e}"
+  end
+end
+
 %w[
+
   basetypes 
   metaclass 
   niceprint
@@ -8,6 +17,9 @@ __DIR__ = File.dirname(__FILE__)
   permutations
   ratio
   zopen
+  colored
+  highlight
+
 ].each do |mod|
-  require File.join(__DIR__, "epitools", mod) 
+  require_wrapper.call mod
 end

data/lib/epitools/basetypes.rb

@@ -442,6 +442,13 @@ class Hash
 end
 
 
+if defined?(BasicObject)
+  BlankSlate = BasicObject
+else
+  class BlankSlate
+    instance_methods.each { |m| undef_method m unless m =~ /^__/ }
+  end
+end
 
 module Kernel
 
@@ -460,16 +467,17 @@ protected
   # Magic "its" way:
   #   User.find(:all).map &its.contacts.map(&its.last_name.capitalize)
   #
-  def it() 
-    It.new 
+  def it()
+    It.new
   end
-  
+
   alias its it
-  
+
 end
 
-class It
-  undef_method( *(instance_methods - ["__id__", "__send__"]) )
+
+class It < BlankSlate
+  #undef_method( *(instance_methods - ["__id__", "__send__"]) )
 
   def initialize
     @methods = []
@@ -489,11 +497,6 @@ class It
   end
 end
 
-
-class BlankSlate
-  instance_methods.each { |m| undef_method m unless m =~ /^__/ }
-end
-
 class NotWrapper < BlankSlate
   def initialize(orig)
     @orig = orig
@@ -505,7 +508,7 @@ class NotWrapper < BlankSlate
   
   def method_missing(meth, *args, &block)
     result = @orig.send(meth, *args, &block)
-    if result.is_a? TrueClass or result.is_a? FalseClass
+    if result.is_a? ::TrueClass or result.is_a? ::FalseClass
       !result
     else
       raise "Sorry, I don't know how to invert #{result.inspect}"

data/lib/epitools/highlight.rb

@@ -0,0 +1,17 @@
+require 'epitools/colored'
+
+class String
+
+  #
+  # Find all occurrences of "pattern" in the string and highlight them
+  # with the specified color. (defaults to light_yellow)
+  #
+  # The pattern can be a string or a regular expression.
+  #
+  def highlight(pattern, color=:light_yellow)
+    pattern = Regexp.new(Regexp.escape(pattern)) if pattern.is_a? String
+    gsub(pattern) { |match| match.send(color) }
+  end
+
+end
+

data/lib/epitools/permutations.rb

@@ -3,10 +3,17 @@ require 'epitools/basetypes'
 class Array
   
   alias_method :"original_*_for_cartesian_*", :*
+  
+  #
+  # Overloaded * operator.
+  #
+  # Original behaviour:
+  #   array * number == <number> copies of array
+  # Extra behaviour:
+  #   array * array = Cartesian product of the two arrays
+  #
   def *(other)
     case other
-      when Integer
-        send(:"original_*_for_cartesian_*", other)
       when Array
         # cross-product
         result = []
@@ -15,24 +22,45 @@ class Array
             result << [self[a], other[b]]
           end
         end
-        result        
+        result
+      else
+        send(:"original_*_for_cartesian_*", other)
     end
   end
   
+  #
+  # Multiply the array by itself 'exponent'-times.
+  #
   def **(exponent)
     ([self] * exponent).foldl(:*)
   end
   
 end
 
-def perms(total, n=0, stack=[], &block)
+
+#
+# Returns all the `size`-sized selections of the elements from an array.
+#
+# I can't remember why I wrote it like this, but the array you want to
+# permute is passed in as a block. For example:
+#
+#   >> perms(1) { [1,2,3,4] }
+#   => [[1], [2], [3], [4]] 
+#   >> perms(2) { [1,2,3,4] }
+#   => [[1, 1], [1, 2], [1, 3], [1, 4], [2, 1], [2, 2], [2, 3], [2, 4],
+#       [3, 1], [3, 2], [3, 3], [3, 4], [4, 1], [4, 2], [4, 3], [4, 4]]
+#
+# The block also gets passed a parameter: the depth of the recursion.
+# I can't remember why I did that either! :D
+#
+def perms(size, n=0, stack=[], &block)
   ps = yield(n)
   results = []
-  if n >= total
+  if n >= size
     results << stack
   else  
     ps.each do |p|
-      results += perms(total, n+1, stack + [p], &block)
+      results += perms(size, n+1, stack + [p], &block)
     end
   end
   results

data/lib/epitools/zopen.rb

@@ -2,14 +2,17 @@ require 'zlib'
 
 #
 # A mutation of "open" that lets you read/write gzip files, as well as
-# regular files. (NOTE: gzip detection is purely based on filename.)
+# regular files.
 #
-# It accepts a block just like open().
+# (NOTE: gzip detection is purely based on the filename.)
+#
+# It accepts a block just like open()!
 #
 # Example:
-#    zopen("test.txt")    #=> #<File:test.txt>
-#    zopen("test.txt.gz") #=> #<Zlib::GzipReader:0xb6c79424>
-#    zopen("otherfile.gz", "w") #=> #<Zlib::GzipReader:0xb6c79424>
+#    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.
 #
 def zopen(filename, mode="r")
 

data/spec/basetypes_spec.rb

@@ -112,7 +112,7 @@ describe Enumerable do
     [1,2,3,4,5].split_after  {|e| e == 3}.should == [ [1,2,3], [4,5] ]
     [1,2,3,4,5].split_before {|e| e == 3}.should == [ [1,2], [3,4,5] ]
 
-    "a\nb\n---\nc\nd\n".split_at(/---/).map_recursively(&:strip).should   == [ %w[a b], %w[c d] ]
+    "a\nb\n---\nc\nd\n".lines.split_at(/---/).map_recursively(&:strip).should   == [ %w[a b], %w[c d] ]
   end
 
   it "handles nested things" do

data/spec/highlight_spec.rb

@@ -0,0 +1,15 @@
+require 'epitools/highlight'
+
+describe String do
+
+  it "highlights" 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
+  
+end

data/spec/spec_helper.rb

@@ -1,9 +1,11 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
-#require 'epitools'
-require 'spec'
-require 'spec/autorun'
+p $:
 
-Spec::Runner.configure do |config|
+require 'rspec'
+require 'epitools'
+
+Rspec.configure do |c|
+  c.mock_with :rspec
 end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: epitools
 version: !ruby/object:Gem::Version 
-  hash: 21
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 1
-  version: 0.2.1
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - epitron
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-19 00:00:00 -04:00
+date: 2010-12-02 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -24,16 +23,43 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 13
         segments: 
-        - 1
         - 2
-        - 9
-        version: 1.2.9
+        - 2
+        - 0
+        version: 2.2.0
   type: :development
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: mechanize
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: sqlite3-ruby
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id003
 description: Miscellaneous utility libraries to make my life easier.
 email: chris@ill-logic.com
 executables: []
@@ -45,7 +71,6 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .document
-- .gitignore
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -57,6 +82,7 @@ files:
 - lib/epitools/browser/browser_cache.rb
 - lib/epitools/browser/mechanize_progressbar.rb
 - lib/epitools/hexdump.rb
+- lib/epitools/highlight.rb
 - lib/epitools/http.rb
 - lib/epitools/lcs.rb
 - lib/epitools/metaclass.rb
@@ -72,6 +98,7 @@ files:
 - lib/epitools/zopen.rb
 - spec/basetypes_spec.rb
 - spec/browser_spec.rb
+- spec/highlight_spec.rb
 - spec/lcs_spec.rb
 - spec/metaclass_spec.rb
 - spec/permutations_spec.rb
@@ -83,11 +110,11 @@ files:
 - spec/zopen_spec.rb
 has_rdoc: true
 homepage: http://github.com/epitron/epitools
-licenses: []
-
+licenses: 
+- WTFPL
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -95,7 +122,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -104,7 +130,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -118,6 +143,7 @@ summary: NOT UTILS... METILS!
 test_files: 
 - spec/basetypes_spec.rb
 - spec/browser_spec.rb
+- spec/highlight_spec.rb
 - spec/lcs_spec.rb
 - spec/metaclass_spec.rb
 - spec/permutations_spec.rb

data/.gitignore

@@ -1,21 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC