booker 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dda11b55cafd0dde5ad282177e0313752a70f2e6
-  data.tar.gz: 023838be5b1e5c47ca2dc2c2e919a916c797d77b
+  metadata.gz: 94d50219879478c9d6762be1e50de304c6cbc5d0
+  data.tar.gz: 768a969566680d92447cc156d5f06df8421590ca
 SHA512:
-  metadata.gz: 4635c3785c478a30e61820b47d08e9d2bcc2d3bf8f5c406d03ee3aca58eca0b6ea266dfc7990e39c91e05a7847e92745c6dddfcc1dd84b0db37f7434f058f295
-  data.tar.gz: 1cb46435f22998e10ebd17446b7de3752f82f9becc2df6ee0b6a405fff9fb63094727ced289af7b92bbd2a8af99c6d368e783ab4c604db278959f36e8c291d68
+  metadata.gz: 38be1cdef260f686f731ee9f912b6c16bbd09e50aa9dbeb8ca72d5536faac4ae2c3ec5161c066a99f8a8ef91b3af6ef945b1e1cb449bfbabf63b54467a8feb3b
+  data.tar.gz: 06dd6ff3e6fd121728c7eee4a979fdad519c08e3820dea374d4ea0fcdc6ae581d659d4a8ce6f750b65d020be652eeadb3680ab46dc0050e58f434bc8a62be0fb

data/lib/booker.rb

@@ -1,7 +1,7 @@
 # parse web's command line args
 
 
-VERSION = "0.3"
+VERSION = "0.3.2"
 
 
 require 'yaml'
@@ -37,23 +37,24 @@ class Booker
     parse_opt args if /^-.*/.match(args[0])
 
     # interpret
-    allargs = wrap(args.join(' '))
-    browsearg = args.shift
+    browsearg = args[0]
 
-    if /[0-9]/.match(browsearg[0]) # bookmark
+    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 ' + url + '...'
-      system browse, wrap(url)
+      system browse << wrap(url)
 
     elsif domain.match(browsearg) # website
       puts 'opening ' + browsearg + '...'
-      system browse, wrap(prep(browsearg))
+      system browse << wrap(prep(browsearg))
 
-    else # just search for these arguments
+    else
+      allargs = wrap(args.join(' '))
       puts 'searching ' + allargs + '...'
       search = BConfig.new.searcher
-      system browse, search, allargs
+      system browse << wrap(search + allargs)
 
     end
   end
@@ -124,7 +125,7 @@ class Booker
     if args[0] == "--version" or args[0] == "-v"
       pexit VERSION, 0
     end
-  end
+  end # parse opt
 
   def install(args)
     target = args.shift
@@ -132,13 +133,10 @@ class Booker
 
     if /comp/i.match(target) # completion installation
       install_completion
-
     elsif /book/i.match(target) # bookmarks installation
       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

data/lib/config.rb

@@ -22,6 +22,7 @@ module Browser
   extend OS
   def browse
     if OS.windows?
+      # alternatively, start seems to work
       '/cygdrive/c/Program\ Files\ \(x86\)/Google/Chrome/Application/chrome.exe '
     elsif OS.mac?
       'open -a "Google Chrome" '
@@ -51,42 +52,51 @@ end
 
 # high level configuration
 class BConfig
-  YAMLCONF = ENV['HOME'] + '/.booker.yml'
+  VALID = [:searcher, :bookmarks, :browser]
+  HOME = ENV['HOME'].nil?? '/usr/local/' : ENV['HOME']
+  YAMLCONF = HOME + '/.booker.yml'
 
   def initialize
     # config defaults (for osx, default chrome profile)
-    @config = {
+    readyaml = read(YAMLCONF)
+    default_config = {
+      :browser  => 'open ',
       :searcher  => "https://duckduckgo.com/?q=",
-      :bookmarks => ENV['HOME'] +
+      :bookmarks => HOME +
       "/Library/Application Support/Google/Chrome/Profile 1/Bookmarks",
     }
 
-    # configure through users yaml config file
-    @config = read(YAMLCONF)
+    # configure w/ yaml config file, if it exists
+    @config = readyaml ? readyaml : default_config
 
-    valid = @config.keys
-    @config.each do |k,v|
-      @config[k.to_sym] = v if valid.include? k.to_sym
+    # prune bad config keys
+    @config.each do |k, v|
+      if !VALID.include? k.to_sym
+        puts "Failure:".red + " Bad key found in config file: #{k}"
+        exit 1
+      end
     end
   end
 
   def read(file)
     begin
-      @config = YAML::load(IO.read(file))
+      config = YAML::load(IO.read(file))
     rescue Errno::ENOENT
       puts "Warning: ".yel +
         "YAML configuration file couldn't be found. Using defaults."
       puts "Suggest: ".grn +
         "web --install config"
+      return false
     rescue Psych::SyntaxError
       puts "Warning: ".red +
         "YAML configuration file contains invalid syntax. Using defaults."
+      return false
     end
-    @config
+    config
   end
 
   def write(k=nil, v=nil)
-    if k.nil? or v.nil?
+    if k.nil? || v.nil?
       File.open(YAMLCONF, 'w') {|f| f.write(@config.to_yaml) }
     else
       @config[k] = v
@@ -95,10 +105,10 @@ class BConfig
   end
 
   def bookmarks
-    @config['bookmarks']
+    @config[:bookmarks]
   end
 
   def searcher
-    @config['searcher']
+    @config[:searcher]
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: booker
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Jeremy Warner