omnibar 0.0.6 → 0.0.7

data/lib/omnibar/queries/github.rb

@@ -3,17 +3,29 @@ module Omnibar
     def result
       repo = search.find(input)
       return repo if repo
-      return input if input.match?(/^[\w-]+\/[\w-]+$/)
+      return input if repo_full_name?
     end
 
-    def search
-      @fm = FuzzyMatch.new(Omnibar.config.github.repos)
+    def self.search
+      @fm ||= FuzzyMatch.new(Omnibar.config.github.repos)
     end
 
     def perform!
       param = result.downcase.gsub(/\s/, '-')
       open_in_browser "https://github.com/#{param}"
     end
+
+    def relevance
+      if repo_full_name?
+        0.75
+      elsif result
+        input.levenshtein_similar(result)
+      end
+    end
+
+    def repo_full_name?
+      input.match?(/^[\w-]+\/[\w-]+$/)
+    end
   end
 end
 

data/lib/omnibar/queries/google.rb

@@ -1,5 +1,17 @@
 module Omnibar
   class Google < Query
+    def label
+      [
+        ANSI.color('G', res: false, fg: :blue),
+        ANSI.color('o', res: false, fg: :red),
+        ANSI.color('o', res: false, fg: :yellow),
+        ANSI.color('g', res: false, fg: :blue),
+        ANSI.color('l', res: false, fg: :green),
+        ANSI.color('e', res: false, fg: :red),
+        ANSI.reset
+      ].join
+    end
+
     def perform!
       param = input.gsub(/\s/, '+')
       open_in_browser "https://www.google.com/search?q=#{param}"

data/lib/omnibar/queries/popular.rb

@@ -4,10 +4,14 @@ module Omnibar
       search.find(input)
     end
 
-    def search
+    def self.search
       @fm ||= FuzzyMatch.new(Omnibar.config.popular.sites)
     end
 
+    def relevance
+      input.levenshtein_similar(result) if result
+    end
+
     def perform!
       return if input.match?(/^fac?e?b?o?o?k?/)
       open_in_browser "https://#{result}"

data/lib/omnibar/queries/snippet.rb

@@ -1,7 +1,6 @@
 module Omnibar
   class Snippet < Query
     def result
-      key = search.find(input)
       value = snippets[key]
       "#{key} :: #{value}" if (key and value)
     end
@@ -10,12 +9,16 @@ module Omnibar
       Omnibar.config.snippets
     end
 
-    def self.search
-      @fz ||= FuzzyMatch.new(Omnibar.config.snippets.keys)
+    def key
+      search.find(input)
     end
 
-    def search
-      self.class.search
+    def relevance
+      input.levenshtein_similar(key) if result
+    end
+
+    def self.search
+      @fz ||= FuzzyMatch.new(Omnibar.config.snippets.keys)
     end
 
     def perform!

data/lib/omnibar/queries/spell.rb

@@ -3,7 +3,11 @@ require 'ffi/aspell'
 module Omnibar
   class Spell < Query
     def result
-      speller.suggestions(input.split(' ').last).first if input.match?(/^spe?l?l? \w+/)
+      return unless using_keyword?
+
+      words = input.split(' ')
+      return ' ' if words.length == 1
+      speller.suggestions(words.last).first
     end
 
     def self.speller
@@ -17,5 +21,14 @@ module Omnibar
     def perform!
       copy_to_clipboard result
     end
+
+    def using_keyword?
+      input.match?(/^spe?l?l?/)
+    end
+
+    def relevance
+      return 1 if using_keyword?
+      0
+    end
   end
 end

data/lib/omnibar/queries/system.rb

@@ -16,12 +16,16 @@ module Omnibar
       search.find(input)
     end
 
+    def relevance
+      input.levenshtein_similar(result) if result
+    end
+
     def search
       @fz ||= FuzzyMatch.new(COMMANDS.keys)
     end
 
     def perform!
-      puts COMMANDS[result]
+      run_silently COMMANDS[result]
     end
   end
 end

data/lib/omnibar/query.rb

@@ -3,26 +3,38 @@ module Omnibar
     attr_reader :input
 
     def initialize(input)
-      @input = input.strip
+      @input = input
     end
 
     def self.inherited(subclass)
       Omnibar.config.queries.push(subclass)
       super(subclass)
+      subclass.prepend(MethodAugmentations)
     end
 
     # TODO: Convert result to class
     # TODO: Allow multiple results per query
     def preview_text
       res = result
-      name = self.class.name.split('::').last.gsub(/[A-Z]/) { |w| ' ' << w }.strip
-      [name, res.strip] unless res.nil? || res.empty?
+      [label, res.strip] unless res.nil? || res.empty?
     end
 
     def result
       input
     end
 
+    def label
+      self.class.name.split('::').last.gsub(/[A-Z]/) { |w| ' ' << w }.strip
+    end
+
+    def search
+      self.class.search
+    end
+
+    def relevance
+      0
+    end
+
     def perform!; end
 
     def copy_to_clipboard(value)
@@ -34,7 +46,21 @@ module Omnibar
     end
 
     def run_silently(*command)
-      `#{command.join(' ')} >/dev/null 2>&1`
+      `#{command.join(' ')} >/dev/null 2>&1 &`
+    end
+
+    module MethodAugmentations
+      def result
+        return if input == ''
+        super
+      end
+
+      def relevance
+        value = super
+        value = 1 if value == true
+        value = 0.01 unless value
+        value
+      end
     end
   end
 end

data/lib/omnibar/renderer.rb

@@ -23,7 +23,6 @@ module Omnibar
         print current[i]
       end
 
-      ANSI
       print current.cursor_position
     end
   end

data/lib/omnibar/state.rb

@@ -34,7 +34,7 @@ module Omnibar
     end
 
     def queries
-      Omnibar.config.queries.map { |q| q.new(input) }
+      Omnibar.config.queries.map { |q| q.new(input) }.sort_by(&:relevance).reverse
     end
 
     def visible_queries
@@ -42,7 +42,7 @@ module Omnibar
     end
 
     def current_query
-      visible_queries[selection] || Query.new
+      visible_queries[selection] || Query.new('')
     end
 
     # TODO: Sort results based on relevance / certainty

data/lib/omnibar/version.rb

@@ -1,3 +1,3 @@
 module Omnibar
-  VERSION = '0.0.6'.freeze
+  VERSION = '0.0.7'.freeze
 end

data/lib/omnibar/view.rb

@@ -36,30 +36,34 @@ module Omnibar
         text = [
           lpad(result.first, max_label_length),
           rpad(result.last, ANSI.size[:width] - max_label_length - 2)
-        ].join(': ')
+        ]
 
         if i == @state.selection
-          text = ANSI.color(text,
-                            fg: Omnibar.config.render.highlight.fg,
-                            bg: Omnibar.config.render.highlight.bg)
+          text.map { |t| highlight(t) }.join(highlight(': '))
+        else
+          text.join(': ')
         end
-
-        text
       end
     end
 
+    def highlight(text)
+      ANSI.color(text,
+                 fg: Omnibar.config.render.highlight.fg,
+                 bg: Omnibar.config.render.highlight.bg)
+    end
+
     def rpad(text, length = ANSI.size[:width])
-      textlength = text.length + non_ascii_chars(text).length
+      textlength = ANSI.strip(text).length + non_ascii_chars(text).length
       text + (' ' * [0, (length - textlength)].max)
     end
 
     def lpad(text, length = ANSI.size[:width])
-      textlength = text.length + non_ascii_chars(text).length
+      textlength = ANSI.strip(text).length + non_ascii_chars(text).length
       (' ' * [0, (length - textlength)].max) + text
     end
 
     def max_label_length
-      @mll ||= (@state.results.map(&:first).map(&:length).max || 0) + 1
+      @mll ||= (@state.results.map(&:first).map { |s| ANSI.strip(s) }.map(&:length).max || 0) + 1
     end
 
     def non_ascii_chars(string)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omnibar
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Jacob Evan Shreve
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-06 00:00:00.000000000 Z
+date: 2017-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-configurable
@@ -122,11 +122,13 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- db/ansi.json
 - exe/omnibar
 - lib/ansi.rb
 - lib/omnibar.rb
 - lib/omnibar/app.rb
 - lib/omnibar/queries/calculate.rb
+- lib/omnibar/queries/docs.rb
 - lib/omnibar/queries/duck_duck_go.rb
 - lib/omnibar/queries/emoji.rb
 - lib/omnibar/queries/github.rb