goog 0.2.0 → 0.2.1

data/bin/goog

@@ -52,12 +52,10 @@ END
   opts.on("-d", '--date-range [DATE RANGE]', 'Show results for date range. See below for options.') {|dr| options[:date_range] = dr }
   opts.on("-n", '--num-pages [NUM PAGES]', 'Show NUM PAGES pages of results') {|pages| options[:pages] = pages.to_i }
   opts.on("-c", '--color', 'Force color output') {options[:color] = true}
-  opts.on("-v", '--vim', 'Open results in Vim and bind <leader>o to open URL on or after cursor') {
-    require 'tempfile'
-    options[:vim] = true
-    $tempfile = Tempfile.new('goog')
-    $stdout = $tempfile
-  }
+  opts.on("-x", '--expand', 'Expand all results into web page text') { options[:expand] = true }
+  opts.on("-e", '--elinks', 'Open results in elinks') { options[:elinks] = true }
+  opts.on("-l", '--less', 'Open results in less') { options[:less] = true }
+  opts.on("-v", '--vim', 'Open results in Vim and bind <leader>o to open URL on or after cursor') { options[:vim] = true }
   opts.on("-i", '--install-plugin', 'Install Goog as a Vim plugin') {
     puts "Installing goog.vim into your ~/.vim/plugin directory."
     `cp #{$vimscript_file} #{ENV['HOME']}/.vim/plugin/`
@@ -74,6 +72,13 @@ END
     exit
   }
 end.parse!
+
+if options[:elinks] || options[:vim] || options[:less]
+  require 'tempfile'
+  $tempfile = Tempfile.new('goog')
+  $stdout = $tempfile
+end
+
 query = ARGV.join(' ')
 unless query
   abort "Please provide a search query"
@@ -88,6 +93,7 @@ query = "/search?q=#{CGI.escape query}"
 if options[:date_range]
   query += "&as_qdr=#{options[:date_range]}"
 end
+pages = []
 (1..(options[:pages] || 1)).each do |page| 
   if query.nil?
     exit
@@ -116,13 +122,22 @@ end
                 end
               end
     number = (page - 1) * 10 + (index + 1)
-    res = if !options[:vim] && (STDOUT.tty? || options[:color])
-      ["#{number}. \e[36m#{title}\e[0m", excerpt, "\e[35m#{link }\e[0m"]
+    res = if options[:elinks]
+      %Q| <p>#{number}. <strong>#{title}</strong><br/>#{excerpt}<br/><a href='#{link}'>#{link}</a></p> |
+    elsif !options[:vim] && (STDOUT.tty? || options[:less] || options[:color])
+      ["#{number}. \e[36m#{title}\e[0m", excerpt, "\e[35m#{link }\e[0m"].compact
     else
-      ["#{number}. #{title}", excerpt, link]
+      ["#{number}. #{title}", excerpt, link].compact
     end
-    $stdout.puts res.compact
+    puts '-' * 80
+    $stdout.puts res
     $stdout.puts
+    if options[:expand]
+      $stderr.puts "Fetching #{title}: #{link}"
+      puts "#{title}: #{link}"
+      puts `elinks -dump -no-numbering '#{link}'`
+    end
+    puts
   }
 
   # find next page link
@@ -137,3 +152,13 @@ if options[:vim]
   exec "vim -S #$vimscript_file -c 'call g:Goog_set_up_search_results_buffer()' #{$tempfile.path}"
 end
 
+if options[:less]
+  $stdout.close
+  exec "less -R #{$tempfile.path}"
+end
+
+if options[:elinks]
+  $stdout.close
+  exec "mv #{$tempfile.path}{,.html} && elinks #{$tempfile.path}.html"
+end
+

data/lib/goog.rb

@@ -1,3 +1,3 @@
 module Goog
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: goog
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-08 00:00:00.000000000 Z
+date: 2012-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -58,7 +58,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: goog
-rubygems_version: 1.8.19
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Simple command line interface to Google search