utils 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3809eaf7bad02676dfb6af1ea42d81eccdb8c736844259c643d7c664f09deae4
-  data.tar.gz: ddbeb6bf9c0ef761f4178b214128450a5aab0f3f3410350d1f0221c0699c231a
+  metadata.gz: 30ee29850e1dd83ba2674daf3545174878b20425fe225e97e831b77ce6d161f5
+  data.tar.gz: d223fd2dde07b9610a59465a356df56e6043b8a71cd32aa3921ececd1c380227
 SHA512:
-  metadata.gz: 037bad1cf871c2f1eba57bc9b0206262105e6b481fd2de1fee7f18b5602cb283e3219ba5a254ec60f0dca3c54b2ac5d63e035a75c0cb910d42279ca4c2329749
-  data.tar.gz: c655f58309f4aca09eccfc35b440daed4d4e7de35b8300e530231e15dc896c90fe11dc027a34404b7ede8fefdd167cb795a91e27830dc628427fd2c8922d69d8
+  metadata.gz: 4a88f6dfd850e88ecae6881dc60e2d31ba6e88b700f455fedf5fe6a3d60ccad82d56c8461d0206d35e6f3369710d4a902922f0aa97bdde5404a0dcd9df0240ed
+  data.tar.gz: 7bd475966ada4a6a5f292d8a8af1c220c784e28a5c8b60dc10aa98e22dff62824eb37d1b8d46ef93ba4fe6f74015283167cf757213c330ab0f01b918f23a39a7

data/Rakefile

@@ -21,6 +21,7 @@ GemHadar do
   dependency  'pstree',         '~>0.1'
   dependency  'pry-editline'
   dependency  'infobar'
+  dependency   'mize'
 
   install_library do
     libdir = CONFIG["sitelibdir"]
@@ -39,6 +40,6 @@ GemHadar do
         install(file, bindir, :mode => 0755)
       end
     end
-    ENV['NO_GEMS'].to_i == 1 or sh 'gem install tins term-ansicolor pstree pry-editline infobar'
+    ENV['NO_GEMS'].to_i == 1 or sh 'gem install tins term-ansicolor pstree pry-editline infobar mize'
   end
 end

data/VERSION

@@ -1 +1 @@
-0.11.0
+0.12.0

data/bin/discover

@@ -5,7 +5,7 @@ include Utils
 require 'tins/xt'
 include Tins::GO
 
-def edit_files(paths, pick: false)
+def edit_files(*paths, pick: false, wait: true)
   editor = Utils::Editor.new
   if pick
     if paths.size > 1
@@ -17,14 +17,14 @@ def edit_files(paths, pick: false)
     end
     editor.edit(path.strip)
   else
-    editor.wait = true
+    editor.wait = wait
     editor.edit(*paths)
   end
 end
 
 def usage
   puts <<-EOT
-Usage: #{File.basename($0)} [OPTS] PATTERN [PATHS]
+Usage: #{File.basename($0)} [OPTS] [PATTERN] [PATHS]
 
 PATTERN is a pattern expression which is find the files. PATHS are the
 directory and file paths that are searched.
@@ -42,6 +42,7 @@ Options are
   -d          match also directories
   -v          be verbose
   -n NUMBER   the first NUMBER of matches is returned
+  -s          search by interactively inputting PATTERN
   -h          display this help
 
 Version is #{File.basename($0)} #{Utils::VERSION}.
@@ -49,7 +50,7 @@ Version is #{File.basename($0)} #{Utils::VERSION}.
   exit 1
 end
 
-args = go 'n:I:i:a:p:creEvdh'
+args = go 'n:I:i:a:p:creEvdsh'
 args[?h] and usage
 
 Term::ANSIColor.coloring = (STDIN.tty? && ENV['TERM'] !~ /dumb/) && !args[?c]
@@ -59,28 +60,57 @@ config.configure_from_paths
 args[?b] ||= config.discover.binary
 args[?n] ||= config.discover.max_matches
 
-pattern = ARGV.shift || ''
+if args[?s]
+  pattern = ''
+else
+  pattern = ARGV.shift || ''
+end
 roots = (ARGV.empty? ? [ Dir.pwd ] : ARGV).map { |f| File.expand_path(f) }
 
-finder = Finder.new(
-  :pattern => pattern,
-  :args    => args,
-  :roots   => roots,
-  :config  => config
-)
+finder = -> * {
+  Finder.new(
+    :pattern => pattern,
+    :args    => args,
+    :roots   => roots,
+    :config  => config
+  )
+}
 
 case
+when args[?s]
+  f = nil
+  pattern = pattern.dup
+  args[?n] = Term::ANSIColor.terminal_lines - 1
+  path = nil
+  found = Utils::InteractiveSearch.new(
+    query: -> answer {
+      pattern.replace answer
+      f = finder.()
+      f.search.output.join(?\n)
+    },
+    found: -> answer {
+      f and path = f.paths.first
+    },
+    output: STDERR
+  ).start
+  if found
+    if args[?e]
+      edit_files path, wait: false
+    else
+      found and puts path
+    end
+    exit 0
+  else
+    exit 1
+  end
+when args[?E]
+  edit_files *finder.().paths, pick: true
+when args[?e]
+  edit_files *finder.().search.paths
 when pattern.empty? && args[?r]
   exit
 when pattern.empty?
   usage
-when args[?E]
-  finder.search
-  edit_files finder.paths, pick: true
-when args[?e]
-  finder.search
-  edit_files finder.paths
 else
-  finder.search
-  puts finder.output
+  puts finder.().search.output
 end

data/bin/myex

@@ -21,12 +21,12 @@ Usage: #{File.basename($0)} list|create|truncate|insert|replace|search [OPTION]
 
     - truncate:   all tables or the given TABLES, if they exist.
 
-    - insert:     extract insert statemnts from the backup. If TABLES are given,
+    - insert:     extract insert statements from the backup. If TABLES are given,
                   extract only those statements for these TABLES.
       -t          if this OPTION is given, truncate the table, before starting
                   to insert.
 
-    - replace:    extract insert statemnts from the backup, and convert them
+    - replace:    extract insert statements from the backup, and convert them
                   into replace statements. If TABLES are given, extract only
                   those statements for these TABLES.
 

data/lib/utils.rb

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

data/lib/utils/finder.rb

@@ -3,6 +3,7 @@ require 'tins/xt'
 require 'tempfile'
 require 'digest/md5'
 require 'fileutils'
+require 'mize'
 
 class ::File
   include Utils::FileXt
@@ -76,6 +77,7 @@ class Utils::Finder
     paths
   end
 
+  memoize method:
   def load_paths
     lines = File.readlines(index_path)
     @args[?v] and warn "Loaded index #{index_path.inspect}."
@@ -90,6 +92,7 @@ class Utils::Finder
     path = index_path
     @args[?v] and warn "Resetting index #{path.inspect}."
     FileUtils.rm_f path
+    mize_cache_clear
   end
 
   def search_index
@@ -134,8 +137,8 @@ class Utils::Finder
     paths.compact!
     @paths, @output = paths.sort.transpose.values_at(-2, -1)
     if n = @args[?n]&.to_i
-      @paths = @paths.first(n)
-      @output = @output.first(n)
+      @paths = @paths&.first(n) || []
+      @output = @output&.first(n) || []
     end
     self
   end

data/lib/utils/interactive_search.rb

@@ -0,0 +1,55 @@
+require 'term/ansicolor'
+class Utils::InteractiveSearch
+  include Term::ANSIColor
+
+  def initialize(query:, found:, output: STDOUT, prompt: 'Search? %s')
+    @query  = query
+    @found  = found
+    @output = output
+    @prompt = prompt
+    @answer = ''
+  end
+
+  def start
+    @output.print clear_screen
+    loop do
+      @output.print move_home(@prompt % @answer)
+      case getc
+      when true
+        @output.print clear_screen move_home reset
+        return !!@found.(@answer)
+      when false
+        return false
+      end
+      result = @query.(@answer)
+      @output.print clear_screen
+      unless @answer.empty?
+        @output.print clear_screen move_to_line(2, result)
+      end
+    end
+  end
+
+  private
+
+  def getc
+    system 'stty raw -echo'
+    c = STDIN.getc
+    system 'stty cooked echo'
+    case c
+    when "\x03", "\e"
+      false
+    when ?\r
+      true
+    when "\x7f"
+      @answer.chop!
+      nil
+    when "\v"
+      @answer.clear
+    when /\A[\x00-\x1f]\z/
+      nil
+    else
+      @answer << c
+      nil
+    end
+  end
+end

data/lib/utils/version.rb

@@ -1,6 +1,6 @@
 module Utils
   # Utils version
-  VERSION         = '0.11.0'
+  VERSION         = '0.12.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,22 +1,22 @@
 # -*- encoding: utf-8 -*-
-# stub: utils 0.11.0 ruby lib
+# stub: utils 0.12.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "utils".freeze
-  s.version = "0.11.0"
+  s.version = "0.12.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 = "2018-10-31"
+  s.date = "2019-03-04"
   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, "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/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_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.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/interactive_search.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_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/interactive_search.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 = "2.7.7".freeze
+  s.rubygems_version = "3.0.2".freeze
   s.summary = "Some useful command line utilities".freeze
 
   if s.respond_to? :specification_version then
@@ -29,6 +29,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<pstree>.freeze, ["~> 0.1"])
       s.add_runtime_dependency(%q<pry-editline>.freeze, [">= 0"])
       s.add_runtime_dependency(%q<infobar>.freeze, [">= 0"])
+      s.add_runtime_dependency(%q<mize>.freeze, [">= 0"])
     else
       s.add_dependency(%q<gem_hadar>.freeze, ["~> 1.9.1"])
       s.add_dependency(%q<tins>.freeze, ["~> 1.14"])
@@ -36,6 +37,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<pstree>.freeze, ["~> 0.1"])
       s.add_dependency(%q<pry-editline>.freeze, [">= 0"])
       s.add_dependency(%q<infobar>.freeze, [">= 0"])
+      s.add_dependency(%q<mize>.freeze, [">= 0"])
     end
   else
     s.add_dependency(%q<gem_hadar>.freeze, ["~> 1.9.1"])
@@ -44,5 +46,6 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<pstree>.freeze, ["~> 0.1"])
     s.add_dependency(%q<pry-editline>.freeze, [">= 0"])
     s.add_dependency(%q<infobar>.freeze, [">= 0"])
+    s.add_dependency(%q<mize>.freeze, [">= 0"])
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: utils
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Florian Frank
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-31 00:00:00.000000000 Z
+date: 2019-03-04 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: mize
+  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:
@@ -144,6 +158,7 @@ extra_rdoc_files:
 - lib/utils/file_xt.rb
 - lib/utils/finder.rb
 - lib/utils/grepper.rb
+- lib/utils/interactive_search.rb
 - lib/utils/irb.rb
 - lib/utils/irb/service.rb
 - lib/utils/line_blamer.rb
@@ -205,6 +220,7 @@ files:
 - lib/utils/file_xt.rb
 - lib/utils/finder.rb
 - lib/utils/grepper.rb
+- lib/utils/interactive_search.rb
 - lib/utils/irb.rb
 - lib/utils/irb/service.rb
 - lib/utils/line_blamer.rb
@@ -238,8 +254,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Some useful command line utilities