booker 0.3.2 → 0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94d50219879478c9d6762be1e50de304c6cbc5d0
-  data.tar.gz: 768a969566680d92447cc156d5f06df8421590ca
+  metadata.gz: ede393f061fc758e36d7ab8a09d414dbee51559c
+  data.tar.gz: 3390c07e38358019217b79fa4d73560a0e7941de
 SHA512:
-  metadata.gz: 38be1cdef260f686f731ee9f912b6c16bbd09e50aa9dbeb8ca72d5536faac4ae2c3ec5161c066a99f8a8ef91b3af6ef945b1e1cb449bfbabf63b54467a8feb3b
-  data.tar.gz: 06dd6ff3e6fd121728c7eee4a979fdad519c08e3820dea374d4ea0fcdc6ae581d659d4a8ce6f750b65d020be652eeadb3680ab46dc0050e58f434bc8a62be0fb
+  metadata.gz: 299fda2e34de05e4ce9501f6dcb62fc748563e639ba775465bb6f686048063b3dabd28070876b445a3071c0677c08a9d8b55600dff8c36bf2922ab317fecaa56
+  data.tar.gz: 2eb7dfde1026069de99d1069c6e1eb112d02bb6318396b70b27ce215ceae451104c36f7b0b71224d99aca449de9f5f279f67333909264392767a7be80e9e3dd9

data/lib/booker.rb

@@ -1,13 +1,14 @@
 # parse web's command line args
 
 
-VERSION = "0.3.2"
+VERSION = "0.4"
 
 
 require 'yaml'
 require 'find'
 require 'json'
 require 'terminfo'
+require 'shellwords'
 require_relative 'bookmarks'
 require_relative 'config'
 require_relative 'consts'
@@ -29,6 +30,10 @@ class Booker
     pexit HELP_BANNER, 0
   end
 
+  def openweb(url)
+    system(browse + wrap(url))
+  end
+
   def parse(args)
     # no args given, show help
     helper if args.none?
@@ -36,26 +41,23 @@ class Booker
     # if arg starts with hyphen, parse option
     parse_opt args if /^-.*/.match(args[0])
 
-    # interpret
+    # interpret command
     browsearg = args[0]
 
     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)
-
+      puts 'opening bookmark ' + url + '...'
+      openweb(wrap(url))
     elsif domain.match(browsearg) # website
-      puts 'opening ' + browsearg + '...'
-      system browse << wrap(prep(browsearg))
-
+      puts 'opening website ' + browsearg + '...'
+      openweb(wrap(prep(browsearg)))
     else
       allargs = wrap(args.join(' '))
       puts 'searching ' + allargs + '...'
       search = BConfig.new.searcher
-      system browse << wrap(search + allargs)
-
+      openweb(Shellwords.escape(search + allargs))
     end
   end
 
@@ -68,13 +70,13 @@ class Booker
     pexit errormsg, 1 if ! (valid_opts.include? nextarg)
 
     # doing forced bookmarking
-    if args[0] == "--bookmark" or args[0] == "-b"
+    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)
+        system(browse + wrap(url))
         exit 0
       else
         pexit 'Error: '.red +
@@ -83,7 +85,7 @@ class Booker
     end
 
     # doing autocompletion
-    if args[0] == "--complete" or args[0] == "-c"
+    if args[0] == "--complete" || args[0] == "-c"
       args.shift # remove flag
       allargs = args.join(' ')
       bm = Bookmarks.new(allargs)
@@ -92,7 +94,7 @@ class Booker
     end
 
     # doing installation
-    if args[0] == "--install" or args[0] == "-i"
+    if args[0] == "--install" || args[0] == "-i"
       args.shift # remove flag
       if args.length > 0
         install(args)
@@ -103,12 +105,12 @@ class Booker
     end
 
     # needs some help
-    if args[0] == "--help" or args[0] == "-h"
+    if args[0] == "--help" || args[0] == "-h"
       helper
     end
 
     # doing forced searching
-    if args[0] == "--search" or args[0] == "-s"
+    if args[0] == "--search" || args[0] == "-s"
       args.shift # remove flag
       allargs = args.join(' ')
       if allargs == ""
@@ -116,13 +118,13 @@ class Booker
       else
         puts 'searching ' + allargs + '...'
         search = BConfig.new.searcher
-        system browse << search << allargs
+        openweb(Shellwords.escape(search + allargs))
         exit 0
       end
     end
 
     # print version information
-    if args[0] == "--version" or args[0] == "-v"
+    if args[0] == "--version" || args[0] == "-v"
       pexit VERSION, 0
     end
   end # parse opt
@@ -172,18 +174,24 @@ class Booker
     # locate bookmarks file, show user, write to config?
     puts 'searching for chrome bookmarks... (takes some time)'
     begin
-      bms = []
+      bms = [] # look for bookmarks
       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
+
+      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 }
+        selected = bms[gets.chomp.to_i]
+        puts 'Selected: '.yel + selected
+        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
     end

data/lib/bookmarks.rb

@@ -31,8 +31,8 @@ class String
 end
 
 
+# try to read bookmarks
 class Bookmarks
-  # try to read bookmarks
   def initialize(search_term)
     @conf = BConfig.new
     begin
@@ -120,28 +120,24 @@ end # close bookmarks class
 # for recursively parsing bookmarks
 class Folder
   include Enumerable
+  attr_reader :json, :title
   def initialize(title='|', json)
     @title = title.gsub(/[:,'"]/, '-').downcase
     @json = json
   end
 
-  def json() @json end
-  def title() @title end
+  # needed for Enumerable
   def each() @json.each end
 end
 
 
 # clean bookmark title, set attrs
 class Bookmark
+  attr_reader :title, :folder, :url, :id
   def initialize(f, t, u, id)
     @title = t.gsub(/[:'"+]/, ' ').downcase
     @folder = f
     @url = u
     @id = id
   end
-
-  def folder() @folder end
-  def title() @title end
-  def url() @url end
-  def id() @id end
 end

data/lib/config.rb

@@ -22,7 +22,7 @@ module Browser
   extend OS
   def browse
     if OS.windows?
-      # alternatively, start seems to work
+      # 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" '
@@ -40,17 +40,18 @@ module Browser
     if /^http/.match(url)
       url
     else
-      'http://' << url
+      'http://' + url
     end
   end
 
   def wrap(url)
-    "'" + url + "'"
+    #"'" + url + "'"
+    url
   end
 end
 
 
-# high level configuration
+# configuration
 class BConfig
   VALID = [:searcher, :bookmarks, :browser]
   HOME = ENV['HOME'].nil?? '/usr/local/' : ENV['HOME']
@@ -84,8 +85,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 + "web --install config"
       return false
     rescue Psych::SyntaxError
       puts "Warning: ".red +
@@ -95,11 +95,12 @@ class BConfig
     config
   end
 
+  # used for creating and updating the default configuration
   def write(k=nil, v=nil)
-    if k.nil? || v.nil?
+    if k.nil? && v.nil?
       File.open(YAMLCONF, 'w') {|f| f.write(@config.to_yaml) }
     else
-      @config[k] = v
+      @config[k] = v # update users yaml config file
       File.open(YAMLCONF, 'w+') {|f| f.write(@config.to_yaml) }
     end
   end

metadata

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