omnibar 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 513b1e361992c5857eeb37e52f0a0d2c52486d99
-  data.tar.gz: da3effe0d3c63a840d6294b97df44f1d0598835b
+  metadata.gz: 89901327f67e2c6978f867ae24b906fc604b56ad
+  data.tar.gz: 3be4ad5cdd64cf4413cb73e3e87775e2190e22bd
 SHA512:
-  metadata.gz: 2b372c0dde29e27c51d2e566ddd7f1a86de1dfe4487e29aff65c5d532882d6f539a6157bc1f791ab3f3bdd04dd70dcd3d7f39bb1ab955465ba5c705a0e5209d7
-  data.tar.gz: 4ed39d98bf94668617a15609daf02d1bf023f8a3f7c9759b4edbd41b685ad65adb400f02d6106793f3a7db436eb329c159b43914e1c892dc86d5a6abfbd5f28d
+  metadata.gz: e8193d63a0129aaf5fc30d5d3444958c07862e9201adfce4d34c929d29edf50938a0033a55a79468b77396be994c6dfe8dd064045e86c49f8c1d6eb05af9fcb0
+  data.tar.gz: 52be6f30e7e997e787741ff42209aaaa5ae160ee85c385957177b2d982338cd0759ee31add06e13934777e47414df5784def08fedd44e4045585208d96a0b053

data/.gitignore

@@ -6,4 +6,5 @@
 /pkg/
 /spec/reports/
 /tmp/
-*.gem
+*.gem
+/log/

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    omnibar (0.0.5)
+    omnibar (0.0.7)
       amatch (~> 0.4.0)
       dry-configurable (~> 0.7.0)
       ffi-aspell (~> 1.1, >= 1.1.0)
@@ -28,7 +28,7 @@ GEM
     ruby_parser (3.10.1)
       sexp_processor (~> 4.9)
     sexp_processor (4.10.0)
-    tins (1.15.0)
+    tins (1.16.3)
 
 PLATFORMS
   ruby

data/Rakefile

@@ -1,2 +1 @@
-require "bundler/gem_tasks"
-task :default => :spec
+require 'bundler/gem_tasks'

data/db/ansi.json

@@ -0,0 +1,258 @@
+{
+  "Black": 0,
+  "Maroon": 1,
+  "Green": 2,
+  "Olive": 3,
+  "Navy": 4,
+  "Purple": 5,
+  "Teal": 6,
+  "Silver": 7,
+  "Grey": 8,
+  "Red": 9,
+  "Lime": 10,
+  "Yellow": 11,
+  "Blue": 12,
+  "Fuchsia": 13,
+  "Aqua": 14,
+  "White": 15,
+  "Grey0": 16,
+  "NavyBlue": 17,
+  "DarkBlue": 18,
+  "Blue2": 19,
+  "Blue3": 20,
+  "Blue1": 21,
+  "DarkGreen": 22,
+  "DeepSkyBlue4": 23,
+  "DeepSkyBlue4": 24,
+  "DeepSkyBlue4": 25,
+  "DodgerBlue3": 26,
+  "DodgerBlue2": 27,
+  "Green4": 28,
+  "SpringGreen4": 29,
+  "Turquoise4": 30,
+  "DeepSkyBlue3": 31,
+  "DeepSkyBlue3": 32,
+  "DodgerBlue1": 33,
+  "Green3": 34,
+  "SpringGreen3": 35,
+  "DarkCyan": 36,
+  "LightSeaGreen": 37,
+  "DeepSkyBlue2": 38,
+  "DeepSkyBlue1": 39,
+  "Green3": 40,
+  "SpringGreen3": 41,
+  "SpringGreen2": 42,
+  "Cyan3": 43,
+  "DarkTurquoise": 44,
+  "Turquoise2": 45,
+  "Green1": 46,
+  "SpringGreen2": 47,
+  "SpringGreen1": 48,
+  "MediumSpringGreen": 49,
+  "Cyan2": 50,
+  "Cyan1": 51,
+  "DarkRed": 52,
+  "DeepPink4": 53,
+  "Purple2": 54,
+  "Purple4": 55,
+  "Purple3": 56,
+  "BlueViolet": 57,
+  "Orange4": 58,
+  "Grey37": 59,
+  "MediumPurple4": 60,
+  "SlateBlue3": 61,
+  "SlateBlue3": 62,
+  "RoyalBlue1": 63,
+  "Chartreuse4": 64,
+  "DarkSeaGreen4": 65,
+  "PaleTurquoise4": 66,
+  "SteelBlue": 67,
+  "SteelBlue3": 68,
+  "CornflowerBlue": 69,
+  "Chartreuse3": 70,
+  "DarkSeaGreen4": 71,
+  "CadetBlue": 72,
+  "CadetBlue": 73,
+  "SkyBlue3": 74,
+  "SteelBlue1": 75,
+  "Chartreuse3": 76,
+  "PaleGreen3": 77,
+  "SeaGreen3": 78,
+  "Aquamarine3": 79,
+  "MediumTurquoise": 80,
+  "SteelBlue1": 81,
+  "Chartreuse2": 82,
+  "SeaGreen2": 83,
+  "SeaGreen1": 84,
+  "SeaGreen1": 85,
+  "Aquamarine1": 86,
+  "DarkSlateGray2": 87,
+  "DarkRed": 88,
+  "DeepPink4": 89,
+  "DarkMagenta": 90,
+  "DarkMagenta": 91,
+  "DarkViolet": 92,
+  "Purple5": 93,
+  "Orange4": 94,
+  "LightPink4": 95,
+  "Plum4": 96,
+  "MediumPurple3": 97,
+  "MediumPurple3": 98,
+  "SlateBlue1": 99,
+  "Yellow4": 100,
+  "Wheat4": 101,
+  "Grey53": 102,
+  "LightSlateGrey": 103,
+  "MediumPurple": 104,
+  "LightSlateBlue": 105,
+  "Yellow4": 106,
+  "DarkOliveGreen3": 107,
+  "DarkSeaGreen": 108,
+  "LightSkyBlue3": 109,
+  "LightSkyBlue3": 110,
+  "SkyBlue2": 111,
+  "Chartreuse2": 112,
+  "DarkOliveGreen3": 113,
+  "PaleGreen3": 114,
+  "DarkSeaGreen3": 115,
+  "DarkSlateGray3": 116,
+  "SkyBlue1": 117,
+  "Chartreuse1": 118,
+  "LightGreen": 119,
+  "LightGreen": 120,
+  "PaleGreen1": 121,
+  "Aquamarine1": 122,
+  "DarkSlateGray1": 123,
+  "Red3": 124,
+  "DeepPink4": 125,
+  "MediumVioletRed": 126,
+  "Magenta3": 127,
+  "DarkViolet": 128,
+  "Purple6": 129,
+  "DarkOrange3": 130,
+  "IndianRed": 131,
+  "HotPink3": 132,
+  "MediumOrchid3": 133,
+  "MediumOrchid": 134,
+  "MediumPurple2": 135,
+  "DarkGoldenrod": 136,
+  "LightSalmon3": 137,
+  "RosyBrown": 138,
+  "Grey63": 139,
+  "MediumPurple2": 140,
+  "MediumPurple1": 141,
+  "Gold3": 142,
+  "DarkKhaki": 143,
+  "NavajoWhite3": 144,
+  "Grey69": 145,
+  "LightSteelBlue3": 146,
+  "LightSteelBlue": 147,
+  "Yellow3": 148,
+  "DarkOliveGreen3": 149,
+  "DarkSeaGreen3": 150,
+  "DarkSeaGreen2": 151,
+  "LightCyan3": 152,
+  "LightSkyBlue1": 153,
+  "GreenYellow": 154,
+  "DarkOliveGreen2": 155,
+  "PaleGreen1": 156,
+  "DarkSeaGreen2": 157,
+  "DarkSeaGreen1": 158,
+  "PaleTurquoise1": 159,
+  "Red3": 160,
+  "DeepPink3": 161,
+  "DeepPink3": 162,
+  "Magenta3": 163,
+  "Magenta3": 164,
+  "Magenta2": 165,
+  "DarkOrange3": 166,
+  "IndianRed": 167,
+  "HotPink3": 168,
+  "HotPink2": 169,
+  "Orchid": 170,
+  "MediumOrchid1": 171,
+  "Orange3": 172,
+  "LightSalmon3": 173,
+  "LightPink3": 174,
+  "Pink3": 175,
+  "Plum3": 176,
+  "Violet": 177,
+  "Gold3": 178,
+  "LightGoldenrod3": 179,
+  "Tan": 180,
+  "MistyRose3": 181,
+  "Thistle3": 182,
+  "Plum2": 183,
+  "Yellow3": 184,
+  "Khaki3": 185,
+  "LightGoldenrod2": 186,
+  "LightYellow3": 187,
+  "Grey84": 188,
+  "LightSteelBlue1": 189,
+  "Yellow2": 190,
+  "DarkOliveGreen1": 191,
+  "DarkOliveGreen1": 192,
+  "DarkSeaGreen1": 193,
+  "Honeydew2": 194,
+  "LightCyan1": 195,
+  "Red1": 196,
+  "DeepPink2": 197,
+  "DeepPink1": 198,
+  "DeepPink1": 199,
+  "Magenta2": 200,
+  "Magenta1": 201,
+  "OrangeRed1": 202,
+  "IndianRed1": 203,
+  "IndianRed1": 204,
+  "HotPink": 205,
+  "HotPink": 206,
+  "MediumOrchid1": 207,
+  "DarkOrange": 208,
+  "Salmon1": 209,
+  "LightCoral": 210,
+  "PaleVioletRed1": 211,
+  "Orchid2": 212,
+  "Orchid1": 213,
+  "Orange1": 214,
+  "SandyBrown": 215,
+  "LightSalmon1": 216,
+  "LightPink1": 217,
+  "Pink1": 218,
+  "Plum1": 219,
+  "Gold1": 220,
+  "LightGoldenrod2": 221,
+  "LightGoldenrod2": 222,
+  "NavajoWhite1": 223,
+  "MistyRose1": 224,
+  "Thistle1": 225,
+  "Yellow1": 226,
+  "LightGoldenrod1": 227,
+  "Khaki1": 228,
+  "Wheat1": 229,
+  "Cornsilk1": 230,
+  "Grey100": 231,
+  "Grey3": 232,
+  "Grey7": 233,
+  "Grey11": 234,
+  "Grey15": 235,
+  "Grey19": 236,
+  "Grey23": 237,
+  "Grey27": 238,
+  "Grey30": 239,
+  "Grey35": 240,
+  "Grey39": 241,
+  "Grey42": 242,
+  "Grey46": 243,
+  "Grey50": 244,
+  "Grey54": 245,
+  "Grey58": 246,
+  "Grey62": 247,
+  "Grey66": 248,
+  "Grey70": 249,
+  "Grey74": 250,
+  "Grey78": 251,
+  "Grey82": 252,
+  "Grey85": 253,
+  "Grey89": 254,
+  "Grey93": 255
+}

data/lib/ansi.rb

@@ -1,15 +1,25 @@
+require 'json'
+
 # This module contains helpers for various ansi-code operations
 module ANSI
   # ANSI color escape codes set the foreground and background colors.
   # Forground color is a number between 30 and 37.
   # Background color is a number between 40 and 47.
   # The ones place represents the same color for both.
-  COLORS = [:black, :red, :green, :yellow, :blue, :magenta, :cyan, 'white', nil, :white].freeze
+  COLORS = JSON.parse(File.read(File.expand_path('../db/ansi.json', File.dirname(__FILE__)))).freeze
 
   def self.clear_screen
     $stdout.write "\e[2J"
   end
 
+  def self.save_screen
+    $stdout.write `tput smcup`
+  end
+
+  def self.restore_screen
+    $stdout.write `tput rmcup`
+  end
+
   def self.move_cursor(row, col)
     $stdout.write "\e[#{row + 1};#{col + 1}H"
   end
@@ -21,17 +31,22 @@ module ANSI
     move_cursor(row, col)
   end
 
-  def self.color(text, fg: :white, bg: :black)
-    fg = COLORS.index(fg) + 30
-    bg = COLORS.index(bg) + 40
-    code = "\e[#{[fg, bg].compact.join(';')}m"
-    "#{code}#{text}\e[0m"
+  def self.color(text, fg: nil, bg: nil, res: true)
+    fg = COLORS[@private.snake_to_camel(fg)] if fg
+    bg = COLORS[@private.snake_to_camel(bg)] if bg
+    fg = "\e[38;5;#{fg}m" if fg
+    bg = "\e[48;5;#{bg}m" if bg
+    "#{fg}#{bg}#{text}#{reset if res}"
   end
 
   def self.reset
     "\e[0m"
   end
 
+  def self.strip(text)
+    text.gsub(/\e\[[0-9,;]+\w/, '')
+  end
+
   def self.position
     res = ''
     $stdin.raw do |stdin|
@@ -55,4 +70,28 @@ module ANSI
       width: win[1]
     }
   end
+
+  def self.print_colors
+    colors = COLORS.keys.count
+    groups = COLORS.to_a.sort_by { |p| p[1] }.each_slice(colors / 3).to_a.map(&:to_h)
+
+    groups.first.keys.length.times.each do |i|
+      3.times do |j|
+        name = groups[j].keys[i]
+        code = groups[j][name]
+
+        pad = ' ' * (40 - (name.length * 2))
+        lpad = ' ' * (3 - code.digits.count)
+        print "#{lpad}#{code} \e[38;5;#{code}m#{name}\e[0m \e[48;5;#{code}m#{name}\e[0m #{pad}"
+      end
+      print "\n"
+    end
+    true
+  end
+
+  @private = Module.new do
+    def self.snake_to_camel(string)
+      string.to_s.split('_').map(&:capitalize).join
+    end
+  end
 end

data/lib/omnibar.rb

@@ -2,6 +2,7 @@
 require 'dry-configurable'
 require 'fuzzy_match'
 require 'amatch'
+require 'logger'
 
 require_relative 'ansi'
 
@@ -15,6 +16,8 @@ require_relative 'omnibar/view'
 module Omnibar
   extend Dry::Configurable
 
+  setting :log, Logger.new('log/omnibar.log'), reader: true rescue nil
+
   setting :queries, []
 
   setting :github do
@@ -31,13 +34,14 @@ module Omnibar
     setting :prompt, ->(width) { (' ' * width) << ANSI.color('★', fg: :magenta) }
 
     setting :highlight do
-      setting :fg, :black
-      setting :bg, :yellow
+      setting :fg, :white
+      setting :bg, :grey15
     end
   end
 
   setting :events do
     setting :after_start, ->(app) {}
+    setting :keypress, ->(state) {}
     setting :after_perform, -> {}
   end
 
@@ -52,7 +56,3 @@ FuzzyMatch.engine = :amatch
 # Require all the queries
 dir = File.join(File.dirname(File.expand_path(__FILE__)), 'omnibar/queries')
 Dir["#{dir}/*.rb"].each { |file| require file }
-
-# Move fallback queries to the end
-Omnibar.config.queries << Omnibar.config.queries.delete(Omnibar::DuckDuckGo)
-Omnibar.config.queries << Omnibar.config.queries.delete(Omnibar::Google)

data/lib/omnibar/app.rb

@@ -12,7 +12,7 @@ module Omnibar
 
     def run
       IO.console.raw do
-        ANSI.clear_screen
+        ANSI.save_screen
         ANSI.move_cursor(0, 0)
         loop do
           render
@@ -36,9 +36,9 @@ module Omnibar
         @state.backspace
       when "\e", "\e["
         handle_input(char)
-      when "\e[A" # Up Arrow
+      when "\e[A", "\v" # Up Arrow, ctrl-k
         @state.select_up
-      when "\e[B" # Down Arrow
+      when "\e[B", "\n" # Down Arrow, ctrl-j
         @state.select_down
       when "\e[C"
         @state.move_cursor_left
@@ -50,8 +50,11 @@ module Omnibar
         perform_action!
         reset_state!
       else
+        puts char.inspect
         @state.add_to_input(char)
       end
+
+      Omnibar.config.events.keypress.call(@state)
     end
 
     def reset_state!
@@ -64,7 +67,7 @@ module Omnibar
     end
 
     def quit
-      ANSI.clear_screen
+      ANSI.restore_screen
       exit 0
     end
   end