utils 0.21.2 → 0.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: afb36522c028e7038dbc5fb7adfc0654a1943d8c8d57ae1e39ce5b4314dedc8c
-  data.tar.gz: 652cd7c050b83f151af992e665751ea2fb871614a33744afe89388ebb2b3ab46
+  metadata.gz: 582ba1bbb090afdc381a9ce6b7937c5c18292f890102813acc0b10407cf3a643
+  data.tar.gz: 6746c570c1a9d251da79d3baf2197d7cb13f0cd44f5e1b72562781136ba38ca2
 SHA512:
-  metadata.gz: 07eca4ba5ab9b9925a5fbbb7a84b5a72d909e0f000f88c1e4ef2f6ec0b69cc004321fd210a88bdd71b120379d7a150ec0490b4e171e9c56fa2be584131aa002e
-  data.tar.gz: aded8038db38b9bb0d600338a3cd6b46f8b763eebca818b98b6b7edd582497a3c50af905b721bcdf563556267a2418918d7681b8da64d4491a4b3b9de129b846
+  metadata.gz: 386432a84a0321caa92c764ff078279b951dcd2f4961795b503281bda54a4e6cf82f5a3056fc54c7b1c37c1b20759a5b95eb9f1c59cfe93b0658190b466bfe01
+  data.tar.gz: c510a9dc1d66a6b840d6741e7cda372c9f47f3ffdbe720a23fd77580442bba82719ac32744cb84f4da22fa12ece8cbbafbe4477038fdfca40291ac0b0d737ced

data/Rakefile

@@ -20,7 +20,8 @@ GemHadar do
   dependency  'term-ansicolor', '~>1.3'
   dependency  'pstree',         '~>0.3'
   dependency  'infobar'
-  dependency   'mize'
+  dependency  'mize'
+  dependency  'search_ui'
 
   install_library do
     libdir = CONFIG["sitelibdir"]

data/VERSION

@@ -1 +1 @@
-0.21.2
+0.22.0

data/bin/discover

@@ -4,6 +4,8 @@ require 'utils'
 include Utils
 require 'tins/xt'
 include Tins::GO
+require 'search_ui'
+include SearchUI
 
 def edit_files(*paths, pick: false, wait: true)
   editor = Utils::Editor.new
@@ -83,22 +85,28 @@ when args[?s]
   pattern = pattern.dup
   args[?n] = Term::ANSIColor.terminal_lines - 1
   path = nil
-  found = Utils::SearchUI.new(
-    query: -> answer, selector {
+  found = Search.new(
+    match: -> answer {
       pattern.replace answer
       f = finder.()
-      f.search.output.each_with_index.map { |l, i| (i == selector ? '> ' : '  ') + l }.join(?\n)
+      matches = f.search.output
+      matches.first(Tins::Terminal.lines - 1)
     },
-    found: -> answer, selector {
-      f and path = f.paths[selector]
+    query: -> _answer, matches, selector {
+      matches.each_with_index.map { |l, i| (i == selector ? '> ' : '  ') + l }.join(?\n)
+    },
+    found: -> _answer, matches, selector {
+      if f
+        path = f.paths[selector]
+      end
     },
     output: STDERR
   ).start
   if found
     if args[?e]
-      edit_files path, wait: false
+      edit_files found, wait: false
     else
-      found and puts path
+      found and puts found
     end
     exit 0
   else

data/lib/utils.rb

@@ -10,7 +10,6 @@ module Utils
   require 'utils/probe_server'
   require 'utils/ssh_tunnel_specification'
   require 'utils/line_blamer'
-  require 'utils/search_ui'
   begin
     require 'utils/line_formatter'
   rescue LoadError

data/lib/utils/version.rb

@@ -1,6 +1,6 @@
 module Utils
   # Utils version
-  VERSION         = '0.21.2'
+  VERSION         = '0.22.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,19 +1,19 @@
 # -*- encoding: utf-8 -*-
-# stub: utils 0.21.2 ruby lib
+# stub: utils 0.22.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "utils".freeze
-  s.version = "0.21.2"
+  s.version = "0.22.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Florian Frank".freeze]
-  s.date = "2020-02-06"
+  s.date = "2020-02-11"
   s.description = "This ruby gem provides some useful command line utilities".freeze
   s.email = "flori@ping.de".freeze
   s.executables = ["discover".freeze, "classify".freeze, "sedit".freeze, "irb_connect".freeze, "ascii7".freeze, "path".freeze, "enum".freeze, "unquarantine_apps".freeze, "ssh-tunnel".freeze, "xmp".freeze, "brakeman2err".freeze, "search".freeze, "chroot-exec".freeze, "edit".freeze, "tmproc".freeze, "json_check".freeze, "edit_wait".freeze, "errf".freeze, "untest".freeze, "blameline".freeze, "remote_copy".freeze, "git-empty".freeze, "create_cstags".freeze, "vacuum_firefox_sqlite".freeze, "same_files".freeze, "chroot-libs".freeze, "git-versions".freeze, "strip_spaces".freeze, "number_files".freeze, "rssr".freeze, "serve".freeze, "vcf2alias".freeze, "on_change".freeze, "utils-utilsrc".freeze, "myex".freeze, "long_lines".freeze, "dialog-pick".freeze, "probe".freeze, "create_tags".freeze]
-  s.extra_rdoc_files = ["README.md".freeze, "lib/utils.rb".freeze, "lib/utils/config_file.rb".freeze, "lib/utils/editor.rb".freeze, "lib/utils/file_xt.rb".freeze, "lib/utils/finder.rb".freeze, "lib/utils/grepper.rb".freeze, "lib/utils/irb.rb".freeze, "lib/utils/irb/service.rb".freeze, "lib/utils/line_blamer.rb".freeze, "lib/utils/line_formatter.rb".freeze, "lib/utils/md5.rb".freeze, "lib/utils/patterns.rb".freeze, "lib/utils/probe_server.rb".freeze, "lib/utils/search_ui.rb".freeze, "lib/utils/ssh_tunnel_specification.rb".freeze, "lib/utils/version.rb".freeze, "lib/utils/xt/source_location_extension.rb".freeze]
-  s.files = [".gitignore".freeze, "COPYING".freeze, "Gemfile".freeze, "README.md".freeze, "Rakefile".freeze, "VERSION".freeze, "bin/ascii7".freeze, "bin/blameline".freeze, "bin/brakeman2err".freeze, "bin/chroot-exec".freeze, "bin/chroot-libs".freeze, "bin/classify".freeze, "bin/create_cstags".freeze, "bin/create_tags".freeze, "bin/dialog-pick".freeze, "bin/discover".freeze, "bin/edit".freeze, "bin/edit_wait".freeze, "bin/enum".freeze, "bin/errf".freeze, "bin/git-empty".freeze, "bin/git-versions".freeze, "bin/irb_connect".freeze, "bin/json_check".freeze, "bin/long_lines".freeze, "bin/myex".freeze, "bin/number_files".freeze, "bin/on_change".freeze, "bin/path".freeze, "bin/probe".freeze, "bin/remote_copy".freeze, "bin/rssr".freeze, "bin/same_files".freeze, "bin/search".freeze, "bin/sedit".freeze, "bin/serve".freeze, "bin/ssh-tunnel".freeze, "bin/strip_spaces".freeze, "bin/tmproc".freeze, "bin/unquarantine_apps".freeze, "bin/untest".freeze, "bin/utils-utilsrc".freeze, "bin/vacuum_firefox_sqlite".freeze, "bin/vcf2alias".freeze, "bin/xmp".freeze, "lib/utils.rb".freeze, "lib/utils/config_file.rb".freeze, "lib/utils/editor.rb".freeze, "lib/utils/file_xt.rb".freeze, "lib/utils/finder.rb".freeze, "lib/utils/grepper.rb".freeze, "lib/utils/irb.rb".freeze, "lib/utils/irb/service.rb".freeze, "lib/utils/line_blamer.rb".freeze, "lib/utils/line_formatter.rb".freeze, "lib/utils/md5.rb".freeze, "lib/utils/patterns.rb".freeze, "lib/utils/probe_server.rb".freeze, "lib/utils/search_ui.rb".freeze, "lib/utils/ssh_tunnel_specification.rb".freeze, "lib/utils/version.rb".freeze, "lib/utils/xt/source_location_extension.rb".freeze, "utils.gemspec".freeze]
+  s.extra_rdoc_files = ["README.md".freeze, "lib/utils.rb".freeze, "lib/utils/config_file.rb".freeze, "lib/utils/editor.rb".freeze, "lib/utils/file_xt.rb".freeze, "lib/utils/finder.rb".freeze, "lib/utils/grepper.rb".freeze, "lib/utils/irb.rb".freeze, "lib/utils/irb/service.rb".freeze, "lib/utils/line_blamer.rb".freeze, "lib/utils/line_formatter.rb".freeze, "lib/utils/md5.rb".freeze, "lib/utils/patterns.rb".freeze, "lib/utils/probe_server.rb".freeze, "lib/utils/ssh_tunnel_specification.rb".freeze, "lib/utils/version.rb".freeze, "lib/utils/xt/source_location_extension.rb".freeze]
+  s.files = [".gitignore".freeze, "COPYING".freeze, "Gemfile".freeze, "README.md".freeze, "Rakefile".freeze, "VERSION".freeze, "bin/ascii7".freeze, "bin/blameline".freeze, "bin/brakeman2err".freeze, "bin/chroot-exec".freeze, "bin/chroot-libs".freeze, "bin/classify".freeze, "bin/create_cstags".freeze, "bin/create_tags".freeze, "bin/dialog-pick".freeze, "bin/discover".freeze, "bin/edit".freeze, "bin/edit_wait".freeze, "bin/enum".freeze, "bin/errf".freeze, "bin/git-empty".freeze, "bin/git-versions".freeze, "bin/irb_connect".freeze, "bin/json_check".freeze, "bin/long_lines".freeze, "bin/myex".freeze, "bin/number_files".freeze, "bin/on_change".freeze, "bin/path".freeze, "bin/probe".freeze, "bin/remote_copy".freeze, "bin/rssr".freeze, "bin/same_files".freeze, "bin/search".freeze, "bin/sedit".freeze, "bin/serve".freeze, "bin/ssh-tunnel".freeze, "bin/strip_spaces".freeze, "bin/tmproc".freeze, "bin/unquarantine_apps".freeze, "bin/untest".freeze, "bin/utils-utilsrc".freeze, "bin/vacuum_firefox_sqlite".freeze, "bin/vcf2alias".freeze, "bin/xmp".freeze, "lib/utils.rb".freeze, "lib/utils/config_file.rb".freeze, "lib/utils/editor.rb".freeze, "lib/utils/file_xt.rb".freeze, "lib/utils/finder.rb".freeze, "lib/utils/grepper.rb".freeze, "lib/utils/irb.rb".freeze, "lib/utils/irb/service.rb".freeze, "lib/utils/line_blamer.rb".freeze, "lib/utils/line_formatter.rb".freeze, "lib/utils/md5.rb".freeze, "lib/utils/patterns.rb".freeze, "lib/utils/probe_server.rb".freeze, "lib/utils/ssh_tunnel_specification.rb".freeze, "lib/utils/version.rb".freeze, "lib/utils/xt/source_location_extension.rb".freeze, "utils.gemspec".freeze]
   s.homepage = "http://github.com/flori/utils".freeze
   s.rdoc_options = ["--title".freeze, "Utils - Some useful command line utilities".freeze, "--main".freeze, "README.md".freeze]
   s.rubygems_version = "3.1.2".freeze
@@ -30,6 +30,7 @@ Gem::Specification.new do |s|
     s.add_runtime_dependency(%q<pstree>.freeze, ["~> 0.3"])
     s.add_runtime_dependency(%q<infobar>.freeze, [">= 0"])
     s.add_runtime_dependency(%q<mize>.freeze, [">= 0"])
+    s.add_runtime_dependency(%q<search_ui>.freeze, [">= 0"])
   else
     s.add_dependency(%q<gem_hadar>.freeze, ["~> 1.11.0"])
     s.add_dependency(%q<tins>.freeze, ["~> 1.14"])
@@ -37,5 +38,6 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<pstree>.freeze, ["~> 0.3"])
     s.add_dependency(%q<infobar>.freeze, [">= 0"])
     s.add_dependency(%q<mize>.freeze, [">= 0"])
+    s.add_dependency(%q<search_ui>.freeze, [">= 0"])
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: utils
 version: !ruby/object:Gem::Version
-  version: 0.21.2
+  version: 0.22.0
 platform: ruby
 authors:
 - Florian Frank
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-06 00:00:00.000000000 Z
+date: 2020-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: search_ui
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: This ruby gem provides some useful command line utilities
 email: flori@ping.de
 executables:
@@ -152,7 +166,6 @@ extra_rdoc_files:
 - lib/utils/md5.rb
 - lib/utils/patterns.rb
 - lib/utils/probe_server.rb
-- lib/utils/search_ui.rb
 - lib/utils/ssh_tunnel_specification.rb
 - lib/utils/version.rb
 - lib/utils/xt/source_location_extension.rb
@@ -215,7 +228,6 @@ files:
 - lib/utils/md5.rb
 - lib/utils/patterns.rb
 - lib/utils/probe_server.rb
-- lib/utils/search_ui.rb
 - lib/utils/ssh_tunnel_specification.rb
 - lib/utils/version.rb
 - lib/utils/xt/source_location_extension.rb

data/lib/utils/search_ui.rb

@@ -1,75 +0,0 @@
-require 'term/ansicolor'
-
-class Utils::SearchUI
-  include Term::ANSIColor
-
-  def initialize(query:, found:, output: STDOUT, prompt: 'Search? %s')
-    @selector = 0
-    @query  = query
-    @found  = found
-    @output = output
-    @prompt = prompt
-    @answer = ''
-  end
-
-  def start
-    @output.print clear_screen, move_home, reset
-    loop do
-      @output.print move_home { @prompt % @answer }
-      case getc
-      when true
-        @output.print clear_screen, move_home, reset
-        if result = @found.(@answer, @selector)
-          return result
-        else
-          return nil
-        end
-      when false
-        return nil
-      end
-      result = @query.(@answer, @selector)
-      @output.print clear_screen
-      unless @answer.empty?
-        @output.print move_home { ?\n + result }
-      end
-    end
-  end
-
-  private
-
-  def getc
-    system 'stty raw -echo'
-    c = STDIN.getc
-    system 'stty cooked echo'
-    case c
-    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
-  end
-end