booker 0.4 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ede393f061fc758e36d7ab8a09d414dbee51559c
-  data.tar.gz: 3390c07e38358019217b79fa4d73560a0e7941de
+SHA256:
+  metadata.gz: 1e80629e0fd1558e7f1a34c2e9536fef061f80d7bc6994c9568499967f909848
+  data.tar.gz: a6434b1920cec9dd572e681fc4ab574672dcd91d601b115668d16b766509d2b0
 SHA512:
-  metadata.gz: 299fda2e34de05e4ce9501f6dcb62fc748563e639ba775465bb6f686048063b3dabd28070876b445a3071c0677c08a9d8b55600dff8c36bf2922ab317fecaa56
-  data.tar.gz: 2eb7dfde1026069de99d1069c6e1eb112d02bb6318396b70b27ce215ceae451104c36f7b0b71224d99aca449de9f5f279f67333909264392767a7be80e9e3dd9
+  metadata.gz: 3e6ec73b48945713ec46e63cdfba5d116fb21e82894b714bdca17eccd52e11ce3e4c1303c1c227fffcec677bc12431f84bdd364ee0edcaf0ae0bdb8ca6cf5613
+  data.tar.gz: 1dab0b803e4e5e11c2c76cd0ef9eaf76e9054e5cc1a7cd100121b4003f315d2db8732e2852c790f724093f4e0fe107426aff01bce19fc3674d1ce71f2ab0b349

data/bin/{web → booker}

@@ -1,12 +1,9 @@
 #!/usr/bin/env ruby
 
-
 require_relative "../lib/booker"
 
-
-# web by jeremy warner
+# booker by jeremy warner
 # open up a website or search in google chrome from cli
 # also show and/or open up google chrome bookmarks
 
-
 Booker.new(ARGV)

data/lib/booker.rb

@@ -1,26 +1,45 @@
-# parse web's command line args
-
-
-VERSION = "0.4"
-
-
+# parse booker's command line args
 require 'yaml'
 require 'find'
 require 'json'
-require 'terminfo'
 require 'shellwords'
 require_relative 'bookmarks'
 require_relative 'config'
 require_relative 'consts'
 
 
-# get web opening command
+# get booker opening command
 class Booker
+  @version = "1.0.0"
+  class << self
+    attr_reader :version
+  end
+
   include Browser
   def initialize(args)
     parse args
   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.first)
+
+    # interpret command
+    browsearg = args.first
+
+    if browsearg.match(/^[0-9]/) # bookmark
+      open_bookmark args
+    elsif domain.match(browsearg) # website
+      puts 'opening website: ' + browsearg
+      openweb(prep(browsearg))
+    else
+      open_search(args.join(' '))
+    end
+  end
+
   def pexit(msg, sig)
     puts msg
     exit sig
@@ -30,104 +49,79 @@ class Booker
     pexit HELP_BANNER, 0
   end
 
+  def version
+    pexit @version, 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])
-
-    # interpret command
-    browsearg = args[0]
+  # 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
 
-    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))
-    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))
-    end
+  def open_search(term)
+    puts 'searching ' + term + '...'
+    search = BConfig.new.searcher
+    openweb(search + Shellwords.escape(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
+    # forced bookmarking
+    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
+    # autocompletion
+    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
+    # installation
+    if nextarg == '--install' || nextarg == '-i'
+      if !args.empty?
         install(args)
-      else
-        pexit 'Error: '.red +
-          "web --install expects arguments: [completion, bookmarks, config]", 1
+      else # do everything
+        install(%w{completion config bookmarks})
       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
+    # forced searching
+    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
@@ -151,60 +145,62 @@ class Booker
     begin
       fpath = `zsh -c 'echo $fpath'`.split(' ')
     rescue
-      pexit "Failure: ".red +
-        "zsh is probably not installed, could not find $fpath", 1
+      pexit "Failure: ".red + "zsh is probably not installed, could not find $fpath", 1
     end
 
     # 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'"
-        puts "Success: ".grn +
-          "installed zsh autocompletion in #{fp}"
+        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})"
+        puts "Failure: ".red + "could not write ZSH completion _booker script to $fpath (#{fp})"
       end
     end
   end
 
   def install_bookmarks
     # locate bookmarks file, show user, write to config?
-    puts 'searching for chrome bookmarks... (takes some time)'
+    puts 'searching for chrome bookmarks...'
     begin
       bms = [] # look for bookmarks
-      Find.find(ENV["HOME"]) do |path|
-        bms << path if /chrom.*bookmarks/i.match path
+      [ '/Library/Application Support/Google/Chrome',
+        '/AppData/Local/Google/Chrome/User Data/Default',
+        '/.config/chromium/Default/',
+        '/.config/google-chrome/Default/',
+      ].each do |f|
+        home = File.join(ENV['HOME'], f)
+        next if !FileTest.directory?(home)
+        Find.find(home) do |file|
+          bms << file if /chrom.*bookmarks/i.match file
+        end
       end
 
       if bms.empty? # no bookmarks found
         puts "Failure: ".red + 'bookmarks file could not be found.'
         raise
       else # have user select a file
-        puts 'select your bookmarks file: '
-        bms.each_with_index{|bm, i| puts i.to_s.grn + " - " + bm }
+        puts 'select bookmarks file: '
+        bms.each_with_index {|bm, i| puts i.to_s.grn + " - " + bm }
         selected = bms[gets.chomp.to_i]
         puts 'Selected: '.yel + selected
-        BConfig.new.write('bookmarks', selected)
-        puts "Success: ".grn +
-          "config file updated with your bookmarks"
+        BConfig.new.write(:bookmarks, selected)
+        puts "Success: ".grn + "config file updated with your bookmarks"
       end
-    rescue # catch all errors
-      pexit "Failure: ".red +
-        "could not add bookmarks to config file ~/.booker", 1
+    rescue StandardError => e
+      puts e.message
+      pexit "Failure: ".red + "could not add bookmarks to config file ~/.booker", 1
     end
   end
 
   def install_config
     begin
       BConfig.new.write
-      puts "Success: ".grn +
-        "example config file written to ~/.booker"
+      puts "Success: ".grn + "example config file written to ~/.booker"
     rescue
-      pexit "Failure: ".red +
-        "could not write example config file to ~/.booker", 1
+      pexit "Failure: ".red + "could not write example config file to ~/.booker", 1
     end
   end
 end

data/lib/bookmarks.rb

@@ -1,8 +1,11 @@
 # grab/parse bookmarks from json file on computer
 
-
 # get int number of columns in half of screen
-TERMWIDTH = (TermInfo.screen_size[1]/2).floor
+def terminal_width
+  guess = `tput cols`.to_i
+  guess == 0 ? 80 : guess
+end
+TERMWIDTH = terminal_width
 
 # compl. color codes space
 CODEWIDTH = 16
@@ -18,7 +21,6 @@ class String
     end
   end
 
-  # thx danhassin
   def colorize(color, mod)
     "\033[#{mod};#{color};49m#{self}\033[0;0m"
   end
@@ -33,7 +35,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 +44,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

@@ -25,14 +25,14 @@ module Browser
       # alternatively, start seems to work - probably check if powershell v cygwin?
       '/cygdrive/c/Program\ Files\ \(x86\)/Google/Chrome/Application/chrome.exe '
     elsif OS.mac?
-      'open -a "Google Chrome" '
+      'open '
     elsif OS.linux?
-      'xdg-open ' # completely guessing here
+      'xdg-open '
     end
   end
 
   def domain
-    /.*(io|com|web|net|org|gov|edu)(\/.*)?$/i
+    /.*(io|com|web|net|org|gov|edu|xyz)(\/.*)?$/i
   end
 
   # helper methods
@@ -45,8 +45,7 @@ module Browser
   end
 
   def wrap(url)
-    #"'" + url + "'"
-    url
+    "\"#{url}\""
   end
 end
 
@@ -62,7 +61,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",
     }
@@ -85,7 +84,7 @@ class BConfig
     rescue Errno::ENOENT
       puts "Warning: ".yel +
         "YAML configuration file couldn't be found. Using defaults."
-      puts "Suggest: ".grn + "web --install config"
+      puts "Suggest: ".grn + "booker --install config"
       return false
     rescue Psych::SyntaxError
       puts "Warning: ".red +

data/lib/consts.rb

@@ -1,9 +1,10 @@
 # file for large constant strings
 
+# todo - wrap in module
 
 HELP_BANNER = <<-EOS
 Open browser:
-    $ web [option] [arguments]
+    $ booker [option] [arguments]
 
 Main options:
     --bookmark, -b: explicity open bookmark
@@ -18,17 +19,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 +38,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 +62,7 @@ _web_bookmarks() {
 }
 
 
-_web() {
+_booker() {
     compstate[insert]=menu
     local curcontext state line
     typeset -A opt_args
@@ -73,29 +75,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,88 +1,56 @@
 --- !ruby/object:Gem::Specification
 name: booker
 version: !ruby/object:Gem::Version
-  version: '0.4'
+  version: 1.0.0
 platform: ruby
 authors:
 - Jeremy Warner
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-11-20 00:00:00.000000000 Z
+date: 2021-06-24 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: ruby-terminfo
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.3.2
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.3.2
+        version: '0'
 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
@@ -91,11 +59,7 @@ homepage: http://github.com/jeremywrnr/booker
 licenses:
 - MIT
 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`
+post_install_message: 'To add zsh completion run: booker --install bookmarks'
 rdoc_options: []
 require_paths:
 - lib
@@ -110,9 +74,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.8
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
 summary: CLI parser/selector for google chrome bookmarks
 test_files: []