utils 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd2e201421219d45b45d2fe83a850971c3b1f311
-  data.tar.gz: 5ba5419654b33453698c6c249749b132081b4555
+  metadata.gz: f866a94b2e6d4f176cb526c5ba15e7721f2cdf48
+  data.tar.gz: 7e3e202ebb2c42ef0f66fa803cf6f772bf39588c
 SHA512:
-  metadata.gz: 6553dda498be7fd555abacb3cd3ef8df38d7d0e408af0fddc76f856cd21ff93c73972fd1719c1cc68e1ddff346d774162b750c736faf4e4a10d6b7f5f3dfe4df
-  data.tar.gz: aced2f21c40473b7d006abe96be590a4095a86b32a1c62e2cc9b6eb0335a8630e09c545e13ace4941baec8bc5f86114f26f90b5244051826ea307c5a0bf3dd05
+  metadata.gz: 625a650bcdda5ed20739478be0b423022e7956582d643c5310c08600505ad451f787830c55b3d2ad67a1966c668277e09740a77a152cf15f0563d89f6e955837
+  data.tar.gz: 02e4866d3c84fb13880deff73a8bcb6a531dd7913eddb20ea88d37ae392a869610d2d7e0d11dd967b0f4df49b900c2c449f39a39247d6e79f96f45515a171eb2

data/VERSION

@@ -1 +1 @@
-0.8.0
+0.9.0

data/bin/ascii7

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+
+map = Hash.new { |h, k| h[k] = k }.merge(
+  " "    => "Spc",
+  "\x7f" => "DEL"
+).merge(%w[
+  NUL SOH STX ETX EOT ENQ ACK BEL BS TAB LF VT FF CR SO SI DLE DC1 DC2
+  DC3 DC4 NAK SYN ETB CAN EM SUB ESC FS GS RS US
+].each_with_index.map { |s, i| [ i.chr, s ] }.to_h)
+prefixes = 0..0b11
+puts ([ '' ] + prefixes.map { |p| '%02b' % p }) * ?\t
+(1 << 5).times do |x|
+  puts ([ "%05b" % x ] + prefixes.map { |p| map[((p << 5) | x).chr] }) * ?\t
+end

data/bin/blameline

@@ -21,9 +21,5 @@ else
 end
 
 for line in lines
-  blamer = Utils::LineBlamer.for_line(line) or next
-  blame = blamer.perform or next
-  blame.sub!(/^[0-9a-f^]+/) { Term::ANSIColor.yellow($&) }
-  blame.sub!(/\(([^)]+)\)/) { "(#{Term::ANSIColor.red($1)})" }
-  puts blame
+  Utils::LineBlamer.blame(line).full? { |l| puts l }
 end

data/bin/brakeman2err

@@ -5,8 +5,8 @@ require 'tins/xt'
 require 'tins/go'
 include Tins::GO
 
-opt = go 'c'
-if opt['c']
+opts = go 'c'
+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

data/bin/classify

@@ -18,9 +18,9 @@ def path_shifter(string, separator: ?/, n: nil)
 end
 
 def underscore(string)
-  string = path_shifter(string, n: $opts['n'], separator: '::')
+  string = path_shifter(string, n: $opts[?n], separator: '::')
   string = Tins::StringUnderscore.instance_method(:underscore).bind(string).()
-  $opts['s'] and string << '.rb'
+  $opts[?s] and string << '.rb'
   string
 end
 
@@ -29,7 +29,7 @@ def parameterize(string, separator)
 end
 
 def camelize(string)
-  string = path_shifter(string, n: $opts['n'])
+  string = path_shifter(string, n: $opts[?n])
   string = string.gsub(/#{Regexp.quote(File.extname(string))}\Z/, '')
   string.camelize
 end
@@ -58,13 +58,13 @@ string = Term::ANSIColor.uncolor string
 config = Utils::ConfigFile.new
 config.configure_from_paths
 
-$opts['n'] ||= compute_shift(config, string)
+$opts[?n] ||= compute_shift(config, string)
 
-$opts['b'] and $opts['n'] = '-1'
+$opts[?b] and $opts[?n] = '-1'
 print case
-when $opts['t']
+when $opts[?t]
   if camelcase?(string)
-    if separator = $opts['p']
+    if separator = $opts[?p]
       parameterize string, separator
     else
       underscore string
@@ -72,8 +72,8 @@ when $opts['t']
   else
     camelize string
   end
-when $opts['d']
-  if separator = $opts['p']
+when $opts[?d]
+  if separator = $opts[?p]
     parameterize string, separator
   else
     underscore string

data/bin/discover

@@ -47,15 +47,15 @@ Version is #{File.basename($0)} #{Utils::VERSION}.
 end
 
 args = go 'I:a:rceEbvh'
-args['h'] and usage
+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']
+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
+args[?b] ||= config.discover.binary
 finder = Finder.new(
   :pattern => pattern,
   :args    => args,
@@ -64,9 +64,9 @@ finder = Finder.new(
 ).search
 
 case
-when args['E']
+when args[?E]
   edit_files finder.paths, pick: true
-when args['e']
+when args[?e]
   edit_files finder.paths
 else
   puts finder.paths

data/bin/edit

@@ -30,19 +30,19 @@ Version is #{File.basename($0)} #{Utils::VERSION}.
 end
 
 $opt = go 'p:S:c:g:wsmh'
-$opt['h'] and usage
+$opt[?h] and usage
 
 config = Utils::ConfigFile.new
 config.configure_from_paths
 
 editor = Editor.new do |c|
-  c.wait           = $opt['w']
-  c.pause_duration = ($opt['p'] || 1).to_i
-  s = $opt['S'] and c.servername = s
-  c.mkdir = $opt['m']
+  c.wait           = $opt[?w]
+  c.pause_duration = ($opt[?p] || 1).to_i
+  s = $opt[?S] and c.servername = s
+  c.mkdir = $opt[?m]
 end
 
-if $opt['s']
+if $opt[?s]
   begin
     until STDIN.eof?
       line = STDIN.gets
@@ -53,9 +53,9 @@ if $opt['s']
     exit 1
   end
   exit 0
-elsif command = $opt['c']
+elsif command = $opt[?c]
   editor.edit_remote_send "\e:#{command}\n"
-elsif command = $opt['C']
+elsif command = $opt[?C]
   editor.edit_remote_send command
 end
 
@@ -71,7 +71,7 @@ if argv.empty?
     argv << file.path
   end
 end
-case git_files_arg = $opt['g']
+case git_files_arg = $opt[?g]
 when ?g
   argv.concat `git diff HEAD --name-only`.lines.map(&:chomp).uniq
 when /\A[mcdo]\z/

data/bin/enum

@@ -150,18 +150,18 @@ $opts = {
 }.update(go('p:e:f:h')) do |o,default,set|
   set || default
 end
-usage if $opts['h'] || ARGV.size != 1
+usage if $opts[?h] || ARGV.size != 1
 $ranges = ARGV.shift
-$limited = $opts['p'] ? Limited.new($opts['p']) : nil
+$limited = $opts[?p] ? Limited.new($opts[?p]) : nil
 ranges = parse_ranges($ranges)
 generator = Generator.new(ranges)
-$opts['f'] ||= %w[ %s ] * generator.size * ':'
+$opts[?f] ||= %w[ %s ] * generator.size * ':'
 
 generator.each do |tuple|
-  if $opts['e']
-    execute_command($opts['e'], $opts['f'], tuple)
+  if $opts[?e]
+    execute_command($opts[?e], $opts[?f], tuple)
   else
-    puts $opts['f'] % tuple
+    puts $opts[?f] % tuple
   end
 end
 exit 0

data/bin/git-versions

@@ -0,0 +1,25 @@
+#!/usr/bin/env ruby
+
+require 'tins/xt'
+require 'term/ansicolor'
+include Tins::GO
+
+$opts = go 'r:v'
+
+class String
+  include Term::ANSIColor
+end
+
+regexp = $opts[?r] && Regexp.new($opts[?r]) || /^v((?:\d+\.)*\d+)/
+
+versions = `git tag`.lines.map(&:chomp).grep(regexp).sort_by { |x|
+  x[regexp, 1].version
+}.reverse
+versions.each_cons(2) do |new, old|
+  puts "Version #{new}".red.bold
+  if $opts[?v]
+    puts `git log --color --stat -u #{old}..#{new}`
+  else
+    puts `git log --color --stat #{old}..#{new}`
+  end
+end

data/bin/irb_connect

@@ -24,14 +24,14 @@ Version is #{File.basename($0)} #{Utils::VERSION}.
 end
 
 
-$opt = go 'e:r:p:l:h'
-$opt['h'] and usage
+$opts = go 'e:r:p:l:h'
+$opts[?h] and usage
 
-proxy = Utils::IRB::Service.connect($opt['r'], $opt['p'])
+proxy = Utils::IRB::Service.connect($opts[?r], $opts[?p])
 case
-when load_path = $opt['l']
+when load_path = $opts[?l]
   proxy.load(load_path)
-when code = $opt['e']
+when code = $opts[?e]
   p proxy.eval(code)
 else
   puts proxy.eval(STDIN.read)

data/bin/myex

@@ -49,7 +49,7 @@ when 'create'
   STDIN.grep(/^CREATE TABLE `([^`]+)` \(/) do |stmt|
     table = $1
     next unless ARGV.empty? or ARGV.member?(table)
-    if opts['d']
+    if opts[?d]
       puts "DROP TABLE IF EXISTS `#{table}`;"
       warn "Dropped table #{table}."
     end
@@ -74,8 +74,8 @@ when 'insert'
   puts "SET FOREIGN_KEY_CHECKS = 0;"
   STDIN.grep(/^INSERT (?:IGNORE )?INTO `(#{ARGV.empty? ? '[^`]+' : ARGV * '|'})`/) do |stmt|
     table = $1
-    stmt.sub!(/(^INSERT) (INTO)/, '\1 IGNORE \2') if opts['i']
-    if opts['t'] and not truncated.key?(table)
+    stmt.sub!(/(^INSERT) (INTO)/, '\1 IGNORE \2') if opts[?i]
+    if opts[?t] and not truncated.key?(table)
       puts "TRUNCATE TABLE `#{table}`;"
       truncated[table] = true
       warn "Truncated table #{table}."

data/bin/path

@@ -9,7 +9,7 @@ path_separator = RUBY_PLATFORM =~ /mswin32/ ? ';' : ':'
 path = (ENV['PATH'] || '').split(path_separator)
 path.map! { |part| File.expand_path(part) }
 
-$opt = go('e')
+$opts = go('e')
 
 case cmd = ARGV.shift
 when 'prefix', 'postfix'
@@ -35,4 +35,4 @@ end
 
 path.uniq!
 
-puts "#{'export ' if $opt['e']}PATH=#{path * path_separator}"
+puts "#{'export ' if $opt[?e]}PATH=#{path * path_separator}"

data/bin/probe

@@ -73,7 +73,7 @@ end
 def connect_server
   DRb.start_service
   probe_server = DRbObject.new_with_uri($uri)
-  if setting = $opt['C']
+  if setting = $opts[?C]
     case setting
     when /\A([^=]+)=([^=]+)\z/
       probe_server.env[$1] = $2
@@ -83,8 +83,8 @@ def connect_server
       usage
     end
   end
-  if $opt['c']
-    opts = $opt.subhash('n', 't').each_with_object([]) { |(k, v), a|
+  if $opts[?c]
+    opts = $opts.subhash('n', 't').each_with_object([]) { |(k, v), a|
       v.full? and a.concat [ "-#{k}", v ]
     }
     probe_server.enqueue opts + $args
@@ -101,23 +101,23 @@ if i = ARGV.index('--')
 else
   $args = ARGV.dup
 end
-$opt = go 'lct:n:u:C:h', $args
-$opt['h'] and usage
+$opts = go 'lct:n:u:C:h', $args
+$opts[?h] and usage
 
-$uri = $opt['u'] || 'drbunix:probe.socket'
+$uri = $opts[?u] || 'drbunix:probe.socket'
 
 case
-when $opt['l']
+when $opts[?l]
   start_server
   exit
-when $opt['c'], $opt['C']
+when $opts[?c], $opts[?C]
   connect_server
 end
 
 $args.empty? and exit
 puts "Running tests in #{$args.inspect}"
 
-case ($opt['t'] || $config.probe.test_framework).to_sym
+case ($opts[?t] || $config.probe.test_framework).to_sym
 when :rspec
   case
   when spring?
@@ -128,7 +128,7 @@ when :rspec
     rspec = [ find_cmd('rspec', 'spec') ] << '-rutils' << '-f' <<
       'Utils::LineFormatter'
   end
-  if linenumber = $opt['n']
+  if linenumber = $opts[?n]
     cmd 'ruby', '-I', $config.probe.include_dirs_argument, *rspec, '-l',
       linenumber, *($args + testrunner_args)
   else
@@ -148,7 +148,7 @@ when :'test-unit'
   else
     testrb = find_cmd('testrb')
   end
-  if testname = $opt['n']
+  if testname = $opts[?n]
     cmd 'ruby', '-I', $config.probe.include_dirs_argument, *testrb,
       '-n', testname, *($args + testrunner_args)
   else
@@ -170,7 +170,7 @@ when :'test-unit'
   end
 when :cucumber
   cucumber = find_cmd('cucumber')
-  if linenumber = $opt['n']
+  if linenumber = $opts[?n]
     cmd 'ruby', cucumber, '-r', $config.probe.include_dirs_argument, '-l',
       linenumber, *($args + testrunner_args)
   else

data/bin/search

@@ -125,7 +125,8 @@ Options are
   -e          open the matching files with edit command
   -E          pick one file to edit
   -r REPLACE  replace the searched match with REPLACE
-  -b
+  -b          also search binary files
+  -g          use git to determine author of the line
   -a CSET     use only character set CSET from PATTERN
   -v          be verbose
   -h          display this help
@@ -135,12 +136,12 @@ Version is #{File.basename($0)} #{Utils::VERSION}.
   exit 1
 end
 
-args = go 'r:I:A:B:C:s:S:n:N:a:RciflLeEvbh'
-args['h'] and usage
+args = go 'r:I:A:B:C:s:S:n:N:a:RciflLeEvbgh'
+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']
+Term::ANSIColor.coloring = (STDIN.tty? && ENV['TERM'] !~ /dumb/) && !args[?c]
 STDOUT.sync = true
 config = Utils::ConfigFile.new
 config.configure_from_paths
@@ -151,8 +152,8 @@ grepper = Grepper.new(
   :config  => config
 ).search
 case
-when args['r'] then edit_files grepper.pattern, grepper.paths, replace: args['r']
-when args['E'] then edit_files grepper.pattern, grepper.paths, pick: true
-when args['e'] then edit_files grepper.pattern, grepper.paths
-when args['l'] then puts grepper.paths
+when args[?r] then edit_files grepper.pattern, grepper.paths, replace: args[?r]
+when args[?E] then edit_files grepper.pattern, grepper.paths, pick: true
+when args[?e] then edit_files grepper.pattern, grepper.paths
+when args[?l] then puts grepper.paths
 end

data/bin/ssh-tunnel

@@ -49,9 +49,9 @@ config = Utils::ConfigFile.new
 arguments = ARGV
 opts = go 't:n:C:m:e:hNTd', arguments
 
-$DEBUG = opts['d']
+$DEBUG = opts[?d]
 
-if opts['T']
+if opts[?T]
   tunnels = PSTree.new.select { |pt| pt.user == ENV['USER'] && pt.cmd =~ /ssh.*-L/ }
   tunnels.map! do |pt|
     cmd = pt.cmd
@@ -63,7 +63,7 @@ if opts['T']
   exit 0
 end
 
-case opts['C']
+case opts[?C]
 when 'ssh-default'
   STDOUT.puts SSH_CONFIG; exit
 when 'rc-default'
@@ -75,9 +75,9 @@ end
 
 config.configure_from_paths
 
-usage if opts['h'] or arguments.size != 1
+usage if opts[?h] or arguments.size != 1
 
-if multiplexer = opts['m']
+if multiplexer = opts[?m]
   config.ssh_tunnel.terminal_multiplexer = multiplexer
 end
 
@@ -96,11 +96,11 @@ ssh_dir = File.expand_path('~/.ssh')
 mkdir_p ssh_dir
 sock_file = "#{ssh_dir}/#{user}@#{remote}:#{rport}.sock"
 if env_user = ENV['USER']
-  opts['n'] ||= env_user
+  opts[?n] ||= env_user
 else
-  opts['n'] ||= 'session'
+  opts[?n] ||= 'session'
 end
-if opts['N']
+if opts[?N]
   cmd "ssh -p #{rport} -S #{sock_file} #{user}@#{remote} #{config.ssh_tunnel.multiplexer_list}"
 else
   File.exist? sock_file and rm_f sock_file
@@ -109,7 +109,7 @@ else
     env << "COPY_REMOTE_HOST_PORT='#{t.bind_address}:#{t.port}'"
     tunnels << "-R #{t}"
   end
-  opts['t'].to_a.each do |tunnel_spec|
+  opts[?t].to_a.each do |tunnel_spec|
     if arg = Utils::SshTunnelSpecification.new(tunnel_spec).valid?
       tunnels << "-L #{arg}"
     else
@@ -119,12 +119,12 @@ else
   config.ssh_tunnel.env.each do |var, val|
     ENV[var.to_s] = val.to_s
   end
-  opts['e'].to_a.each do |setting|
+  opts[?e].to_a.each do |setting|
     var, val = setting.split('=', 2)
     ENV[var] = val
   end
   cmd "ssh -p #{rport} -Mt  "\
     "-S #{sock_file} #{user}@#{remote} #{tunnels * ' '} "\
-      "'env #{env * ' '} #{config.ssh_tunnel.multiplexer_new(opts['n'])} || "\
-      "#{config.ssh_tunnel.multiplexer_attach(opts['n'])}'"
+      "'env #{env * ' '} #{config.ssh_tunnel.multiplexer_new(opts[?n])} || "\
+      "#{config.ssh_tunnel.multiplexer_attach(opts[?n])}'"
 end

data/bin/strip_spaces

@@ -21,6 +21,7 @@ stripped.
 
 Options are
 
+  -t COLUMNS  turn tabs into COLUMNS spaces
   -I SUFFIXES list of suffixes
   -h          display this help
 
@@ -29,14 +30,14 @@ Version is #{File.basename($0)} #{Utils::VERSION}.
   exit 1
 end
 
-args = go 'I:h'
-args['h'] and usage
+args = go 'I:t:h'
+args[?h] and usage
 
 unless ARGV.empty?
   paths = ARGV.map { |p| File.expand_path(p) }
 end
 
-suffix = args['I'].ask_and_send(:split, /[\s,]+/).to_a
+suffix = args[?I].ask_and_send(:split, /[\s,]+/).to_a
 
 config = Utils::ConfigFile.new
 config.configure_from_paths
@@ -52,12 +53,15 @@ if paths
     s.file? or next
     config.strip_spaces.skip?(bn) and next
     File.ascii?(filename) or next
-    STDOUT.puts "Stripping spaces from #{filename.inspect}."
+    STDOUT.puts "Stripping spaces/tabs from #{filename.inspect}."
     secure_write(filename) do |output|
       File.open(filename) do |file|
         old_mode = file.stat.mode
         file.each do |line|
           line.gsub!(/[ \t\v]+$/, '')
+          if tabs = args[?t]
+            line.gsub!(/\t/, ' ' * Integer(tabs))
+          end
           output.write line
         end
         File.chmod old_mode, output.path

data/lib/utils/config_file.rb

@@ -156,7 +156,7 @@ class Utils::ConfigFile
   end
 
   class SshTunnel < BlockConfig
-    config :terminal_multiplexer, 'screen'
+    config :terminal_multiplexer, 'tmux'
 
     config :env, {}
 

data/lib/utils/finder.rb

@@ -15,11 +15,11 @@ class Utils::Finder
     @roots = discover_roots(opts[:roots])
     @config = opts[:config] || Utils::ConfigFile.new
     pattern_opts = opts.subhash(:pattern) | {
-      :cset  => @args['a'],
+      :cset  => @args[?a],
       :icase => @args.fetch('i', true),
     }
-    @binary = @args['b']
-    @pattern = @args['r'] ?
+    @binary = @args[?b]
+    @pattern = @args[?r] ?
       RegexpPattern.new(pattern_opts) :
       FuzzyPattern.new(pattern_opts)
     @paths  = []
@@ -44,16 +44,16 @@ class Utils::Finder
 
   def search
     paths = []
-    suffixes = @args['I'].ask_and_send(:split, /[\s,]+/).to_a
+    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}."
+          @args[?v] and warn "Pruning #{filename.inspect}."
           prune
         end
         if s.file? && @config.discover.skip?(bn)
-          @args['v'] and warn "Skipping #{filename.inspect}."
+          @args[?v] and warn "Skipping #{filename.inspect}."
           next
         end
         paths << filename
@@ -62,7 +62,7 @@ class Utils::Finder
     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']
+      if do_match = attempt_match?(path) and @args[?v]
         warn "Attempt match of #{path.inspect}"
       end
       if do_match and match = @pattern.match(path)

data/lib/utils/grepper.rb

@@ -42,22 +42,22 @@ class Utils::Grepper
     end
     @paths  = []
     pattern_opts = opts.subhash(:pattern) | {
-      :cset  => @args['a'],
-      :icase => @args['i'],
+      :cset  => @args[?a],
+      :icase => @args[?i],
     }
-    @pattern = @args['R'] ?
+    @pattern = @args[?R] ?
       FuzzyPattern.new(pattern_opts) :
       RegexpPattern.new(pattern_opts)
     @name_pattern =
-      if name_pattern = @args['N']
+      if name_pattern = @args[?N]
         RegexpPattern.new(:pattern => name_pattern)
-      elsif name_pattern = @args['n']
+      elsif name_pattern = @args[?n]
         FuzzyPattern.new(:pattern => name_pattern)
       end
     @skip_pattern =
-      if skip_pattern = @args['S']
+      if skip_pattern = @args[?S]
         RegexpPattern.new(:pattern => skip_pattern)
-      elsif skip_pattern = @args['s']
+      elsif skip_pattern = @args[?s]
         FuzzyPattern.new(:pattern => skip_pattern)
       end
   end
@@ -71,40 +71,40 @@ class Utils::Grepper
     @output = []
     bn, s = File.basename(filename), File.stat(filename)
     if !s || s.directory? && @config.search.prune?(bn)
-      @args['v'] and warn "Pruning #{filename.inspect}."
+      @args[?v] and warn "Pruning #{filename.inspect}."
       prune
     end
     if s.file? && !@config.search.skip?(bn) &&
       (!@name_pattern || @name_pattern.match(bn))
     then
-      File.open(filename, 'rb') do |file|
-        if file.binary? != true
-          @args['v'] and warn "Matching #{filename.inspect}."
-          if @args['f']
+      File.open(filename, 'rb', encoding: Encoding::UTF_8) do |file|
+        if @args[?b] && !@args[?g] || file.binary? != true
+          @args[?v] and warn "Matching #{filename.inspect}."
+          if @args[?f]
             @output << filename
           else
             match_lines file
           end
         else
-          @args['v'] and warn "Skipping binary file #{filename.inspect}."
+          @args[?v] and warn "Skipping binary file #{filename.inspect}."
         end
       end
     else
-      @args['v'] and warn "Skipping #{filename.inspect}."
+      @args[?v] and warn "Skipping #{filename.inspect}."
     end
     unless @output.empty?
       case
-      when @args['b']
+      when @args[?g]
         @output.uniq!
         @output.each do |l|
           blamer = LineBlamer.for_line(l)
           if blame = blamer.perform
             blame.sub!(/^[0-9a-f^]+/) { Term::ANSIColor.yellow($&) }
             blame.sub!(/\(([^)]+)\)/) { "(#{Term::ANSIColor.red($1)})" }
-            puts "#{l} #{blame}"
+            puts "#{blame.chomp} #{Term::ANSIColor.blue(l)}"
           end
         end
-      when @args['l'], @args['e'], @args['E'], @args['r']
+      when @args[?l], @args[?e], @args[?E], @args[?r]
         @output.uniq!
         @paths.concat @output
       else
@@ -122,21 +122,21 @@ class Utils::Grepper
         line[m.begin(0)...m.end(0)] = black on_white m[0]
         @queue and @queue << line
         case
-        when @args['l']
+        when @args[?l]
           @output << @filename
-        when @args['L'], @args['r'], @args['b']
+        when @args[?L], @args[?r], @args[?g]
           @output << "#{@filename}:#{file.lineno}"
-        when @args['e'], @args['E']
+        when @args[?e], @args[?E]
           @output << "#{@filename}:#{file.lineno}"
           break
         else
           @output << red("#{@filename}:#{file.lineno}")
-          if @args['B'] or @args['C']
+          if @args[?B] or @args[?C]
             @output.concat @queue.data
           else
             @output << line
           end
-          if @args['A'] or @args['C']
+          if @args[?A] or @args[?C]
             where = file.tell
             lineno = file.lineno
             @queue.max_size.times do
@@ -156,7 +156,7 @@ class Utils::Grepper
   end
 
   def search
-    suffixes = @args['I'].ask_and_send(:split, /[\s,]+/).to_a
+    suffixes = @args[?I].ask_and_send(:split, /[\s,]+/).to_a
     find(*(@roots + [ { :suffix => suffixes } ])) do |filename|
       match(filename)
     end

data/lib/utils/line_blamer.rb

@@ -8,6 +8,14 @@ module Utils
       location = line.source_location and new *location
     end
 
+    def self.blame(line)
+      blamer = for_line(line)
+      if blame = blamer.perform
+        blame.sub!(/^[0-9a-f^]+/) { Term::ANSIColor.yellow($&) }
+        blame.sub!(/\(([^)]+)\)/) { "(#{Term::ANSIColor.red($1)})" }
+      end
+    end
+
     def perform(options = '')
       `git 2>/dev/null blame #{options} -L #@lineno,+1 "#@file"`.full?
     end

data/lib/utils/patterns.rb

@@ -13,6 +13,8 @@ module Utils
 
       def method_missing(*a, &b)
         @matcher.__send__(*a, &b)
+      rescue ArgumentError => e
+        raise e unless e.message.include?('invalid byte sequence in UTF-8')
       end
     end
 

data/lib/utils/probe_server.rb

@@ -35,7 +35,7 @@ module Utils
       end
 
       def inspect
-        ok_colorize("Job##{id} #{args.map { |a| a.include?(' ') ? a.inspect : a } * ' '}")
+        ok_colorize("#{id} #{args.map { |a| a.include?(' ') ? a.inspect : a } * ' '}")
       end
 
       alias to_s inspect

data/lib/utils/version.rb

@@ -1,6 +1,6 @@
 module Utils
   # Utils version
-  VERSION         = '0.8.0'
+  VERSION         = '0.9.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,45 +1,45 @@
 # -*- encoding: utf-8 -*-
-# stub: utils 0.8.0 ruby lib
+# stub: utils 0.9.0 ruby lib
 
 Gem::Specification.new do |s|
-  s.name = "utils"
-  s.version = "0.8.0"
+  s.name = "utils".freeze
+  s.version = "0.9.0"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.require_paths = ["lib"]
-  s.authors = ["Florian Frank"]
-  s.date = "2016-09-30"
-  s.description = "This ruby gem provides some useful command line utilities"
-  s.email = "flori@ping.de"
-  s.executables = ["blameline", "brakeman2err", "chroot-exec", "chroot-libs", "classify", "create_tags", "dialog-pick", "discover", "edit", "edit_wait", "enum", "errf", "git-empty", "irb_connect", "json_check", "long_lines", "myex", "number_files", "on_change", "path", "probe", "remote_copy", "rssr", "same_files", "search", "sedit", "serve", "ssh-tunnel", "strip_spaces", "unquarantine_apps", "untest", "utils-utilsrc", "vacuum_firefox_sqlite", "xmp"]
-  s.extra_rdoc_files = ["README.md", "lib/utils.rb", "lib/utils/config_file.rb", "lib/utils/editor.rb", "lib/utils/file_xt.rb", "lib/utils/finder.rb", "lib/utils/grepper.rb", "lib/utils/irb.rb", "lib/utils/irb/service.rb", "lib/utils/line_blamer.rb", "lib/utils/line_formatter.rb", "lib/utils/md5.rb", "lib/utils/patterns.rb", "lib/utils/probe_server.rb", "lib/utils/ssh_tunnel_specification.rb", "lib/utils/version.rb", "lib/utils/xt/source_location_extension.rb"]
-  s.files = [".gitignore", "COPYING", "Gemfile", "README.md", "Rakefile", "VERSION", "bin/blameline", "bin/brakeman2err", "bin/chroot-exec", "bin/chroot-libs", "bin/classify", "bin/create_tags", "bin/dialog-pick", "bin/discover", "bin/edit", "bin/edit_wait", "bin/enum", "bin/errf", "bin/git-empty", "bin/irb_connect", "bin/json_check", "bin/long_lines", "bin/myex", "bin/number_files", "bin/on_change", "bin/path", "bin/probe", "bin/remote_copy", "bin/rssr", "bin/same_files", "bin/search", "bin/sedit", "bin/serve", "bin/ssh-tunnel", "bin/strip_spaces", "bin/unquarantine_apps", "bin/untest", "bin/utils-utilsrc", "bin/vacuum_firefox_sqlite", "bin/xmp", "lib/utils.rb", "lib/utils/config_file.rb", "lib/utils/editor.rb", "lib/utils/file_xt.rb", "lib/utils/finder.rb", "lib/utils/grepper.rb", "lib/utils/irb.rb", "lib/utils/irb/service.rb", "lib/utils/line_blamer.rb", "lib/utils/line_formatter.rb", "lib/utils/md5.rb", "lib/utils/patterns.rb", "lib/utils/probe_server.rb", "lib/utils/ssh_tunnel_specification.rb", "lib/utils/version.rb", "lib/utils/xt/source_location_extension.rb", "utils.gemspec", "utils.gemspec "]
-  s.homepage = "http://github.com/flori/utils"
-  s.rdoc_options = ["--title", "Utils - Some useful command line utilities", "--main", "README.md"]
-  s.rubygems_version = "2.5.1"
-  s.summary = "Some useful command line utilities"
+  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.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.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.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.summary = "Some useful command line utilities".freeze
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<gem_hadar>, ["~> 1.8.0"])
-      s.add_runtime_dependency(%q<tins>, ["~> 1.8"])
-      s.add_runtime_dependency(%q<term-ansicolor>, ["~> 1.3"])
-      s.add_runtime_dependency(%q<pstree>, ["~> 0.1"])
-      s.add_runtime_dependency(%q<pry-editline>, [">= 0"])
+      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<term-ansicolor>.freeze, ["~> 1.3"])
+      s.add_runtime_dependency(%q<pstree>.freeze, ["~> 0.1"])
+      s.add_runtime_dependency(%q<pry-editline>.freeze, [">= 0"])
     else
-      s.add_dependency(%q<gem_hadar>, ["~> 1.8.0"])
-      s.add_dependency(%q<tins>, ["~> 1.8"])
-      s.add_dependency(%q<term-ansicolor>, ["~> 1.3"])
-      s.add_dependency(%q<pstree>, ["~> 0.1"])
-      s.add_dependency(%q<pry-editline>, [">= 0"])
+      s.add_dependency(%q<gem_hadar>.freeze, ["~> 1.9.1"])
+      s.add_dependency(%q<tins>.freeze, ["~> 1.8"])
+      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"])
     end
   else
-    s.add_dependency(%q<gem_hadar>, ["~> 1.8.0"])
-    s.add_dependency(%q<tins>, ["~> 1.8"])
-    s.add_dependency(%q<term-ansicolor>, ["~> 1.3"])
-    s.add_dependency(%q<pstree>, ["~> 0.1"])
-    s.add_dependency(%q<pry-editline>, [">= 0"])
+    s.add_dependency(%q<gem_hadar>.freeze, ["~> 1.9.1"])
+    s.add_dependency(%q<tins>.freeze, ["~> 1.8"])
+    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"])
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: utils
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Florian Frank
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-30 00:00:00.000000000 Z
+date: 2017-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem_hadar
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.9.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: 1.9.1
 - !ruby/object:Gem::Dependency
   name: tins
   requirement: !ruby/object:Gem::Requirement
@@ -83,6 +83,7 @@ dependencies:
 description: This ruby gem provides some useful command line utilities
 email: flori@ping.de
 executables:
+- ascii7
 - blameline
 - brakeman2err
 - chroot-exec
@@ -96,6 +97,7 @@ executables:
 - enum
 - errf
 - git-empty
+- git-versions
 - irb_connect
 - json_check
 - long_lines
@@ -143,6 +145,7 @@ files:
 - README.md
 - Rakefile
 - VERSION
+- bin/ascii7
 - bin/blameline
 - bin/brakeman2err
 - bin/chroot-exec
@@ -156,6 +159,7 @@ files:
 - bin/enum
 - bin/errf
 - bin/git-empty
+- bin/git-versions
 - bin/irb_connect
 - bin/json_check
 - bin/long_lines
@@ -194,7 +198,6 @@ files:
 - lib/utils/version.rb
 - lib/utils/xt/source_location_extension.rb
 - utils.gemspec
-- 'utils.gemspec '
 homepage: http://github.com/flori/utils
 licenses: []
 metadata: {}
@@ -218,7 +221,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Some useful command line utilities