ZenTest 3.4.3 → 3.5.1

data/History.txt

@@ -1,10 +1,53 @@
+*** 3.5.1 / 2007-04-17
+
++ 4 bug fixes:
+    + Fixed gem name to be camel-case again. Fixed on rubyforge too.
+	+ Fixed rdoc for hooks.
+	+ Fixed redgreen, results changed to an array.
+    + Patch up Rails fixture defaults, since they're not inheriting properly.
+
+*** 3.5.0 / 2007-04-12
+
++ 4 major enhancements:
+    + Now requires RubyGems 0.9.1 or newer.
+    + Autotest and unit_diff are both unbuffered. Results are more live.
+    + Refactored and redesigned how files map to test from Sean Carley. See fixtures plugin as an example.
+    + Generalize how autotest handler is instantiated and invoked, allowing for many more autotest types, including combos.
++ 23 minor enhancements:
+    + Added all_good hook if initial run was all_good as well.
+    + Added assert_in_epsilon to ZentestAssertions.
+    + Added autotest plugin to auto-update source ala tinderbox/cruisecontrol.
+    + Added autotest plugin to update ichat/adium IM status with code stats.
+    + Added autotest plugin to update the GNU screen statusbar from Yuichi Tateno.
+    + Added autotest syntax error handling from Ryan Platte.
+    + Added autotest/emacs emacs integration plugin!!! YAY!
+    + Added autotest/migrate.rb.
+    + Added camping support from Geoffrey Grossenbach.
+    + Added changed file reporting to autotest via -v flag.
+    + Added informative summary and filtering via ENV['VERSIONS'] to multiruby.
+    + Added libnotify support from Kazuo Saito.
+    + Added lots of rdoc patches from Hugh Sasse.
+    + Added rjs files to view_test_case.
+    + Added rspec_autotest "stolen" from caldersphere.net
+    + Added run_command hook to trigger the start of a test run.
+    + Added tmp to rails' exceptions list.
+    + Added unit_diff command variable to autotest for customizing flags and such.
+    + Added zentest_mapping.rb and test.
+    + Allow session to work in Test::Rails view tests.
+    + Improved autotest/growl.rb output from imajes.
+    + Improved autotest/timestamp output from Josh Susser.
+    + Test::Rails works with Rails 1.2.
++ 2 bug fixes:
+    + Accelerated Test::Rails unit tests via sensible defaults.
+    + Better assertion messages for ZentestAssertions.
+
 *** 3.4.3 / 2006-12-19
 
 + 2 minor enhancements:
-        + Add assert_title and assert_h (for header).
+    + Add assert_title and assert_h (for header).
 + 2 bug fixes:
-        + Rereleased against latest version of hoe to fix load path problems.
-        + Fix case ViewTestCase for case-sensitive file systems.
+    + Rereleased against latest version of hoe to fix load path problems.
+    + Fix case ViewTestCase for case-sensitive file systems.
 
 *** 3.4.2 / 2006-11-09
 

data/Manifest.txt

@@ -15,15 +15,26 @@ example1.rb
 example2.rb
 example_dot_autotest.rb
 lib/autotest.rb
+lib/autotest/autoupdate.rb
+lib/autotest/emacs.rb
+lib/autotest/fixtures.rb
 lib/autotest/growl.rb
+lib/autotest/heckle.rb
 lib/autotest/html_report.rb
 lib/autotest/kdenotify.rb
 lib/autotest/menu.rb
+lib/autotest/migrate.rb
+lib/autotest/notify.rb
 lib/autotest/pretty.rb
 lib/autotest/redgreen.rb
+lib/autotest/screen.rb
+lib/autotest/shame.rb
 lib/autotest/snarl.rb
 lib/autotest/timestamp.rb
+lib/camping_autotest.rb
+lib/functional_test_matrix.rb
 lib/rails_autotest.rb
+lib/rspec_rails_autotest.rb
 lib/ruby_fork.rb
 lib/test/rails.rb
 lib/test/rails/controller_test_case.rb
@@ -38,6 +49,7 @@ lib/test/rails/view_test_case.rb
 lib/test/zentest_assertions.rb
 lib/unit_diff.rb
 lib/zentest.rb
+lib/zentest_mapping.rb
 test/test_autotest.rb
 test/test_help.rb
 test/test_rails_autotest.rb
@@ -48,3 +60,4 @@ test/test_ruby_fork.rb
 test/test_unit_diff.rb
 test/test_zentest.rb
 test/test_zentest_assertions.rb
+test/test_zentest_mapping.rb

data/README.txt

@@ -65,6 +65,7 @@ implementation.
 
 * Ruby 1.6+
 * Test::Unit
+* Hoe
 * Rake or rubygems for install/uninstall
 * diff.exe on windoze. Try http://gnuwin32.sourceforge.net/packages.html
 

data/Rakefile

@@ -1,14 +1,12 @@
 # -*- ruby -*-
 
-ENV["RUBY_FLAGS"]="-Ilib:bin:test" # FIX
+$: << 'lib'
 
 require 'rubygems'
 require 'hoe'
 require './lib/zentest.rb'
 
 Hoe.new("ZenTest", ZenTest::VERSION) do |p|
-  paragraphs = File.read("README.txt").split(/\n\n+/)
-
   p.author = ['Ryan Davis', 'Eric Hodel']
 
   changes = p.paragraphs_of("History.txt", 0..1).join("\n\n")
@@ -23,6 +21,25 @@ task :autotest do
   ruby "-Ilib ./bin/autotest"
 end
 
+task :update do
+  File.open "example_dot_autotest.rb", "w" do |f|
+    f.puts "# -*- ruby -*-"
+    f.puts
+    Dir.chdir "lib" do
+      Dir["autotest/*.rb"].sort.each do |s|
+        f.puts "# require '#{s[0..-4]}'"
+      end
+    end
+
+    f.puts
+    f.puts "# Autotest::AutoUpdate.sleep_time = 60"
+    f.puts "# Autotest::AutoUpdate.update_cmd = 'svn up'"
+    f.puts "# Autotest::Heckle.flags << '-t test/**/*.rb'"
+    f.puts "# Autotest::Heckle.klasses << 'MyClass'"
+    f.puts "# Autotest::Shame.chat_app = :adium"
+  end
+end
+
 task :sort do
   begin
     sh 'for f in lib/*.rb; do echo $f; grep "^ *def " $f | grep -v sort=skip > x; sort x > y; echo $f; echo; diff x y; done'

data/bin/autotest

@@ -1,50 +1,36 @@
 #!/usr/local/bin/ruby -ws
 
+$v    ||= false
 $h    ||= false
 $help ||= false
 
 if $h or $help then
-  help = []
-  help << "autotest [options]"
-  help << nil
-  help << "options:"
-  help << "\t-h"
-  help << "\t-help\t\tYou're looking at it."
-  help << nil
-  help << "\t-v\t\tBe verbose."
-  help << "\t\t\tPrints files that autotest doesn't know how to map to"
-  help << "\t\t\ttests."
-  help << nil
-  help << "\t-rails\t\tForce rails mode."
-  help << "\t\t\tRails will be automatically detected by the presence of"
-  help << "\t\t\tconfig/environment.rb. Use this if you don't have one."
-  help << nil
-  help << "\t\t\tYou may need to run 'rake db:test:prepare' before"
-  help << "\t\t\tstarting autotest on a rails project."
-  help << nil
-  help << "\t-vcs=NAME\tVersion control system to update."
-  help << "\t\t\tAutotest will automatically update every vcstime"
-  help << "\t\t\tseconds."
-  help << "\t\t\tAutotest understands Perforce (p4), CVS (cvs) and"
-  help <<  "\t\t\tSubversion (svn)."
-  help << nil
-  help << "\t-vcstime=N\tUpdate source control every N seconds."
-  help << "\t\t\tDefaults to every five minutes (300 seconds)."
+  help = [
+          "autotest [options]",
+          nil,
+          "options:",
+          "\t-h",
+          "\t-help\t\tYou're looking at it.",
+          nil,
+          "\t-v\t\tBe verbose.",
+          "\t\t\tPrints files that autotest doesn't know how to map to",
+          "\t\t\ttests.",
+         ]
   STDERR.puts help.join("\n")
   exit 1
 end
 
-$v       ||= false
+$rspec   ||= false
 $rails   ||= false
-$vcs     ||= nil
-$vcstime ||= 300
-$vcstime = $vcstime.to_i
+$camping ||= false
 
-if $rails or File.exist? 'config/environment.rb' then
-  require 'rails_autotest'
-  RailsAutotest.run
-else
-  require 'autotest'
-  Autotest.run
-end
+style = []
+style << "rspec" if $rspec or File.directory?('spec')
+style << "rails" if $rails or File.exist? 'config/environment.rb'
+style << "camping" if $camping or File.exist? 'test/camping_test_case.rb'
+style << "autotest"
 
+mod = style.join("_")
+puts "loading #{mod}"
+require mod
+Object.const_get(style.map {|s| s.capitalize}.join).run

data/bin/multiruby

@@ -18,12 +18,12 @@ Dir.chdir root_dir do
   %w(build install versions).each do |dir|
     unless test ?d, dir then
       puts "creating #{dir}"
-      Dir.mkdir dir 
+      Dir.mkdir dir
       if dir == "versions" then
         file = "ruby-#{RUBY_VERSION}.tar.gz"
         puts "  downloading #{file} via HTTP... this might take a while."
         puts "  Put other ruby tarballs in versions to use them."
-        
+
         Dir.chdir dir do
           require 'open-uri'
           open("http://ftp.ruby-lang.org/pub/ruby/#{file}") do |f|
@@ -77,7 +77,10 @@ Dir.chdir root_dir do
   end
 end
 
-results = versions.map do |version|
+versions = ENV['VERSIONS'].split(/:/) if ENV.has_key? 'VERSIONS'
+
+results = {}
+versions.each do |version|
   ruby = "#{root_dir}/install/#{version}/bin/ruby"
   puts
   puts "VERSION = #{version}"
@@ -85,12 +88,15 @@ results = versions.map do |version|
   system ruby, *ARGV
   puts
   puts "RESULT = #{$?}"
-  $?
+  results[version] = $?
 end
 
-result = results.select { |n| n != 0 }.size
+passed, failed = results.keys.partition { |v| results[v] == 0 }
 
 puts
-puts "TOTAL RESULT = #{result} failures"
+puts "TOTAL RESULT = #{failed.size} failures out of #{results.size}"
+puts
+puts "Passed: #{passed.join(", ")}"
+puts "Failed: #{failed.join(", ")}"
 
-exit result
+exit failed.size

data/bin/unit_diff

@@ -35,4 +35,4 @@ if defined? $h then
   exit 0
 end
 
-puts UnitDiff.unit_diff(ARGF)
+UnitDiff.unit_diff

data/example_dot_autotest.rb

@@ -1,10 +1,24 @@
 # -*- ruby -*-
 
+# require 'autotest/autoupdate'
+# require 'autotest/emacs'
+# require 'autotest/fixtures'
 # require 'autotest/growl'
+# require 'autotest/heckle'
 # require 'autotest/html_report'
 # require 'autotest/kdenotify'
 # require 'autotest/menu'
+# require 'autotest/migrate'
+# require 'autotest/notify'
 # require 'autotest/pretty'
 # require 'autotest/redgreen'
+# require 'autotest/screen'
+# require 'autotest/shame'
 # require 'autotest/snarl'
 # require 'autotest/timestamp'
+
+# Autotest::AutoUpdate.sleep_time = 60
+# Autotest::AutoUpdate.update_cmd = 'svn up'
+# Autotest::Heckle.flags << '-t test/**/*.rb'
+# Autotest::Heckle.klasses << 'MyClass'
+# Autotest::Shame.chat_app = :adium

data/lib/autotest.rb

@@ -1,6 +1,7 @@
 require 'find'
 require 'rbconfig'
 
+$v ||= false
 $TESTING = false unless defined? $TESTING
 
 ##
@@ -27,8 +28,8 @@ $TESTING = false unless defined? $TESTING
 #
 #   Autotest.add_hook hook_name { |autotest| ... }
 #
-# The available hooks are: run, interrupt, quit, ran_command, red,
-#   green, all_good, and reset.
+# The available hooks are: initialize, run, run_command, ran_command,
+#   red, green, all_good, reset, interrupt, and quit.
 #
 # See example_dot_autotest.rb for more details.
 #
@@ -62,7 +63,18 @@ class Autotest
     new.run
   end
 
-  attr_accessor :exceptions, :files, :files_to_test, :interrupted, :last_mtime, :libs, :output, :results, :tainted, :wants_to_quit
+  attr_accessor(:exceptions,
+                :files,
+                :files_to_test,
+                :interrupted,
+                :last_mtime,
+                :libs,
+                :output,
+                :results,
+                :tainted,
+                :test_mappings,
+                :unit_diff,
+                :wants_to_quit)
 
   def initialize
     @files = Hash.new Time.at(0)
@@ -71,6 +83,17 @@ class Autotest
     @libs = %w[. lib test].join(File::PATH_SEPARATOR)
     @output = $stderr
     @sleep = 1
+    @unit_diff = "unit_diff -u"
+
+    @test_mappings = {
+      /^lib\/.*\.rb$/ => proc { |filename, _|
+        files_matching %r%^test/.*#{File.basename(filename).gsub '_', '_?'}$%
+      },
+      /^test\/test_.*rb$/ => proc { |filename, _|
+        filename
+      }
+    }
+
     hook :initialize
   end
 
@@ -82,7 +105,11 @@ class Autotest
     loop do # ^c handler
       begin
         get_to_green
-        rerun_all_tests if @tainted
+        if @tainted then
+          rerun_all_tests
+        else
+          hook :all_good
+        end
         wait_for_changes
       rescue Interrupt
         if @wants_to_quit then
@@ -106,11 +133,30 @@ class Autotest
     find_files_to_test # failed + changed/affected
     cmd = make_test_cmd @files_to_test
 
+    hook :run_command
     puts cmd
 
-    @results = `#{cmd}`
+    old_sync = $stdout.sync
+    $stdout.sync = true
+    @results = []
+    line = []
+    begin
+      open("| #{cmd}", "r") do |f|
+        until f.eof? do
+          c = f.getc
+          putc c
+          line << c
+          if c == ?\n then
+            @results << line.pack("c*")
+            line.clear
+          end
+        end
+      end
+    ensure
+      $stdout.sync = old_sync
+    end
     hook :ran_command
-    puts @results
+    @results = @results.join
 
     handle_results(@results)
   end
@@ -165,7 +211,6 @@ class Autotest
     result = {}
     Find.find '.' do |f|
       Find.prune if @exceptions and f =~ @exceptions and test ?d, f
-      Find.prune if f =~ /(\.(svn|hg)|CVS|tmp|public|doc|pkg)$/ # prune dirs
 
       next if test ?d, f
       next if f =~ /(swp|~|rej|orig)$/        # temporary/patch files
@@ -183,6 +228,8 @@ class Autotest
       @files[filename] < mtime
     }
 
+    p updated if $v unless updated.empty? or @last_mtime.to_i == 0
+
     # TODO: keep an mtime at app level and drop the files hash
     updated.each do |filename, mtime|
       @files[filename] = mtime
@@ -195,18 +242,18 @@ class Autotest
     end
 
     previous = @last_mtime
-    @last_mtime = @files.values.sort.last
+    @last_mtime = @files.values.max
     @last_mtime > previous
   end
 
   def handle_results(results)
     failed = results.scan(/^\s+\d+\) (?:Failure|Error):\n(.*?)\((.*?)\)/)
-    @files_to_test = consolidate_failures failed
-    unless @files_to_test.empty? then
-      hook :red
-    else
-      hook :green
-    end unless $TESTING
+    completed = results =~ /\d+ tests, \d+ assertions, \d+ failures, \d+ errors/
+
+    @files_to_test = consolidate_failures failed if completed
+
+    hook completed && @files_to_test.empty? ? :green : :red unless $TESTING
+
     @tainted = true unless @files_to_test.empty?
   end
 
@@ -215,12 +262,12 @@ class Autotest
     full, partial = files_to_test.partition { |k,v| v.empty? }
 
     unless full.empty? then
-      classes = full.map {|k,v| k}.flatten.join(' ')
-      cmds << "#{ruby} -I#{@libs} -rtest/unit -e \"%w[#{classes}].each { |f| require f }\" | unit_diff -u"
+      classes = full.map {|k,v| k}.flatten.uniq.sort.join(' ')
+      cmds << "#{ruby} -I#{@libs} -rtest/unit -e \"%w[#{classes}].each { |f| require f }\" | #{unit_diff}"
     end
 
     partial.each do |klass, methods|
-      cmds << "#{ruby} -I#{@libs} #{klass} -n \"/^(#{Regexp.union(*methods).source})$/\" | unit_diff -u" 
+      cmds << "#{ruby} -I#{@libs} #{klass} -n \"/^(#{Regexp.union(*methods).source})$/\" | #{unit_diff}"
     end
 
     return cmds.join('; ')
@@ -241,7 +288,7 @@ class Autotest
     @tainted = false
     hook :reset
   end
-  
+
   def ruby
     ruby = File.join(Config::CONFIG['bindir'],
                      Config::CONFIG['ruby_install_name'])
@@ -254,18 +301,12 @@ class Autotest
   end
 
   def tests_for_file(filename)
-    case filename
-    when /^lib\/.*\.rb$/ then
-      impl = File.basename(filename).gsub '_', '_?'
-      @files.keys.select do |k|
-        k =~ %r%^test/.*#{impl}$%
-      end
-    when /^test\/test_.*rb$/ then
-      [filename]
-    else
-      @output.puts "Dunno! #{filename}" if $TESTING
-      []
-    end
+    result = @test_mappings.find { |file_re, ignored| filename =~ file_re }
+    result = result.nil? ? [] : Array(result.last.call(filename, $~))
+
+    @output.puts "Dunno! #{filename}" if $TESTING and result.empty?
+
+    result.sort.uniq
   end
 
   def wait_for_changes
@@ -275,6 +316,12 @@ class Autotest
     end until find_files_to_test
   end
 
+  def files_matching regexp
+    @files.keys.select { |k|
+      k =~ regexp
+    }
+  end
+
   ############################################################
   # Hooks: