google 1.0.8 → 1.0.9

data/bin/google

@@ -2,4 +2,35 @@
 
 require_relative '../lib/google'
 
-# Trollop::die "This is a fancy trollop die message."
+opts = Trollop::options do
+  version "google v1.0.9 (c) 2012 Kerrick Long http://kerrick.github.com/google"
+  banner <<-EOM
+The google gem is a simple tool to search Gooogle with via a CLI.
+Usage:
+    google [options] "my search query string here"
+where [options] are:
+EOM
+
+  opt :page, "Start by showing the <i>th result page.", :type => :int, :default => 1
+  opt :size, "Show <i> results on each SERP. Must be between 1 and 8.", :type => :int, :default => 4
+  opt :result, "Skip the SERP and show the <i>th result.", :type => :int
+  opt :lucky, "I'm feeling lucky! Skip the SERP and show the first result. (Alias to --result 1)"
+  opt :readability, "Filter the results through readability to get rid of extra content.", :default => true
+  opt :markdown, "Change the results from raw HTML to markdown.", :default => true
+  opt :version, "Print the version and exit."
+  opt :help, "Show this information and exit."
+end
+
+query = ARGV.join(' ')
+raise Trollop::die "no search query specified" if query.empty?
+
+opts[:result] = 1 if opts[:lucky]
+raise Trollop::die "Must use --no-markdown if you use --no-readability" if !opts[:readability] && opts[:markdown]
+
+begin
+  g = Google.new query, opts
+  g.search
+rescue Interrupt
+  puts "\nInterrupt received. Exiting application."
+  exit
+end

data/google.gemspec

@@ -1,19 +1,19 @@
 Gem::Specification.new do |s|
-  s.name = "google"
-  s.version = "1.0.8"
+  s.name        = "google"
+  s.version     = "1.0.9"
   s.executables << 'google'
+  s.add_runtime_dependency "trollop", ["~> 1"]
   s.add_runtime_dependency "json", ["~> 1"]
   s.add_runtime_dependency "htmlentities", ["~> 4"]
   s.add_runtime_dependency "formatador", ["~> 0.2"]
   s.add_runtime_dependency "ruby-readability", ["~> 0.5"]
-  s.date = "2012-05-23"
-  s.summary = "Google Search on the command line"
+  s.date        = "2012-05-25"
+  s.summary     = "Google Search on the command line"
   s.description = "A ruby gem to give you the power of Google Search in your command line."
-  s.authors = ["Kerrick Long"]
-  s.email = "me@kerricklong.com"
-  s.files = ["lib/google.rb"]
-  s.files += %w(LICENSE.md README.md google.gemspec)
-  s.files += Dir.glob("lib/**/*.rb")
-  s.files += Dir.glob("bin/**/*")
-  s.homepage = "http://kerrick.github.com/google/"
+  s.authors     = ["Kerrick Long"]
+  s.email       = "me@kerricklong.com"
+  s.files       = ["bin/google"]
+  s.files      += ["lib/google.rb", "lib/google/utils.rb", "lib/google/reverse-markdown/reverse_markdown.rb"]
+  s.files      += ["LICENSE.md", "README.md", "google.gemspec"]
+  s.homepage    = "http://kerrick.github.com/google/"
 end

data/lib/google.rb

@@ -1,66 +1,141 @@
-require_relative 'trollop/lib/trollop'
-require_relative 'google/utils'
-require_relative 'google/search'
-require_relative 'google/request'
-require_relative 'google/display_serp'
-require_relative 'google/input'
-require_relative 'google/grab'
-require_relative 'google/pipe-view'
-
-opts = Trollop::options do
-  version "google v1.0.8 (c) 2012 Kerrick Long http://kerrick.github.com/google"
-  banner <<-EOM
-The google gem is a simple tool to search Gooogle with via a CLI.
-Usage:
-    google [options] "my search query string here"
-where [options] are:
-EOM
-
-  opt :page,
-      "Start by showing the <i>th result page.",
-      :type => :int,
-      :default => 1
-
-  opt :size,
-      "Show <i> results on each SERP. Must be between 1 and 8.",
-      :type => :int,
-      :default => 4
-
-  opt :result,
-      "Skip the SERP and show the <i>th result.",
-      :type => :int
-
-  opt :lucky,
-      "I'm feeling lucky! Skip the SERP and show the first result. " +
-      "(Alias to --result 1)"
-
-  opt :readability,
-      "Filter the results through readability to get rid of extra content.",
-      :default => true
-
-  opt :markdown,
-      "Change the results from raw HTML to markdown.",
-      :default => true
-
-  opt :version,
-      "Print the version and exit."
-
-  opt :help,
-      "Show this information and exit."
-end
+require 'google/utils'
+require 'google/reverse-markdown/reverse_markdown'
+require 'trollop'
+require 'uri'
+require 'open-uri'
+require 'json'
+require 'formatador'
+require 'htmlentities'
+require 'ruby-readability'
 
-query = ARGV.join(' ')
-raise Trollop::die "no search query specified" if query.empty?
+class Google
+  def initialize(query, opts)
+    @query       = URI.escape(query)
+    @opts        = opts
+    @opts[:size] = 8 if opts[:size] > 7
+    @opts[:size] = 1 if opts[:size] <= 1
+  end
 
-opts[:result] = 1 if opts[:lucky]
-if !opts[:readability] && opts[:markdown]
-  raise Trollop::die "Must use --no-markdown if you use --no-readability"
-end
+  def search
+    if @opts[:result]
+      results = request :q => @query, :rsz => 1, :start => (@opts[:result] - 1)
+      view results[:results]['responseData']['results'][0]['url']
+    else
+      results = request :q => @query, :rsz => @opts[:size], :start => ((@opts[:page] - 1) * @opts[:size])
+      display_serp results
+    end
+  end
+
+  def request(query_strings)
+    @api_url = "http://ajax.googleapis.com/ajax/services/search/web?v=1.0"\
+               "&rsz=#{query_strings[:rsz]}&start=#{query_strings[:start]}&q=#{query_strings[:q]}"
+    results  = JSON.parse(open(@api_url).read)
+    if results['responseStatus'].to_i != 200
+      Trollop::die Utils::wrap("Google Search API Status #{results['responseStatus']}. Details:\n"\
+                               "#{results['responseDetails']}\nTry again in a moment")
+    end
+
+    {:results => results, :query_strings => query_strings}
+  end
+
+  def display_serp(info)
+    results           = info[:results]
+    query_strings     = info[:query_strings]
+    coder             = HTMLEntities.new
+    current_page      = results['responseData']['cursor']['currentPageIndex']+1
+    max_result        = query_strings[:start] + query_strings[:rsz]
+    estimated_results = results['responseData']['cursor']['resultCount']
+    result_array      = results['responseData']['results']
+
+    Formatador.display_line "\n#{' ' * (max_result.to_s.length + 2)}[yellow]Powered by Google[/]"
+
+    result_array.each_with_index do |result, i|
+      this_num = (i + query_strings[:start] + 1).to_s
+
+      serp_title  = "\n#{' ' * (max_result.to_s.length - this_num.length)}[bold][blue]#{this_num}. "\
+                    "[normal]#{result["titleNoFormatting"]}[/]\n"
+      serp_url    = "#{' ' * max_result.to_s.length}[green]#{result["url"]}[/]\n"
+      serp_desc   = ' ' * max_result.to_s.length + result["content"].gsub(/<b>/, "[bold]").gsub(/<\/b>/, "[/]").squeeze(" ")
+
+      Formatador.display_line coder.decode(Utils::wrap(serp_title, :prefix => max_result.to_s.length + 2))
+      Formatador.display_line coder.decode(Utils::wrap(serp_url, :prefix => max_result.to_s.length + 2))
+      Formatador.display_line coder.decode(Utils::wrap(serp_desc, :prefix => max_result.to_s.length + 2))
+    end
+
+    Formatador.display_line "\n#{' ' * (max_result.to_s.length + 2)}[yellow]Displaying results #{query_strings[:start] + 1}"\
+                            " through #{max_result} of #{estimated_results} (Page #{current_page})"
+
+    input info, result_array
+  end
+
+  def input(info, result_array)
+    Formatador.display Utils::wrap("\n[yellow]Enter N or P for pagination, E or Q to quit, or a number to see that result.")
+    Formatador.display "\n[bold]>[/] "
+    choice = STDIN.gets
+    if choice.nil? # Likely because the user submitted EOT via ^D
+      choice = ' '
+    else
+      choice.chomp + ' '
+    end
+
+    case
+    # Quit
+    when choice[0].downcase == 'e' || choice[0].downcase == 'q'
+      exit
+    # Next Page
+    when choice[0].downcase == 'n'
+      display_serp  request(:q => @query, :rsz => @opts[:size], :start => info[:query_strings][:start] + @opts[:size])
+    # Previous Page
+    when choice[0].downcase == 'p'
+      if info[:query_strings][:start] < 1
+        Formatador.display Utils::wrap("[yellow]! Already at page one.")
+        input info, result_array
+      else
+        display_serp request(:q => @query, :rsz => @opts[:size], :start => info[:query_strings][:start] - @opts[:size])
+      end
+    # Numerical Choice
+    when choice[0].match(/\d/)
+      /(\d+)(\s*\|(.*))*/.match(choice) do |str|
+        num = str[1].to_i - 1 # Remember, we are 1-indexing things for the user
+        # Is the result on the current page?
+        if info[:query_strings][:start] <= num && info[:query_strings][:start] + @opts[:size] > num
+          # Is the user piping the result to something?
+          if str[3].nil?
+            view result_array[num - info[:query_strings][:start]]['url']
+          else
+            pipe str[3].strip, result_array[num - info[:query_strings][:start]]['url']
+          end
+        else
+          Formatador.display Utils::wrap("[yellow]! Result not on this page.")
+          input info, result_array
+        end
+      end
+    # Catch-all to grab input again
+    else
+      input info, result_array
+    end
+  end
+
+  def grab(url)
+    source = open(url).read
+    content = @opts[:readability] ? Readability::Document.new(source,
+                                                              :tags => %w[div p a pre code h1 h2 h3 h4 h5 h6 blockquote ul ol li],
+                                                              :attributes => %w[href],
+                                                              :remote_empty_nodes => true).content : source
+    output = @opts[:markdown] ? ReverseMarkdown.new.parse_string(content) : content
+    output
+  end
+
+  def pipe(command, url)
+    text = grab(url)
+    IO.popen(command, 'w+') do |process|
+      process.write(text)
+      process.close_write
+      puts process.read
+    end
+  end
 
-begin
-  g = Google.new query, opts
-  g.search
-rescue Interrupt
-  puts "\nInterrupt received. Exiting application."
-  exit
+  def view(url)
+    Formatador.display Utils::wrap(grab(url))
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: google
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-23 00:00:00.000000000 Z
+date: 2012-05-25 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: trollop
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -82,21 +98,13 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/google.rb
 - bin/google
+- lib/google.rb
+- lib/google/utils.rb
+- lib/google/reverse-markdown/reverse_markdown.rb
 - LICENSE.md
 - README.md
 - google.gemspec
-- lib/google/display_serp.rb
-- lib/google/request.rb
-- lib/google/pipe-view.rb
-- lib/google/search.rb
-- lib/google/utils.rb
-- lib/google/input.rb
-- lib/google/grab.rb
-- lib/reverse-markdown/reverse_markdown.rb
-- lib/trollop/test/test_trollop.rb
-- lib/trollop/lib/trollop.rb
 homepage: http://kerrick.github.com/google/
 licenses: []
 post_install_message: 

data/lib/google/display_serp.rb

@@ -1,53 +0,0 @@
-require 'formatador'
-require 'htmlentities'
-
-class Google
-  def display_serp info
-    results           = info[:results]
-    query_strings     = info[:query_strings]
-    coder             = HTMLEntities.new
-    current_page      = results['responseData']['cursor']['currentPageIndex']+1
-    max_result        = query_strings[:start] + query_strings[:rsz]
-    estimated_results = results['responseData']['cursor']['resultCount']
-    result_array      = results['responseData']['results']
-
-    attribution  = "\n"
-    attribution << ' ' * (max_result.to_s.length + 2)
-    attribution << "[yellow]Powered by Google[/]"
-    Formatador.display_line attribution
-
-    result_array.each_with_index do | result, i |
-      this_num = (i + query_strings[:start] + 1).to_s
-
-      serp_title  = "\n#{' ' * (max_result.to_s.length - this_num.length)}"
-      serp_title << "[bold][blue]#{this_num}. "
-      serp_title << "[normal]#{result["titleNoFormatting"]}[/]\n"
-      serp_url    = ' ' * max_result.to_s.length
-      serp_url   << "[green]#{result["url"]}[/]\n"
-      serp_desc   = ' ' * max_result.to_s.length
-      serp_desc  << result["content"].gsub(/<b>/, "[bold]")
-                    .gsub(/<\/b>/, "[/]").squeeze(" ")
-
-      Formatador.display_line coder.decode(
-        Utils::wrap(serp_title, :prefix => max_result.to_s.length + 2)
-      )
-      Formatador.display_line coder.decode(
-        Utils::wrap(serp_url, :prefix => max_result.to_s.length + 2)
-      )
-      Formatador.display_line coder.decode(
-        Utils::wrap(serp_desc, :prefix => max_result.to_s.length + 2)
-      )
-    end
-
-    metadata  = ''
-    metadata << "\n#{' ' * (max_result.to_s.length + 2)}"
-    metadata << "[yellow]Displaying results "
-    metadata << "#{query_strings[:start] + 1} through "
-    metadata << "#{max_result} of "
-    metadata << "#{estimated_results} "
-    metadata << "(Page #{current_page})"
-    Formatador.display_line metadata
-
-    input info, result_array
-  end
-end

data/lib/google/grab.rb

@@ -1,26 +0,0 @@
-require 'open-uri'
-require 'ruby-readability'
-require_relative '../reverse-markdown/reverse_markdown'
-
-class Google
-  def grab url
-    source = open(url).read
-
-    if @opts[:readability]
-      content = Readability::Document.new(source,
-           :tags => %w[div p a pre code h1 h2 h3 h4 h5 h6 blockquote ul ol li],
-           :attributes => %w[href],
-           :remote_empty_nodes => true).content
-    else
-      content = source
-    end
-
-    if @opts[:markdown]
-      output = ReverseMarkdown.new.parse_string(content)
-    else
-      output = content
-    end
-
-    output
-  end
-end

data/lib/google/input.rb

@@ -1,57 +0,0 @@
-require 'formatador'
-
-class Google
-  def input info, result_array
-    prompt  = "\n[yellow]"
-    prompt << "Enter N or P for Next or Previous page, E or Q to quit, "
-    prompt << "or a number to see that result."
-
-    Formatador.display Utils::wrap(prompt)
-
-    Formatador.display "\n[bold]>[/] "
-    choice = STDIN.gets
-    if choice.nil?
-      choice = ' '
-    else
-      choice.chomp + ' '
-    end
-
-    case
-    when choice[0].downcase == 'e' || choice[0].downcase == 'q'
-      exit
-    when choice[0].downcase == 'n'
-      results = request :q => @query,
-                        :rsz => @opts[:size],
-                        :start => info[:query_strings][:start] + @opts[:size]
-      display_serp results
-    when choice[0].downcase == 'p'
-      if info[:query_strings][:start] < 1
-        Formatador.display Utils::wrap("[yellow]! Already at page one.")
-        input info
-      else
-        results = request :q => @query,
-                          :rsz => @opts[:size],
-                          :start => info[:query_strings][:start] - @opts[:size]
-        display_serp results
-      end
-    when choice[0].match(/\d/)
-      /(\d+)(\s*\|(.*))*/.match(choice) do | str |
-        num = str[1].to_i - 1
-        if info[:query_strings][:start] <= num &&
-           info[:query_strings][:start] + @opts[:size] > num
-          if str[3].nil?
-            view result_array[num - info[:query_strings][:start]]['url']
-          else
-            pipe str[3].strip,
-                 result_array[num - info[:query_strings][:start]]['url']
-          end
-        else
-          Formatador.display Utils::wrap("[yellow]! Result not on this page.")
-          input info, result_array
-        end
-      end
-    else
-      input info, result_array
-    end
-  end
-end