booker 0.4 → 0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ede393f061fc758e36d7ab8a09d414dbee51559c
-  data.tar.gz: 3390c07e38358019217b79fa4d73560a0e7941de
+  metadata.gz: d252a9a7c36783822c6fb4d7aeb4e92bc4a84e0a
+  data.tar.gz: bf2315269a359f08bec9c34631efdd58980e39e9
 SHA512:
-  metadata.gz: 299fda2e34de05e4ce9501f6dcb62fc748563e639ba775465bb6f686048063b3dabd28070876b445a3071c0677c08a9d8b55600dff8c36bf2922ab317fecaa56
-  data.tar.gz: 2eb7dfde1026069de99d1069c6e1eb112d02bb6318396b70b27ce215ceae451104c36f7b0b71224d99aca449de9f5f279f67333909264392767a7be80e9e3dd9
+  metadata.gz: a954524d07453dd2fdec24744211b1e4037581b822706dd4094001f06bc3175830453757abca42c73059a9a91e27abbb034e3d55426e90b0a886fb560995f20a
+  data.tar.gz: ca595683fc4e2d57c6308fada77b2d7ee430415190c8b680af2edbd7a653ac64f81be3bd956368e1b7114a3ae2be471e6a52843f0863dcaa5be3d001357e4bb5

data/lib/booker.rb

@@ -1,7 +1,7 @@
-# parse web's command line args
+# parse booker's command line args
 
 
-VERSION = "0.4"
+VERSION = "0.5"
 
 
 require 'yaml'
@@ -21,113 +21,110 @@ class Booker
     parse args
   end
 
-  def pexit(msg, sig)
-    puts msg
-    exit sig
-  end
-
-  def helper
-    pexit HELP_BANNER, 0
-  end
-
-  def openweb(url)
-    system(browse + wrap(url))
-  end
-
   def parse(args)
     # no args given, show help
     helper if args.none?
 
     # if arg starts with hyphen, parse option
-    parse_opt args if /^-.*/.match(args[0])
+    parse_opt args if /^-.*/.match(args.first)
 
     # interpret command
-    browsearg = args[0]
+    browsearg = args.first
 
     if browsearg.match(/^[0-9]/) # bookmark
-      bm = Bookmarks.new('')
-      url = bm.bookmark_url(browsearg)
-      pexit "Failure:".red + " bookmark #{browsearg} not found", 1 if url.nil?
-      puts 'opening bookmark ' + url + '...'
-      openweb(wrap(url))
+      open_bookmark args
     elsif domain.match(browsearg) # website
       puts 'opening website ' + browsearg + '...'
       openweb(wrap(prep(browsearg)))
     else
       allargs = wrap(args.join(' '))
-      puts 'searching ' + allargs + '...'
-      search = BConfig.new.searcher
-      openweb(Shellwords.escape(search + allargs))
+      open_search allargs
     end
   end
 
+  def pexit(msg, sig)
+    puts msg
+    exit sig
+  end
+
+  def helper
+    pexit HELP_BANNER, 0
+  end
+
+  def version
+    pexit VERSION, 0
+  end
+
+  def openweb(url)
+    system(browse + wrap(url))
+  end
+
+  # an array of ints, as bookmark ids
+  def open_bookmark(bm)
+    id = bm.shift
+    url = Bookmarks.new.bookmark_url(id)
+    pexit "Failure:".red + " bookmark #{id} not found", 1 if url.nil?
+    puts 'opening bookmark ' + url + '...'
+    openweb(wrap(url))
+    open_bookmark bm unless bm.empty?
+  end
+
+  def open_search(term)
+    puts 'searching ' + term + '...'
+    search = BConfig.new.searcher
+    openweb(Shellwords.escape(search + term))
+  end
+
+  # parse and execute any command line options
   def parse_opt(args)
     valid_opts = %w{--version -v --install -i --help -h
     --complete -c --bookmark -b --search -s}
 
-    nextarg = args[0]
-    errormsg = "Error: ".red + "unrecognized option #{nextarg}"
+    nextarg = args.shift
+    errormsg = 'Error: '.red + "unrecognized option #{nextarg}"
     pexit errormsg, 1 if ! (valid_opts.include? nextarg)
 
     # doing forced bookmarking
-    if args[0] == "--bookmark" || args[0] == "-b"
-      bm = Bookmarks.new('')
-      id = args[1]
-      if id
-        url = bm.bookmark_url(id)
-        puts 'opening ' + url + '...'
-        system(browse + wrap(url))
-        exit 0
+    if nextarg == '--bookmark' || nextarg == '-b'
+      if args.first.nil?
+        pexit 'Error: '.red + 'booker --bookmark expects bookmark id', 1
       else
-        pexit 'Error: '.red +
-          'web --bookmark expects bookmark id', 1
+        open_bookmark args
       end
     end
 
     # doing autocompletion
-    if args[0] == "--complete" || args[0] == "-c"
-      args.shift # remove flag
+    if nextarg == '--complete' || nextarg == '-c'
       allargs = args.join(' ')
       bm = Bookmarks.new(allargs)
       bm.autocomplete
-      exit 0
     end
 
     # doing installation
-    if args[0] == "--install" || args[0] == "-i"
-      args.shift # remove flag
-      if args.length > 0
+    if nextarg == '--install' || nextarg == '-i'
+      if !args.empty?
         install(args)
       else
-        pexit 'Error: '.red +
-          "web --install expects arguments: [completion, bookmarks, config]", 1
+        err = 'booker --install expects arguments: [completion, bookmarks, config]'
+        pexit 'Error: '.red + err, 1
       end
     end
 
-    # needs some help
-    if args[0] == "--help" || args[0] == "-h"
-      helper
-    end
-
     # doing forced searching
-    if args[0] == "--search" || args[0] == "-s"
-      args.shift # remove flag
+    if nextarg == '--search' || nextarg == '-s'
+      pexit '--search requires an argument', 1 if args.empty?
       allargs = args.join(' ')
-      if allargs == ""
-        pexit "--search requires an argument", 1
-      else
-        puts 'searching ' + allargs + '...'
-        search = BConfig.new.searcher
-        openweb(Shellwords.escape(search + allargs))
-        exit 0
-      end
+      open_search allargs
     end
 
     # print version information
-    if args[0] == "--version" || args[0] == "-v"
-      pexit VERSION, 0
-    end
-  end # parse opt
+    version if nextarg == '--version' || nextarg == '-v'
+
+    # needs some help
+    helper if nextarg == '--help' || nextarg == '-h'
+
+    exit 0 # dont parse_arg
+  end # parse_opt
 
   def install(args)
     target = args.shift
@@ -158,14 +155,14 @@ class Booker
     # determine where to install completion function
     fpath.each do |fp|
       begin
-        File.open(fp + "/_web", 'w') {|f| f.write(COMPLETION) }
-        system "zsh -c 'autoload -U _web'"
+        File.open(fp + "/_booker", 'w') {|f| f.write(COMPLETION) }
+        system "zsh -c 'autoload -U _booker'"
         puts "Success: ".grn +
           "installed zsh autocompletion in #{fp}"
         break # if this works, don't try anymore
       rescue
         puts "Failure: ".red +
-          "could not write ZSH completion _web script to $fpath (#{fp})"
+          "could not write ZSH completion _booker script to $fpath (#{fp})"
       end
     end
   end

data/lib/bookmarks.rb

@@ -33,7 +33,7 @@ end
 
 # try to read bookmarks
 class Bookmarks
-  def initialize(search_term)
+  def initialize(search_term = '')
     @conf = BConfig.new
     begin
       local_bookmarks = JSON.parse(open(@conf.bookmarks).read)
@@ -42,7 +42,7 @@ class Bookmarks
       puts "Warning: ".yel +
         "Chrome JSON Bookmarks not found."
       puts "Suggest: ".grn +
-        "web --install bookmarks"
+        "booker --install bookmarks"
       @chrome_bookmarks = {}
     end
 

data/lib/config.rb

@@ -32,7 +32,7 @@ module Browser
   end
 
   def domain
-    /.*(io|com|web|net|org|gov|edu)(\/.*)?$/i
+    /.*(io|com|web|net|org|gov|edu|xyz)(\/.*)?$/i
   end
 
   # helper methods
@@ -62,7 +62,7 @@ class BConfig
     readyaml = read(YAMLCONF)
     default_config = {
       :browser  => 'open ',
-      :searcher  => "https://duckduckgo.com/?q=",
+      :searcher  => "https://google.com/?q=",
       :bookmarks => HOME +
       "/Library/Application Support/Google/Chrome/Profile 1/Bookmarks",
     }

data/lib/consts.rb

@@ -3,7 +3,7 @@
 
 HELP_BANNER = <<-EOS
 Open browser:
-    $ web [option] [arguments]
+    $ booker [option] [arguments]
 
 Main options:
     --bookmark, -b: explicity open bookmark
@@ -18,17 +18,18 @@ EOS
 
 
 DEF_CONFIG = <<-EOS
-bookmarks: null
-searcher:  https://duckduckgo.com/?q=
+---
+:searcher:  https://google.com/?q=
+:bookmarks: null
 EOS
 
 
 COMPLETION = <<-EOS
-#compdef web
+#compdef booker
 #autoload
 
 
-_web_bookmarks() {
+_booker_bookmarks() {
     #http://zsh.sourceforge.net/Guide/zshguide06.html#l147
     setopt glob bareglobqual nullglob rcexpandparam extendedglob automenu
     unsetopt allexport aliases errexit octalzeroes ksharrays cshnullglob
@@ -36,9 +37,9 @@ _web_bookmarks() {
     #get chrome bookmarks
     local -a bookmarks sites search
 
-    #grab all CLI args, remove 'web' from start
-    search=`echo $@ | sed -e '/^web /d'`
-    sites=`web --complete $search`
+    #grab all CLI args, remove 'booker' from start
+    search=`echo $@ | sed -e '/^booker /d'`
+    sites=`booker --complete $search`
     bookmarks=("${(f)${sites}}")
 
     #terminal colors
@@ -60,7 +61,7 @@ _web_bookmarks() {
 }
 
 
-_web() {
+_booker() {
     compstate[insert]=menu
     local curcontext state line
     typeset -A opt_args
@@ -73,29 +74,29 @@ _web() {
         '(--install)--install[perform installations (bookmarks, completion, config)]'\
         '(-s)-s[search google for...]'\
         '(--search)--search[search google for...]'\
-        '(-h)-h[show web help]'\
-        '(--help)--help[show web help]'\
+        '(-h)-h[show booker help]'\
+        '(--help)--help[show booker help]'\
         '(-v)-v[show version]'\
         '(--version)--version[show version]'\
         '*::bookmarks:->bookmarks' && return 0
 
-    _web_bookmarks $words
+    _booker_bookmarks $words
 }
 
 
-_web
+_booker
 EOS
 
 
 ZSH_SCRIPT = <<-EOS
-# load zsh web completions
+# load zsh booker completions
 install_loc=~/.oh-my-zsh/completions
-script=_web
+script=_booker
 
 install:
-	mkdir -vp $(install_loc)
-	cp -v $(script) $(install_loc)/
+  mkdir -vp $(install_loc)
+  cp -v $(script) $(install_loc)/
 
 uninstall:
-	rm -v $(install_loc)/$(script)
+  rm -v $(install_loc)/$(script)
 EOS

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: booker
 version: !ruby/object:Gem::Version
-  version: '0.4'
+  version: '0.5'
 platform: ruby
 authors:
 - Jeremy Warner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-20 00:00:00.000000000 Z
+date: 2015-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-terminfo
@@ -73,16 +73,16 @@ dependencies:
 description: |2
       Select your bookmarks from the command line, by their bookmark id number.
       ZSH users will be able to tab complete through their matches, similar to
-      how the autocompletion for `kill` works. If no bookmark is provided, web
-      will check if the argument is a website and visit it, or search duckduckgo
-      for the string argument.
+      how the autocompletion for `kill` works. If no bookmark is provided, booker
+      will check if the argument is a website and visit it, or go to google
+      (or your preferred search engine) with the string argument.
 email: jeremywrnr@gmail.com
 executables:
-- web
+- booker
 extensions: []
 extra_rdoc_files: []
 files:
-- bin/web
+- bin/booker
 - lib/booker.rb
 - lib/bookmarks.rb
 - lib/config.rb
@@ -93,9 +93,9 @@ licenses:
 metadata: {}
 post_install_message: |2
       Thank you for installing booker!
-      To find your bookmarks,  run `web -i bookmarks`
-      To add zsh completion,   run `web -i completion`
-      To see more help,        run `web --help`
+      To find your bookmarks,  run `booker -i bookmarks`
+      To add zsh completion,   run `booker -i completion`
+      To see more help,        run `booker --help`
 rdoc_options: []
 require_paths:
 - lib
@@ -111,8 +111,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: CLI parser/selector for google chrome bookmarks
 test_files: []
+has_rdoc: