utils 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f866a94b2e6d4f176cb526c5ba15e7721f2cdf48
-  data.tar.gz: 7e3e202ebb2c42ef0f66fa803cf6f772bf39588c
+  metadata.gz: '0168640de88ac768d044217a1e65492ca4a8141c'
+  data.tar.gz: 4690e0a0a58b371c5ecc1efef47547da07af73f8
 SHA512:
-  metadata.gz: 625a650bcdda5ed20739478be0b423022e7956582d643c5310c08600505ad451f787830c55b3d2ad67a1966c668277e09740a77a152cf15f0563d89f6e955837
-  data.tar.gz: 02e4866d3c84fb13880deff73a8bcb6a531dd7913eddb20ea88d37ae392a869610d2d7e0d11dd967b0f4df49b900c2c449f39a39247d6e79f96f45515a171eb2
+  metadata.gz: 91b790e9449ba425ebd05a2d2bd41ce7c9ee696d9d352889561c6c9f47d5bc8f12ed5833ef17a5e7b9743ee8c3a6ee59bc80807d9e9a8a959d6a57989a21a89e
+  data.tar.gz: 9830a6c2fc92b191292e304d62125b64c723cd33947af282d2eb74185531af73a9ef58941d2e0a803873b40da4edf1f8d0fd55d46aeab44ba8fd6f7c2ce8b24b

data/.gitignore

@@ -2,6 +2,7 @@
 .AppleDouble
 .DS_Store
 .bundle
+.byebug_history
 .rvmrc
 Gemfile.lock
 pkg

data/Gemfile

@@ -3,3 +3,4 @@
 source 'https://rubygems.org'
 
 gemspec
+gem 'byebug', platform: :mri

data/Rakefile

@@ -13,13 +13,14 @@ GemHadar do
   executables Dir['bin/*'].map(&File.method(:basename))
   test_dir    'tests'
   ignore      '.*.sw[pon]', 'pkg', 'Gemfile.lock', '.rvmrc', '.AppleDouble',
-    'tags', '.bundle', '.DS_Store'
+    'tags', '.bundle', '.DS_Store', '.byebug_history'
   readme      'README.md'
 
-  dependency  'tins',           '~>1.8'
+  dependency  'tins',           '~>1.14'
   dependency  'term-ansicolor', '~>1.3'
   dependency  'pstree',         '~>0.1'
   dependency  'pry-editline'
+  dependency  'infobar'
 
   install_library do
     libdir = CONFIG["sitelibdir"]
@@ -38,6 +39,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'
+    ENV['NO_GEMS'].to_i == 1 or sh 'gem install tins term-ansicolor pstree pry-editline infobar'
   end
 end

data/VERSION

@@ -1 +1 @@
-0.9.0
+0.10.0

data/bin/brakeman2err

@@ -1,23 +1,33 @@
 #!/usr/bin/env ruby
 
+require 'utils'
 require 'json'
 require 'tins/xt'
 require 'tins/go'
 include Tins::GO
+require 'infobar'
 
-opts = go 'c'
+opts = go 'ce'
 if opts[?c]
   brakeman = `bundle exec which brakeman`.full? or fail "cannot find brakeman in path"
-  system *%w'bundle exec brakeman -q -s brakeman_ignore --url-safe-methods brakeman_ignore -o .brakeman.json' or fail "calling brakeman failed"
-end
-results = JSON File.read('.brakeman.json'), object_class: JSON::GenericObject
-puts "Found #{results.errors.size} errors and #{results.warnings.size} warnings.",
-  "_" * 80
-for error in results.errors
-  puts error.location, "Error #{error.error.inspect}"
-end
-for warning in results.warnings
-  puts "#{warning.file}:#{warning.line}",
-    "#{warning.warning_type} (#{warning.confidence}) #{warning.message.inspect}",
-    warning.code, "See: #{warning.link}"
+  Infobar.busy(label: 'Computing brakeman results') do
+    system 'bundle exec brakeman -q -i config/brakeman.yml -o .brakeman.json 2>/dev/null' or fail "calling brakeman failed"
+  end
+else
+  results = JSON File.read('.brakeman.json'), object_class: JSON::GenericObject
+  if opts[?e]
+    puts "Found #{results.errors.size} errors and #{results.warnings.size} warnings.",
+      "_" * 80
+      for error in results.errors
+        puts error.location, "Error #{error.error.inspect}"
+      end
+  else
+    puts "Found #{results.warnings.size} warnings.", "_" * 80
+  end
+  for warning in results.warnings
+    puts "#{warning.file}:#{warning.line}",
+      "#{warning.warning_type} (#{warning.confidence}) #{warning.message.inspect}",
+      warning.code, "See: #{warning.link}"
+  end
+
 end

data/bin/create_tags

@@ -1,8 +1,10 @@
 #!/usr/bin/env ruby
 
+require 'infobar'
+
 paths = %w[ . ] + `bundle list --paths`.lines.map(&:chomp)
 cmd = %w[ ctags --recurse=yes --languages=Ruby,C ] + paths
-$DEBUG and warn "Executing #{cmd * ' '}."
-system *cmd
-megabytes = File.size('tags').to_f / 1024 ** 2 rescue nil
-megabytes and warn 'Created %.3fM of tags.' % megabytes
+Infobar.busy(label: 'Creating tags') { system *cmd }
+if megabytes = File.size('tags').to_f / 1024 ** 2 rescue nil
+  infobar.puts 'Created %.3fM of tags.' % megabytes
+end

data/bin/discover

@@ -31,14 +31,17 @@ directory and file paths that are searched.
 
 Options are
 
-  -r          interpret PATTERN argument as regex not fuzzy
+  -pX         interpret PATTERN argument as X=r for regexp or X=f for fuzzy
+  -r          reset the search index
   -c          disable color output
   -e          open the matching files with edit command
   -E          pick one file to edit
   -a CSET     use only character set CSET from PATTERN
+  -iX         use case insensitive matches with X=y (default) or not with X=n
   -I SUFFIX   only include files with suffix SUFFIX during finding
-  -b          match also binary files
+  -d          match also directories
   -v          be verbose
+  -n NUMBER   the first NUMBER of matches is returned
   -h          display this help
 
 Version is #{File.basename($0)} #{Utils::VERSION}.
@@ -46,28 +49,37 @@ Version is #{File.basename($0)} #{Utils::VERSION}.
   exit 1
 end
 
-args = go 'I:a:rceEbvh'
+args = go 'n:I:i:a:p:creEvdh'
 args[?h] and usage
-pattern = ARGV.shift or usage
-roots = (ARGV.empty? ? [ Dir.pwd ] : ARGV).map { |f| File.expand_path(f) }
 
 Term::ANSIColor.coloring = (STDIN.tty? && ENV['TERM'] !~ /dumb/) && !args[?c]
 STDOUT.sync = true
 config = Utils::ConfigFile.new
 config.configure_from_paths
 args[?b] ||= config.discover.binary
+
+pattern = ARGV.shift || ''
+roots = (ARGV.empty? ? [ Dir.pwd ] : ARGV).map { |f| File.expand_path(f) }
+
 finder = Finder.new(
   :pattern => pattern,
   :args    => args,
   :roots   => roots,
   :config  => config
-).search
+)
 
 case
+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
-  puts finder.paths
+  finder.search
+  puts finder.output
 end

data/bin/edit

@@ -22,6 +22,7 @@ Options are
   -C COMMAND     send visual command to the current running editor
   -p DURATION    pause for this many seconds to wait for vim's reaction
   -S SERVER      specify the server for this edit command
+  -l             list current vim servers
   -h             display this help
 
 Version is #{File.basename($0)} #{Utils::VERSION}.
@@ -29,7 +30,7 @@ Version is #{File.basename($0)} #{Utils::VERSION}.
   exit 1
 end
 
-$opt = go 'p:S:c:g:wsmh'
+$opt = go 'p:S:c:g:wsmlh'
 $opt[?h] and usage
 
 config = Utils::ConfigFile.new
@@ -42,7 +43,10 @@ editor = Editor.new do |c|
   c.mkdir = $opt[?m]
 end
 
-if $opt[?s]
+if $opt[?l]
+  puts editor.serverlist
+  exit 0
+elsif $opt[?s]
   begin
     until STDIN.eof?
       line = STDIN.gets

data/bin/myex

@@ -1,31 +1,40 @@
 #!/usr/bin/env ruby
+## vim: set ft=ruby et sw=2 ts=2:
 # encoding: ascii-8bit
 
 require 'tins/go'
 include Tins::GO
+require 'term/ansicolor'
+include Term::ANSIColor
 
 def usage
   puts <<EOT
-Usage: #{File.basename($0)} list|create|truncate|insert|replace [OPTION] [TABLES]
+Usage: #{File.basename($0)} list|create|truncate|insert|replace|search [OPTION] [TABLES]
 
   Commands are
-    - list:     display all tables in the backup
+    - list:       display all tables in the backup
 
-    - create:   display all create table statements in the backup. If TABLES
-                are given, display only those statements.
-      -d        if this OPTION is given, first drop the table (if it exists)
-                before creation.
+    - create:     display all create table statements in the backup. If TABLES
+                  are given, display only those statements.
+      -d          if this OPTION is given, first drop the table (if it exists)
+                  before creation.
 
-    - truncate: all tables or the given TABLES, if they exist.
+    - truncate:   all tables or the given TABLES, if they exist.
 
-    - insert:   extract insert statemnts 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.
+    - insert:     extract insert statemnts 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
-                into replace statements. If TABLES are given, extract only
-                those statements for these TABLES.
+    - replace:    extract insert statemnts from the backup, and convert them
+                  into replace statements. If TABLES are given, extract only
+                  those statements for these TABLES.
+
+    - search:     search the insert statements from the backup matching the
+                  pattern given with the -p option and output them in a context
+                  of the size (as number of characters) given via the -C option.
+      -p PATTERN the pattern to match.
+      -C NUMBER  the NUMBER of characters for the context.
 EOT
   exit 1
 end
@@ -38,7 +47,7 @@ def bell(n = 1, s = 1)
 end
 
 cmd = ARGV.shift or usage
-opts = go('dtDi')
+opts = go('dtDiC:p:')
 
 STDOUT.sync = true
 STDIN.set_encoding 'ascii-8bit'
@@ -89,6 +98,20 @@ when 'replace'
     puts stmt.sub(/^INSERT INTO `(?:[^`]+)`/, "REPLACE INTO `#{table}`")
     warn "Replaced into table #{table}."
   end
+when 'search'
+  pattern = opts[?p] or usage
+  c = (opts[?C] || 20).to_i
+  STDIN.each_line do |l|
+    if l =~ /^INSERT INTO `(#{ARGV.empty? ? '[^`]+' : ARGV * '|'})`.*?(#{pattern})/
+      table   = $1
+      match   = $2
+      context = l[ [ $~.begin(2) - c, 0 ].max..($~.end(2) + c) ]
+      context.sub!(match, bold(match))
+      table.encode!('UTF-8', undef: :replace, invalid: :replace)
+      context.encode!('UTF-8', undef: :replace, invalid: :replace)
+      puts "#{table}: …#{context}…"
+    end
+  end
 else
   usage
 end

data/bin/probe

@@ -28,6 +28,9 @@ Version is #{File.basename($0)} #{Utils::VERSION}.
 end
 
 def cmd(*args)
+  if ENV.key?('BUNDLE_GEMFILE')
+    args.unshift 'bundle', 'exec'
+  end
   puts args * ' '
   system(*args) or exit $?.exitstatus
 end
@@ -37,13 +40,6 @@ def find_cmd(*cmds)
     raise fail "no #{cmds * '|'} command found"
 end
 
-def zeus?
-  !`which zeus`.empty? && test(?S, '.zeus.sock')
-end
-singleton_class.class_eval do
-  memoize_function :zeus?
-end
-
 def spring?
   `bin/spring status`.lines.first =~ /^Spring is running:/
 rescue Errno::ENOENT
@@ -58,9 +54,6 @@ def start_server
   spring? and
     puts "Found spring running, I'll try to use it for running tests."
 
-  zeus? and
-    puts "Found a zeus socket file, I'll try to use it for running tests."
-
   begin
     DRb.start_service
     DRbObject.new_with_uri($uri).shutdown
@@ -121,33 +114,22 @@ case ($opts[?t] || $config.probe.test_framework).to_sym
 when :rspec
   case
   when spring?
-    rspec = %w[bin/spring rspec -rutils -f Utils::LineFormatter ]
-  when zeus?
-    rspec = %w[-S zeus rspec -rutils -f Utils::LineFormatter ]
+    rspec = %w[ bin/spring rspec ]
   else
-    rspec = [ find_cmd('rspec', 'spec') ] << '-rutils' << '-f' <<
-      'Utils::LineFormatter'
+    rspec = [ find_cmd('rspec', 'spec') ]
   end
-  if linenumber = $opts[?n]
-    cmd 'ruby', '-I', $config.probe.include_dirs_argument, *rspec, '-l',
-      linenumber, *($args + testrunner_args)
-  else
-    $args = $args.map do |a|
-      if Utils::Editor::FILE_LINENUMBER_REGEXP =~ a
-        $~.captures * ':'
-      else
-        a
-      end
+  rspec << '-rutils' << '-f' << 'Utils::LineFormatter'
+  $args = $args.map do |a|
+    if Utils::Editor::FILE_LINENUMBER_REGEXP =~ a
+      $~.captures.compact * ':'
+    else
+      a
     end
-    cmd 'ruby', '-I', $config.probe.include_dirs_argument, *rspec,
-      *($args + testrunner_args)
   end
+  cmd 'ruby', '-I', $config.probe.include_dirs_argument, *rspec,
+    *($args + testrunner_args)
 when :'test-unit'
-  if zeus?
-    testrb = %w[-S zeus testrb]
-  else
-    testrb = find_cmd('testrb')
-  end
+  testrb = find_cmd('testrb')
   if testname = $opts[?n]
     cmd 'ruby', '-I', $config.probe.include_dirs_argument, *testrb,
       '-n', testname, *($args + testrunner_args)
@@ -176,7 +158,7 @@ when :cucumber
   else
     $args = $args.map do |a|
       if Utils::Editor::FILE_LINENUMBER_REGEXP =~ a
-        $~.captures * ':'
+        $~.captures.compact * ':'
       else
         a
       end

data/bin/search

@@ -109,18 +109,18 @@ the files. PATHS are the directory and file paths that are searched.
 Options are
 
   -n PATTERN  only search files whose names match fuzzy PATTERN
-  -N PATTERN  only search files whose names match regex PATTERN
+  -N PATTERN  only search files whose names match regexp PATTERN
   -s PATTERN  skip lines that match fuzzy PATTERN
-  -S PATTERN  skip lines that match regex PATTERN
+  -S PATTERN  skip lines that match regexp PATTERN
   -A NUMBER   displays NUMBER lines of context after the match
   -B NUMBER   displays NUMBER lines of context before the match
   -C NUMBER   displays NUMBER lines of context around the match
   -f          just list the paths of the files that would be searched
   -l          just list the paths of the files with matches
   -L          list only the path:linenumber of the files with matches
-  -R          interpret PATTERN argument as fuzzy not regex
+  -pX         interpret PATTERN argument as X=f fuzzy or X=r for regexp
   -c          disable color output
-  -i          use case insensitive matches
+  -iX         use case insensitive matches with X=y (default) or not with X=n
   -I SUFFIX   only include files with suffix SUFFIX in search
   -e          open the matching files with edit command
   -E          pick one file to edit
@@ -136,7 +136,7 @@ Version is #{File.basename($0)} #{Utils::VERSION}.
   exit 1
 end
 
-args = go 'r:I:A:B:C:s:S:n:N:a:RciflLeEvbgh'
+args = go 'r:p:I:A:B:C:s:S:n:N:a:i:cflLeEvbgh'
 args[?h] and usage
 pattern = ARGV.shift or usage
 roots = (ARGV.empty? ? [ Dir.pwd ] : ARGV).map { |f| File.expand_path(f) }

data/bin/strip_spaces

@@ -37,7 +37,7 @@ unless ARGV.empty?
   paths = ARGV.map { |p| File.expand_path(p) }
 end
 
-suffix = args[?I].ask_and_send(:split, /[\s,]+/).to_a
+suffix = Array(args[?I])
 
 config = Utils::ConfigFile.new
 config.configure_from_paths

data/bin/tmproc

@@ -0,0 +1,21 @@
+#!/usr/bin/env ruby
+
+require 'yaml'
+require 'tins'
+
+filename = ARGV.shift || 'Procfile'
+procfile = YAML.load_file(filename)
+
+unless ENV['TMUX']
+  name = File.basename(Dir.pwd)
+  exec 'tmux', 'new-session', '-s', name, '-n', ?s, '-A', $0, filename
+end
+
+tmux_pane = ENV.fetch('TMUX_PANE')
+lines     = Tins::Terminal.lines
+
+procfile.each_value do |process|
+  system "(tmux select-pane -t #{tmux_pane} \\; split-window -l #{lines / procfile.size} #{process}) &"
+end
+
+exec 'tmux', 'new-window', '-n', 'e', 'edit', ?;, 'split-window', '-h', 'bundle', 'exec', 'probe', '-l'

data/bin/vcf2alias

@@ -0,0 +1,46 @@
+#!/usr/bin/env ruby
+#
+require 'tins/xt'
+require 'set'
+
+$shortcuts = Set.new
+
+def shortcut(fn, suffix = nil)
+  shortcut = fn.scan(/([A-ZÄÖÜ])[a-zäöü]/).join.downcase
+  shortcut.empty? and return fn.gsub(' ', ?_)
+  shortcut = "#{shortcut}#{suffix}"
+  while $shortcuts.member?(shortcut)
+    shortcut.sub!(/(\d+)\z/) { $1.to_i + 1 }
+    shortcut.sub!(/\D\z/, '\\&1')
+  end
+  $shortcuts << shortcut
+  shortcut
+end
+
+vcf_path = ARGV.shift || '~/Desktop/Contacts.vcf'
+vcf_path = File.expand_path vcf_path
+alias_path = ARGV.shift || '~/.muttrc-aliases'
+alias_path = File.expand_path alias_path
+begin
+  real_alias_path = File.readlink alias_path
+  alias_path = real_alias_path
+rescue Errno::ENOENT
+end
+
+File.secure_write(alias_path) do |aliases|
+  File.open(vcf_path) do |vcf|
+    until vcf.eof?
+      card = vcf.readline('END:VCARD')
+      fn = card[/^FN:(.*)/, 1] or next
+      fn.chomp!
+      hemail = card[/^EMAIL;.*?type=HOME.*?:(.*)/, 1]
+      hemail and aliases.puts "alias #{shortcut(fn, ?h)} #{fn} <#{hemail.chomp}>"
+      wemail = card[/^EMAIL;.*?type=WORK.*?:(.*)/, 1]
+      wemail and aliases.puts "alias #{shortcut(fn, ?w)} #{fn} <#{wemail.chomp}>"
+      email = card[/^EMAIL;.*?:(.*)/, 1]
+      if email && ! [ hemail, wemail ].include?(email)
+        aliases.puts "alias #{shortcut(fn)} #{fn} <#{email.chomp}>"
+      end
+    end
+  end
+end

data/lib/utils/editor.rb

@@ -73,10 +73,15 @@ module Utils
     end
 
     def edit(*filenames)
+      source_location = nil
       if filenames.size == 1 and
         source_location = filenames.first.source_location
       then
-        edit_source_location(source_location) # || edit_file(expand_globs(source_location[0, 1]))
+        if source_location.respond_to?(:filename) and source_location.respond_to?(:linenumber)
+          edit_source_location(source_location)
+        else
+          edit_file_linenumber(*source_location)
+        end
       elsif source_locations = filenames.map(&:source_location).compact.full?
         filenames = expand_globs(source_locations.map(&:first))
         edit_file(*filenames)
@@ -99,8 +104,16 @@ module Utils
       edit_remote_file(*filenames)
     end
 
-    def edit_file_linenumber(filename, linenumber)
+    def edit_file_linenumber(filename, linenumber, rangeend = nil)
       make_dirs filename
+      if rangeend
+        Thread.new do
+          while !started?
+            sleep 1
+          end
+          edit_remote_send("<ESC>:normal #{linenumber}GV#{rangeend}G<CR>")
+        end
+      end
       if wait?
         edit_remote_wait("+#{linenumber}", filename)
       else
@@ -109,7 +122,11 @@ module Utils
     end
 
     def edit_source_location(source_location)
-      edit_file_linenumber(source_location[0], source_location[1])
+      edit_file_linenumber(
+        source_location.filename,
+        source_location.linenumber,
+        source_location.rangeend
+      )
     end
 
     def start
@@ -140,7 +157,7 @@ module Utils
     end
 
     def serverlist
-      @serverlist ||= `#{vim.map(&:inspect) * ' '} --serverlist`.split
+      `#{vim.map(&:inspect) * ' '} --serverlist`.split
     end
 
     def started?(name = servername)

data/lib/utils/finder.rb

@@ -1,5 +1,8 @@
 require 'term/ansicolor'
 require 'tins/xt'
+require 'tempfile'
+require 'digest/md5'
+require 'fileutils'
 
 class ::File
   include Utils::FileXt
@@ -16,81 +19,124 @@ class Utils::Finder
     @config = opts[:config] || Utils::ConfigFile.new
     pattern_opts = opts.subhash(:pattern) | {
       :cset  => @args[?a],
-      :icase => @args.fetch('i', true),
+      :icase => @args[?i] != ?n,
     }
-    @binary = @args[?b]
-    @pattern = @args[?r] ?
-      RegexpPattern.new(pattern_opts) :
-      FuzzyPattern.new(pattern_opts)
+    @pattern = choose(@args[?p], pattern_opts)
     @paths  = []
+    @args[?r] and reset_index
   end
 
   attr_reader :paths
 
   attr_reader :output
 
-  def ascii_file?(stat, path)
-    stat.file? && (@binary || stat.size == 0 || File.ascii?(path))
+  def search_index
+    paths = load_paths
+    search_paths(paths)
   end
 
-  def attempt_match?(path)
-    stat = path.stat
-    stat.symlink? and stat = path.lstat
-    stat.directory? || ascii_file?(stat, path)
-  rescue SystemCallError => e
-    warn "Caught #{e.class}: #{e}"
-    nil
-  end
+  alias search search_index
 
-  def search
+  def build_paths
     paths = []
-    suffixes = @args[?I].ask_and_send(:split, /[\s,]+/).to_a
-    find(*(@roots + [ { :suffix => suffixes } ])) do |filename|
-      begin
-        bn, s = filename.pathname.basename, filename.stat
-        if !s || s.directory? && @config.discover.prune?(bn)
-          @args[?v] and warn "Pruning #{filename.inspect}."
-          prune
-        end
-        if s.file? && @config.discover.skip?(bn)
-          @args[?v] and warn "Skipping #{filename.inspect}."
-          next
-        end
-        paths << filename
+    visit = -> filename {
+      s  = filename.stat
+      bn = filename.pathname.basename
+      if !s ||
+          s.directory? && @config.discover.prune?(bn) ||
+          s.file? && @config.discover.skip?(bn)
+      then
+        @args[?v] and warn "Pruning #{filename.inspect}."
+        prune
       end
+      true
+    }
+    find(*@roots, visit: visit) do |filename|
+      filename.stat.directory? and filename << ?/
+      paths << filename
     end
     paths.uniq!
-    paths.map! { |p| a = File.split(p) ; a.unshift(p) ; a }
-    paths = paths.map! do |path, dir, file|
-      if do_match = attempt_match?(path) and @args[?v]
-        warn "Attempt match of #{path.inspect}"
-      end
-      if do_match and match = @pattern.match(path)
+    paths
+  end
+
+  def index_path
+    roots = @roots.map { |r| File.expand_path(r) }.uniq.sort
+    filename = "finder-paths-" +
+      Digest::MD5.new.update(roots.inspect).hexdigest
+    dirname = File.join(Dir.tmpdir, File.basename($0))
+    FileUtils.mkdir_p dirname
+    File.join(dirname, filename)
+  end
+
+  def create_paths
+    paths = build_paths
+    File.secure_write(index_path) do |output|
+      output.puts paths
+    end
+    paths
+  end
+
+  def load_paths
+    lines = File.readlines(index_path)
+    @args[?v] and warn "Loaded index #{index_path.inspect}."
+    lines.empty? and raise Errno::ENOENT
+    @args[?d] or lines = lines.grep_v(%r{/$})
+    lines.map(&:chomp!)
+  rescue Errno::ENOENT
+    return create_paths
+  end
+
+  def reset_index
+    path = index_path
+    @args[?v] and warn "Resetting index #{path.inspect}."
+    FileUtils.rm_f path
+  end
+
+  def search_index
+    search_paths load_paths
+  end
+
+  def search_directly
+    search_paths build_paths
+  end
+
+  def search_paths(paths)
+    suffixes = Array(@args[?I])
+    suffixes.full? do |s|
+      paths.select! { |path| s.include?(File.extname(path)[1..-1]) }
+    end
+    paths = paths.map! do |path|
+      if match = @pattern.match(path)
         if FuzzyPattern === @pattern
           current = 0
-          marked_file = ''
-          score, e = 0, 0
-          for i in 1...(match.size)
+          marked_path = ''
+          score, e = path.size, nil
+          for i in 1...match.size
             match[i] or next
             b = match.begin(i)
-            marked_file << path[current...b]
-            marked_file << red(path[b, 1])
-            score += (b - e)
+            e ||= b
+            marked_path << path[current...b]
+            marked_path << red(path[b, 1])
+            score += (b - e) * (path.size - b)
             e = match.end(i)
             current = b + 1
           end
-          marked_file << match.post_match
-          [ score, file.size, path, File.join(dir, marked_file) ]
+          marked_path << match.post_match
+          [ score, path, marked_path ]
         else
-          marked_file = path[0...match.begin(0)] <<
+          marked_path = path[0...match.begin(0)] <<
             red(path[match.begin(0)...match.end(0)]) <<
             path[match.end(0)..-1]
-          [ 0, file.size, path, File.join(dir, marked_file) ]
+          [ 0, path, marked_path ]
         end
       end
     end
     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)
+    end
     self
   end
 

data/lib/utils/grepper.rb

@@ -43,11 +43,9 @@ class Utils::Grepper
     @paths  = []
     pattern_opts = opts.subhash(:pattern) | {
       :cset  => @args[?a],
-      :icase => @args[?i],
+      :icase => @args[?i] != ?n,
     }
-    @pattern = @args[?R] ?
-      FuzzyPattern.new(pattern_opts) :
-      RegexpPattern.new(pattern_opts)
+    @pattern = choose(@args[?p], pattern_opts, default: ?r)
     @name_pattern =
       if name_pattern = @args[?N]
         RegexpPattern.new(:pattern => name_pattern)
@@ -156,8 +154,23 @@ class Utils::Grepper
   end
 
   def search
-    suffixes = @args[?I].ask_and_send(:split, /[\s,]+/).to_a
-    find(*(@roots + [ { :suffix => suffixes } ])) do |filename|
+    suffixes = Array(@args[?I])
+    visit = -> filename {
+      s  = filename.stat
+      bn = filename.pathname.basename
+      if !s ||
+          s.directory? && @config.search.prune?(bn) ||
+          s.file? && @config.search.skip?(bn)
+      then
+        @args[?v] and warn "Pruning #{filename.inspect}."
+        prune
+      elsif suffixes.empty?
+        true
+      else
+        suffixes.include?(filename.suffix)
+      end
+    }
+    find(*@roots, visit: visit) do |filename|
       match(filename)
     end
     @paths = @paths.sort_by(&:source_location)

data/lib/utils/patterns.rb

@@ -19,9 +19,9 @@ module Utils
     end
 
     class FuzzyPattern < Pattern
-      def initialize(opts ={})
+      def initialize(opts = {})
         super
-        r = @pattern.split(//).grep(/[0-9a-z]/).map { |x|
+        r = @pattern.split(//).grep(/[[:print:]]/).map { |x|
           "(#{Regexp.quote(x)})"
         } * '.*?'
         @matcher = Regexp.new(
@@ -36,5 +36,16 @@ module Utils
         @matcher = Regexp.new(@pattern, @icase ? Regexp::IGNORECASE : 0)
       end
     end
+
+    def choose(argument, pattern_opts, default: ?f)
+      case argument
+      when /^r/, (default == ?r ? nil : :not)
+        RegexpPattern.new(pattern_opts)
+      when /^f/, (default == ?f ? nil : :not)
+        FuzzyPattern.new(pattern_opts)
+      else
+        raise ArgumentError, 'argument -p has to be f=fuzzy or r=regexp'
+      end
+    end
   end
 end

data/lib/utils/version.rb

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

data/lib/utils/xt/source_location_extension.rb

@@ -7,17 +7,19 @@ module Utils
 
       CLASS_METHOD_REGEXP    = /\A([A-Z][\w:]+)([#.])([\w!?]+)/
 
-      FILE_LINENUMBER_REGEXP = /\A\s*([^:]+):(\d+)/
+      FILE_LINENUMBER_REGEXP = /\A\s*([^:]+):(\d+)-?(\d+)?/
 
       def source_location
         filename   = nil
         linenumber = nil
+        rangeend   = nil
         if respond_to?(:to_str)
           string = to_str
           case
           when string =~ FILE_LINENUMBER_REGEXP && File.exist?($1)
-            filename = $1
+            filename   = $1
             linenumber = $2.to_i
+            rangeend   = $3&.to_i
           when string =~ CLASS_METHOD_REGEXP && !File.exist?(string)
             klassname   = $1
             method_kind = $2 == '#' ? :instance_method : :method
@@ -35,7 +37,9 @@ module Utils
         array_singleton_class.instance_eval do
           define_method(:filename) { filename }
           define_method(:linenumber) { linenumber }
+          define_method(:rangeend) { rangeend }
           define_method(:to_s) { [ filename, linenumber ].compact * ':' }
+          define_method(:range) { rangeend ? "#{to_s}-#{rangeend}" : "#{to_s}" }
         end
         array
       end

data/utils.gemspec

@@ -1,22 +1,22 @@
 # -*- encoding: utf-8 -*-
-# stub: utils 0.9.0 ruby lib
+# stub: utils 0.10.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "utils".freeze
-  s.version = "0.9.0"
+  s.version = "0.10.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 = "2017-02-07"
+  s.date = "2018-01-24"
   s.description = "This ruby gem provides some useful command line utilities".freeze
   s.email = "flori@ping.de".freeze
-  s.executables = ["ascii7".freeze, "blameline".freeze, "brakeman2err".freeze, "chroot-exec".freeze, "chroot-libs".freeze, "classify".freeze, "create_tags".freeze, "dialog-pick".freeze, "discover".freeze, "edit".freeze, "edit_wait".freeze, "enum".freeze, "errf".freeze, "git-empty".freeze, "git-versions".freeze, "irb_connect".freeze, "json_check".freeze, "long_lines".freeze, "myex".freeze, "number_files".freeze, "on_change".freeze, "path".freeze, "probe".freeze, "remote_copy".freeze, "rssr".freeze, "same_files".freeze, "search".freeze, "sedit".freeze, "serve".freeze, "ssh-tunnel".freeze, "strip_spaces".freeze, "unquarantine_apps".freeze, "untest".freeze, "utils-utilsrc".freeze, "vacuum_firefox_sqlite".freeze, "xmp".freeze]
+  s.executables = ["ascii7".freeze, "blameline".freeze, "brakeman2err".freeze, "chroot-exec".freeze, "chroot-libs".freeze, "classify".freeze, "create_tags".freeze, "dialog-pick".freeze, "discover".freeze, "edit".freeze, "edit_wait".freeze, "enum".freeze, "errf".freeze, "git-empty".freeze, "git-versions".freeze, "irb_connect".freeze, "json_check".freeze, "long_lines".freeze, "myex".freeze, "number_files".freeze, "on_change".freeze, "path".freeze, "probe".freeze, "remote_copy".freeze, "rssr".freeze, "same_files".freeze, "search".freeze, "sedit".freeze, "serve".freeze, "ssh-tunnel".freeze, "strip_spaces".freeze, "tmproc".freeze, "unquarantine_apps".freeze, "untest".freeze, "utils-utilsrc".freeze, "vacuum_firefox_sqlite".freeze, "vcf2alias".freeze, "xmp".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/unquarantine_apps".freeze, "bin/untest".freeze, "bin/utils-utilsrc".freeze, "bin/vacuum_firefox_sqlite".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.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.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.6.8".freeze
+  s.rubygems_version = "2.6.14".freeze
   s.summary = "Some useful command line utilities".freeze
 
   if s.respond_to? :specification_version then
@@ -24,22 +24,25 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<gem_hadar>.freeze, ["~> 1.9.1"])
-      s.add_runtime_dependency(%q<tins>.freeze, ["~> 1.8"])
+      s.add_runtime_dependency(%q<tins>.freeze, ["~> 1.14"])
       s.add_runtime_dependency(%q<term-ansicolor>.freeze, ["~> 1.3"])
       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"])
     else
       s.add_dependency(%q<gem_hadar>.freeze, ["~> 1.9.1"])
-      s.add_dependency(%q<tins>.freeze, ["~> 1.8"])
+      s.add_dependency(%q<tins>.freeze, ["~> 1.14"])
       s.add_dependency(%q<term-ansicolor>.freeze, ["~> 1.3"])
       s.add_dependency(%q<pstree>.freeze, ["~> 0.1"])
       s.add_dependency(%q<pry-editline>.freeze, [">= 0"])
+      s.add_dependency(%q<infobar>.freeze, [">= 0"])
     end
   else
     s.add_dependency(%q<gem_hadar>.freeze, ["~> 1.9.1"])
-    s.add_dependency(%q<tins>.freeze, ["~> 1.8"])
+    s.add_dependency(%q<tins>.freeze, ["~> 1.14"])
     s.add_dependency(%q<term-ansicolor>.freeze, ["~> 1.3"])
     s.add_dependency(%q<pstree>.freeze, ["~> 0.1"])
     s.add_dependency(%q<pry-editline>.freeze, [">= 0"])
+    s.add_dependency(%q<infobar>.freeze, [">= 0"])
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: utils
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Florian Frank
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-07 00:00:00.000000000 Z
+date: 2018-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.14'
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: infobar
+  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:
@@ -114,10 +128,12 @@ executables:
 - serve
 - ssh-tunnel
 - strip_spaces
+- tmproc
 - unquarantine_apps
 - untest
 - utils-utilsrc
 - vacuum_firefox_sqlite
+- vcf2alias
 - xmp
 extensions: []
 extra_rdoc_files:
@@ -176,10 +192,12 @@ files:
 - bin/serve
 - bin/ssh-tunnel
 - bin/strip_spaces
+- bin/tmproc
 - bin/unquarantine_apps
 - bin/untest
 - bin/utils-utilsrc
 - bin/vacuum_firefox_sqlite
+- bin/vcf2alias
 - bin/xmp
 - lib/utils.rb
 - lib/utils/config_file.rb
@@ -221,7 +239,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Some useful command line utilities