booker 0.3 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5567e3732287e8680b5d69750b5a7ad29d292398
-  data.tar.gz: 030ad3b1bbcd9dd616a8350c514dfb4433f9fcef
+  metadata.gz: dda11b55cafd0dde5ad282177e0313752a70f2e6
+  data.tar.gz: 023838be5b1e5c47ca2dc2c2e919a916c797d77b
 SHA512:
-  metadata.gz: 9a0272734819dc107596283fc56dc580e29359e7f96e35a0e1d92e2a84c4acebf24ff0dafe7d45fc8ecbef3fda7ae80496bd78d38233732f5a7fed4f6e94042b
-  data.tar.gz: 183bb981b94176d4f38783b9e54d426be8fb59c316672aaa3e7d2d34067558bc2e9d7803e184d16f97f304037b5de193575840aac20333cd1544a7060abc8c49
+  metadata.gz: 4635c3785c478a30e61820b47d08e9d2bcc2d3bf8f5c406d03ee3aca58eca0b6ea266dfc7990e39c91e05a7847e92745c6dddfcc1dd84b0db37f7434f058f295
+  data.tar.gz: 1cb46435f22998e10ebd17446b7de3752f82f9becc2df6ee0b6a405fff9fb63094727ced289af7b92bbd2a8af99c6d368e783ab4c604db278959f36e8c291d68

data/lib/booker.rb

@@ -20,15 +20,15 @@ class Booker
     parse args
   end
 
-  def helper
-    pexit HELP_BANNER, 1
-  end
-
   def pexit(msg, sig)
     puts msg
     exit sig
   end
 
+  def helper
+    pexit HELP_BANNER, 0
+  end
+
   def parse(args)
     # no args given, show help
     helper if args.none?
@@ -37,26 +37,24 @@ class Booker
     parse_opt args if /^-.*/.match(args[0])
 
     # interpret
-    while args do
-      allargs = "'" + args.join(' ') + "'"
-      browsearg = args.shift
+    allargs = wrap(args.join(' '))
+    browsearg = args.shift
 
-      if /[0-9]/.match(browsearg[0]) # bookmark
-        bm = Bookmarks.new('')
-        url = bm.bookmark_url(browsearg)
-        puts 'opening ' + url + '...'
-        exec browse << wrap(url)
+    if /[0-9]/.match(browsearg[0]) # bookmark
+      bm = Bookmarks.new('')
+      url = bm.bookmark_url(browsearg)
+      puts 'opening ' + url + '...'
+      system browse, wrap(url)
 
-      elsif domain.match(browsearg) # website
-        puts 'opening ' + browsearg + '...'
-        exec browse << wrap(prep(browsearg))
+    elsif domain.match(browsearg) # website
+      puts 'opening ' + browsearg + '...'
+      system browse, wrap(prep(browsearg))
 
-      else # just search for these arguments
-        puts 'searching ' + allargs + '...'
-        search = BConfig.new.searcher
-        exec browse << search << allargs
+    else # just search for these arguments
+      puts 'searching ' + allargs + '...'
+      search = BConfig.new.searcher
+      system browse, search, allargs
 
-      end
     end
   end
 
@@ -75,10 +73,10 @@ class Booker
       if id
         url = bm.bookmark_url(id)
         puts 'opening ' + url + '...'
-        exec browse << wrap(url)
+        system browse << wrap(url)
         exit 0
       else
-        pexit '  Error: '.red +
+        pexit 'Error: '.red +
           'web --bookmark expects bookmark id', 1
       end
     end
@@ -98,7 +96,7 @@ class Booker
       if args.length > 0
         install(args)
       else
-        pexit '  Error: '.red +
+        pexit 'Error: '.red +
           "web --install expects arguments: [completion, bookmarks, config]", 1
       end
     end
@@ -117,7 +115,7 @@ class Booker
       else
         puts 'searching ' + allargs + '...'
         search = BConfig.new.searcher
-        exec browse << search << allargs
+        system browse << search << allargs
         exit 0
       end
     end
@@ -133,62 +131,74 @@ class Booker
     exit 0 if target.nil?
 
     if /comp/i.match(target) # completion installation
-      # check if zsh is even installed for this user
-      begin
-        fpath = `zsh -c 'echo $fpath'`.split(' ')
-      rescue
-        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}"
-          break # if this works, don't try anymore
-        rescue
-          puts "Failure: ".red +
-            "could not write ZSH completion _web script to $fpath"
-        end
-      end
+      install_completion
 
     elsif /book/i.match(target) # bookmarks installation
-      # locate bookmarks file, show user, write to config?
-      puts 'searching for chrome bookmarks... (takes some time)'
-      begin
-        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]
-        puts 'Selected: '.yel + selected
-        BConfig.new.write('bookmarks', selected)
-        puts "Success: ".grn +
-          "config file updated with your bookmarks"
-      rescue
-        pexit "Failure: ".red +
-          "could not add bookmarks to config file ~/.booker", 1
-      end
+      install_bookmarks
 
     elsif /conf/i.match(target) # default config file generation
+      install_config
+
+    else # unknown argument passed into install
+      pexit "Failure: ".red + "unknown installation option (#{target})", 1
+    end
+
+    install(args) # recurse til done
+  end
+
+  def install_completion
+    # check if zsh is even installed for this user
+    begin
+      fpath = `zsh -c 'echo $fpath'`.split(' ')
+    rescue
+      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
-        BConfig.new.write
+        File.open(fp + "/_web", 'w') {|f| f.write(COMPLETION) }
+        system "zsh -c 'autoload -U _web'"
         puts "Success: ".grn +
-          "example config file written to ~/.booker"
+          "installed zsh autocompletion in #{fp}"
+        break # if this works, don't try anymore
       rescue
-        pexit "Failure: ".red +
-          "could not write example config file to ~/.booker", 1
+        puts "Failure: ".red +
+          "could not write ZSH completion _web script to $fpath (#{fp})"
       end
+    end
+  end
 
-    else # unknown argument passed into install
+  def install_bookmarks
+    # locate bookmarks file, show user, write to config?
+    puts 'searching for chrome bookmarks... (takes some time)'
+    begin
+      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]
+      puts 'Selected: '.yel + selected
+      BConfig.new.write('bookmarks', selected)
+      puts "Success: ".grn +
+        "config file updated with your bookmarks"
+    rescue
       pexit "Failure: ".red +
-        "unknown installation option (#{target})", 1
+        "could not add bookmarks to config file ~/.booker", 1
     end
+  end
 
-    install(args) # recurse til done
+  def install_config
+    begin
+      BConfig.new.write
+      puts "Success: ".grn +
+        "example config file written to ~/.booker"
+    rescue
+      pexit "Failure: ".red +
+        "could not write example config file to ~/.booker", 1
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: booker
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: 0.3.1
 platform: ruby
 authors:
 - Jeremy Warner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-20 00:00:00.000000000 Z
+date: 2015-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-terminfo