utils 0.18.1 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7bee4cb885dc46160028f6011fdf435fffd82234d901fa0b7bf1db3db409245b
-  data.tar.gz: 29b8c82dc580506bc25b3097cfdc3a08b585383b3d09f6d41df59b3c0b27498d
+  metadata.gz: 4d96c7cf970c92753376fda93b80ddaacaddc369e6b76016b32f1ba4dca4e481
+  data.tar.gz: 734f6d3bb32ca8c8afaef530d6634be5672cd30569c728a62bf9dd3282e9b143
 SHA512:
-  metadata.gz: 63478f0d27f7cedcc8e1d5bf784f88840067647d0f69494d0213800ce62b9d5e61ceeef501a88905dc2edd705ec25c584da0946b31504610682e07301b46d6a4
-  data.tar.gz: 6b3f95eccd99acd8054f06fd045c1b0a939e3569ca0dfb62b4be47c15164187b824ad5d3a651be04bdd57da078b7b41840fb68e7a7b6de9f92df6a9cd9142460
+  metadata.gz: f40d11fbdb46906ca04c51dea3c326ea74a4fdd2fcc1f7900d57c3cafb6c98565e444c5ba2e1aeca35f02c882d3ffe67f0827b671eadaddecbe8926394f90c95
+  data.tar.gz: a734f2ac070ad39bffa1428855ec64cc09e76e6149c710b9e7876a180a72a1df274d5fb51994087ec8388ff803900be6f5ea3fd240dba9443621f0721a420a72

data/VERSION

@@ -1 +1 @@
-0.18.1
+0.19.0

data/bin/discover

@@ -84,13 +84,13 @@ when args[?s]
   args[?n] = Term::ANSIColor.terminal_lines - 1
   path = nil
   found = Utils::SearchUI.new(
-    query: -> answer {
+    query: -> answer, selector {
       pattern.replace answer
       f = finder.()
-      f.search.output.join(?\n)
+      f.search.output.each_with_index.map { |l, i| (i == selector ? '> ' : '  ') + l }.join(?\n)
     },
-    found: -> answer {
-      f and path = f.paths.first
+    found: -> answer, selector {
+      f and path = f.paths[selector]
     },
     output: STDERR
   ).start

data/lib/utils/search_ui.rb

@@ -4,6 +4,7 @@ class Utils::SearchUI
   include Term::ANSIColor
 
   def initialize(query:, found:, output: STDOUT, prompt: 'Search? %s')
+    @selector = 0
     @query  = query
     @found  = found
     @output = output
@@ -18,7 +19,7 @@ class Utils::SearchUI
       case getc
       when true
         @output.print clear_screen, move_home, reset
-        if result = @found.(@answer)
+        if result = @found.(@answer, @selector)
           return result
         else
           return nil
@@ -26,7 +27,7 @@ class Utils::SearchUI
       when false
         return nil
       end
-      result = @query.(@answer)
+      result = @query.(@answer, @selector)
       @output.print clear_screen
       unless @answer.empty?
         @output.print move_home { ?\n + result }
@@ -41,19 +42,32 @@ class Utils::SearchUI
     c = STDIN.getc
     system 'stty cooked echo'
     case c
-    when "\x03", "\e"
+    when "\x03"
       false
+    when "\e"
+      STDIN.getc == ?[ or return nil
+      STDIN.getc =~ /\A([AB])\z/ or return nil
+      if $1 == ?A
+        @selector -= 1
+      else
+        @selector += 1
+      end
+      @selector = [ @selector, 0 ].max
+      nil
     when ?\r
       true
     when "\x7f"
+      @selector = 0
       @answer.chop!
       nil
     when "\v"
+      @selector = 0
       @answer.clear
       nil
     when /\A[\x00-\x1f]\z/
       nil
     else
+      @selector = 0
       @answer << c
       nil
     end

data/lib/utils/version.rb

@@ -1,6 +1,6 @@
 module Utils
   # Utils version
-  VERSION         = '0.18.1'
+  VERSION         = '0.19.0'
   VERSION_ARRAY   = VERSION.split('.').map(&:to_i) # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:

data/utils.gemspec

@@ -1,9 +1,9 @@
 # -*- encoding: utf-8 -*-
-# stub: utils 0.18.1 ruby lib
+# stub: utils 0.19.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "utils".freeze
-  s.version = "0.18.1"
+  s.version = "0.19.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: utils
 version: !ruby/object:Gem::Version
-  version: 0.18.1
+  version: 0.19.0
 platform: ruby
 authors:
 - Florian Frank