utils 0.0.10 → 0.0.12

data/.rvmrc

@@ -0,0 +1,3 @@
+rvm use ruby-1.9.2-p290
+rvm gemset create utils
+rvm gemset use utils

data/Rakefile

@@ -15,8 +15,8 @@ GemHadar do
   ignore      '.*.sw[pon]', 'pkg', 'Gemfile.lock'
   readme      'README.rdoc'
 
-  dependency  'spruz', '~>0.2.10'
-  dependency  'term-ansicolor', '1.0.5'
+  dependency  'spruz', '~>0.2.12'
+  dependency  'term-ansicolor', '~>1.0'
 
   install_library do
     libdir = CONFIG["sitelibdir"]

data/VERSION

@@ -1 +1 @@
-0.0.10
+0.0.12

data/bin/chroot-libs

@@ -5,7 +5,7 @@ include FileUtils::Verbose
 
 msg = "Usage: #$0 EXECUTABLE DIR [LIB ..]"
 executable = ARGV.shift or fail msg
-dir = ARGV.shift or fail msg 
+dir = ARGV.shift or fail msg
 dir = File.expand_path dir
 mkdir_p dir
 

data/bin/discover

@@ -1,102 +1,15 @@
 #!/usr/bin/env ruby
 
 require 'utils'
-include Utils::Patterns
-require 'term/ansicolor'
-require 'spruz/xt'
-
-class ::String
-  include Term::ANSIColor
-end
-
-class ::File
-  include Utils::FileXt
-end
-
-class Finder
-  include Utils::Find
-
-  def initialize(opts = {})
-    @args    = opts[:args] || {}
-    @roots   = opts[:roots] || []
-    pattern_opts = opts.subhash(:pattern) | {
-      :cset  => @args['a'],
-      :icase => @args['i'],
-    }
-    @pattern = @args['r'] ?
-      RegexpPattern.new(pattern_opts) :
-      FuzzyPattern.new(pattern_opts)
-    @directory = @args['d']
-    @only_directory = @args['D']
-    @pathes  = []
-  end
-
-  attr_reader :pathes
-
-  def attempt_match?(path)
-    stat = File.stat(path)
-    stat.symlink? and stat = File.lstat(path)
-    if @only_directory
-      stat.directory?
-    elsif @directory
-      stat.directory? || stat.file? && (stat.size == 0 || File.ascii?(path))
-    else
-      stat.file? && (stat.size == 0 || File.ascii?(path))
-    end
-  rescue SystemCallError => e
-    warn "Caught #{e.class}: #{e}"
-    nil
-  end
-
-  def search
-    pathes = []
-    find(*@roots) { |file| pathes << file }
-    pathes.flatten!
-    pathes.uniq!
-    pathes.map! { |p| a = File.split(p) ; a.unshift(p) ; a }
-    @suffix = @args['I']
-    pathes = pathes.map! do |path, dir, file|
-      @suffix && @suffix != File.extname(file)[1..-1] and next
-      if do_match = attempt_match?(path) and $DEBUG
-        warn "Attempt match of #{path.inspect}"
-      end
-      if do_match and match = @pattern.match(file)
-        if FuzzyPattern === @pattern
-          current = 0
-          bold_file = ''
-          score, e = 0, 0
-          for i in 1...(match.size)
-            match[i] or next
-            b = match.begin(i)
-            bold_file << file[current...b]
-            bold_file << file[b, 1].bold
-            score += (b - e)
-            e = match.end(i)
-            current = b + 1
-          end
-          bold_file << match.post_match
-          [ score, file.size, path, File.join(dir, bold_file) ]
-        else
-          bold_file = file[0...match.begin(0)] <<
-            file[match.begin(0)...match.end(0)].bold <<
-            file[match.end(0)..-1]
-          [ 0, file.size, path, File.join(dir, bold_file) ]
-        end
-      end
-    end
-    pathes.compact!
-    @pathes, output = pathes.sort.transpose.values_at(-2, -1)
-    if !@args['e'] && output && !output.empty?
-      puts output
-    end
-    self
-  end
-end
-
+include Utils
+require 'spruz/go'
 include Spruz::GO
 
 def edit_files(pathes)
-  system "edit #{pathes.map { |x| "'#{x}'" } * ' '}"
+  editor = Utils::Edit::Editor.new do |config|
+    config.wait = true
+  end
+  editor.edit(*pathes)
 end
 
 def usage
@@ -123,7 +36,7 @@ Options are
 end
 
 args = go 'I:a:rdDcieh'
-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) }
 
@@ -134,7 +47,9 @@ finder = Finder.new(
   :pattern => pattern,
   :args    => args,
   :roots   => roots
-).search
+).search do |output|
+  puts output
+end
 if args['e']
   edit_files finder.pathes
 end

data/bin/edit

@@ -2,54 +2,69 @@
 
 require 'spruz/go'
 include Spruz::GO
-require 'utils/edit'
-include Utils::Edit
+require 'utils'
+include Utils
 require 'tempfile'
 
-$opt = go 'w'
+def usage
+  puts <<-EOT
+Usage: #{File.basename($0)} [OPTS] [PATHES]
 
-vim = locate_vim_binary
-servername  = [ '--servername', "G#{ENV['USER'].upcase}" ]
-serverlist = `#{vim} -g --serverlist`.split
-remote = $opt['w'] ? '--remote-wait' : '--remote'
+PATHES are the directory and file pathes that are opened in the vim.
 
-argv = ARGV.dup
-if argv.empty?
-  if !STDIN.tty?
-    file = File.new(File.join(Dir.tmpdir, "edit_tmp.#$$"), 'w')
+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
+  -p DURATION pause for this many seconds to wait for vim's reaction
+  -h          display this help
+
+  EOT
+  exit 1
+end
+
+$opt = go 'wp:sh'
+$opt['h'] and usage
+
+editor = Editor.new do |config|
+  config.wait           = $opt['w']
+  config.pause_duration = ($opt['p'] || 1).to_i
+end
+
+if $opt['s']
+  begin
     until STDIN.eof?
-      buffer = STDIN.read(8192)
-      file.write buffer
+      line = STDIN.gets
+      line = line.sub(/.*?([^:\s]+:)/, '\1')
+      editor.edit(line)
     end
-    file.close
-    argv << file.path
-  elsif serverlist.member?(servername)
-    system *cmd(vim, '-g', servername, remote, "stupid_trick#{rand}")
-    sleep 1
-    exec *cmd(vim, '-g', servername, '--remote-send', '<ESC>:bw<CR>')
-  else
-    exec *cmd(vim, '-g', servername, remote)
+  rescue Interrupt
   end
-end
-unless argv.empty?
-  lineno_re = /^\s*([^:]+):(\d+)/
-  if argv.first =~ lineno_re
-    for a in argv
-      if a =~ lineno_re
-        system *cmd(vim, '-g', servername, remote, $1)
-        sleep 1
-        system *cmd(vim, '-g', servername, '--remote-send', "<ESC>:#$2<CR>")
-      else
-        system *cmd(vim, '-g', servername, remote, a)
+else
+  argv = ARGV.dup
+  if argv.empty?
+    if !STDIN.tty?
+      file = File.new(File.join(Dir.tmpdir, "edit_tmp.#$$"), 'w')
+      until STDIN.eof?
+        buffer = STDIN.read(8192)
+        file.write buffer
       end
-      if a != argv.last
-        STDOUT.print "Press enter to edit the next file."
-        STDOUT.flush
-        STDIN.gets
+      file.close
+      argv << file.path
+    else
+      editor.ensure_running
+    end
+  end
+  unless argv.empty?
+    if editor.file_linenumber?(argv.first)
+      editor.wait = argv.size > 1
+      for current_file in argv
+        STDOUT.puts "Edit #{current_file}"
+        editor.edit current_file
       end
+    else
+      editor.edit(*argv)
     end
-  else
-    exec *cmd(vim, '-g', servername, remote, *argv)
   end
 end
 exit 0

data/bin/search

@@ -2,164 +2,18 @@
 # encoding: UTF-8
 
 require 'utils'
-include Utils::Patterns
-require 'term/ansicolor'
-require 'spruz/xt'
-
-class ::String
-  include Term::ANSIColor
-end
-
-class ::File
-  include Utils::FileXt
-end
-
-class Grepper
-  PRUNE = /\A(\.svn|\.git|CVS|tmp)\Z/
-  SKIP  = /(\A\.|\.sw[pon]\Z|~\Z)/
-
-  class Queue
-    def initialize(max_size)
-      @max_size, @data = max_size, []
-    end
-
-    attr_reader :max_size
-
-    def data
-      @data.dup
-    end
-
-    def push(x)
-      @data.shift if @data.size > @max_size
-      @data << x
-      self
-    end
-    alias << push
-  end
-
-  def initialize(opts = {})
-    @args  = opts[:args] || {}
-    @roots = opts[:roots] || []
-    if n = @args.values_at(*%w[A B C]).compact.first
-      if n.to_s =~ /\A\d+\Z/ and (n = n.to_i) >= 1
-        @queue = Queue.new n
-      else
-        raise ArgumentError, "needs to be an integer number >= 1"
-      end
-    end
-    @pathes  = []
-    pattern_opts = opts.subhash(:pattern) | {
-      :cset  => @args['a'],
-      :icase => @args['i'],
-    }
-    @pattern = @args['R'] ?
-      FuzzyPattern.new(pattern_opts) :
-      RegexpPattern.new(pattern_opts)
-    @name_pattern =
-      if name_pattern = @args['N']
-        RegexpPattern.new(:pattern => name_pattern)
-      elsif name_pattern = @args['n']
-        FuzzyPattern.new(:pattern => name_pattern)
-      end
-    @skip_pattern =
-      if skip_pattern = @args['S']
-        RegexpPattern.new(:pattern => skip_pattern)
-      elsif skip_pattern = @args['s']
-        FuzzyPattern.new(:pattern => skip_pattern)
-      end
-  end
-
-  attr_reader :pathes
-
-  def match(filename)
-    @filename = filename
-    bn = File.basename(filename)
-    @output = []
-    s = File.stat(filename)
-    if s.directory? && bn =~ PRUNE
-      $DEBUG and warn "Pruning '#{filename}'."
-      Utils::Find.prune
-    end
-    if s.file? && bn !~ SKIP && (!@name_pattern || @name_pattern.match(bn))
-      File.open(filename, 'rb') do |file|
-        if file.binary? != true
-          $DEBUG and warn "Matching '#{filename}'."
-          match_lines file
-        else
-          $DEBUG and warn "Skipping binary file '#{filename}'."
-        end
-      end
-    else
-      $DEBUG and warn "Skipping '#{filename}'."
-    end
-    unless @output.empty?
-      case
-      when @args['l'], @args['e']
-        @output.uniq!
-        @pathes.concat @output
-      else
-        STDOUT.puts @output
-      end
-      @output.clear
-    end
-    self
-  rescue SystemCallError => e
-    warn "Caught #{e.class}: #{e}"
-    nil
-  end
-
-  def match_lines(file)
-    for line in file
-      if m = @pattern.match(line)
-        @skip_pattern and @skip_pattern =~ line and next
-        line[m.begin(0)...m.end(0)] = m[0].on_yellow
-        @queue and @queue << line
-        if @args['l'] or @args['e']
-          @output << @filename
-        elsif @args['L']
-          @output << "#{@filename}:#{file.lineno}"
-        else
-          @output << "#{@filename}:#{file.lineno}".red
-          if @args['B'] or @args['C']
-            @output.concat @queue.data
-          else
-            @output << line
-          end
-          if @args['A'] or @args['C']
-            where = file.tell
-            @queue.max_size.times do
-              file.eof? and break
-              line = file.readline 
-              @queue << line
-              @output << line
-            end
-            file.seek where
-          end
-        end
-      else
-        @queue and @queue << line
-      end
-    end
-  end
-
-  def search
-    @suffix = @args['I']
-    for dir in @roots
-      Utils::Find.find(dir) do |filename|
-        if !@suffix || @suffix == File.extname(filename)[1..-1]
-          match(filename)
-        end
-      end
-    end
-    @pathes.sort!
-    self
-  end
-end
-
+include Utils
+require 'spruz/go'
 include Spruz::GO
 
 def edit_files(pathes)
-  system "edit #{pathes.map { |x| "'#{x}'" } * ' '}"
+  editor = Utils::Edit::Editor.new do |config|
+    config.wait = true
+  end
+  for (file, linenumber) in pathes.map { |p| p.split(':') }
+    STDERR.puts "Edit #{file}:#{linenumber}"
+    editor.edit_linenumber(file, linenumber)
+  end
 end
 
 def usage
@@ -193,7 +47,7 @@ Options are
 end
 
 args = go 'I:A:B:C:s:S:n:N:a:RcilLeh'
-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) }