amatch 0.2.2 → 0.2.3

data/CHANGES

@@ -1,3 +1,5 @@
+2006-06-25 (0.2.3)
+    * Fixed agrep.rb to use the new API.
 2005-10-11 (0.2.2)
     * Fixed a typo in extconf.rb that prohibitted compiling on
     non-gcc compilers.

data/Rakefile

@@ -1,5 +1,4 @@
-# Rakefile for Amatch      -*- ruby -*-
-
+# vim: set et sw=2 ts=2:
 require 'rake/clean'
 require 'rake/testtask'
 require 'rake/gempackagetask'
@@ -17,7 +16,7 @@ PKG_FILES.exclude(/^doc/)
 task :default => :test
 
 desc "Run unit tests"
-task(:test => [:compile]) do
+task :test => :compile do
   cd 'tests' do
     ruby %{-I../ext runner.rb}
   end
@@ -43,7 +42,6 @@ desc "Removing generated files"
 task :clean do
   rm_rf 'doc'
   cd 'ext'  do
-    rm_f 'amatch.o', :verbose => true
     ruby 'extconf.rb'
     sh "make distclean" if File.exist?('Makefile')
   end
@@ -111,4 +109,3 @@ Rake::GemPackageTask.new(spec) do |pkg|
 end
 
 task :release => [ :clean, :package ]
-  # vim: set et sw=2 ts=2:

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/bin/agrep.rb

@@ -1,13 +1,14 @@
 #! /usr/bin/env ruby
+# vim: set et sw=2 ts=2:
 #
-## $Id: agrep.rb,v 1.3 2005/04/24 21:11:06 flori Exp $
+## $Id: agrep.rb,v 1.5 2006/09/26 15:59:48 flori Exp $
 #
 
 require 'amatch'
 require 'getoptlong'
 
 def usage(msg, options)
-  print msg, "\nUsage: #{File.basename($0)} pattern [FILE ...]\n\n"
+  puts msg, "Usage: #{File.basename($0)} [OPTIONS] PATTERN [FILE ...]", ""
   options.each do |o|
     puts "  " + o[1] + ", " + o[0] + " " +
       (o[2] == GetoptLong::REQUIRED_ARGUMENT ? 'ARGUMENT' : '')
@@ -16,18 +17,14 @@ def usage(msg, options)
   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
+class Amatch::Levenshtein
+  def search_relative(strings)
+    search(strings).to_f / pattern.size
   end
 end
 
 $distance = 1
-$mode = :l_search
+$mode = :search
 begin
   parser = GetoptLong.new
   options = [
@@ -43,7 +40,7 @@ begin
     when 'distance'
       $distance = arg.to_f
     when 'relative'
-      $mode = :l_search_relative
+      $mode = :search_relative
     when 'verbose'
       $verbose = 1
     when 'help'
@@ -55,7 +52,7 @@ rescue
 end
 pattern = ARGV.shift or usage('Pattern needed!', options)
 
-matcher = MyAmatch.new(pattern)
+matcher = Amatch::Levenshtein.new(pattern)
 size = 0
 start = Time.new
 if ARGV.size > 0 then
@@ -64,12 +61,12 @@ if ARGV.size > 0 then
     size += File.size(filename)
     begin
       File.open(filename, 'r').each_line do |line|
-        if matcher.__send__($mode, line) < $distance
+        if matcher.__send__($mode, line) <= $distance
           puts "#{filename}:#{line}"
         end
       end
     rescue
-      STDERR.print "Failure at #{filename}: #{$!} => Skipping!\n"
+      STDERR.puts "Failure at #{filename}: #{$!} => Skipping!"
     end
   end
 else
@@ -84,4 +81,3 @@ time = Time.new - start
 $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:

metadata

@@ -3,73 +3,69 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: amatch
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
-date: 2005-11-10 00:00:00 +01:00
+  version: 0.2.3
+date: 2006-09-26 00:00:00 +02:00
 summary: Approximate String Matching library
 require_paths: 
-  - ext
+- ext
 email: flori@ping.de
 homepage: http://amatch.rubyforge.org
 rubyforge_project: amatch
-description: "Amatch is a library for approximate string matching and searching in strings.
-  Several algorithms can be used to do this, and it's also possible to compute a
-  similarity metric number between 0.0 and 1.0 for two given strings."
+description: Amatch is a library for approximate string matching and searching in strings. Several algorithms can be used to do this, and it's also possible to compute a similarity metric number between 0.0 and 1.0 for two given strings.
 autorequire: amatch
 default_executable: agrep.rb
 bindir: bin
 has_rdoc: true
 required_ruby_version: !ruby/object:Gem::Version::Requirement 
   requirements: 
-    - 
-      - ">"
-      - !ruby/object:Gem::Version 
-        version: 0.0.0
+  - - ">"
+    - !ruby/object:Gem::Version 
+      version: 0.0.0
   version: 
 platform: ruby
 signing_key: 
 cert_chain: 
 authors: 
-  - Florian Frank
+- Florian Frank
 files: 
-  - InstalledFiles
-  - bin
-  - install.rb
-  - GPL
-  - ext
-  - Rakefile
-  - VERSION
-  - tests
-  - foo.rb
-  - CHANGES
-  - config.save
-  - README.en
-  - bin/agrep.rb
-  - ext/pair.h
-  - ext/extconf.rb
-  - ext/amatch.bundle
-  - ext/pair.c
-  - ext/tags
-  - ext/MANIFEST
-  - ext/amatch.c
-  - tests/test_longest_substring.rb
-  - tests/test_hamming.rb
-  - tests/test_sellers.rb
-  - tests/test_levenshtein.rb
-  - tests/test_pair_distance.rb
-  - tests/runner.rb
-  - tests/test_longest_subsequence.rb
+- bin
+- VERSION
+- tests
+- GPL
+- README.en
+- install.rb
+- ext
+- Rakefile
+- CHANGES
+- bin/agrep.rb
+- tests/runner.rb
+- tests/test_longest_substring.rb
+- tests/test_levenshtein.rb
+- tests/test_hamming.rb
+- tests/test_sellers.rb
+- tests/test_pair_distance.rb
+- tests/test_longest_subsequence.rb
+- ext/tags
+- ext/pair.h
+- ext/extconf.rb
+- ext/MANIFEST
+- ext/pair.c
+- ext/amatch.c
 test_files: 
-  - tests/runner.rb
+- tests/runner.rb
 rdoc_options: 
-  - "--title"
-  - "Amatch -- Approximate Matching"
-  - "--main"
-  - Amatch
-  - "--line-numbers"
+- --title
+- Amatch -- Approximate Matching
+- --main
+- Amatch
+- --line-numbers
 extra_rdoc_files: []
+
 executables: 
-  - agrep.rb
+- agrep.rb
 extensions: 
-  - ext/extconf.rb
+- ext/extconf.rb
 requirements: []
-dependencies: []
+
+dependencies: []
+

data/InstalledFiles

@@ -1,5 +0,0 @@
-/usr/local/stow/ruby/bin/
-/usr/local/stow/ruby/bin/CVS
-/usr/local/stow/ruby/bin/CVS
-/usr/local/stow/ruby/bin/CVS
-/usr/local/stow/ruby/lib/ruby/site_ruby/1.8/i686-linux/.

data/config.save

@@ -1,12 +0,0 @@
-bin-dir=$prefix/bin
-site-ruby=$prefix/lib/ruby/site_ruby/1.8
-prefix=/usr/local/stow/ruby
-ruby-path=/usr/local/stow/ruby/bin/ruby
-make-prog=make
-rb-dir=$site-ruby
-without-ext=no
-ruby-prog=/usr/local/stow/ruby/bin/ruby
-site-ruby-common=$prefix/lib/ruby/site_ruby
-std-ruby=$prefix/lib/ruby/1.8
-data-dir=$prefix/share
-so-dir=$prefix/lib/ruby/site_ruby/1.8/i686-linux

data/foo.rb

@@ -1,9 +0,0 @@
-$:.unshift 'ext'
-
-require 'amatch'
-
-a = "A" * "lost this fantasy,  this fantasy,  this  fantasy,  this fantasy,  this fantasy,  this fantasy\r\n\r\nGood love  Neat work\r\n\r\nSuper job Fancy work\r\n\r\nPants job Cool work".size
-b = "A" * "lost\r\n\r\nGood love Neat work\r\n\r\nSuper  job Fancy work\r\n\r\nPants job Cool work".size
-#p a.levenshtein_similar(b)
-amatch = Amatch::Levenshtein.new(a)
-amatch.similar(b)