goog 0.1.3 → 0.1.4

data/bin/goog

@@ -6,7 +6,8 @@ require 'yaml'
 require 'uri'
 require 'optparse'
 
-
+$vimscript_file = File.expand_path(File.join(File.dirname(__FILE__), '..', 'plugin', 'goog.vim'))
+orig_query = "query: #{ARGV.join(' ')}\n\n"
 options = {}
 OptionParser.new do |opts|
   opts.banner = "Usage: goog [options] [query]"
@@ -25,6 +26,23 @@ VIM KEY MAPPINGS
     <leader>o       open URL on or after cursor in default external web browser
     <leader>O       open URL on or after cursor in split Vim window using elinks, links, or lynx
 
+VIM PLUGIN COMMANDS
+
+    :Goog [query]
+
+      where query is any of the flags and arguments you can pass to the command
+      line version, except for -v.
+
+goog will run the Google search and print matches with syntax coloring in a
+split Vim buffer.
+
+In the GoogSearchResults buffer:
+
+    CTRL-j          jumps to the next URL
+    CTRL-k          jumps to the previous URL
+    <leader>o       open URL on or after cursor in default external web browser
+    <leader>O       open URL on or after cursor in split Vim window using elinks, links, or lynx
+
 goog #{Goog::VERSION}
 http://github.com/danchoi/goog
 Author: Daniel Choi <dhchoi@gmail.com>
@@ -37,22 +55,29 @@ END
   opts.on("-v", '--vim', 'Open results in Vim and bind <leader>o to open URL on or after cursor') {
     require 'tempfile'
     options[:vim] = true
-    $vimscript_file = File.expand_path(File.join(File.dirname(__FILE__), '..', 'vim', 'goog.vim'))
     $tempfile = Tempfile.new('goog')
     $stdout = $tempfile
   }
+  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/`
+    puts "Done. Type goog -h for Vim commands."
+    exit
+  }
 end.parse!
 query = ARGV.join(' ')
 unless query
   abort "Please provide a search query"
 end
 
+$stdout.puts orig_query
 unless `which tidy` =~ /tidy/
   abort "No tidy found. Please install tidy."
 end
 if RUBY_VERSION !~ /^1.9/
   abort "Requires Ruby 1.9"
 end
+
 query = "/search?q=#{CGI.escape query}"
 if options[:date_range]
   query += "&as_qdr=#{options[:date_range]}"
@@ -103,6 +128,6 @@ end
 
 if options[:vim]
   $stdout.close
-  exec "vim -S #$vimscript_file #{$tempfile.path}"
+  exec "vim -S #$vimscript_file -c 'call g:Goog_set_up_search_results_buffer()' #{$tempfile.path}"
 end
 

data/lib/goog.rb

@@ -1,3 +1,3 @@
 module Goog
-  VERSION = '0.1.3'
+  VERSION = '0.1.4'
 end

data/plugin/goog.vim

@@ -0,0 +1,94 @@
+" Vim script that makes Vim a search results browser
+" http://github.com/danchoi/goog
+" Maintainer:	Daniel Choi <dhchoi@gmail.com>
+" License: MIT License (c) 2012 Daniel Choi
+
+
+let s:http_link_pattern = '^https\?:[^ >)\]]\+'
+
+let g:gui_web_browser = system("echo -n $(which gnome-open || which open)")
+if ! exists("g:text_web_browser")
+  if executable("elinks") 
+    let  g:text_web_browser = 'elinks -dump -no-numbering'
+  elseif executable("lynx")
+    let  g:text_web_browser = 'lynx -dump -nonumbers'
+  elseif executable("links") 
+    let  g:text_web_browser = 'links -dump'
+  endif
+end
+
+
+let s:web_page_bufname = "GoogWeb"
+
+func! s:open_href_under_cursor(text_browser)
+  let res = search(s:http_link_pattern, 'cw')
+  if res != 0
+    let href = matchstr(expand("<cWORD>") , s:http_link_pattern)
+    if a:text_browser == 0
+      let command = g:gui_web_browser . " " . shellescape(href) . " "
+      call system(command)
+    else
+      let command = g:text_web_browser . ' ' .  shellescape(href) . " "
+      echom command
+      let result = system(command)
+      if bufexists(s:web_page_bufname) && bufwinnr(s:web_page_bufname) != -1
+        exec bufwinnr(s:web_page_bufname)."wincmd w "
+      else
+        exec "split ".s:web_page_bufname
+      endif
+      silent! put! =result
+      silent! 1put! ='URL: '.href 
+      silent! 2put! =''
+      setlocal buftype=nofile 
+      normal 1G
+    endif
+  end
+endfunc
+
+func! s:find_next_link(backward)
+  let n = 0
+  " don't wrap
+  if a:backward == 1 
+    normal lb
+    let result = search(s:http_link_pattern, 'Wb') 
+  else
+    let result = search(s:http_link_pattern, 'W')
+  endif
+  if (result == 0) 
+    return ""
+  end
+  return 
+endfunc
+
+
+func! g:Goog_set_up_search_results_buffer()
+  syntax region h1  start="^\d\+\."       end="\($\)" 
+  syntax region href  start="^https\?:"     end="\($\)" 
+  highlight link h1     Identifier
+  highlight link href   Constant
+  hi Identifier	term=NONE cterm=NONE gui=NONE ctermfg=LightCyan
+  hi Constant  term=NONE cterm=NONE  gui=NONE ctermfg=Magenta
+  nnoremap <buffer> <leader>o :call <SID>open_href_under_cursor(0)<CR>
+  nnoremap <buffer> <leader>O :call <SID>open_href_under_cursor(1)<CR>
+  noremap <buffer> <c-j> :call <SID>find_next_link(0)<CR>
+  noremap <buffer> <c-k> :call <SID>find_next_link(1)<CR>
+endfunc 
+
+func! s:run_Goog_search(query)
+  let g:Goog_running_in_vim = 1
+  if !executable("goog") 
+    echom "You don't have goog installed. Please gem install goog and try again."
+    finish
+  endif
+  let res=system("goog ".shellescape(a:query))
+  exec "split GoogSearchResults"
+  silent! put! =res
+  silent! 1put! ='query: 'query
+  silent! 2put! =''
+  setlocal buftype=nofile 
+  normal 1G
+  call g:Goog_set_up_search_results_buffer()
+endfunc
+
+command -nargs=* Goog call <SID>run_Goog_search(<q-args>)
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: goog
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-06 00:00:00.000000000 Z
+date: 2012-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -37,7 +37,7 @@ extra_rdoc_files: []
 files:
 - bin/goog
 - lib/goog.rb
-- vim/goog.vim
+- plugin/goog.vim
 homepage: https://github.com/danchoi/goog
 licenses: []
 post_install_message: 

data/vim/goog.vim

@@ -1,51 +0,0 @@
-syntax region h1  start="^\d\+\."       end="\($\)" 
-syntax region href  start="^https\?:"     end="\($\)" 
-highlight link h1     Identifier
-highlight link href   Constant
-hi Identifier	term=NONE cterm=NONE gui=NONE ctermfg=LightCyan
-hi Constant  term=NONE cterm=NONE  gui=NONE ctermfg=Magenta
-
-let s:http_link_pattern = 'https\?:[^ >)\]]\+'
-
-let g:gui_web_browser = system("echo -n $(which gnome-open || which open)")
-if ! exists("g:text_web_browser")
-  if executable("elinks") 
-    let  g:text_web_browser = 'elinks -dump -no-numbering'
-  elseif executable("lynx")
-    let  g:text_web_browser = 'lynx -dump -nonumbers'
-  elseif executable("links") 
-    let  g:text_web_browser = 'links -dump'
-  endif
-end
-
-
-let s:web_page_bufname = "GoogBrowser"
-func! s:open_href_under_cursor(text_browser)
-  let res = search(s:http_link_pattern, 'cw')
-  if res != 0
-    let href = matchstr(expand("<cWORD>") , s:http_link_pattern)
-    if a:text_browser == 0
-      let command = g:gui_web_browser . " " . shellescape(href) . " "
-      call system(command)
-    else
-      let command = g:text_web_browser . ' ' .  shellescape(href) . " "
-      echom command
-      let result = system(command)
-      if bufexists(s:web_page_bufname) && bufwinnr(s:web_page_bufname) != -1
-        exec bufwinnr(s:web_page_bufname)."wincmd w"    
-      else
-        exec "new ".s:web_page_bufname
-      endif
-      silent! put! =result
-      silent! 1put! ='URL: '.href 
-      silent! 2put! =''
-      setlocal buftype=nofile 
-      normal 1G
-    endif
-  end
-endfunc
-
-nnoremap <leader>o :call <SID>open_href_under_cursor(0)<CR>
-nnoremap <leader>O :call <SID>open_href_under_cursor(1)<CR>
-
-" http://www.padrinorb.com/pages/why