booker 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1532762ef0daee4451bf6edc98b8383ffe7efb0b
-  data.tar.gz: 04935d5ae99fa9ae66dd5ff6a242cdb1825b4375
+  metadata.gz: 66eee15b03131060b83845037e2d8379db8fec53
+  data.tar.gz: ee81fcf16d0a652e6bd8283b0ae73f4a12924fcb
 SHA512:
-  metadata.gz: fc05ede43930fcc9632b8e1cc4f7648eb181d157e791f34983f2892f122205b1d6283b68d3e1f977bc396a2b9b698ae62ef8210353bca09fe5530ad82916ea8b
-  data.tar.gz: 746db64651cde56e9f52ccabec68403197af8dc9588fdc66ad5fb177d82e9c8dee90242ce0ae7f405b32295f86afa339471193ab2925491224a51ea8b847f426
+  metadata.gz: e17594d0e0f5e70c1825a299f82ca2410014f35098095461bbd2550aa30c8828f7db401c6d84abc0df4771215c5e72733cc6a5c5ae1d1aeb2a5df4c9977f4320
+  data.tar.gz: c207c0b6389922960bbf3df2974980ecdb20f281697ee7c7a24afa5779f3bceed127ae36de4afee429ecdc48c1065d20bfd79934e26c96ad75e1cfae99b13129

data/lib/booker.rb

@@ -1,10 +1,11 @@
 # parse web's command line args
 
 
-VERSION = "0.2.1"
+VERSION = "0.2.2"
 
 
 require 'yaml'
+require 'find'
 require 'json'
 require_relative 'bookmarks'
 require_relative 'config'
@@ -131,23 +132,35 @@ class Booker
     exit 0 if target.nil?
 
     if /comp/i.match(target) # completion installation
+      # check if zsh is even installed for this user
       begin
-        # determine where to install function
-        fpath = `zsh -c 'echo $fpath'`.split(' ')[0]
-        File.open(fpath + "/_web", 'w') {|f| f.write(COMPLETION) }
-        loaded = `zsh -c 'autoload -U _web'`
-        puts "Success: ".grn +
-          "installed zsh autocompletion in #{fpath}"
+        fpath = `zsh -c 'echo $fpath'`.split(' ')
       rescue
         pexit "Failure: ".red +
-          "could not write ZSH completion _web script to $fpath", 1
+          "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) }
+          break # if this works, don't try anymore
+        rescue
+          puts "Failure: ".red +
+            "could not write ZSH completion _web script to $fpath"
+        end
       end
+      exec "zsh -c 'autoload -U _web'"
+      puts "Success: ".grn +
+        "installed zsh autocompletion in #{fpath}"
 
-    elsif /bookmark/i.match(target) # bookmarks installation
+    elsif /book/i.match(target) # bookmarks installation
       # locate bookmarks file, show user, write to config?
-      puts 'searching for chrome bookmarks...(takes time)'
+      puts 'searching for chrome bookmarks... (takes some time)'
       begin
-        bms = `find ~ -iname '*bookmarks' | grep -i chrom`.split("\n")
+        bms = []
+        Find.find(ENV["HOME"]) do |path|
+          bms << path if /chrom.*bookmarks/i.match path
+        end
         puts 'select your bookmarks file: '
         bms.each_with_index{|bm, i| puts i.to_s.grn + " - " + bm }
         selected = bms[gets.chomp.to_i]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: booker
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Jeremy Warner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-17 00:00:00.000000000 Z
+date: 2015-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -73,8 +73,9 @@ licenses:
 metadata: {}
 post_install_message: |2
       Thank you for installing booker!
-      To set bookmarks location, run `web --install bookmarks`
-      To add zsh completion, run `web --install completion`
+      To set bookmarks location, run `web -i bookmarks`
+      To add zsh completion,     run `web -i completion`
+      To see more help,          run `web --help`
 rdoc_options: []
 require_paths:
 - lib