booker 0.2.2 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66eee15b03131060b83845037e2d8379db8fec53
-  data.tar.gz: ee81fcf16d0a652e6bd8283b0ae73f4a12924fcb
+  metadata.gz: 5567e3732287e8680b5d69750b5a7ad29d292398
+  data.tar.gz: 030ad3b1bbcd9dd616a8350c514dfb4433f9fcef
 SHA512:
-  metadata.gz: e17594d0e0f5e70c1825a299f82ca2410014f35098095461bbd2550aa30c8828f7db401c6d84abc0df4771215c5e72733cc6a5c5ae1d1aeb2a5df4c9977f4320
-  data.tar.gz: c207c0b6389922960bbf3df2974980ecdb20f281697ee7c7a24afa5779f3bceed127ae36de4afee429ecdc48c1065d20bfd79934e26c96ad75e1cfae99b13129
+  metadata.gz: 9a0272734819dc107596283fc56dc580e29359e7f96e35a0e1d92e2a84c4acebf24ff0dafe7d45fc8ecbef3fda7ae80496bd78d38233732f5a7fed4f6e94042b
+  data.tar.gz: 183bb981b94176d4f38783b9e54d426be8fb59c316672aaa3e7d2d34067558bc2e9d7803e184d16f97f304037b5de193575840aac20333cd1544a7060abc8c49

data/lib/booker.rb

@@ -1,12 +1,13 @@
 # parse web's command line args
 
 
-VERSION = "0.2.2"
+VERSION = "0.3"
 
 
 require 'yaml'
 require 'find'
 require 'json'
+require 'terminfo'
 require_relative 'bookmarks'
 require_relative 'config'
 require_relative 'consts'
@@ -143,15 +144,15 @@ class Booker
       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
-      exec "zsh -c 'autoload -U _web'"
-      puts "Success: ".grn +
-        "installed zsh autocompletion in #{fpath}"
 
     elsif /book/i.match(target) # bookmarks installation
       # locate bookmarks file, show user, write to config?
@@ -169,18 +170,18 @@ class Booker
         puts "Success: ".grn +
           "config file updated with your bookmarks"
       rescue
-        puts "Failure: ".red +
-          "could not add bookmarks to config file ~/.booker"
+        pexit "Failure: ".red +
+          "could not add bookmarks to config file ~/.booker", 1
       end
 
-    elsif /config/i.match(target) # default config file generation
+    elsif /conf/i.match(target) # default config file generation
       begin
         BConfig.new.write
         puts "Success: ".grn +
-          "config file written to ~/.booker"
+          "example config file written to ~/.booker"
       rescue
-        puts "Failure: ".red +
-          "could not write config file ~/.booker"
+        pexit "Failure: ".red +
+          "could not write example config file to ~/.booker", 1
       end
 
     else # unknown argument passed into install

data/lib/bookmarks.rb

@@ -1,10 +1,14 @@
 # grab/parse bookmarks from json file on computer
 
 
-TERMWIDTH = 80
+# get int number of columns in half of screen
+TERMWIDTH = (TermInfo.screen_size[1]/2).floor
 
+# compl. color codes space
+CODEWIDTH = 16
 
-# thx danhassin
+
+# add some colors, windowing methods
 class String
   def window(width)
     if self.length >= width
@@ -14,6 +18,7 @@ class String
     end
   end
 
+  # thx danhassin
   def colorize(color, mod)
     "\033[#{mod};#{color};49m#{self}\033[0;0m"
   end
@@ -47,33 +52,35 @@ class Bookmarks
     parse
   end
 
-
-  # output for zsh
+  # output for zsh autocompetion, print out id, title and cleaned url
   def autocomplete
     @allurls.each do |url|
-      # delete anything not allowed in linktitle
-      name = url.folder + url.title.gsub(/[^a-z0-9\-\/_]/i, '')
-      name.gsub!(/\-+/, '-')
-      name.gsub!(/ /,'')
-      name = name.window(TERMWIDTH)
-
-      # remove strange things from any linkurls
-      link = url.url.gsub(/[,'"&?].*/, '')
-      link.gsub!(/.*:\/+/,'')
-      link.gsub!(/ /,'')
-      link = link[0..TERMWIDTH]
-
-      # print out title and cleaned url, for autocompetion
+      name = clean_name(url)
+      link = clean_link(url)
       puts url.id + ":" + name + ":" + link
     end
   end
 
+  # clean title for completion, delete anything not allowed in linktitle
+  def clean_name(url)
+    name = url.folder + ' |' + url.title.gsub(/[^a-z0-9\-\/_ ]/i, '')
+    name.gsub!(/\-+/, '-')
+    name.gsub!(/[ ]+/,' ')
+    name = name.window(TERMWIDTH)
+  end
+
+  # clean link for completion, remove strange things from any linkurls
+  def clean_link(url)
+    link = url.url.gsub(/[,'"&?].*/, '')
+    link.gsub!(/.*:\/+/,'')
+    link.gsub!(/ /,'')
+    link = link[0..TERMWIDTH-CODEWIDTH] # need space for term. color codes
+  end
+
   # get link (from id number)
   def bookmark_url(id)
     @allurls.each do |url|
-      if id == url.id
-        return url.url
-      end
+      return url.url if id == url.id
     end
   end
 
@@ -113,8 +120,8 @@ end # close bookmarks class
 # for recursively parsing bookmarks
 class Folder
   include Enumerable
-  def initialize(title='/', json)
-    @title = title.gsub(/[: ,'"]/, '-').downcase
+  def initialize(title='|', json)
+    @title = title.gsub(/[:,'"]/, '-').downcase
     @json = json
   end
 
@@ -127,7 +134,7 @@ end
 # clean bookmark title, set attrs
 class Bookmark
   def initialize(f, t, u, id)
-    @title = t.gsub(/[: ,'"+\-]/, '_').downcase
+    @title = t.gsub(/[:'"+]/, ' ').downcase
     @folder = f
     @url = u
     @id = id

data/lib/config.rb

@@ -31,7 +31,7 @@ module Browser
   end
 
   def domain
-    /.*(io|com|web|net|org|gov|edu)$/i
+    /.*(io|com|web|net|org|gov|edu)(\/.*)?$/i
   end
 
   # helper methods

metadata

@@ -1,15 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: booker
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: '0.3'
 platform: ruby
 authors:
 - Jeremy Warner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-19 00:00:00.000000000 Z
+date: 2015-10-20 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: ruby-terminfo
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -73,9 +93,9 @@ licenses:
 metadata: {}
 post_install_message: |2
       Thank you for installing booker!
-      To set bookmarks location, run `web -i bookmarks`
-      To add zsh completion,     run `web -i completion`
-      To see more help,          run `web --help`
+      To find your bookmarks,  run `web -i bookmarks`
+      To add zsh completion,   run `web -i completion`
+      To see more help,        run `web --help`
 rdoc_options: []
 require_paths:
 - lib