ZenTest 4.0.0 → 4.1.0

data/.autotest

@@ -9,6 +9,10 @@ Autotest.add_hook :initialize do |at|
 
   at.libs << ':../../minitest/dev/lib'
   at.testlib = "minitest/autorun"
+
+  %w(TestZenTest).each do |klass|
+    at.extra_class_map[klass] = "test/test_zentest.rb"
+  end
 end
 
 Autotest.add_hook :all_good do |at|

data/History.txt

@@ -1,3 +1,25 @@
+=== 4.1.0 / 2009-06-03
+
+* 1 major enhancement:
+
+  * Removed all plugins I don't want to maintain anymore. (gem inst autotest-rails)
+
+* 4 minor enhancements:
+
+  * Added #blur to focus.rb to nuke all other test classes
+  * Clear RUBYOPT before installs (balatero)
+  * Removed test/unit include in zentest so we can focus on miniunit
+  * sort versions for builds. (Jens Wille)
+
+* 6 bug fixes:
+
+  * Fixed a stupid bug when running on some versions of bash >= 3.2.x and using '&>' in a system call. (Jens Wille)
+  * Fixed inconsistent test commands in autotest. (jbarnette)
+  * Fixed unit_diff's usage generation when installed as gem. (borior)
+  * Fixed zentest to deal with unnamed classes. (Bill Dortch)
+  * Removed buggy/unused -l support in unit_diff. (borior)
+  * make twice to make it more resilient to makefile parallel bugs
+
 === 4.0.0 / 2009-03-02
 
 * 2 minor enhancements:

data/Manifest.txt

@@ -18,28 +18,9 @@ example2.rb
 example_dot_autotest.rb
 lib/autotest.rb
 lib/autotest/autoupdate.rb
-lib/autotest/camping.rb
-lib/autotest/cctray.rb
-lib/autotest/discover.rb
-lib/autotest/emacs.rb
-lib/autotest/email_notify.rb
-lib/autotest/fixtures.rb
-lib/autotest/growl.rb
-lib/autotest/heckle.rb
-lib/autotest/html_report.rb
-lib/autotest/jabber_notify.rb
-lib/autotest/kdenotify.rb
-lib/autotest/menu.rb
-lib/autotest/migrate.rb
-lib/autotest/notify.rb
 lib/autotest/once.rb
-lib/autotest/pretty.rb
-lib/autotest/rails.rb
 lib/autotest/rcov.rb
-lib/autotest/redgreen.rb
 lib/autotest/restart.rb
-lib/autotest/shame.rb
-lib/autotest/snarl.rb
 lib/autotest/timestamp.rb
 lib/focus.rb
 lib/functional_test_matrix.rb

data/README.txt

@@ -6,12 +6,13 @@
 
 == DESCRIPTION
 
-ZenTest provides 4 different tools and 1 library: zentest, unit_diff,
-autotest, multiruby, and Test::Rails.
+ZenTest provides 4 different tools: zentest, unit_diff, autotest, and
+multiruby.
 
 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.
+pace. ZenTest only works with Ruby and Test::Unit. Nobody uses this
+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.
@@ -24,8 +25,6 @@ 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.
-
 == STRATEGERY
 
 There are two strategeries intended for ZenTest: test conformance
@@ -43,7 +42,7 @@ implementation.
 == FEATURES
 
 * Scans your ruby code and tests and generates missing methods for you.
-* Includes a very helpful filter for Test::Unit output called unit_diff.
+* Includes a very helpful filter for Test/Spec output called unit_diff.
 * Continually and intelligently test only those files you change with autotest.
 * Test against multiple versions with multiruby.
 * Enhance and automatically audit your rails tests using Test::Rails.
@@ -67,7 +66,7 @@ implementation.
 == REQUIREMENTS
 
 * Ruby 1.6+, JRuby 1.1.2+, or rubinius
-* Test::Unit or miniunit
+* Test::Unit or miniunit (or something else ... I have no idea)
 * Hoe
 * rubygems
 * diff.exe on windoze. Try http://gnuwin32.sourceforge.net/packages.html

data/Rakefile

@@ -9,11 +9,11 @@ Hoe.add_include_dirs("../../minitest/dev/lib")
 
 require './lib/zentest.rb'
 
-Hoe.new("ZenTest", ZenTest::VERSION) do |zentest|
-  zentest.developer('Ryan Davis', 'ryand-ruby@zenspider.com')
-  zentest.developer('Eric Hodel', 'drbrain@segment7.net')
+Hoe.spec "ZenTest" do
+  developer 'Ryan Davis', 'ryand-ruby@zenspider.com'
+  developer 'Eric Hodel', 'drbrain@segment7.net'
 
-  zentest.testlib = :minitest
+  self.testlib = :minitest
 end
 
 task :autotest do
@@ -57,17 +57,5 @@ task :sort do
   end
 end
 
-task :rcov_info do
-  ruby "-Ilib -S rcov --text-report --save coverage.info test/test_*.rb"
-end
-
-task :rcov_overlay do
-  rcov, eol = Marshal.load(File.read("coverage.info")).last[ENV["FILE"]], 1
-  puts rcov[:lines].zip(rcov[:coverage]).map { |line, coverage|
-    bol, eol = eol, eol + line.length
-    [bol, eol, "#ffcccc"] unless coverage
-  }.compact.inspect
-end
-
 # vim:syntax=ruby
 

data/bin/unit_diff

@@ -10,7 +10,6 @@
 #    -c contextual diff
 #    -h show usage
 #    -k keep temp diff files around
-#    -l prefix line numbers on the diffs
 #    -u unified diff
 #    -v display version
 
@@ -25,7 +24,7 @@ if defined? $v then
 end
 
 if defined? $h then
-  File.open($0) do |f|
+  File.open(__FILE__) do |f|
     begin; end until f.readline =~ /usage:/
     f.readline
     while line = f.readline and line.sub!(/^# ?/, '')

data/example_dot_autotest.rb

@@ -1,45 +1,12 @@
 # -*- ruby -*-
 
 # require 'autotest/autoupdate'
-# require 'autotest/camping'
-# require 'autotest/cctray'
-# require 'autotest/emacs'
-# require 'autotest/email_notify'
-# require 'autotest/fixtures'
-# require 'autotest/growl'
-# require 'autotest/heckle'
-# require 'autotest/html_report'
-# require 'autotest/jabber_notify'
-# require 'autotest/kdenotify'
-# 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'
 # require 'autotest/timestamp'
 
 # Autotest::AutoUpdate.sleep_time = o
 # Autotest::AutoUpdate.update_cmd = o
-# Autotest::CCTray.project_name = name
-# Autotest::Emacs.command = o
-# Autotest::EmailNotify.smtp_settings = o
-# Autotest::EmailNotify.from = o
-# Autotest::EmailNotify.recipients = o
-# Autotest::EmailNotify.use_svn = o
-# Autotest::EmailNotify.report_every_run = o
-# 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.rb

@@ -430,16 +430,17 @@ class Autotest
   def make_test_cmd files_to_test
     cmds = []
     full, partial = reorder(files_to_test).partition { |k,v| v.empty? }
+    base_cmd = "#{ruby} -I#{libs} -rubygems"
 
     unless full.empty? then
       classes = full.map {|k,v| k}.flatten.uniq
       classes.unshift testlib
-      cmds << "#{ruby} -I#{libs} -rubygems -e \"%w[#{classes.join(' ')}].each { |f| require f }\" | #{unit_diff}"
+      cmds << "#{base_cmd} -e \"%w[#{classes.join(' ')}].each { |f| require f }\" | #{unit_diff}"
     end
 
     partial.each do |klass, methods|
       regexp = Regexp.union(*methods).source
-      cmds << "#{ruby} -I#{libs} #{klass} -n \"/^(#{regexp})$/\" | #{unit_diff}"
+      cmds << "#{base_cmd} #{klass} -n \"/^(#{regexp})$/\" | #{unit_diff}"
     end
 
     return cmds.join("#{SEP} ")

data/lib/focus.rb

@@ -6,4 +6,16 @@ class Module
       remove_method unwanted
     end
   end
+
+  def blur
+    parent = self.superclass
+
+    ObjectSpace.each_object Class do |klass|
+      next unless parent > klass
+      next if klass == self
+
+      klass.send :focus
+      klass.send :undef_method, :default_test
+    end
+  end
 end

data/lib/multiruby.rb

@@ -38,6 +38,8 @@ require 'open-uri'
 #     RUBY_URL = url for MRI tarballs
 #     VERSIONS = what versions to install
 #
+#     RUBYOPT is cleared on installs.
+#
 # NOTES:
 #
 # * you can add a symlink to your rubinius build into ~/.multiruby/install
@@ -63,6 +65,8 @@ module Multiruby
   end
 
   def self.build_and_install
+    ENV.delete 'RUBYOPT'
+
     root_dir = self.root_dir
     versions = []
 
@@ -74,7 +78,7 @@ module Multiruby
       rubygem_tarball = File.expand_path rubygems.last rescue nil
 
       Dir.chdir "build" do
-        Dir["../versions/*"].each do |tarball|
+        Dir["../versions/*"].sort.each do |tarball|
           next if tarball =~ /rubygems/
 
           build_dir = File.basename tarball, ".tar.gz"
@@ -108,7 +112,7 @@ module Multiruby
                 run "tar zxf #{rubygem_tarball}" unless test ?d, rubygems
 
                 Dir.chdir rubygems do
-                  run "../ruby ./setup.rb --no-rdoc --no-ri &> ../log.rubygems"
+                  run "../ruby ./setup.rb --no-rdoc --no-ri", "../log.rubygems"
                 end
               end
             end
@@ -189,9 +193,10 @@ module Multiruby
 
   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"
+    run "./configure --prefix #{inst_dir}", "log.configure" unless
+      test ?f, "Makefile"
+    run "(nice make -j4; nice make)", "log.build"
+    run "make install", "log.install"
   end
 
   def self.help
@@ -257,7 +262,7 @@ module Multiruby
   end
 
   def self.rake_build inst_dir
-    run "rake &> log.build"
+    run "rake", "log.build"
     FileUtils.ln_sf "../build/#{File.basename Dir.pwd}", inst_dir
   end
 
@@ -289,7 +294,8 @@ module Multiruby
     root_dir
   end
 
-  def self.run cmd
+  def self.run base_cmd, log
+    cmd = "#{base_cmd} > #{log} 2>&1"
     puts "Running command: #{cmd}"
     raise "ERROR: Command failed with exit code #{$?}" unless system cmd
   end

data/lib/unit_diff.rb

@@ -177,7 +177,6 @@ class UnitDiff
     $b = false unless defined? $b
     $c = false unless defined? $c
     $k = false unless defined? $k
-    $l = false unless defined? $l
     $u = false unless defined? $u
 
     data, footer = self.parse_input(input, output)
@@ -249,7 +248,7 @@ class UnitDiff
   end
 
   def massage(data)
-    data = data.map { |l| '%3d) %s' % [count+=1, l] } if $l
+    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,8 +1,10 @@
 
-require 'zentest_mapping'
-
 $stdlib = {}
-ObjectSpace.each_object(Module) { |m| $stdlib[m.name] = true }
+ObjectSpace.each_object(Module) do |m|
+  $stdlib[m.name] = true if m.respond_to? :name
+end
+
+require 'zentest_mapping'
 
 $:.unshift( *$I.split(/:/) ) if defined? $I and String === $I
 $r = false unless defined? $r # reverse mapping for testclass names
@@ -17,7 +19,6 @@ if $r then
   require f if test ?f, f
 end
 
-$ZENTEST = true
 $TESTING = true
 
 class Module
@@ -52,7 +53,7 @@ end
 
 class ZenTest
 
-  VERSION = '4.0.0'
+  VERSION = '4.1.0'
 
   include ZenTestMapping
 
@@ -475,7 +476,8 @@ class ZenTest
 
     if @missing_methods.size > 0 then
       @result.push ""
-      @result.push "require 'test/unit' unless defined? $ZENTEST and $ZENTEST"
+      @result.push "require 'test/unit/testcase'"
+      @result.push "require 'test/unit' if $0 == __FILE__"
       @result.push ""
     end
 

data/test/test_autotest.rb

@@ -359,7 +359,7 @@ test_error2(#{@test_class}):
     }
 
     expected = [ "#{RUBY} -I.:lib:test -rubygems -e \"%w[test/unit #{@test}].each { |f| require f }\" | unit_diff -u",
-                 "#{RUBY} -I.:lib:test test/test_fooby.rb -n \"/^(test_something1|test_something2)$/\" | unit_diff -u" ].join("; ")
+                 "#{RUBY} -I.:lib:test -rubygems test/test_fooby.rb -n \"/^(test_something1|test_something2)$/\" | unit_diff -u" ].join("; ")
 
     result = @a.make_test_cmd f
     assert_equal expected, result

data/test/test_zentest.rb

@@ -174,7 +174,8 @@ class TestZenTest < MiniTest::Unit::TestCase
     }
     @tester.inherited_methods = @tester.test_klasses.merge(@tester.klasses)
     @generated_code = "
-require 'test/unit' unless defined? $ZENTEST and $ZENTEST
+require 'test/unit/testcase'
+require 'test/unit' if $0 == __FILE__
 
 class Something
   def self.method4(*args)
@@ -418,10 +419,10 @@ end
 
   def test_get_methods_for_subclass_full
     expect = {
-      "self.cls_inherited" => true, 
+      "self.cls_inherited" => true,
       "self.cls_extended" => true,
       "overridden" => true,
-      "extended" => true 
+      "extended" => true
    }
     result = @tester.get_methods_for("LowlyOne", true)
 
@@ -440,7 +441,7 @@ end
 
   def test_result
     self.util_simple_setup
-    
+
     @tester.analyze
     @tester.generate_code
     str = @tester.result.split($/, 2).last
@@ -504,50 +505,52 @@ end
     assert_equal expected, util_testcase("Blah0", "TestBlah0")
   end
 
+  HEADER = "\nrequire 'test/unit/testcase'\nrequire 'test/unit' if $0 == __FILE__\n\n"
+
   def test_testcase1
-    expected = "\nrequire 'test/unit' unless defined? $ZENTEST and $ZENTEST\n\nclass Blah1\n  def missingimpl(*args)\n    raise NotImplementedError, 'Need to write missingimpl'\n  end\nend\n\nclass TestBlah1 < 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"
+    expected = "#{HEADER}class Blah1\n  def missingimpl(*args)\n    raise NotImplementedError, 'Need to write missingimpl'\n  end\nend\n\nclass TestBlah1 < 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("Blah1", "TestBlah1")
   end
 
   def test_testcase2
-    expected = "\nrequire 'test/unit' unless defined? $ZENTEST and $ZENTEST\n\nmodule 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}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"
 
 assert_equal expected, util_testcase("Something2::Blah2", "TestSomething2::TestBlah2")
   end
 
   def test_testcase3
-    expected = "\nrequire 'test/unit' unless defined? $ZENTEST and $ZENTEST\n\nclass Blah3\n  def missingimpl(*args)\n    raise NotImplementedError, 'Need to write missingimpl'\n  end\nend\n\n# Number of errors detected: 1"
+    expected = "#{HEADER}class Blah3\n  def missingimpl(*args)\n    raise NotImplementedError, 'Need to write missingimpl'\n  end\nend\n\n# Number of errors detected: 1"
 
     assert_equal expected, util_testcase("TestBlah3")
   end
 
   def test_testcase4
-    expected = "\nrequire 'test/unit' unless defined? $ZENTEST and $ZENTEST\n\nclass TestBlah4 < Test::Unit::TestCase\n  def test_missingtest1\n    raise NotImplementedError, 'Need to write test_missingtest1'\n  end\n\n  def test_missingtest2\n    raise NotImplementedError, 'Need to write test_missingtest2'\n  end\nend\n\n# Number of errors detected: 3"
+    expected = "#{HEADER}class TestBlah4 < Test::Unit::TestCase\n  def test_missingtest1\n    raise NotImplementedError, 'Need to write test_missingtest1'\n  end\n\n  def test_missingtest2\n    raise NotImplementedError, 'Need to write test_missingtest2'\n  end\nend\n\n# Number of errors detected: 3"
 
     assert_equal expected, util_testcase("Blah4")
   end
 
   def test_testcase5
-    expected = "\nrequire 'test/unit' unless defined? $ZENTEST and $ZENTEST\n\nclass TestMyHash5 < 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"
+    expected = "#{HEADER}class TestMyHash5 < 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("MyHash5")
   end
 
   def test_testcase6
-    expected = "\nrequire 'test/unit' unless defined? $ZENTEST and $ZENTEST\n\nmodule 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}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"
 
     assert_equal expected, util_testcase("MyModule6::MyClass6")
   end
 
   def test_testcase7
-    expected = "\nrequire 'test/unit' unless defined? $ZENTEST and $ZENTEST\n\nmodule 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}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"
 
     assert_equal expected, util_testcase("MyModule7::MyClass7")
   end
 
   def test_testcase8
-    expected = "\nrequire 'test/unit' unless defined? $ZENTEST and $ZENTEST\n\nclass TestMyClass8 < Test::Unit::TestCase\n  def test_class_foobar\n    raise NotImplementedError, 'Need to write test_class_foobar'\n  end\n\n  def test_class_foobaz\n    raise NotImplementedError, 'Need to write test_class_foobaz'\n  end\nend\n\n# Number of errors detected: 3"
+    expected = "#{HEADER}class TestMyClass8 < Test::Unit::TestCase\n  def test_class_foobar\n    raise NotImplementedError, 'Need to write test_class_foobar'\n  end\n\n  def test_class_foobaz\n    raise NotImplementedError, 'Need to write test_class_foobaz'\n  end\nend\n\n# Number of errors detected: 3"
 
     assert_equal expected, util_testcase("MyClass8")
   end
@@ -556,7 +559,7 @@ assert_equal expected, util_testcase("Something2::Blah2", "TestSomething2::TestB
     # 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"
+    expected = "#{HEADER}class 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")
   end