utils 0.2.4 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89a3df48460cbab73ab5920232f548d286ad1687
-  data.tar.gz: 34635c93eddf0452bf25e41f1154d62ec6e72082
+  metadata.gz: 27961e1f6195cb69054f6b658820b1544d33ab46
+  data.tar.gz: e0a540a6f1cb21602322d8741a349212c9330882
 SHA512:
-  metadata.gz: 7ab3f1c6025817ac0be2d4b649a1afe085e3bbcb76b41b0596c77023a12be7eea54fc98e8c7297c75704bfc02f62e37790834aed93d7836ec2b8ee3d5e6fe8d2
-  data.tar.gz: 71f338cd751118381ea9bb1c88581ec68745e9993ceeb046b922e283a45968f614be11197c796b45575e60cf2d3e98652afba03958b9b1c4a47d2b4235fdce00
+  metadata.gz: f13ebaa7a97cc7a8067f63149a3ecccfedf237686cdd7864cddee1e8d52fba0e411a0329fb3eb8a764c593cfb49aed8943167c74bb0ed546802511b2b36acda5
+  data.tar.gz: 81efb168bb27cd2498147c6b48f18dad0714a575dd4d516d021acd57817a2b8072d1a297890cf172bf93efb807a4879542b8166dd28c5c12e7b9528d385ef1db

data/Rakefile

@@ -15,7 +15,7 @@ GemHadar do
   ignore      '.*.sw[pon]', 'pkg', 'Gemfile.lock', '.rvmrc', '.AppleDouble', 'tags', '.bundle'
   readme      'README.md'
 
-  dependency  'tins',           '~>1.0'
+  dependency  'tins',           '~>1.8'
   dependency  'term-ansicolor', '~>1.3'
   dependency  'pstree',         '~>0.1'
   dependency  'pry-editline'

data/VERSION

@@ -1 +1 @@
-0.2.4
+0.6.4

data/bin/classify

@@ -4,23 +4,35 @@ require 'tins/go'
 include Tins::GO
 require 'tins/xt/string'
 
-$opts = go 'bdts'
+$opts = go 'bdtsn:'
 
 string  = ARGV.shift or fail "need a class/filepath/filename"
 
+def path_shifter(string, separator: ?/, n: 0)
+  n or return string
+  n, path = n.to_i, string.split(separator)
+  if n < 0
+    path = path.slice(n..-1)
+  else
+    path.slice!(0...n)
+  end
+  path * separator
+end
+
 def underscore(string)
-  string = string.sub(/.*::/, '') if $opts['b']
+  string = path_shifter(string, n: $opts['n'], separator: '::')
   string = string.underscore
   $opts['s'] and string << '.rb'
   print string
 end
 
 def camelize(string)
-  string = File.basename(string) if $opts['b']
+  string = path_shifter(string, n: $opts['n'])
   string = string.gsub(/#{Regexp.quote(File.extname(string))}\Z/, '')
   print string.camelize
 end
 
+$opts['b'] and $opts['n'] = '-1'
 case
 when $opts['t']
   if string[0, 1] =~ /[A-Z]/

data/bin/discover

@@ -2,14 +2,24 @@
 
 require 'utils'
 include Utils
-require 'tins/go'
+require 'tins/xt'
 include Tins::GO
 
-def edit_files(paths)
-  editor = Utils::Editor.new do |config|
-    config.wait = true
+def edit_files(paths, pick: false)
+  editor = Utils::Editor.new
+  if pick
+    if paths.size > 1
+      path = complete(prompt: 'Pick? ') do |p|
+        paths.grep /#{p}/
+      end
+    else
+      path = paths.first
+    end
+    editor.edit(path.strip)
+  else
+    editor.wait = true
+    editor.edit(*paths)
   end
-  editor.edit(*paths)
 end
 
 def usage
@@ -27,6 +37,7 @@ Options are
   -c          disable color output
   -i          use case insensitive matches
   -e          open the matching files with edit command
+  -E          pick one file to edit
   -a CSET     use only character set CSET from PATTERN
   -I SUFFIX   only include files with suffix SUFFIX during finding
   -b          match also binary files
@@ -38,7 +49,7 @@ Version is #{File.basename($0)} #{Utils::VERSION}.
   exit 1
 end
 
-args = go 'I:a:rdDciebvh'
+args = go 'I:a:rdDcieEbvh'
 args['h'] and usage
 pattern = ARGV.shift or usage
 roots = (ARGV.empty? ? [ Dir.pwd ] : ARGV).map { |f| File.expand_path(f) }
@@ -53,9 +64,13 @@ finder = Finder.new(
   :args    => args,
   :roots   => roots,
   :config  => config
-).search do |output|
-  puts output
-end
-if args['e']
+).search
+
+case
+when args['E']
+  edit_files finder.paths, pick: true
+when args['e']
   edit_files finder.paths
+else
+  puts finder.paths
 end

data/bin/edit

@@ -14,21 +14,22 @@ PATHS are the directory and file paths that are opened in the vim.
 
 Options are
 
-  -w          open a buffer in vim and wait until it is deleted
-  -s          read files and files:linenumbers from stdin and open them
-  -m          make intermediate non existing directories to file
-  -c COMMAND  send ex command to the current running editor
-  -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
-  -h          display this help
+  -w             open a buffer in vim and wait until it is deleted
+  -s             read files and files:linenumbers from stdin and open them
+  -m             make intermediate non existing directories to file
+  -g [m|c|d|o|g] open modified/cached/deleted/other/(next git commit) files
+  -c COMMAND     send ex command to the current running editor
+  -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
+  -h             display this help
 
 Version is #{File.basename($0)} #{Utils::VERSION}.
   EOT
   exit 1
 end
 
-$opt = go 'p:S:c:wsmh'
+$opt = go 'p:S:c:g:wsmh'
 $opt['h'] and usage
 
 config = Utils::Config::ConfigFile.new
@@ -70,6 +71,12 @@ if argv.empty?
     argv << file.path
   end
 end
+case git_files_arg = $opt['g']
+when ?g
+  argv.concat `git diff HEAD --name-only`.lines.map(&:chomp).uniq
+when /\A[mcdo]\z/
+  argv.concat `git ls-files -#{git_files_arg}`.lines.map(&:chomp).uniq
+end
 if argv.empty?
   editor.start
 else

data/bin/probe

@@ -10,15 +10,16 @@ require 'drb'
 
 def usage
   puts <<-EOT
-Usage: #{File.basename($0)} [OPTS] FILENAME[:LINENO] [FILENAME]
+Usage: #{File.basename($0)} [OPTS] [FILENAME[:LINENO]]
 
 Options are
 
   -n TESTNAME   run the test TESTNAME in file FILENAME
   -t FRAMEWORK  use test framework FRAMEWORK (rspec, test-unit or cucumber)
   -c            start probe as a client
+  -C FOO[=BAR]  set/get env variable on probe server
   -l            start probe as a server
-  -p PORT       listen on/connect to local port PORT
+  -u URI        use this DRb URI communication
   -h            display this help
 
 Version is #{File.basename($0)} #{Utils::VERSION}.
@@ -43,8 +44,20 @@ singleton_class.class_eval do
   memoize_function :zeus?
 end
 
+def spring?
+  `bin/spring status`.lines.first =~ /^Spring is running:/
+rescue Errno::ENOENT
+  false
+end
+singleton_class.class_eval do
+  memoize_function :spring?
+end
+
 def start_server
   Thread.abort_on_exception = $DEBUG
+  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."
 
@@ -58,10 +71,18 @@ def start_server
 end
 
 def connect_server
-  Utils::ProbeServer::Job.colorize = true
-  puts "Connecting probe server on #{$uri.inspect}."
   DRb.start_service
   probe_server = DRbObject.new_with_uri($uri)
+  if setting = $opt['C']
+    case setting
+    when /\A([^=]+)=([^=]+)\z/
+      probe_server.env[$1] = $2
+    when /\A([^=]+)\z/
+      puts probe_server.env[$1]
+    else
+      usage
+    end
+  end
   if $opt['c']
     opts = $opt.subhash('n', 't').each_with_object([]) { |(k, v), a|
       v.full? and a.concat [ "-#{k}", v ]
@@ -80,28 +101,32 @@ if i = ARGV.index('--')
 else
   $args = ARGV.dup
 end
-$opt = go 'lcp:t:n:h', $args
+$opt = go 'lct:n:u:C:h', $args
 $opt['h'] and usage
 
-$uri = "druby://localhost:#{$opt['p'] || 6623}"
+$uri = $opt['u'] || 'drbunix:probe.socket'
 
 case
 when $opt['l']
   start_server
   exit
-when $opt['c']
+when $opt['c'], $opt['C']
   connect_server
 end
 
-$args.empty? and fail "require filename or filename:linenumber as arguments"
+$args.empty? and exit
 puts "Running tests in #{$args.inspect}"
 
 case ($opt['t'] || $config.probe.test_framework).to_sym
 when :rspec
-  if zeus?
-    rspec = %w[-S zeus rspec -f Utils::LineFormatter ]
+  case
+  when spring?
+    rspec = %w[bin/spring rspec -rutils -f Utils::LineFormatter ]
+  when zeus?
+    rspec = %w[-S zeus rspec -rutils -f Utils::LineFormatter ]
   else
-    rspec = [ find_cmd('rspec', 'spec') ] << '-f' << 'Utils::LineFormatter'
+    rspec = [ find_cmd('rspec', 'spec') ] << '-rutils' << '-f' <<
+      'Utils::LineFormatter'
   end
   if linenumber = $opt['n']
     cmd 'ruby', '-I', $config.probe.include_dirs_argument, *rspec, '-l',

data/bin/search

@@ -3,8 +3,10 @@
 
 require 'utils'
 include Utils
-require 'tins/go'
+require 'tins/xt'
 include Tins::GO
+require 'term/ansicolor'
+include Term::ANSIColor
 
 def convert_ruby_to_vim_regexp(pattern)
   regexp = pattern.source.dup
@@ -13,14 +15,87 @@ def convert_ruby_to_vim_regexp(pattern)
   regexp
 end
 
-def edit_files(pattern, paths)
-  editor = Utils::Editor.new do |config|
-    config.wait = true
+def read_line(path)
+  filename, lineno = path.source_location
+  line = File.open(filename) do |file|
+    file.lazy.each_with_index.select { |l, n| n + 1 == lineno }.first&.first 
   end
+end
+
+def replace_line(path, new_line)
+  filename, lineno = path.source_location
+  File.secure_write filename do |output|
+    File.open(filename) do |file|
+      file.each_with_index do |line, n|
+        if n + 1 == lineno
+          output.write new_line
+        else
+          output.write line
+        end
+      end
+    end
+  end
+end
+
+def replace_ask(editor, path, pattern, replace, all)
+  line = read_line path
+  display_new_line = line.gsub(
+    pattern.matcher,
+    "#{on_red(line[pattern.matcher])}#{on_green(replace)}"
+  )
+  loop do
+    puts red(path)
+    puts display_new_line
+    if all
+      new_line = line.gsub(pattern.matcher, replace)
+      replace_line path, new_line
+      break true
+    else
+      print "Replace? (#{bold(?y)}/n/e/a) "
+      case answer = STDIN.gets.chomp
+      when ?y, '', ?a
+        new_line = line.gsub(pattern.matcher, replace)
+        replace_line path, new_line
+        break answer == ?a
+      when ?n
+        break false
+      when ?e
+        editor.edit(path.strip)
+        break false
+      when ?a
+        break true
+      else
+        next
+      end
+    end
+  end
+end
+
+def edit_files(pattern, paths, pick: false, replace: nil)
+  editor = Utils::Editor.new
   editor.edit_remote_send("<ESC>/#{convert_ruby_to_vim_regexp(pattern)}<CR>")
-  for path in paths
-    STDERR.puts "Edit #{path}"
-    editor.edit(path)
+  case
+  when replace
+    editor.wait = true
+    all = false
+    for path in paths
+      all |= replace_ask editor, path, pattern, replace, all
+    end
+  when pick
+    if paths.size > 1
+      path = complete(prompt: 'Pick? ') do |p|
+        paths.grep /#{p}/
+      end
+    else
+      path = paths.first
+    end
+    editor.edit(path.strip)
+  else
+    editor.wait = true
+    for path in paths
+      STDERR.puts "Edit #{path}"
+      editor.edit(path)
+    end
   end
 end
 
@@ -48,6 +123,8 @@ Options are
   -i          use case insensitive matches
   -I SUFFIX   only include files with suffix SUFFIX in search
   -e          open the matching files with edit command
+  -E          pick one file to edit
+  -r REPLACE  replace the searched match with REPLACE
   -a CSET     use only character set CSET from PATTERN
   -v          be verbose
   -h          display this help
@@ -57,7 +134,7 @@ Version is #{File.basename($0)} #{Utils::VERSION}.
   exit 1
 end
 
-args = go 'I:A:B:C:s:S:n:N:a:RciflLevh'
+args = go 'r:I:A:B:C:s:S:n:N:a:RciflLeEvh'
 args['h'] and usage
 pattern = ARGV.shift or usage
 roots = (ARGV.empty? ? [ Dir.pwd ] : ARGV).map { |f| File.expand_path(f) }
@@ -73,6 +150,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
 end

data/lib/utils.rb

@@ -10,8 +10,11 @@ module Utils
   require 'utils/grepper'
   require 'utils/probe_server'
   require 'utils/ssh_tunnel_specification'
-  require 'utils/line_formatter'
   require 'utils/line_blamer'
+  begin
+    require 'utils/line_formatter'
+  rescue LoadError
+  end
 
   require 'utils/xt/source_location_extension'
   class ::Object

data/lib/utils/finder.rb

@@ -99,9 +99,6 @@ class Utils::Finder
     end
     paths.compact!
     @paths, @output = paths.sort.transpose.values_at(-2, -1)
-    if !@args['e'] && @output && !@output.empty?
-      yield @output if block_given?
-    end
     self
   end
 end

data/lib/utils/grepper.rb

@@ -94,7 +94,7 @@ class Utils::Grepper
     end
     unless @output.empty?
       case
-      when @args['l'], @args['e']
+      when @args['l'], @args['e'], @args['E'], @args['r']
         @output.uniq!
         @paths.concat @output
       else
@@ -111,11 +111,12 @@ class Utils::Grepper
         @skip_pattern and @skip_pattern =~ line and next
         line[m.begin(0)...m.end(0)] = black on_white m[0]
         @queue and @queue << line
-        if @args['l']
+        case
+        when @args['l']
           @output << @filename
-        elsif @args['L']
+        when @args['L'], @args['r']
           @output << "#{@filename}:#{file.lineno}"
-        elsif @args['e']
+        when @args['e'], @args['E']
           @output << "#{@filename}:#{file.lineno}"
           break
         else
@@ -149,15 +150,7 @@ class Utils::Grepper
     find(*(@roots + [ { :suffix => suffixes } ])) do |filename|
       match(filename)
     end
-    if @args['L'] or @args['e']
-      @paths = @paths.sort_by do |path|
-        pair = path.split(':')
-        pair[1] = pair[1].to_i
-        pair
-      end
-    else
-      @paths.sort!
-    end
+    @paths = @paths.sort_by(&:source_location)
     self
   end
 end