ZenTest 4.5.0 → 4.6.0

data/History.txt

@@ -1,3 +1,25 @@
+=== 4.6.0 / 2011-07-22
+
+* 6 minor enhancements:
+
+  * Added -p (plain diff) and made -u (unified diff) the default for unit_diff.
+  * Added ./tmp to default exclusions.
+  * Autotest defaults unit_diff to nil now, to allow minitest's enhanced assert_equal to shine.
+  * Autotest will raise if the :died handler doesn't handle the exception. (ralfebert)
+  * Dropped 1.8.6 as a default tag/branch to build in multiruby.
+  * autotest can now be automatically 'narrowed' on the command-line.
+    * eg: `autotest lib test/test_blah.rb`
+
+* 7 bug fixes:
+
+  * Believe it or not... but some ppl use zentest. Fixed nested class vs module bug
+  * Fix to turn on jruby's support for ObjectSpace. (stepheneb)
+  * Fixed a rubygems deprecation in autotest
+  * Fixed unit_diff scanning for minitest output.
+  * Normalized shebangs to fix problems on windows (luis)
+  * autotest/isolate.rb sets GEM_HOME as well as GEM_PATH.
+  * Fixed 1.9.3 warnings.
+
 === 4.5.0 / 2011-02-18
 
 * 6 minor enhancements:

data/README.txt

@@ -1,8 +1,7 @@
 = ZenTest
 
-* http://www.zenspider.com/ZSS/Products/ZenTest/
-* http://rubyforge.org/projects/zentest/
-* mailto:ryand-ruby@zenspider.com
+home :: https://github.com/seattlerb/zentest
+rdoc :: http://zentest.rubyforge.org/ZenTest
 
 == DESCRIPTION
 
@@ -16,6 +15,8 @@ tool anymore but it is the package namesake, so it stays.
 
 unit_diff is a command-line filter to diff expected results from
 actual results and allow you to quickly see exactly what is wrong.
+Do note that minitest 2.2+ provides an enhanced assert_equal obviating
+the need for unit_diff
 
 autotest is a continous testing facility meant to be used during
 development. As soon as you save a file, autotest will run the
@@ -83,7 +84,7 @@ Read this: http://blog.mmediasys.com/2010/11/24/we-all-love-colors/
 
 (The MIT License)
 
-Copyright (c) Ryan Davis, Eric Hodel, Zen Spider Software, Seattle.rb
+Copyright (c) Ryan Davis, Eric Hodel, seattle.rb
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/bin/unit_diff

@@ -1,5 +1,5 @@
-#!/usr/local/bin/ruby -ws
-# 
+#!/usr/bin/env ruby -ws
+#
 # unit_diff - a ruby unit test filter by Ryan Davis <ryand-ruby@zenspider.com>
 #
 # usage:
@@ -10,7 +10,8 @@
 #    -c contextual diff
 #    -h show usage
 #    -k keep temp diff files around
-#    -u unified diff
+#    -u unified diff [default]
+#    -p plain diff
 #    -v display version
 
 require 'unit_diff'

data/bin/zentest

@@ -1,4 +1,4 @@
-#!/usr/local/bin/ruby -swI .
+#!/usr/bin/env ruby -swI .
 
 require 'zentest'
 

data/lib/autotest.rb

@@ -223,7 +223,7 @@ class Autotest
     #
     # I'm removing this code once a sane rspec goes out.
 
-    hacky_discovery = Gem.source_index.gems.any? { |n,_| n =~ /^rspec/ }
+    hacky_discovery = Gem::Specification.any? { |s| s.name =~ /^rspec/ }
     $: << '.' if hacky_discovery
 
     Gem.find_files("autotest/discover").each do |f|
@@ -289,8 +289,8 @@ class Autotest
     self.prefix            = nil
     self.sleep             = 1
     self.testlib           = "test/unit"
-    self.find_directories  = ['.']
-    self.unit_diff         = "unit_diff -u"
+    self.find_directories  = ARGV.empty? ? ['.'] : ARGV.dup
+    self.unit_diff         = nil
     self.latest_results    = nil
 
     # file in /lib -> run test in /test
@@ -341,7 +341,7 @@ class Autotest
     end
     hook :quit
   rescue Exception => err
-    hook :died, err
+    hook(:died, err) or raise err
   end
 
   ##
@@ -512,6 +512,7 @@ class Autotest
 
         next if test ?d, f
         next if f =~ /(swp|~|rej|orig)$/ # temporary/patch files
+        next if f =~ /^\.\/tmp/          # temporary dir, used by isolate
         next if f =~ /\/\.?#/            # Emacs autosave/cvs merge files
 
         filename = f.sub(/^\.\//, '')
@@ -599,16 +600,19 @@ class Autotest
   def make_test_cmd files_to_test
     cmds = []
     full, partial = reorder(files_to_test).partition { |k,v| v.empty? }
+    diff = self.unit_diff
+    diff = " | #{diff}" if diff and diff !~ /^\|/
 
     unless full.empty? then
       classes = full.map {|k,v| k}.flatten.uniq
       classes.unshift testlib
-      cmds << "#{ruby_cmd} -e \"%w[#{classes.join ' '}].each { |f| require f }\" | #{unit_diff}"
+      classes = classes.join " "
+      cmds << "#{ruby_cmd} -e \"%w[#{classes}].each { |f| require f }\"#{diff}"
     end
 
     partial.each do |klass, methods|
       regexp = Regexp.union(*methods).source
-      cmds << "#{ruby_cmd} #{klass} -n \"/^(#{regexp})$/\" | #{unit_diff}"
+      cmds << "#{ruby_cmd} #{klass} -n \"/^(#{regexp})$/\"#{diff}"
     end
 
     cmds.join "#{SEP} "

data/lib/autotest/isolate.rb

@@ -9,6 +9,7 @@ module Autotest::Isolate
   end
 
   Autotest.add_hook :initialize do |at|
+    ENV["GEM_HOME"] = @@dir
     ENV["GEM_PATH"] = @@dir
     ENV["PATH"]    += ":#{@@dir}/bin"
 

data/lib/multiruby.rb

@@ -45,8 +45,8 @@ require 'open-uri'
 module Multiruby
   def self.env name, fallback; ENV[name] || fallback; end # :nodoc:
 
-  TAGS     = %w(    1_8_6 1_8_7 1_9_1 1_9_2)
-  BRANCHES = %w(1_8 1_8_6 1_8_7 trunk)
+  TAGS     = %w(    1_8_7 1_9_1 1_9_2)
+  BRANCHES = %w(1_8 1_8_7 1_9 trunk)
 
   VERSIONS = env('VERSIONS', TAGS.join(":").gsub(/_/, '.')).split(/:/)
   MRI_SVN  = env 'MRI_SVN',  'http://svn.ruby-lang.org/repos/ruby'

data/lib/unit_diff.rb

@@ -33,7 +33,8 @@ require 'rbconfig'
 #     -h show usage
 #     -k keep temp diff files around
 #     -l prefix line numbers on the diffs
-#     -u unified diff
+#     -u unified diff [default]
+#     -p plain diff
 #     -v display version
 
 class UnitDiff
@@ -71,7 +72,7 @@ class UnitDiff
     output.sync = true
     while line = input.gets
       case line
-      when /^(Loaded suite|Started)/ then
+      when /^(Loaded suite|Started|# Running tests:)/ then
         print_lines = true
         output.puts line
         chars = []
@@ -122,7 +123,6 @@ class UnitDiff
     expect = []
     butwas = []
     footer = []
-    found = false
     state = :header
 
     until result.empty? do
@@ -193,7 +193,8 @@ class UnitDiff
     $b = false unless defined? $b
     $c = false unless defined? $c
     $k = false unless defined? $k
-    $u = false unless defined? $u
+    $u = true  unless defined? $u
+    $p = false unless defined? $p
 
     data, footer = self.parse_input(input, output)
 
@@ -201,9 +202,6 @@ class UnitDiff
 
     # Output
     data.each do |result|
-      first = []
-      second = []
-
       if result.first =~ /Error/ then
         output.push result.join('')
         next
@@ -224,7 +222,7 @@ class UnitDiff
     end
 
     if footer then
-      footer.shift if footer.first.strip.empty?# unless footer.first.nil?
+      footer.shift if footer.first.strip.empty?
       output.push footer.compact.map {|line| line.strip}.join("\n")
     end
 
@@ -241,10 +239,13 @@ class UnitDiff
         b.write(massage(butwas))
         b.rewind
 
-        diff_flags = $u ? "-u" : $c ? "-c" : ""
+        diff_flags = $p ? "" : $c ? "-c" : "-u"
         diff_flags += " -b" if $b
 
         result = `#{DIFF} #{diff_flags} #{a.path} #{b.path}`
+        result.sub!(/^\-\-\- .+/, "--- expected")
+        result.sub!(/^\+\+\+ .+/, "+++ actual")
+
         output = if result.empty? then
                    "[no difference--suspect ==]"
                  else
@@ -264,7 +265,6 @@ class UnitDiff
   end
 
   def massage(data)
-    count = 0
     # unescape newlines, strip <> from entire string
     data = data.join
     data = data.gsub(/\\n/, "\n").gsub(/0x[a-f0-9]+/m, '0xXXXXXX') + "\n"

data/lib/zentest.rb

@@ -1,3 +1,7 @@
+if (defined? RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
+  require 'java'
+  JRuby.objectspace=true
+end
 
 $stdlib = {}
 ObjectSpace.each_object(Module) do |m|
@@ -53,7 +57,7 @@ end
 
 class ZenTest
 
-  VERSION = '4.5.0'
+  VERSION = '4.6.0'
 
   include ZenTestMapping
 
@@ -95,7 +99,7 @@ class ZenTest
   # using ObjectSpace to search for it.
   def get_class(klassname)
     begin
-      klass = Module.const_get(klassname.intern)
+      klass = klassname.split(/::/).inject(Object) { |k,n| k.const_get n }
       puts "# found class #{klass.name}" if $DEBUG
     rescue NameError
       ObjectSpace.each_object(Class) do |cls|
@@ -339,7 +343,7 @@ class ZenTest
   def analyze_impl(klassname)
     testklassname = self.convert_class_name(klassname)
     if @test_klasses[testklassname] then
-      methods, testmethods = methods_and_tests(klassname,testklassname)
+      _, testmethods = methods_and_tests(klassname, testklassname)
 
       # check that each method has a test method
       @klasses[klassname].each_key do | methodname |
@@ -349,7 +353,7 @@ class ZenTest
             unless testmethods.keys.find { |m| m =~ /#{testmethodname}(_\w+)+$/ } then
               self.add_missing_method(testklassname, testmethodname)
             end
-          rescue RegexpError => e
+          rescue RegexpError
             puts "# ERROR trying to use '#{testmethodname}' as a regex. Look at #{klassname}.#{methodname}"
           end
         end # testmethods[testmethodname]
@@ -470,7 +474,6 @@ class ZenTest
     indentunit = "  "
 
     @missing_methods.keys.sort.each do |fullklasspath|
-
       methods = @missing_methods[fullklasspath]
       cls_methods = methods.keys.grep(/^(self\.|test_class_)/)
       methods.delete_if {|k,v| cls_methods.include? k }
@@ -479,16 +482,8 @@ class ZenTest
 
       indent = 0
       is_test_class = self.is_test_class(fullklasspath)
-      klasspath = fullklasspath.split(/::/)
-      klassname = klasspath.pop
-
-      klasspath.each do | modulename |
-        m = self.get_class(modulename)
-        type = m.nil? ? "module" : m.class.name.downcase
-        @result.push indentunit*indent + "#{type} #{modulename}"
-        indent += 1
-      end
-      @result.push indentunit*indent + "class #{klassname}" + (is_test_class ? " < Test::Unit::TestCase" : '')
+
+      @result.push indentunit*indent + "class #{fullklasspath}" + (is_test_class ? " < Test::Unit::TestCase" : '')
       indent += 1
 
       meths = []
@@ -508,10 +503,6 @@ class ZenTest
 
       indent -= 1
       @result.push indentunit*indent + "end"
-      klasspath.each do | modulename |
-        indent -= 1
-        @result.push indentunit*indent + "end"
-      end
       @result.push ''
     end
 

data/test/test_autotest.rb

@@ -387,6 +387,25 @@ test_error2(#{@test_class}):
       'test/test_fooby.rb' => [ 'test_something1', 'test_something2' ]
     }
 
+    pre = "#{RUBY} -I.:lib:test -rubygems"
+    req = ".each { |f| require f }\""
+
+    expected =
+      [ "#{pre} -e \"%w[test/unit #{@test}]#{req}",
+        "#{pre} test/test_fooby.rb -n \"/^(test_something1|test_something2)$/\""
+      ].join("; ")
+
+    result = @a.make_test_cmd f
+    assert_equal expected, result
+  end
+
+  def test_make_test_cmd_unit_diff
+    @a.unit_diff = "unit_diff -u"
+    f = {
+      @test => [],
+      'test/test_fooby.rb' => [ 'test_something1', 'test_something2' ]
+    }
+
     pre = "#{RUBY} -I.:lib:test -rubygems"
     req = ".each { |f| require f }\""
     post = "| unit_diff -u"

data/test/test_unit_diff.rb

@@ -145,8 +145,6 @@ backtrace = <<-BACKTRACE
   end
 
   def test_unit_diff_empty # simulates broken pipe at the least
-    input = ""
-    expected = ""
     util_unit_diff("", "", "")
   end
 
@@ -287,15 +285,28 @@ backtrace = <<-BACKTRACE
   def test_unit_diff_angles
     header = "Loaded suite ./blah\nStarted\nF\nFinished in 0.035332 seconds.\n\n"
     input = "#{header}  1) Failure:\ntest_test1(TestBlah) [./blah.rb:25]:\n<\"<html>\"> expected but was\n<\"<body>\">.\n\n1 tests, 1 assertions, 1 failures, 0 errors\n"
-    expected = "1) Failure:\ntest_test1(TestBlah) [./blah.rb:25]:\n1c1\n< <html>\n---\n> <body>\n\n1 tests, 1 assertions, 1 failures, 0 errors"
+    expected = "1) Failure:
+test_test1(TestBlah) [./blah.rb:25]:
+--- expected
++++ actual
+@@ -1 +1 @@
+-<html>
++<body>
+
+1 tests, 1 assertions, 1 failures, 0 errors"
 
     util_unit_diff(header, input, expected)
   end
 
   def test_unit_diff1
-    header = "Loaded suite ./blah\nStarted\nF\nFinished in 0.035332 seconds.\n\n"
+    header = "Loaded suite ./blah
+Started
+F
+Finished in 0.035332 seconds.
+
+"
     input = "#{header}  1) Failure:\ntest_test1(TestBlah) [./blah.rb:25]:\n<\"line1\\nline2\\nline3\\n\"> expected but was\n<\"line4\\nline5\\nline6\\n\">.\n\n1 tests, 1 assertions, 1 failures, 0 errors\n"
-    expected = "1) Failure:\ntest_test1(TestBlah) [./blah.rb:25]:\n1,3c1,3\n< line1\n< line2\n< line3\n---\n> line4\n> line5\n> line6\n\n1 tests, 1 assertions, 1 failures, 0 errors"
+    expected = "1) Failure:\ntest_test1(TestBlah) [./blah.rb:25]:\n--- expected\n+++ actual\n@@ -1,4 +1,4 @@\n-line1\n-line2\n-line3\n+line4\n+line5\n+line6\n \n\n1 tests, 1 assertions, 1 failures, 0 errors"
 
     util_unit_diff(header, input, expected)
   end
@@ -303,7 +314,7 @@ backtrace = <<-BACKTRACE
   def test_unit_diff2
     header = "Loaded suite ./blah\nStarted\nFF\nFinished in 0.035332 seconds.\n\n"
     input = "#{header}  1) Failure:\ntest_test1(TestBlah) [./blah.rb:25]:\n<\"line1\\nline2\\nline3\\n\"> expected but was\n<\"line4\\nline5\\nline6\\n\">.\n\n  2) Failure:\ntest_test2(TestBlah) [./blah.rb:29]:\n<\"line1\"> expected but was\n<\"line2\\nline3\\n\\n\">.\n\n2 tests, 2 assertions, 2 failures, 0 errors\n"
-    expected = "1) Failure:\ntest_test1(TestBlah) [./blah.rb:25]:\n1,3c1,3\n< line1\n< line2\n< line3\n---\n> line4\n> line5\n> line6\n\n2) Failure:\ntest_test2(TestBlah) [./blah.rb:29]:\n1c1,4\n< line1\n---\n> line2\n> line3\n> \n> \n\n2 tests, 2 assertions, 2 failures, 0 errors"
+    expected = "1) Failure:\ntest_test1(TestBlah) [./blah.rb:25]:\n--- expected\n+++ actual\n@@ -1,4 +1,4 @@\n-line1\n-line2\n-line3\n+line4\n+line5\n+line6\n \n\n2) Failure:\ntest_test2(TestBlah) [./blah.rb:29]:\n--- expected\n+++ actual\n@@ -1 +1,4 @@\n-line1\n+line2\n+line3\n+\n+\n\n2 tests, 2 assertions, 2 failures, 0 errors"
 
     util_unit_diff(header, input, expected)
   end
@@ -326,9 +337,27 @@ backtrace = <<-BACKTRACE
   end
 
   def test_unit_diff_NOT_suspect_equals
-    header   = "Loaded suite ./blah\nStarted\n.\nFinished in 0.0 seconds.\n\n"
-    input    = "#{header}  1) Failure:\ntest_blah(TestBlah)\n<\"out\"> expected but was\n<\"out\\n\">.\n\n1 tests, 1 assertions, 1 failures, 0 errors"
-    expected = "1) Failure:\ntest_blah(TestBlah)\n1a2\n> \n\n1 tests, 1 assertions, 1 failures, 0 errors"
+    header   = "Loaded suite ./blah
+Started
+.
+Finished in 0.0 seconds.
+
+"
+    input    = "#{header}  1) Failure:
+test_blah(TestBlah)
+<\"out\"> expected but was
+<\"out\\n\">.
+
+1 tests, 1 assertions, 1 failures, 0 errors"
+    expected = "1) Failure:
+test_blah(TestBlah)
+--- expected
++++ actual
+@@ -1 +1,2 @@
+ out
++
+
+1 tests, 1 assertions, 1 failures, 0 errors"
 
     util_unit_diff(header, input, expected)
   end

data/test/test_zentest.rb

@@ -514,7 +514,7 @@ end
   end
 
   def test_testcase2
-    expected = "#{HEADER}module Something2\n  class Blah2\n    def missingimpl(*args)\n      raise NotImplementedError, 'Need to write missingimpl'\n    end\n  end\nend\n\nmodule TestSomething2\n  class TestBlah2 < Test::Unit::TestCase\n    def test_missingtest\n      raise NotImplementedError, 'Need to write test_missingtest'\n    end\n  end\nend\n\n# Number of errors detected: 2"
+    expected = "#{HEADER}class Something2::Blah2\n  def missingimpl(*args)\n    raise NotImplementedError, 'Need to write missingimpl'\n  end\nend\n\nclass TestSomething2::TestBlah2 < Test::Unit::TestCase\n  def test_missingtest\n    raise NotImplementedError, 'Need to write test_missingtest'\n  end\nend\n\n# Number of errors detected: 2"
 
 assert_equal expected, util_testcase("Something2::Blah2", "TestSomething2::TestBlah2")
   end
@@ -538,13 +538,13 @@ assert_equal expected, util_testcase("Something2::Blah2", "TestSomething2::TestB
   end
 
   def test_testcase6
-    expected = "#{HEADER}module TestMyModule6\n  class TestMyClass6 < Test::Unit::TestCase\n    def test_index\n      raise NotImplementedError, 'Need to write test_index'\n    end\n\n    def test_missingtest1\n      raise NotImplementedError, 'Need to write test_missingtest1'\n    end\n  end\nend\n\n# Number of errors detected: 3"
+    expected = "#{HEADER}class TestMyModule6::TestMyClass6 < Test::Unit::TestCase\n  def test_index\n    raise NotImplementedError, 'Need to write test_index'\n  end\n\n  def test_missingtest1\n    raise NotImplementedError, 'Need to write test_missingtest1'\n  end\nend\n\n# Number of errors detected: 3"
 
     assert_equal expected, util_testcase("MyModule6::MyClass6")
   end
 
   def test_testcase7
-    expected = "#{HEADER}module TestMyModule7\n  class TestMyClass7 < Test::Unit::TestCase\n    def test_index\n      raise NotImplementedError, 'Need to write test_index'\n    end\n\n    def test_missingtest1\n      raise NotImplementedError, 'Need to write test_missingtest1'\n    end\n  end\nend\n\n# Number of errors detected: 3"
+    expected = "#{HEADER}class TestMyModule7::TestMyClass7 < Test::Unit::TestCase\n  def test_index\n    raise NotImplementedError, 'Need to write test_index'\n  end\n\n  def test_missingtest1\n    raise NotImplementedError, 'Need to write test_missingtest1'\n  end\nend\n\n# Number of errors detected: 3"
 
     assert_equal expected, util_testcase("MyModule7::MyClass7")
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ZenTest
 version: !ruby/object:Gem::Version 
-  hash: 43
+  hash: 39
   prerelease: 
   segments: 
   - 4
-  - 5
+  - 6
   - 0
-  version: 4.5.0
+  version: 4.6.0
 platform: ruby
 authors: 
 - Ryan Davis
@@ -37,8 +37,7 @@ cert_chain:
   FBHgymkyj/AOSqKRIpXPhjC6
   -----END CERTIFICATE-----
 
-date: 2011-02-18 00:00:00 -08:00
-default_executable: 
+date: 2011-07-23 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: minitest
@@ -46,14 +45,13 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 5
         segments: 
         - 2
-        - 0
-        - 2
-        version: 2.0.2
+        - 3
+        version: "2.3"
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -62,14 +60,13 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 41
+        hash: 23
         segments: 
         - 2
-        - 9
-        - 1
-        version: 2.9.1
+        - 10
+        version: "2.10"
   type: :development
   version_requirements: *id002
 description: |-
@@ -83,6 +80,8 @@ description: |-
   
   unit_diff is a command-line filter to diff expected results from
   actual results and allow you to quickly see exactly what is wrong.
+  Do note that minitest 2.2+ provides an enhanced assert_equal obviating
+  the need for unit_diff
   
   autotest is a continous testing facility meant to be used during
   development. As soon as you save a file, autotest will run the
@@ -149,8 +148,7 @@ files:
 - test/test_zentest.rb
 - test/test_zentest_mapping.rb
 - .gemtest
-has_rdoc: true
-homepage: http://www.zenspider.com/ZSS/Products/ZenTest/
+homepage: https://github.com/seattlerb/zentest
 licenses: []
 
 post_install_message: 
@@ -180,7 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: zentest
-rubygems_version: 1.4.2
+rubygems_version: 1.8.2
 signing_key: 
 specification_version: 3
 summary: "ZenTest provides 4 different tools: zentest, unit_diff, autotest, and multiruby"