ZenTest 3.10.0 → 3.11.0

data/History.txt

@@ -1,3 +1,37 @@
+=== 3.11.0 / 2008-10-22
+
+* 19 minor enhancements:
+
+  * Added :updated hook, gets list of updated files before running tests.
+  * Added autotest/restart.rb - restarts autotest if .autotest updated.
+  * Added better help to multiruby.
+  * Added dummy build command to multiruby_setup.
+  * Added git support.
+  * Added rbx:ln:$dir and rbx:git:current.
+  * Added rubygems:merge as a nice little hack to share rubygems setups.
+  * Added svn tag updating (eg will svn sw from mri 1.8.6 222 to 1.8.6 231).
+  * Autotest hooks now take *args as well as instance of autotest.
+  * Made it possible to have manually specified tags.
+  * Made multiruby a little more self-repairing wrt symlinks and build dirs.
+  * Refactored into mri_latest_tag(v).
+  * Refactored unit_diff to make it a bit easier to use as a library.
+  * Refactored zentest mapping main methods into munge/unmunge.
+  * Removed rubinius specific symlink hacks, now fully supported.
+  * mri:svn:releases figures out all the latest patch levels.
+  * multiruby_setup clean now checks for rakefile first, since rbx has both. :(
+  * multiruby_setup help now exits instead of building.
+  * multiruby_setup list and clean now exit
+
+* 2 bug fixes:
+
+  * ZenTestMapping converts operator prefixes to operators only when an _ follows.
+  * Apparently Tempfile.open doesn't return it's last value. fixed.
+
+* 2 bug fixes:
+
+  * Fixed bug in mri:svn:branch:xxx with svn dir name.
+  * multiruby_setup rm now smarter about tarballs.
+
 === 3.10.0 / 2008-06-17
 
 * 1 major enhancement:

data/Manifest.txt

@@ -36,6 +36,7 @@ lib/autotest/pretty.rb
 lib/autotest/rails.rb
 lib/autotest/rcov.rb
 lib/autotest/redgreen.rb
+lib/autotest/restart.rb
 lib/autotest/screen.rb
 lib/autotest/shame.rb
 lib/autotest/snarl.rb

data/bin/multiruby_setup

@@ -4,43 +4,62 @@ require 'multiruby'
 
 ARGV << "help" if ARGV.empty?
 
+Dir.chdir Multiruby.root_dir
+Multiruby.setup_dirs(false)
+
 ARGV.each do |spec|
   case spec
   when "-h", "help" then
     Multiruby.help
+    exit 0
   when "list" then
     Multiruby.list
+    exit 0
+  when "build" then
+    # do nothing
   when /rm:(.*)/ then
     Multiruby.rm $1
   when "clean" then
     Multiruby.clean
+    exit 0
   when "update" then
     Multiruby.update
   when "update:rubygems" then
     Multiruby.update_rubygems
+  when "rubygems:merge" then
+    Multiruby.merge_rubygems
   when "mri:svn:current" then
     ARGV << "mri:svn:releases" << "mri:svn:branches"
   when "mri:svn:releases" then
     Multiruby::TAGS.each do |v|
-      ARGV << "mri:svn:#{v}"
+      latest = Multiruby.mri_latest_tag v
+      abort "Can't find tag #{v}" unless latest
+      ARGV << "mri:svn:tag:#{latest}:mri_rel_#{v}"
     end
   when "mri:svn:branches" then
     Multiruby::BRANCHES.each do |v|
-      ARGV << "mri:svn:#{v}"
+      ARGV << "mri:svn:branch:#{v}"
     end
   when /mri:svn:branch:(.*)/ then
-    ver = $1
+    dir = ver = $1
     ver = "branches/ruby_#{ver}" unless ver == "trunk"
 
-    Multiruby.svn_co "#{Multiruby::MRI_SVN}/#{ver}", "mri_#{ver}"
+    Multiruby.svn_co "#{Multiruby::MRI_SVN}/#{ver}", "mri_#{dir}"
+  when /mri:svn:tag:(.*):(.*)/ then
+    ver, dir = $1, $2
+
+    Multiruby.svn_co "#{Multiruby::MRI_SVN}/tags/#{ver}", dir
   when /mri:svn:tag:(.*)/ then
     ver = $1
-    latest = Multiruby.tags.grep(/#{ver}/).last
 
-    Multiruby.svn_co "#{Multiruby::MRI_SVN}/tags/#{latest}", "mri_rel_#{ver}"
+    ARGV << "mri:svn:tag:#{ver}:#{ver}"
   when /mri:tar:(.*)/ then
     v = $1
     Multiruby.fetch_tar v
+  when /rbx:ln:(.*)/ then
+    Multiruby.rbx_ln $1
+  when /rbx:git:current/ then
+    Multiruby.git_clone "#{Multiruby::RBX_GIT}/code", "rubinius"
   else
     warn "unknown spec #{spec}"
   end

data/example_dot_autotest.rb

@@ -14,9 +14,11 @@
 # require 'autotest/menu'
 # require 'autotest/migrate'
 # require 'autotest/notify'
+# require 'autotest/once'
 # require 'autotest/pretty'
 # require 'autotest/rcov'
 # require 'autotest/redgreen'
+# require 'autotest/restart'
 # require 'autotest/screen'
 # require 'autotest/shame'
 # require 'autotest/snarl'
@@ -31,12 +33,13 @@
 # Autotest::EmailNotify.recipients = o
 # Autotest::EmailNotify.use_svn = o
 # Autotest::EmailNotify.report_every_run = o
-# Autotest::Growl.growl title, msg, pri = 0
+# Autotest::Growl.growl title, msg, pri = 0, img = nil
 # Autotest::JabberNotify.recipients = o
 # Autotest::JabberNotify.account = o
 # Autotest::JabberNotify.password = o
 # Autotest::JabberNotify.use_svn = o
 # Autotest::JabberNotify.report_every_run = o
+# Autotest::RCov.command = o
 # Autotest::RCov.pattern = o
 # Autotest::Shame.chat_app = o
 # Autotest::Snarl.snarl title, msg, ico = nil

data/lib/autotest/fixtures.rb

@@ -6,7 +6,7 @@
 module Autotest::Fixtures
   Autotest.add_hook :initialize do  |at|
     at.test_mappings['^test/fixtures/(.*)s.yml'] = proc { |filename, matches|
-      at.files_matching /test\/\w+\/#{matches[1]}(_\w+)?.*_test.rb$/
+      at.files_matching(/test\/\w+\/#{matches[1]}(_\w+)?.*_test.rb$/)
     }
   end
 end

data/lib/autotest/restart.rb

@@ -0,0 +1,11 @@
+module Autotest::Restart
+  Autotest.add_hook :updated do |at, *args|
+    if args.flatten.include? ".autotest" then
+      warn "Detected change to .autotest, restarting"
+      cmd = "autotest"
+      cmd << " -v" if $v
+      
+      exec cmd
+    end
+  end
+end

data/lib/autotest.rb

@@ -29,10 +29,13 @@ $TESTING = false unless defined? $TESTING
 #   Autotest.add_hook hook_name { |autotest| ... }
 #
 # The available hooks are: initialize, run, run_command, ran_command,
-#   red, green, all_good, reset, interrupt, and quit.
+#   red, green, updated, all_good, reset, interrupt, and quit.
 #
 # See example_dot_autotest.rb for more details.
 #
+# If a hook returns a true value, it signals to autotest that the hook
+# was handled and should not continue executing hooks.
+#
 # Naming:
 #
 # Autotest uses a simple naming scheme to figure out how to map
@@ -377,7 +380,9 @@ class Autotest
   def find_files_to_test(files=find_files)
     updated = files.select { |filename, mtime| self.last_mtime < mtime }
 
-    p updated if $v unless updated.empty? or self.last_mtime.to_i == 0
+    p updated if $v unless updated.empty? || self.last_mtime.to_i == 0
+
+    hook :updated, updated unless updated.empty? || self.last_mtime.to_i == 0
 
     updated.map { |f,m| test_files_for(f) }.flatten.uniq.each do |filename|
       self.files_to_test[filename] # creates key with default value
@@ -507,7 +512,8 @@ class Autotest
 
     result = result.nil? ? [] : Array(result.last.call(filename, $~))
 
-    output.puts "Dunno! #{filename}" if ($v or $TESTING) and result.empty?
+    output.puts "No tests matched #{filename}" if
+      ($v or $TESTING) and result.empty?
 
     result.sort.uniq.select { |f| known_files[f] }
   end
@@ -624,7 +630,7 @@ class Autotest
   # until one returns true. Returns false if no hook handled the
   # event.
 
-  def hook(name)
+  def hook(name, *args)
     deprecated = {
       # none currently
     }
@@ -634,7 +640,7 @@ class Autotest
     end
 
     HOOKS[name].any? do |plugin|
-      plugin[self]
+      plugin[self, *args]
     end
   end
 

data/lib/multiruby.rb

@@ -12,6 +12,7 @@ require 'open-uri'
 #     list            - print installed versions.
 #     update          - update svn builds.
 #     update:rubygems - update rubygems and nuke install dirs.
+#     rubygems:merge  - symlink all rubygem dirs to one dir.
 #     rm:$version     - remove a particular version.
 #     clean           - clean scm build dirs and remove non-scm build dirs.
 #
@@ -23,6 +24,8 @@ require 'open-uri'
 #     mri:svn:branch:$branch - install a specific $branch of mri from svn.
 #     mri:svn:tag:$tag       - install a specific $tag of mri from svn.
 #     mri:tar:$version       - install a specific $version of mri from tarball.
+#     rbx:ln:$dir            - symlink your rbx $dir
+#     rbx:git:current        - install rbx from git
 #
 # NOTES:
 #
@@ -30,9 +33,18 @@ require 'open-uri'
 # * I'll get to adding support for other implementations soon.
 #
 module Multiruby
-  MRI_SVN = "http://svn.ruby-lang.org/repos/ruby"
-  TAGS     = %w(    1_8_6 1_8_7 1_9  ).map { |v| "tag:#{v}" }
-  BRANCHES = %w(1_8 1_8_6 1_8_7 trunk).map { |v| "branch:#{v}" }
+  MRI_SVN  = "http://svn.ruby-lang.org/repos/ruby"
+  RBX_GIT  = "git://git.rubini.us"
+
+  TAGS     = %w(    1_8_6 1_8_7 1_9  )
+  BRANCHES = %w(1_8 1_8_6 1_8_7 trunk)
+
+  HELP = []
+
+  File.readlines(__FILE__).each do |line|
+    next unless line =~ /^#( |$)/
+    HELP << line.sub(/^# ?/, '')
+  end
 
   def self.build_and_install
     root_dir = self.root_dir
@@ -56,20 +68,26 @@ module Multiruby
 
           unless test ?d, inst_dir then
             unless test ?d, build_dir then
-              puts "creating #{inst_dir}"
-              Dir.mkdir inst_dir
-              run "tar zxf #{tarball}"
+              if test ?d, tarball then
+                dir = File.basename tarball
+                FileUtils.ln_sf "../versions/#{dir}", "../build/#{dir}"
+              else
+                puts "creating #{inst_dir}"
+                Dir.mkdir inst_dir
+                run "tar zxf #{tarball}"
+              end
             end
             Dir.chdir build_dir do
               puts "building and installing #{version}"
-              run "autoconf" unless test ?f, "configure"
-              FileUtils.rm_r "ext/readline" if test ?d, "ext/readline"
-              run "./configure --prefix #{inst_dir} &> log.configure" unless test ?f, "Makefile"
-              run "nice make -j4 &> log.build"
-              run "make install &> log.install"
-              build_dir = Dir.pwd
-
-              if rubygem_tarball and version !~ /1[._-]9|trunk/ then
+              if test ?f, "configure.in" then
+                gnu_utils_build inst_dir
+              elsif test ?f, "Rakefile" then
+                rake_build inst_dir
+              else
+                raise "dunno how to build"
+              end
+
+              if rubygem_tarball and version !~ /1[._-]9|mri_trunk|rubinius/ then
                 rubygems = File.basename rubygem_tarball, ".tgz"
                 run "tar zxf #{rubygem_tarball}" unless test ?d, rubygems
 
@@ -81,11 +99,6 @@ module Multiruby
           end
         end
       end
-
-      # pick up rubinius - allows for simple symlinks to your build dir
-      self.in_install_dir do
-        versions.push(*Dir["rubinius*"])
-      end
     end
 
     versions
@@ -95,10 +108,10 @@ module Multiruby
     self.each_scm_build_dir do |style|
       case style
       when :svn, :git then
-        if File.exist? "Makefile" then
-          system "make clean"
-        elsif File.exist? "Rakefile" then
-          system "rake clean"
+        if File.exist? "Rakefile" then
+          run "rake clean"
+        elsif File.exist? "Makefile" then
+          run "make clean"
         end
       else
         FileUtils.rm_rf Dir.pwd
@@ -122,13 +135,15 @@ module Multiruby
     end
   end
 
-  def self.extract_latest_version url
+  def self.extract_latest_version url, matching=nil
     file = URI.parse(url).read
     versions = file.scan(/href="(ruby.*tar.gz)"/).flatten.reject { |s|
       s =~ /preview/
     }.sort_by { |s|
       s.split(/\D+/).map { |i| i.to_i }
-    }.flatten.last
+    }.flatten
+    versions = versions.grep(/#{Regexp.escape(matching)}/) if matching
+    versions.last
   end
 
   def self.fetch_tar v
@@ -137,8 +152,10 @@ module Multiruby
 
     in_versions_dir do
       warn "    Determining latest version for #{v}"
-      base = extract_latest_version("#{base_url}/#{v}/")
-      url = File.join base_url, v, base
+      ver = v[/\d+\.\d+/]
+      base = extract_latest_version("#{base_url}/#{ver}/", v)
+      abort "Could not determine release for #{v}" unless base
+      url = File.join base_url, ver, base
       warn "    Fetching #{base} via HTTP... this might take a while."
       open(url) do |f|
         File.open base, 'w' do |out|
@@ -148,13 +165,29 @@ module Multiruby
     end
   end
 
-  def self.help
-    File.readlines(__FILE__).each do |line|
-      next unless line =~ /^#( |$)/
-      puts line.sub(/^# ?/, '')
+  def self.git_clone url, dir
+    Multiruby.in_versions_dir do
+      Multiruby.run "git clone #{url} #{dir}" unless File.directory? dir
+      FileUtils.ln_sf "../versions/#{dir}", "../build/#{dir}"
     end
   end
 
+  def self.gnu_utils_build inst_dir
+    run "autoconf" unless test ?f, "configure"
+    run "./configure --prefix #{inst_dir} &> log.configure" unless test ?f, "Makefile"
+    run "nice make -j4 &> log.build"
+    run "make install &> log.install"
+  end
+
+  def self.rake_build inst_dir
+    run "rake &> log.build"
+    FileUtils.ln_sf "../build/#{File.basename Dir.pwd}", inst_dir
+  end
+
+  def self.help
+    puts HELP.join
+  end
+
   def self.in_build_dir
     Dir.chdir File.join(self.root_dir, "build") do
       yield
@@ -194,10 +227,38 @@ module Multiruby
     end
   end
 
+  def self.merge_rubygems
+    in_install_dir do
+      gems = Dir["*/lib/ruby/gems"]
+
+      unless test ?d, "../gems" then
+        FileUtils.mv gems.first, ".."
+      end
+
+      gems.each do |d|
+        FileUtils.rm_rf d
+        FileUtils.ln_sf "../../../../gems", d
+      end
+    end
+  end
+
+  def self.mri_latest_tag v
+    Multiruby.tags.grep(/#{v}/).last
+  end
+
+  def self.rbx_ln dir
+    dir = File.expand_path dir
+    Multiruby.in_versions_dir do
+      FileUtils.ln_sf dir, "rubinius"
+      FileUtils.ln_sf "../versions/rubinius", "../install/rubinius"
+    end
+  end
+
   def self.rm name
     Multiruby.in_root_dir do
       FileUtils.rm_rf Dir["*/#{name}"]
-      File.unlink "versions/ruby-#{name}.tar.gz"
+      f = "versions/ruby-#{name}.tar.gz"
+      File.unlink f if test ?f, f
     end
   end
 
@@ -218,12 +279,12 @@ module Multiruby
     raise "ERROR: Command failed with exit code #{$?}" unless system cmd
   end
 
-  def self.setup_dirs
+  def self.setup_dirs(download = true)
     %w(build install versions tmp).each do |dir|
       unless test ?d, dir then
         puts "creating #{dir}"
         Dir.mkdir dir
-        if dir == "versions" then
+        if dir == "versions" && download then
           warn "  Downloading initial ruby tarballs to ~/.multiruby/versions:"
           %w(1.8 1.9).each do |v|
             self.fetch_tar v
@@ -238,7 +299,7 @@ module Multiruby
   def self.svn_co url, dir
     Multiruby.in_versions_dir do
       Multiruby.run "svn co #{url} #{dir}" unless File.directory? dir
-      FileUtils.ln_s "../versions/#{dir}", "../build/#{dir}"
+      FileUtils.ln_sf "../versions/#{dir}", "../build/#{dir}"
     end
   end
 
@@ -246,7 +307,7 @@ module Multiruby
     tags = nil
     Multiruby.in_tmp_dir do
       cache = "svn.tag.cache"
-      File.unlink cache if Time.now - File.mtime(cache) > 86400 rescue nil
+      File.unlink cache if Time.now - File.mtime(cache) > 3600 rescue nil
 
       File.open cache, "w" do |f|
         f.write `svn ls #{MRI_SVN}/tags/`
@@ -264,23 +325,56 @@ module Multiruby
     # figure out latest tag on that name and svn sw to it trunk and
     # others will just svn update
 
+    clean = []
+
     self.each_scm_build_dir do |style|
+      dir = File.basename(Dir.pwd)
+      warn dir
+
       case style
       when :svn then
-        dir = File.basename(Dir.pwd)
-        warn dir
         case dir
         when /mri_\d/ then
           system "svn cleanup" # just in case
-          FileUtils.rm_rf "../install/#{dir}" if `svn up` =~ /^[ADUCG] /
-        when /tag/
-          warn "don't know how to update tags: #{dir}"
-          # url = `svn info`[/^URL: (.*)/, 1]
+          svn_up = `svn up`
+          in_build_dir do
+            if svn_up =~ /^[ADUCG] / then
+              clean << dir
+            else
+              warn "  no update"
+            end
+            FileUtils.ln_sf "../build/#{dir}", "../versions/#{dir}"
+          end
+        when /mri_rel_(.+)/ then
+          ver = $1
+          url = `svn info`[/^URL: (.*)/, 1]
+          latest = self.mri_latest_tag(ver).chomp('/')
+          new_url = File.join(File.dirname(url), latest)
+          if new_url != url then
+            run "svn sw #{new_url}"
+            clean << dir
+          else
+            warn "  no update"
+          end
+        else
+          warn "  update in this svn dir not supported yet: #{dir}"
+        end
+      when :git then
+        case dir
+        when /rubinius/ then
+          run "rake git:update build" # minor cheat by building here
         else
-          warn "don't know how to update: #{dir}"
+          warn "  update in this git dir not supported yet: #{dir}"
         end
       else
-        warn "update in non-svn dir not supported yet: #{dir}"
+        warn "  update in non-svn dir not supported yet: #{dir}"
+      end
+    end
+
+    in_install_dir do
+      clean.each do |dir|
+        warn "removing install/#{dir}"
+        FileUtils.rm_rf dir
       end
     end
   end
@@ -299,5 +393,9 @@ module Multiruby
         f.write URI.parse(url+file).read
       end
     end
+
+    Multiruby.in_install_dir do
+      FileUtils.rm_rf Dir["*"]
+    end
   end
 end

data/lib/unit_diff.rb

@@ -199,31 +199,7 @@ class UnitDiff
       output.push prefix.compact.map {|line| line.strip}.join("\n")
 
       if butwas then
-        Tempfile.open("expect") do |a|
-          a.write(massage(expect))
-          a.rewind
-          Tempfile.open("butwas") do |b|
-            b.write(massage(butwas))
-            b.rewind
-
-            diff_flags = $u ? "-u" : $c ? "-c" : ""
-            diff_flags += " -b" if $b
-
-            result = `#{DIFF} #{diff_flags} #{a.path} #{b.path}`
-            if result.empty? then
-              output.push "[no difference--suspect ==]"
-            else
-              output.push result.split(/\n/)
-            end
-
-            if $k then
-              warn "moving #{a.path} to #{a.path}.keep"
-              File.rename a.path, a.path + ".keep"
-              warn "moving #{b.path} to #{b.path}.keep"
-              File.rename b.path, b.path + ".keep"
-            end
-          end
-        end
+        output.push self.diff(expect, butwas)
 
         output.push result_footer
         output.push ''
@@ -240,6 +216,38 @@ class UnitDiff
     return output.flatten.join("\n")
   end
 
+  def diff expect, butwas
+    output = nil
+
+    Tempfile.open("expect") do |a|
+      a.write(massage(expect))
+      a.rewind
+      Tempfile.open("butwas") do |b|
+        b.write(massage(butwas))
+        b.rewind
+
+        diff_flags = $u ? "-u" : $c ? "-c" : ""
+        diff_flags += " -b" if $b
+
+        result = `#{DIFF} #{diff_flags} #{a.path} #{b.path}`
+        output = if result.empty? then
+                   "[no difference--suspect ==]"
+                 else
+                   result.split(/\n/)
+                 end
+
+        if $k then
+          warn "moving #{a.path} to #{a.path}.keep"
+          File.rename a.path, a.path + ".keep"
+          warn "moving #{b.path} to #{b.path}.keep"
+          File.rename b.path, b.path + ".keep"
+        end
+      end
+    end
+
+    output
+  end
+
   def massage(data)
     data = data.map { |l| '%3d) %s' % [count+=1, l] } if $l
     # unescape newlines, strip <> from entire string

data/lib/zentest.rb

@@ -56,7 +56,7 @@ end
 
 class ZenTest
 
-  VERSION = '3.10.0'
+  VERSION = '3.11.0'
 
   include ZenTestMapping
 
@@ -422,6 +422,20 @@ class ZenTest
     end # @klasses[klassname]
   end
 
+  def test_to_normal(name, klassname=nil)
+    super do |name|
+      if defined? @inherited_methods then
+        known_methods = (@inherited_methods[klassname] || {}).keys.sort.reverse
+        known_methods_re = known_methods.map {|s| Regexp.escape(s) }.join("|")
+
+        name = name.sub(/^(#{known_methods_re})(_.*)?$/) { $1 } unless
+          known_methods_re.empty?
+
+        name
+      end
+    end
+  end
+
   # create a given method at a given
   # indentation. Returns an array containing
   # the lines of the method.
@@ -456,8 +470,6 @@ class ZenTest
   # NotImplementedError, so that they can be filled
   # in later, and so the tests will fail to start with.
   def generate_code
-
-#    @result.unshift "# run against: #{files.join(', ')}" if $DEBUG
     @result.unshift "# Code Generated by ZenTest v. #{VERSION}"
 
     if $DEBUG then

data/lib/zentest_mapping.rb

@@ -55,45 +55,63 @@ module ZenTestMapping
 
   @@method_map = @@orig_method_map.merge(@@orig_method_map.invert)
 
-  # Generates a test method name from a normal method,
-  # taking into account names composed of metacharacters
-  # (used for arithmetic, etc
-  def normal_to_test(name)
-    name = name.to_s.dup # wtf?
+  @@mapped_re = @@orig_method_map.values.sort_by { |k| k.length }.map {|s|
+    Regexp.escape(s)
+  }.reverse.join("|")
+
+  def munge name
+    name = name.to_s.dup
+
     is_cls_method = name.sub!(/^self\./, '')
+
     name = @@method_map[name] if @@method_map.has_key? name
     name = name.sub(/=$/, '_equals')
     name = name.sub(/\?$/, '_eh')
     name = name.sub(/\!$/, '_bang')
+
+    name = yield name if block_given?
+
     name = "class_" + name if is_cls_method
-    "test_#{name}"
-  end
 
-  # Converts a method name beginning with test to its
-  # corresponding normal method name, taking into account
-  # symbolic names which may have been anglicised by
-  # #normal_to_test().
-  def test_to_normal(name, klassname=nil)
-    name = name.to_s
+    name
+  end
 
-    known_methods = (@inherited_methods[klassname] || {}).keys.sort.reverse
+  # Generates a test method name from a normal method,
+  # taking into account names composed of metacharacters
+  # (used for arithmetic, etc
+  def normal_to_test name
+    "test_#{munge name}"
+  end
 
-    mapped_re = @@orig_method_map.values.sort_by { |k| k.length }.map {|s| Regexp.escape(s)}.reverse.join("|")
-    known_methods_re = known_methods.map {|s| Regexp.escape(s)}.join("|")
+  def unmunge name
+    name = name.to_s.dup
 
-    name = name.sub(/^test_/, '')
-    name = name.sub(/_equals/, '=') unless name =~ /index/
-    name = name.sub(/_bang.*$/, '!') # FIX: deal w/ extensions separately
-    name = name.sub(/_eh/, '?')
     is_cls_method = name.sub!(/^class_/, '')
-    name = name.sub(/^(#{mapped_re})(.*)$/) {$1}
-    name = name.sub(/^(#{known_methods_re})(.*)$/) {$1} unless known_methods_re.empty?
 
-    # look up in method map
+    name = name.sub(/_equals(_.*)?$/, '=') unless name =~ /index/
+    name = name.sub(/_bang(_.*)?$/, '!')
+    name = name.sub(/_eh(_.*)?$/, '?')
+    name = name.sub(/^(#{@@mapped_re})(_.*)?$/) {$1}
+    name = yield name if block_given?
     name = @@method_map[name] if @@method_map.has_key? name
-
     name = 'self.' + name if is_cls_method
 
     name
   end
+
+  # Converts a method name beginning with test to its
+  # corresponding normal method name, taking into account
+  # symbolic names which may have been anglicised by
+  # #normal_to_test().
+  def test_to_normal(name, klassname=nil)
+    unmunge(name.to_s.sub(/^test_/, '')) do |n|
+      if defined? @inherited_methods then
+        known_methods = (@inherited_methods[klassname] || {}).keys.sort.reverse
+        known_methods_re = known_methods.map {|s| Regexp.escape(s) }.join("|")
+        n = n.sub(/^(#{known_methods_re})(_.*)?$/) { $1 } unless
+          known_methods_re.empty?
+        n
+      end
+    end
+  end
 end

data/test/test_autotest.rb

@@ -182,7 +182,7 @@ class TestAutotest < Test::Unit::TestCase
     files = { "fooby.rb" => Time.at(42) }
     assert @a.find_files_to_test(files)  # we find fooby,
     assert_equal empty, @a.files_to_test # but it isn't something to test
-    assert_equal "Dunno! fooby.rb\n", @a.output.string
+    assert_equal "No tests matched fooby.rb\n", @a.output.string
   end
 
   def test_find_files_to_test_lib

data/test/test_zentest.rb

@@ -12,14 +12,10 @@ $TESTING = true
 # I do this so I can still run ZenTest against the tests and itself...
 require 'zentest' unless defined? $ZENTEST
 
-class TrueClass # stupid YAML is breaking my tests. Enters via Test::Rails
-  remove_method :taguri, :taguri=, :to_yaml rescue nil
-end
-
 # These are just classes set up for quick testing.
 # TODO: need to test a compound class name Mod::Cls
 
-class Cls1              # ZenTest SKIP
+class Cls1                  # ZenTest SKIP
   def meth1; end
   def self.meth2; end
 end
@@ -37,7 +33,7 @@ class SuperDuper            # ZenTest SKIP
   def overridden; end
 end
 
-class LowlyOne < SuperDuper     # ZenTest SKIP
+class LowlyOne < SuperDuper # ZenTest SKIP
   def self.cls_extended; end
   def overridden; end
   def extended; end
@@ -145,6 +141,10 @@ end
 class TestTrueClass; end
 
 class TestZenTest < Test::Unit::TestCase
+  unless defined? Mini then
+    alias :refute_nil :assert_not_nil
+  end
+
 
   def setup
     @tester = ZenTest.new()
@@ -559,6 +559,9 @@ assert_equal expected, util_testcase("Something2::Blah2", "TestSomething2::TestB
   end
 
   def test_testcase9
+    # stupid YAML is breaking my tests. Enters via Test::Rails. order dependent.
+    TrueClass.send :remove_method, :taguri, :taguri=, :to_yaml if defined? YAML
+
     expected = "\nrequire 'test/unit' unless defined? $ZENTEST and $ZENTEST\n\nclass TestTrueClass < Test::Unit::TestCase\n  def test_and\n    raise NotImplementedError, 'Need to write test_and'\n  end\n\n  def test_carat\n    raise NotImplementedError, 'Need to write test_carat'\n  end\n\n  def test_or\n    raise NotImplementedError, 'Need to write test_or'\n  end\n\n  def test_to_s\n    raise NotImplementedError, 'Need to write test_to_s'\n  end\nend\n\n# Number of errors detected: 4"
 
     assert_equal expected, util_testcase("TestTrueClass")

data/test/test_zentest_mapping.rb

@@ -16,27 +16,25 @@ class TestZentestMapping < Test::Unit::TestCase
 
   def util_simple_setup
     klasses = {
-      "Something" =>
-        {
-        "method1" => true,
-        "method1!" => true,
-        "method1=" => true,
-        "method1?" => true,
-        "attrib" => true,
-        "attrib=" => true,
-        "equal?" => true,
+      "Something" => {
+        "method1"      => true,
+        "method1!"     => true,
+        "method1="     => true,
+        "method1?"     => true,
+        "attrib"       => true,
+        "attrib="      => true,
+        "equal?"       => true,
         "self.method3" => true,
-        "self.[]" => true,
+        "self.[]"      => true,
       },
     }
     test_klasses = {
-      "TestSomething" =>
-        {
+      "TestSomething" => {
         "test_class_method4" => true,
-        "test_method2" => true,
-        "setup" => true,
-        "teardown" => true,
-        "test_class_index" => true,
+        "test_method2"       => true,
+        "setup"              => true,
+        "teardown"           => true,
+        "test_class_index"   => true,
       },
     }
     @tester.inherited_methods = test_klasses.merge(klasses)
@@ -101,24 +99,28 @@ end
 
   def test_normal_to_test_cls
     self.util_simple_setup
-    assert_equal("test_class_method1",        @tester.normal_to_test("self.method1"))
-    assert_equal("test_class_method1_bang",   @tester.normal_to_test("self.method1!"))
-    assert_equal("test_class_method1_eh",     @tester.normal_to_test("self.method1?"))
-    assert_equal("test_class_method1_equals", @tester.normal_to_test("self.method1="))
+    assert_equal("test_class_method1",
+                 @tester.normal_to_test("self.method1"))
+    assert_equal("test_class_method1_bang",
+                 @tester.normal_to_test("self.method1!"))
+    assert_equal("test_class_method1_eh",
+                 @tester.normal_to_test("self.method1?"))
+    assert_equal("test_class_method1_equals",
+                 @tester.normal_to_test("self.method1="))
   end
 
   def test_normal_to_test_operators
     self.util_simple_setup
-    assert_equal("test_and",     @tester.normal_to_test("&"))
-    assert_equal("test_bang",    @tester.normal_to_test("!"))
-    assert_equal("test_carat",   @tester.normal_to_test("^"))
-    assert_equal("test_div",     @tester.normal_to_test("/"))
+    assert_equal("test_and",         @tester.normal_to_test("&"))
+    assert_equal("test_bang",        @tester.normal_to_test("!"))
+    assert_equal("test_carat",       @tester.normal_to_test("^"))
+    assert_equal("test_div",         @tester.normal_to_test("/"))
     assert_equal("test_equalstilde", @tester.normal_to_test("=~"))
-    assert_equal("test_minus",   @tester.normal_to_test("-"))
-    assert_equal("test_or",      @tester.normal_to_test("|"))
-    assert_equal("test_percent", @tester.normal_to_test("%"))
-    assert_equal("test_plus",    @tester.normal_to_test("+"))
-    assert_equal("test_tilde",   @tester.normal_to_test("~"))
+    assert_equal("test_minus",       @tester.normal_to_test("-"))
+    assert_equal("test_or",          @tester.normal_to_test("|"))
+    assert_equal("test_percent",     @tester.normal_to_test("%"))
+    assert_equal("test_plus",        @tester.normal_to_test("+"))
+    assert_equal("test_tilde",       @tester.normal_to_test("~"))
   end
 
   def test_normal_to_test_overlap
@@ -145,27 +147,44 @@ end
 
   def test_test_to_normal
     self.util_simple_setup
-    assert_equal("method1!", @tester.test_to_normal("test_method1_bang", "Something"))
-    assert_equal("method1",  @tester.test_to_normal("test_method1", "Something"))
-    assert_equal("method1=", @tester.test_to_normal("test_method1_equals", "Something"))
-    assert_equal("method1?", @tester.test_to_normal("test_method1_eh", "Something"))
+    assert_equal("method1!",
+                 @tester.test_to_normal("test_method1_bang", "Something"))
+    assert_equal("method1",
+                 @tester.test_to_normal("test_method1", "Something"))
+    assert_equal("method1=",
+                 @tester.test_to_normal("test_method1_equals", "Something"))
+    assert_equal("method1?",
+                 @tester.test_to_normal("test_method1_eh", "Something"))
   end
 
   def test_test_to_normal_cls
     self.util_simple_setup
-    assert_equal("self.method1",  @tester.test_to_normal("test_class_method1"))
-    assert_equal("self.method1!", @tester.test_to_normal("test_class_method1_bang"))
-    assert_equal("self.method1?", @tester.test_to_normal("test_class_method1_eh"))
-    assert_equal("self.method1=", @tester.test_to_normal("test_class_method1_equals"))
-    assert_equal("self.[]", @tester.test_to_normal("test_class_index"))
+    assert_equal("self.method1",
+                 @tester.test_to_normal("test_class_method1"))
+    assert_equal("self.method1!",
+                 @tester.test_to_normal("test_class_method1_bang"))
+    assert_equal("self.method1?",
+                 @tester.test_to_normal("test_class_method1_eh"))
+    assert_equal("self.method1=",
+                 @tester.test_to_normal("test_class_method1_equals"))
+    assert_equal("self.[]",
+                 @tester.test_to_normal("test_class_index"))
   end
 
   def test_test_to_normal_extended
     self.util_simple_setup
-    assert_equal("equal?",  @tester.test_to_normal("test_equal_eh_extension", "Something"))
-    assert_equal("equal?",  @tester.test_to_normal("test_equal_eh_extension_again", "Something"))
-    assert_equal("method1", @tester.test_to_normal("test_method1_extension", "Something"))
-    assert_equal("method1", @tester.test_to_normal("test_method1_extension_again", "Something"))
+    assert_equal("equal?",
+                 @tester.test_to_normal("test_equal_eh_extension",
+                                        "Something"))
+    assert_equal("equal?",
+                 @tester.test_to_normal("test_equal_eh_extension_again",
+                                        "Something"))
+    assert_equal("method1",
+                 @tester.test_to_normal("test_method1_extension",
+                                        "Something"))
+    assert_equal("method1",
+                 @tester.test_to_normal("test_method1_extension_again",
+                                        "Something"))
   end
 
   def test_test_to_normal_mapped
@@ -214,4 +233,9 @@ end
     assert_equal("-@",  @tester.test_to_normal("test_unary_minus"))
     assert_equal("+@",  @tester.test_to_normal("test_unary_plus"))
   end
+
+  def test_to_normal_subset
+    self.util_simple_setup
+    assert_equal("get_foo",  @tester.test_to_normal("test_get_foo"))
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ZenTest
 version: !ruby/object:Gem::Version 
-  version: 3.10.0
+  version: 3.11.0
 platform: ruby
 authors: 
 - Ryan Davis
@@ -10,17 +10,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-06-17 00:00:00 -07:00
+date: 2008-10-22 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: hoe
+  type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.5.3
+        version: 1.8.0
     version: 
 description: "ZenTest provides 4 different tools and 1 library: zentest, unit_diff, autotest, multiruby, and Test::Rails.  ZenTest scans your target and unit-test code and writes your missing code based on simple naming rules, enabling XP at a much quicker pace. ZenTest only works with Ruby and Test::Unit.  unit_diff is a command-line filter to diff expected results from actual results and allow you to quickly see exactly what is wrong.  autotest is a continous testing facility meant to be used during development. As soon as you save a file, autotest will run the corresponding dependent tests.  multiruby runs anything you want on multiple versions of ruby. Great for compatibility checking! Use multiruby_setup to manage your installed versions.  Test::Rails helps you build industrial-strength Rails code."
 email: 
@@ -80,6 +81,7 @@ files:
 - lib/autotest/rails.rb
 - lib/autotest/rcov.rb
 - lib/autotest/redgreen.rb
+- lib/autotest/restart.rb
 - lib/autotest/screen.rb
 - lib/autotest/shame.rb
 - lib/autotest/snarl.rb
@@ -133,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: zentest
-rubygems_version: 1.1.1
+rubygems_version: 1.3.0
 signing_key: 
 specification_version: 2
 summary: "ZenTest provides 4 different tools and 1 library: zentest, unit_diff, autotest, multiruby, and Test::Rails"