ZenTest 3.9.1 → 3.9.2

data/History.txt

@@ -1,3 +1,20 @@
+=== 3.9.2 / 2008-03-20
+
+* 4 minor enhancements:
+
+  * Added compatibility with miniunit differences.
+  * Added email_notify, jabber_notify, and rcov autotest plugins.
+  * Updated rakefile to include examples automatically in example_dot_autotest.
+  * multiruby now outputs each command so you can grab it easily.
+
+* 5 bug fixes:
+
+  * Ensure tests are run after reset.
+  * Fixed all test/rails tests to run in any combo.
+  * Fixed up growl.rb a bit... still buggy (growlnotify, not growl.rb).
+  * Fixes for -f (fast start) and last_mtime in general.
+  * Fixes for 1.9 and rubinius
+
 === 3.9.1 / 2008-01-31
 
 * 1 bug fix:

data/Manifest.txt

@@ -20,16 +20,19 @@ 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/pretty.rb
 lib/autotest/rails.rb
+lib/autotest/rcov.rb
 lib/autotest/redgreen.rb
 lib/autotest/screen.rb
 lib/autotest/shame.rb

data/Rakefile

@@ -16,23 +16,31 @@ task :autotest do
 end
 
 task :update do
+  system "p4 edit example_dot_autotest.rb"
   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|
+        next if s =~ /rails|discover/
         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::Emacs.client_cmd = 'emacsclient -e'"
-    f.puts "# Autotest::Heckle.flags << '-t test/**/*.rb'"
-    f.puts "# Autotest::Heckle.klasses << 'MyClass'"
-    f.puts "# Autotest::Shame.chat_app = :adium"
+
+    Dir["lib/autotest/*.rb"].sort.each do |file|
+      file = File.read(file)
+      m = file[/module.*/].split(/ /).last rescue nil
+      next unless m
+
+      file.grep(/def[^(]+=/).each do |setter|
+        setter = setter.sub(/^ *def self\./, '').sub(/\s*=\s*/, ' = ')
+        f.puts "# #{m}.#{setter}"
+      end
+    end
   end
+  system "p4 diff -du example_dot_autotest.rb"
 end
 
 task :sort do

data/bin/multiruby

@@ -1,4 +1,4 @@
-#!/usr/local/bin/ruby -w
+#!/usr/bin/env ruby -w
 
 require 'fileutils'
 
@@ -96,6 +96,9 @@ versions.each do |version|
 
   puts
   puts "VERSION = #{version}"
+  cmd = [ruby, ARGV].flatten.map { |s| s =~ /\"/ ? "'#{s}'" : s }.join(' ')
+  cmd.sub!(/#{ENV['HOME']}/, '~')
+  puts "CMD     = #{cmd}"
   puts
   system ruby, *ARGV
   puts

data/example_dot_autotest.rb

@@ -4,24 +4,39 @@
 # 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/pretty'
+# require 'autotest/rcov'
 # 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::Emacs.client_cmd = 'emacsclient -e'
-# Autotest::Heckle.flags << '-t test/**/*.rb'
-# Autotest::Heckle.klasses << 'MyClass'
-# Autotest::Shame.chat_app = :adium
+# 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
+# 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.pattern = o
+# Autotest::Shame.chat_app = o
+# Autotest::Snarl.snarl title, msg, ico = nil

data/lib/autotest.rb

@@ -222,10 +222,10 @@ class Autotest
   # Keep running the tests after a change, until all pass.
 
   def get_to_green
-    until all_good do
+    begin
       run_tests
       wait_for_changes unless all_good
-    end
+    end until all_good
   end
 
   ##
@@ -234,8 +234,12 @@ class Autotest
   def run_tests
     hook :run_command
 
-    self.find_files_to_test
+    new_mtime = self.find_files_to_test
+    return unless new_mtime
+    self.last_mtime = new_mtime
+
     cmd = self.make_test_cmd self.files_to_test
+    return if cmd.empty?
 
     puts cmd unless $q
 
@@ -377,8 +381,11 @@ class Autotest
       self.files_to_test[filename] # creates key with default value
     end
 
-    self.last_mtime = files.values.max
-    not updated.empty?
+    if updated.empty? then
+      nil
+    else
+      files.values.max
+    end
   end
 
   ##
@@ -438,7 +445,8 @@ class Autotest
     when :reverse then
       files_to_test.sort_by { |k,v| k }.reverse
     when :random then
-      files_to_test.sort_by { |k,v| rand }
+      max = files_to_test.size
+      files_to_test.sort_by { |k,v| rand(max) }
     when :natural then
       (self.find_order & files_to_test.keys).map { |f| [f, files_to_test[f]] }
     else

data/lib/autotest/email_notify.rb

@@ -0,0 +1,66 @@
+require 'net/smtp'
+
+module Autotest::EmailNotify
+  @@smtp_settings = ['localhost']
+  @@from = nil
+  @@recipients = []
+  @@use_svn = true
+  @@report_every_run = false
+
+  @@last_rev = nil
+
+  def self.smtp_settings= o
+    @@smtp_settings = o
+  end
+
+  def self.from= o
+    @@from = o
+  end
+
+  def self.recipients= o
+    @@recipients = o
+  end
+
+  def self.use_svn= o
+    @@use_svn = o
+  end
+
+  def self.report_every_run= o
+    @@report_every_run = o
+  end
+
+  def self.notify title, msg
+    @@recipients.each do |to|
+      body = ["From: autotest <#{@@from}>"]
+      body << "To: <#{to}>"
+      body << "Subject: #{title}"
+      body << "\n"
+      body << msg
+      Net::SMTP.start(*@@smtp_settings) do |smtp|
+        smtp.send_message body.join("\n"), @@from, to
+      end
+    end
+  end
+
+  def self.svn_release
+    if @@use_svn
+      rev = `svn info`.match(/Revision: (\d+)/)[1]
+      return "r#{rev} "
+    end
+  end
+
+  Autotest.add_hook :ran_command do |at|
+    rev = self.svn_release
+    if @@report_every_run or rev != @@last_rev
+      @@last_rev = rev
+      output = at.results.join
+      failed = output.scan(/^\s+\d+\) (?:Failure|Error):\n(.*?)\((.*?)\)/)
+      if failed.size == 0 then
+        notify "#{rev}Tests Passed", output
+      else
+        f,e = failed.partition { |s| s =~ /Failure/ }
+        notify "#{rev}#{failed.size} Tests Failed", output
+      end
+    end
+  end
+end

data/lib/autotest/growl.rb

@@ -1,13 +1,16 @@
 # -*- ruby -*-
 
 module Autotest::Growl
-  def self.growl title, msg, pri=0
-    title += " in #{Dir.pwd}"
-    msg += " at #{Time.now}"
-    system "growlnotify -n autotest --image /Applications/Mail.app/Contents/Resources/Caution.tiff -p #{pri} -m #{msg.inspect} #{title}"
+  def self.growl title, msg, pri = 0, img = nil
+    title += " in #{Dir.pwd.split(/\//)[-3..-1].join("/")}"
+    msg += " at #{Time.now.strftime('%Y-%m-%d %H:%M:%S')}"
+    # TODO: parameterize default image
+    img ||= "/Applications/Mail.app/Contents/Resources/Caution.tiff"
+    cmd = "growlnotify -n autotest --image #{img} -p #{pri} -m #{msg.inspect} #{title}"
+    system cmd
   end
 
-  Autotest.add_hook :run do  |at|
+  Autotest.add_hook :initialize do  |at|
     growl "autotest running", "Started"
   end
 

data/lib/autotest/jabber_notify.rb

@@ -0,0 +1,111 @@
+begin; require 'rubygems'; rescue LoadError; end
+require 'xmpp4r-simple'
+
+module Autotest::JabberNotify
+  @@recipients = []
+  @@account = nil
+  @@password = nil
+  @@use_svn = true
+  @@report_every_run = true
+
+  @@im = nil
+  @@last_rev = nil
+  @@green = false
+
+  def self.recipients= o
+    @@recipients = o
+  end
+
+  def self.account= o
+    @@account = o
+  end
+
+  def self.password= o
+    @@password = o
+  end
+
+  def self.use_svn= o
+    @@use_svn = o
+  end
+
+  def self.report_every_run= o
+    @@report_every_run = o
+  end
+
+  def self.im
+    unless @@im
+      puts "# creating im client"
+      @@im = Jabber::Simple.new(@@account,@@password)
+      sleep(2)  # need this or else the first announcement may cause an error
+    end
+    if !@@im.connected?
+      puts "# reconnecting to #{@@account}"
+      @@im.reconnect
+    end
+    @@im
+  end
+
+  def self.notify(msg)
+    @@recipients.each do |contact|
+      self.im.deliver(contact, msg)
+    end
+  end
+
+  def self.status(status)
+    rev = self.svn_release
+    status = "#{rev}#{status}"
+    self.im.status(:chat, status)
+  end
+
+  def self.svn_release
+    if @@use_svn
+      rev = `svn info`.match(/Revision: (\d+)/)[1]
+      return "r#{rev} "
+    end
+  end
+
+  # hooks
+
+  Autotest.add_hook :run do |at|
+    notify "autotest started"
+  end
+
+  Autotest.add_hook :run_command do |at|
+    status "testing"
+  end
+
+  Autotest.add_hook :ran_command do |at|
+    rev = self.svn_release
+    if @@report_every_run or rev != @@last_rev
+      @@last_rev = rev
+      output = at.results.join
+      failed = output.scan(/^\s+\d+\) ((?:Failure|Error):\n.*?\.*?\))/).flatten
+      failed.map! {|f| f.gsub!(/\n/,' '); f.gsub(/^/,'- ') }
+      time = output.scan(/Finished in (.*?)\n/)
+      if failed.size > 0 then
+        notify "Tests Passed\n#{time}\n" if !@@green
+        @@green = true # prevent repeat success notifications
+      else
+        @@green = false
+        notify "#{failed.size} Tests Failed\n" + failed.join("\n")
+      end
+    end
+  end
+
+  Autotest.add_hook :green do |at|
+    status "Tests Pass"
+  end
+
+  Autotest.add_hook :red do |at|
+    status "Tests Failed"
+  end
+
+  Autotest.add_hook :quit do |at|
+    notify "autotest is exiting"
+    self.im.disconnect
+  end
+
+  Autotest.add_hook :all do |at|_hook
+    notify "Tests have fully passed" unless $TESTING
+  end
+end

data/lib/autotest/rcov.rb

@@ -0,0 +1,16 @@
+module Autotest::RCov
+  @@command, @@pattern = "rcov", "test/*.rb"
+
+  def self.command= o
+    @@command = o
+  end
+
+  def self.pattern= o
+    @@pattern = o
+  end
+
+  Autotest.add_hook :all_good do |at|
+    system "rake #{@@command} PATTERN=#{@@pattern}"
+  end
+end
+

data/lib/test/zentest_assertions.rb

@@ -1,6 +1,8 @@
 ##
 # Extra assertions for Test::Unit
 
+Test::Unit::Assertions = MiniTest::Unit::TestCase if defined? MiniTest # HACK
+
 module Test::Unit::Assertions
 
   ##
@@ -67,7 +69,7 @@ module Test::Unit::Assertions
   ##
   # Alias for assert_not_equal
 
-  alias deny_equal assert_not_equal
+  alias deny_equal assert_not_equal # rescue nil
 
   ##
   # Asserts that +obj+ responds to #include? and that obj does not include

data/lib/unit_diff.rb

@@ -128,7 +128,7 @@ class UnitDiff
           bw = result.shift.sub(/^to equal (.*):?$/, '\1')
           butwas << bw
         else
-          state = :butwas if result.first.sub!(/ expected but was/, '')
+          state = :butwas if result.first.sub!(/ expected( but was|, not)/, '')
           expect << result.shift
         end
       when :butwas then
@@ -207,7 +207,7 @@ class UnitDiff
             if result.empty? then
               output.push "[no difference--suspect ==]"
             else
-              output.push result.map { |line| line.chomp }
+              output.push result.split(/\n/)
             end
 
             if $k then

data/lib/zentest.rb

@@ -56,7 +56,7 @@ end
 
 class ZenTest
 
-  VERSION = '3.9.1'
+  VERSION = '3.9.2'
 
   include ZenTestMapping
 

data/test/test_autotest.rb

@@ -224,11 +224,16 @@ class TestAutotest < Test::Unit::TestCase
   end
 
   def test_reorder_random
-    srand 42
     @a.order = :random
-    expected = ["test/test_blah.rb", "lib/blah.rb"].map { |f| [f, @files[f]] }
 
-    assert_equal expected, @a.reorder(@files)
+    srand 42
+    expected, size = @files.dup, @files.size
+    expected = expected.sort_by { rand(size) }
+
+    srand 42
+    result = @a.reorder(@files.dup)
+
+    assert_equal expected, result
   end
 
   def test_reorder_natural
@@ -404,8 +409,8 @@ test_error2(#{@test_class}):
   end
 
   def util_find_files_to_test(f, expected)
-    t = @a.last_mtime + 1
-    files = { f => t }
+    t = @a.last_mtime
+    files = { f => t + 1 }
 
     assert @a.find_files_to_test(files)
     assert_equal expected, @a.files_to_test

data/test/test_rails_autotest.rb

@@ -73,25 +73,16 @@ class TestRailsAutotest < TestAutotest
   end
 
   def test_reorder_random
-    srand 42
     @a.order = :random
-    expected = ["test/views/admin/themes_view_test.rb",
-                "test/functional/articles_controller_test.rb",
-                "app/models/route.rb",
-                "test/views/articles_view_test.rb",
-                "test/views/route_view_test.rb",
-                "test/controllers/articles_controller_test.rb",
-                "test/functional/admin/themes_controller_test.rb",
-                "test/functional/route_controller_test.rb",
-                "test/unit/route_test.rb",
-                "test/functional/dummy_controller_test.rb",
-                "test/controllers/admin/themes_controller_test.rb",
-                "test/views/layouts_view_test.rb",
-                "test/controllers/dummy_controller_test.rb",
-                "test/controllers/route_controller_test.rb"]
-    expected.map! { |f| [f, @files[f]] }
-
-    assert_equal expected, @a.reorder(@files)
+
+    srand 42
+    expected, size = @files.dup, @files.size
+    expected = expected.sort_by { rand(size) }
+
+    srand 42
+    result = @a.reorder(@files.dup)
+
+    assert_equal expected, result
   end
 
   def test_test_files_for

data/test/test_rails_controller_test_case.rb

@@ -1,12 +1,14 @@
 require 'test/unit'
 require 'test/zentest_assertions'
 
-$TESTING_RTC = true
+unless defined? $TESTING_RTC then
+  $TESTING_RTC = true
 
-begin
-  require 'test/rails'
-rescue LoadError, NameError
-  $TESTING_RTC = false
+  begin
+    require 'test/rails'
+  rescue LoadError, NameError
+    $TESTING_RTC = false
+  end
 end
 
 class TRController < ApplicationController

data/test/test_rails_helper_test_case.rb

@@ -1,12 +1,14 @@
 require 'test/unit'
 require 'test/zentest_assertions'
 
-$TESTING_RTC = true
+unless defined? $TESTING_RTC then
+  $TESTING_RTC = true
 
-begin
-  require 'test/rails'
-rescue LoadError, NameError
-  $TESTING_RTC = false
+  begin
+    require 'test/rails'
+  rescue LoadError, NameError
+    $TESTING_RTC = false
+  end
 end
 
 begin

data/test/test_rails_view_test_case.rb

@@ -1,7 +1,15 @@
 require 'test/unit'
 require 'test/zentest_assertions'
 
-$TESTING_RTC = true
+unless defined? $TESTING_RTC then
+  $TESTING_RTC = true
+
+  begin
+    require 'test/rails'
+  rescue LoadError, NameError
+    $TESTING_RTC = false
+  end
+end
 
 module Rails
   module VERSION
@@ -9,12 +17,6 @@ module Rails
   end
 end
 
-begin
-  require 'test/rails'
-rescue LoadError, NameError
-  $TESTING_RTC = false
-end
-
 class TestRailsViewTestCase < Test::Rails::ViewTestCase
 
   def setup

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ZenTest
 version: !ruby/object:Gem::Version 
-  version: 3.9.1
+  version: 3.9.2
 platform: ruby
 authors: 
 - Ryan Davis
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-01-31 00:00:00 -08:00
+date: 2008-03-20 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.5.0
+        version: 1.5.1
     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!  Test::Rails helps you build industrial-strength Rails code."
 email: 
@@ -63,16 +63,19 @@ files:
 - 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/pretty.rb
 - lib/autotest/rails.rb
+- lib/autotest/rcov.rb
 - lib/autotest/redgreen.rb
 - lib/autotest/screen.rb
 - lib/autotest/shame.rb