bin/agrep.rb in amatch-0.1.5 vs bin/agrep.rb in amatch-0.2.0

@@ -1,74 +1,87 @@
 #! /usr/bin/env ruby
 #
-## $Id: agrep.rb,v 1.1.1.1 2004/09/27 19:23:42 flori Exp $
+## $Id: agrep.rb,v 1.3 2005/04/24 21:11:06 flori Exp $
 #
 
 require 'amatch'
 require 'getoptlong'
 
 def usage(msg, options)
-	print msg, "\nUsage: #{File.basename($0)} pattern [FILE ...]\n\n"
-	options.each { |o|
-		print "  " + o[1] + ", " + o[0] + " " +
-			(o[2] == GetoptLong::REQUIRED_ARGUMENT ? 'ARGUMENT' : '') + "\n"
-	}
-	print "\nReport bugs to <[e-mail]>.\n"
-	exit 0
+  print msg, "\nUsage: #{File.basename($0)} pattern [FILE ...]\n\n"
+  options.each do |o|
+    puts "  " + o[1] + ", " + o[0] + " " +
+      (o[2] == GetoptLong::REQUIRED_ARGUMENT ? 'ARGUMENT' : '')
+  end
+  puts "\nReport bugs to <[e-mail]>."
+  exit 0
 end
 
+class MyAmatch < Amatch
+  def l_search_relative(strings)
+    if strings.is_a? Array
+      l_search(strings).map { |x| x / pattern.size }
+    else
+      l_search(strings) / pattern.size
+    end
+  end
+end
+
 $distance = 1
+$mode = :l_search
 begin
-	parser = GetoptLong.new
-	options = [
-		[ '--distance',	'-d',	GetoptLong::REQUIRED_ARGUMENT ],
-		[ '--relative',	'-r',	GetoptLong::NO_ARGUMENT ],
-		[ '--verbose',	'-v',	GetoptLong::NO_ARGUMENT ],
-		[ '--help',		'-h',	GetoptLong::NO_ARGUMENT ],
-	]
-	parser.set_options(*options)
-	parser.each_option { |name, arg|
-		name = name.sub(/^--/, '')
-		case name
-		when 'distance'
-			$distance = arg.to_f
-		when 'relative'
-			$relative = 1
-		when 'verbose'
-			$verbose = 1
-		when 'help'
-			usage('You\'ve asked for it!', options)
-		end
-	}
+  parser = GetoptLong.new
+  options = [
+    [ '--distance',   '-d',  GetoptLong::REQUIRED_ARGUMENT ],
+    [ '--relative',   '-r',  GetoptLong::NO_ARGUMENT ],
+    [ '--verbose',    '-v',  GetoptLong::NO_ARGUMENT ],
+    [ '--help',       '-h',  GetoptLong::NO_ARGUMENT ],
+  ]
+  parser.set_options(*options)
+  parser.each_option do |name, arg|
+    name = name.sub(/^--/, '')
+    case name
+    when 'distance'
+      $distance = arg.to_f
+    when 'relative'
+      $mode = :l_search_relative
+    when 'verbose'
+      $verbose = 1
+    when 'help'
+      usage('You\'ve asked for it!', options)
+    end
+  end
 rescue
-	exit 1
+  exit 1
 end
-$pattern = ARGV.shift or usage('Pattern needed!', options)
+pattern = ARGV.shift or usage('Pattern needed!', options)
 
-matcher = Amatch.new($pattern)
+matcher = MyAmatch.new(pattern)
 size = 0
 start = Time.new
 if ARGV.size > 0 then
-	ARGV.each { |filename|
-		File.stat(filename).file? or next
-		size += File.size(filename)
-		begin
-			File.open(filename, 'r').each_line { |line|
-				print "#{filename}:#{line}" if
-					($relative ?	matcher.searchr(line) :
-									matcher.search(line)) <= $distance
-			}
-		rescue
-			$stderr.print "Failure at #{filename}: #{$!} => Skipping!\n"
-		end
-	}
+  ARGV.each do |filename|
+    File.stat(filename).file? or next
+    size += File.size(filename)
+    begin
+      File.open(filename, 'r').each_line do |line|
+        if matcher.__send__($mode, line) < $distance
+          puts "#{filename}:#{line}"
+        end
+      end
+    rescue
+      STDERR.print "Failure at #{filename}: #{$!} => Skipping!\n"
+    end
+  end
 else
-	$stdin.each_line { |line|
-		size += line.size
-		print line if ($relative ?	matcher.searchr(line) :
-									matcher.search(line)) <= $distance
-	}
+  STDIN.each_line do |line|
+    size += line.size
+    if matcher.__send__($mode, line) <= $distance
+      puts line
+    end
+  end
 end
 time = Time.new - start
-$verbose and $stderr.printf "%.3f secs running, scanned %.3f KB/s.\n",
-	time, size / time / 1024
+$verbose and STDERR.printf "%.3f secs running, scanned %.3f KB/s.\n",
+  time, size / time / 1024
 exit 0
+  # vim: set et sw=2 ts=2: