epitools 0.4.4 → 0.4.5

data/VERSION

@@ -1 +1 @@
-0.4.4
+0.4.5

data/epitools.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{epitools}
-  s.version = "0.4.4"
+  s.version = "0.4.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["epitron"]
-  s.date = %q{2011-01-15}
+  s.date = %q{2011-01-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/browser/browser_cache.rb

@@ -35,6 +35,7 @@ class CacheDB
     url = page.uri.to_s
 
     p [:page_uri, url]
+    p [:original_url, url]
 
     if url != original_url
       # redirect original_url to url
@@ -48,7 +49,7 @@ class CacheDB
       )
     end
 
-    compressed_body = Zlib::Deflate.deflate(page.body)
+    compressed_body = page.body #Zlib::Deflate.deflate(page.body)
     expire(url) if options[:overwrite]
     db.execute(
       "INSERT INTO cache VALUES ( ?, ?, ?, ? )",
@@ -71,7 +72,7 @@ class CacheDB
     if redirect
       get(redirect)
     else
-      body = Zlib::Inflate.inflate(compressed_body)
+      body = compressed_body #Zlib::Inflate.inflate(compressed_body)
 
       Mechanize::Page.new(
         URI.parse(url),
@@ -150,6 +151,10 @@ class CacheDB
     create_tables
   end
 
+  def delete!
+    File.unlink @filename  
+  end
+
 private
 
   def list_tables

data/lib/epitools/clitools.rb

@@ -16,7 +16,30 @@ class String
 end
 
 #
-# Output to less.
+# Create scrollable output via less!
+#
+# This command runs `less` in a subprocess, and gives you the IO to its STDIN pipe
+# so that you can communicate with it.
+#
+# Example:
+#
+#   lesspipe do |less|
+#     50.times { less.puts "Hi mom!" }
+#   end
+#
+# The default less parameters are:
+# * 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 }
+#
+# It accepts the following boolean options:
+#    :color  => Allow ANSI colour codes?
+#    :wrap   => Wrap long lines?
+#    :always => Always page, even if there's less than one page of text?
 #
 def lesspipe(*args)
   if args.any? and args.last.is_a?(Hash)
@@ -41,3 +64,57 @@ def lesspipe(*args)
     end
   end
 end
+
+
+#
+# Execute a `system()` command using SQL-style escaped arguments.
+#
+# Example:
+#    cmd( ["cp -arv ? ?", "/usr/src", "/home/you/A Folder/dest"] )
+#
+# Which is equivalent to:
+#    system( "cp", "-arv", "/usr/src", "/home/you/A Folder/dest" )
+#
+# Notice that you don't need to shell-escape anything.
+# That's done automagically!
+#
+# If you don't pass any arrays, `cmd` works the same as `system`:
+#    cmd( "cp", "-arv", "etc", "etc" )
+#
+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?
+            cmd_args << arg.shift
+          else
+            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        
+
+  p [:cmd_args, cmd_args] if $DEBUG
+  
+  system(*cmd_args)    
+end
+

data/spec/basetypes_spec.rb

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

data/spec/browser_spec.rb

@@ -1,14 +1,71 @@
 require 'epitools/browser'
 
-describe Browser do
+#describe Browser do
+#
+#  before :all do
+#    @browser = Browser.new
+#  end
+#
+#  after :all do
+#    @browser.cache.delete!
+#  end
+#
+#  it "googles" do
+#    page = @browser.get("http://google.com")
+#    page.body["Feeling Lucky"].should_not be_empty
+#  end
+#
+#end
+
+class Mechanize::Page
+  def url
+    uri.to_s
+  end
+end
+
+describe CacheDB do
 
   before :all do
-    @browser = Browser.new
+    @agent = Mechanize.new
+    CacheDB.new(@agent).delete!
+    @cache = CacheDB.new(@agent)
+  end
+
+  def new_page(body, url)
+    Mechanize::Page.new(
+      URI.parse(url),
+      {'content-type'=>'text/html'},
+      body,
+      nil,
+      @agent
+    )
+  end
+
+  after :all do
+    #@cache.delete!
   end
-  
-  it "googles" do
-    page = @browser.get("http://google.com")
-    page.body["Feeling Lucky"].should_not be_empty
+
+  it "writes and reads" do
+    body = "Blah blah blah."
+    url  = "http://example.com/url.html"
+
+    page = new_page(body, url)
+
+    page.body.should == body
+    page.url.should == url
+
+    @cache.put page, url
+
+    p @cache.urls
+
+    @cache.includes?(url).should == true
+
+    result = @cache.get url
+
+    body.should == page.body
+    body.should == result.body
+    url.should == page.url
+    url.should == result.url
   end
 
 end

data/spec/clitools_spec.rb

@@ -12,4 +12,14 @@ describe String do
     "xxxmatchzzz".highlight(/MATCH/i, color).should  == highlighted
   end
   
+  it "cmds" do
+    cmd( ['test -f ?', __FILE__] ).should == true
+    cmd( ['test -d ?', __FILE__] ).should == false
+    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
+  end
+    
 end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: epitools
 version: !ruby/object:Gem::Version 
-  hash: 7
   prerelease: false
   segments: 
   - 0
   - 4
-  - 4
-  version: 0.4.4
+  - 5
+  version: 0.4.5
 platform: ruby
 authors: 
 - epitron
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-15 00:00:00 -05:00
+date: 2011-01-20 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,7 +25,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
         - 2
         - 2
@@ -42,7 +40,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
         segments: 
         - 1
         - 0
@@ -58,7 +55,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -129,7 +125,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -138,7 +133,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"