booker 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9bab5ef84a7945f91e33f44a6da33ef1089c77b9
-  data.tar.gz: 705e3cdf9f3ad3c9ed8de0414ed006d187d21195
+  metadata.gz: 77132e0717914716bdbb9faef9f055fab5356da8
+  data.tar.gz: fc1e922a5f2e5145f1a27d46183e5c5ce04ec81e
 SHA512:
-  metadata.gz: b9ed16c402971158fb3f54b7becbee48f99432738bf33879bf2bffcd956836a4356a3941b03dc6c95c0c00355a8ba4180e0c21f258649f2dbf874aad7347d68f
-  data.tar.gz: c1a6a49b54d3638b78391ebef6a05271c962e9406a4d26ed39490ef51aa44b26f00f0619d4f535028385032ee206f15ee70bc51769e0ba33ef0545d552e536bb
+  metadata.gz: 2535513f6eb7860b4eb8d64b6a7df73afde2fb54b4f51073cb2d3dfb2a35c7008bc264b05882118669525a469e56a3100463e6e5311969db842a731487cd56ba
+  data.tar.gz: 026fd73d94df38ac6a8bfa405c452f40afa167c281ab8d2a1a13031082ac8dd735b1ffa6d388ab917a9cb6e6cee7f454ff5de62715fbeeebb185a2ae35dcfeb9

data/bin/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,9 +1,4 @@
 # parse booker's command line args
-
-
-VERSION = "0.5.1"
-
-
 require 'yaml'
 require 'find'
 require 'json'
@@ -14,8 +9,13 @@ require_relative 'config'
 require_relative 'consts'
 
 
-# get web opening command
+# get booker opening command
 class Booker
+  @version = "0.6.0"
+  class << self
+    attr_reader :version
+  end
+
   include Browser
   def initialize(args)
     parse args
@@ -34,11 +34,10 @@ class Booker
     if browsearg.match(/^[0-9]/) # bookmark
       open_bookmark args
     elsif domain.match(browsearg) # website
-      puts 'opening website ' + browsearg + '...'
-      openweb(wrap(prep(browsearg)))
+      puts 'opening website: ' + browsearg
+      openweb(prep(browsearg))
     else
-      allargs = wrap(args.join(' '))
-      open_search allargs
+      open_search(args.join(' '))
     end
   end
 
@@ -52,7 +51,7 @@ class Booker
   end
 
   def version
-    pexit VERSION, 0
+    pexit @version, 0
   end
 
   def openweb(url)
@@ -72,7 +71,7 @@ class Booker
   def open_search(term)
     puts 'searching ' + term + '...'
     search = BConfig.new.searcher
-    openweb(Shellwords.escape(search + term))
+    openweb(search + Shellwords.escape(term))
   end
 
   # parse and execute any command line options
@@ -84,7 +83,7 @@ class Booker
     errormsg = 'Error: '.red + "unrecognized option #{nextarg}"
     pexit errormsg, 1 if ! (valid_opts.include? nextarg)
 
-    # doing forced bookmarking
+    # forced bookmarking
     if nextarg == '--bookmark' || nextarg == '-b'
       if args.first.nil?
         pexit 'Error: '.red + 'booker --bookmark expects bookmark id', 1
@@ -93,14 +92,14 @@ class Booker
       end
     end
 
-    # doing autocompletion
+    # autocompletion
     if nextarg == '--complete' || nextarg == '-c'
       allargs = args.join(' ')
       bm = Bookmarks.new(allargs)
       bm.autocomplete
     end
 
-    # doing installation
+    # installation
     if nextarg == '--install' || nextarg == '-i'
       if !args.empty?
         install(args)
@@ -110,7 +109,7 @@ class Booker
       end
     end
 
-    # doing forced searching
+    # forced searching
     if nextarg == '--search' || nextarg == '-s'
       pexit '--search requires an argument', 1 if args.empty?
       allargs = args.join(' ')
@@ -148,8 +147,7 @@ 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
@@ -157,51 +155,54 @@ class Booker
       begin
         File.open(fp + "/_booker", 'w') {|f| f.write(COMPLETION) }
         system "zsh -c 'autoload -U _booker'"
-        puts "Success: ".grn +
-          "installed zsh autocompletion in #{fp}"
+        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 _booker 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"
+        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,6 +1,5 @@
 # grab/parse bookmarks from json file on computer
 
-
 # get int number of columns in half of screen
 TERMWIDTH = (TermInfo.screen_size[1]/2).floor
 
@@ -18,7 +17,7 @@ class String
     end
   end
 
-  # thx danhassin
+  # thx danhassin/dingbat
   def colorize(color, mod)
     "\033[#{mod};#{color};49m#{self}\033[0;0m"
   end

data/lib/config.rb

@@ -25,7 +25,7 @@ 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
     end
@@ -45,8 +45,7 @@ module Browser
   end
 
   def wrap(url)
-    #"'" + url + "'"
-    url
+    "\"#{url}\""
   end
 end
 
@@ -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,5 +1,6 @@
 # file for large constant strings
 
+# todo - wrap in module
 
 HELP_BANNER = <<-EOS
 Open browser:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: booker
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Jeremy Warner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-18 00:00:00.000000000 Z
+date: 2018-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-terminfo
@@ -36,20 +36,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.1
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.1
+        version: 2.1.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -111,9 +111,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: CLI parser/selector for google chrome bookmarks
 test_files: []
-has_rdoc: