ZenTest 3.6.1 → 3.7.0

data/History.txt

@@ -1,6 +1,30 @@
+=== 3.7.0 / 2007-12-21
+
+* 8 minor enhancements:
+
+  * Added add_mapping to make file mappings cleaner.
+  * Added assert_callback thanks to Aaron Patterson.
+  * Added autotest/cctray.
+  * Added extra_files and extra_class_map, allowing .autotest files to be awesome.
+  * Added url for lettuce principal thanks to Hugh Sasse.
+  * Added zentest.rb refactorings thanks to Hugh Sasse.
+  * Exceptions are now an array of regexps, built after :initialize hook.
+  * Removed ruby_fork and ruby_fork_client. Eric got a faster laptop. :P
+
+* 6 bug fixes:
+
+  * Fixed all my annoyances with @exceptions.
+  * Fixed crasher in autotest/redgreen for non-matches.
+  * Fixed everything to work with ruby 1.9.
+  * Fixed rubygem requires causing strangeness in tests.
+  * Fixed zentest mapping so ruby2ruby and test_ruby2ruby work.
+  * Removed stupid YAML methods from TrueClass during
+    testing. (Infected by Test::Rails' use of rubygems)
+
 === 3.6.1 / 2007-07-23
 
 * 4 minor enhancements:
+
   * Test::Rails::ViewTestCase now uses assert_select.
     * assert_form and friends now work with blocks like assert_select
       does.
@@ -12,15 +36,20 @@
 === 3.6.0 / 2007-05-25
 
 * 4 major enhancements:
+
   * New auto-discovery mechanism to make rspec and friends work independently!
   * Moved and restructured camping and rails as plugins.
   * Removed rspec - now packaged with rspec and/or as plugin.
   * Changed the way FTM tests are named. Allows multiple matricies.
+
 * 3 minor enhancements:
+
   * Added :OK special result value to FTM.
   * Hugh Sasse is awesome. Rdoc happiness.
   * Parameterized emacs client command.
+
 * 3 bug fixes:
+
   * Dup load path because I'm dum.
   * Fixed a lame syntax error in emacs.rb.
   * autotest now builds command separator with '&' on windoze. ARGH! Why is this the first I've heard of this?!?
@@ -28,6 +57,7 @@
 === 3.5.2 / 2007-04-30
 
 * 4 bug fixes:
+
   * Patch up Rails fixture defaults for Test::Rails::TestCase.
   * Session now properly hooked up to controllers.
   * ruby 1.8.6 has a bug on 'raise Interrupt' with no args. Fixed on both sides.
@@ -36,6 +66,7 @@
 === 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.
@@ -44,11 +75,14 @@
 === 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.
@@ -72,24 +106,32 @@
   * 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).
+
 * 2 bug fixes:
+
   * 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
 
 * 2 minor enhancements:
+
   * Add TextHelper for pluralize.
   * Add deny_nil to Test::Rails.
+
 * 7 bug fixes:
+
   * Fixed test_help's Flash. It's is a module. Oops...
   * Don't run util_audit_assert_assigned if tests didn't pass, results will be bogus.
   * Fixed AssertionsTest names to match what autotest expects.
@@ -101,10 +143,13 @@
 === 3.4.1 / 2006-10-13
 
 * 3 minor enhancements:
+
   * FUNDAMENTALLY changed the way failures map back to tests. This REQUIRES users of autotest to ensure that their tests and impls map 1:1 at every scoping level. I'll blog more details.
   * Hoe'd rakefile
   * Added support for render :collection to RenderTree.
+
 * 7 bug fixes:
+
   * Fixed autotest tests for custom ruby names.
   * Fixed some documentation errors in ControllerTestCase.
   * Fixed setup in FunctionalTestCase.
@@ -116,6 +161,7 @@
 === 3.4.0 / 2006-09-12
 
 * 13 minor enhancements:
+
   * Broke out example_dot_autotest into multiple files in lib.
   * Enhanced hook system so it can return true if event handled.
   * Sleep is now 1 second by default because life is too short.
@@ -129,7 +175,9 @@
   * Added markaby support for Test::Rails.
   * Added hack to display a tree of render calls.
   * Added hook to perform extra setup for 
+
 * 5 bug fixes:
+
     - Extended zentest to deal with rails a bit better... ugh.
     - Fixed @libs for windoze.
     - Fixed inner class/test identification in autotest.
@@ -139,15 +187,20 @@
 === 3.3.0 / 2006-07-28
 
 * 1 major enhancement:
+
   * autotest has been rewritten to be much cleaner, now has a plugin system.
+
 * 5 minor enhancements:
+
   * test/rails adds helper tests, "stolen" from Geoff's work, (which was "stolen" from ryan's work. :P)
   * autotest turnaround is now faster.
   * Added more prune dirs to autotest.
   * test/rails rewinds IOs containing captured output. Added assert_empty.
   * Document that autotest doesn't run the db:test:prepare rake task when in Rails mode.
   * Added ruby_fork, but haven't fully plugged into autotest yet.
+
 * 7 bug fixes:
+
   * Add SIGINT handler to unit_diff to give a more graceful exit.
   * Don't strip <> from tempfiles, parse_diff does it for us.
   * Fixed autotest problems on windoze. Ugh.
@@ -160,10 +213,15 @@
 === 3.2.0 / 2006-04-10
 
 * 1 major enhancement:
+
   * Added Test::Rails.
+
 * 1 minor enhancement:
+
   * Extended autotest for Test::Rails.
+
 * 4 bug fixes:
+
   * Autotest now detects changes in rhtml.
   * Improved autotest's file mapping and choice of ruby.
   * We've got RDoc, yes we do!
@@ -172,9 +230,12 @@
 === 3.1.0 / 2006-03-29
 
 * 2 major enhancements:
+
   * Added multiruby! YAY!
   * Massive improvements to autotest: speed, reliability, reporting, etc.
+
 * 10 minor enhancements:
+
   * multiruby builds in a centralized location. YAY!
   * multiruby now allows reinstalls quickly and easily (can even skip config).
   * multiruby exits with total sum of exit codes.
@@ -185,7 +246,9 @@
   * autotest always runs with unit_diff -u.
   * autotest can now run cvs/svn/p4 up periodically to be a mini-tinderbox.
   * autotest now has real help.
+
 * 4 bug fixes:
+
   * ZenTest is now zentest. Yay for consistency! (do a rake uninstall to clean)
   * ZenTest excludes pretty_print methods.
   * Fixed unary operator issues (they were backwards... oops!) for ZenTest.
@@ -194,13 +257,18 @@
 === 3.0.0 / 2006-03-06
 
 * 2 major enhancements:
+
   * Added autotest and rails_autotest. YAY for continous testing!
   * Repackaged and gemified. YAY for gemification!
+
 * 3 minor enhancements:
+
   * Added non-mappable tests starting with test_integration_.
   * Lots of code and test refactoring and cleanup.
   * Massive improvement on unit tests.
+
 * 3 bug fixes:
+
   * Cleaned up class method inheritence. Esp relevant for rails testing.
   * Finally fixed the unit_diff parse bug!
   * Fixed improper counting of errors if a class was missing, should be 1 + missing methods.
@@ -208,10 +276,13 @@
 === 2.4.0 / 2005-03-21
 
 * 3 minor enhancements:
+
   * Able to audit standard class library (so now we can audit rubicon!).
   * Able to map against class methods (self.blah <=> test_class_blah).
   * Added -I=rubypath support 
+
 * 4 bug fixes:
+
   * bug:1151 Fixed stupid problem w/ unit_diff.
   * bug:1454 code generation correctly matches class/module for nested classes.
   * bug:1455 Updated method mapping to work on all operators listed in my quickref.
@@ -220,13 +291,16 @@
 === 2.3.0 / 2004-11-18
 
 * 6 minor enhancements:
+
   * Massively expanded the method name mappings.
   * Added -r flag to reverse map names, for Rails style testing.
   * Added -e to auto eval tests generated.
   * Added -b & -c flags in unit_diff (passed to diff)
   * Added install and uninstall rules to Makefile.
   * Added some more doco to README.txt
+
 * 7 bug fixes:
+
   * Cleaned up and refactored tests.
   * Changed the way files are generated, to accomodate new flags.
   * Added some more tests.
@@ -238,11 +312,14 @@
 === 2.2.0 / 2004-10-18
 
 * 4 minor enhancements:
+
   * Added LinuxJournalArticle.txt! WOOT!
   * Added unit_diff.rb - a very cool filter for test output!
   * Extended ZenTest to work with standard input
   * Added "ZenTest FULL" to force ZenTest to analyze inherited methods, for subclasses of the standard library.
+
 * 3 bug fixes:
+
   * Extended makefile to be more dynamic and stop diffing versions. ugh.
   * Expanded the method rename map to handle <<, *, +, and ==. 
   * Added more test cases.
@@ -250,6 +327,7 @@
 === 2.1.2 / 2004-03-08
 
 * 4 bug fixes:
+
   * Fixed yet another 1.8ism, results will be the same in 1.8 and 1.6.
   * Fixed code responsible for method name conversion.
   * I am a moron... didn't run tests after updating version.
@@ -258,6 +336,7 @@
 === 2.1.1 / 2004-03-06
 
 * 3 bug fixes:
+
   * Fixed a 1.8ism.
   * Removed zentestrunner. Older ruby users will just have to suffer.
   * Updated history to ZenWeb format.
@@ -265,13 +344,18 @@
 === 2.1.0 / 2003-01-07
 
 * 3 major enhancements:
+
   * Output is runnable as-is thanks to zentestrunner.rb.
   * Wrapped up all running functionality into ZenTest.fix
   * Added simple statistic output... Thanks Dave & Andy!!!
+
 * 2 minor enhancements:
+
   * Added zentestrunner.rb until Nathaniel accepts my changes!
   * Added a clean rule to Makefile
+
 * 3 bug fixes:
+
   * Removed at_exit override and avoided test/unit altogether.
   * Extended README.txt to include some of the rules.
   * Fixed several tests and added assertions for new stats
@@ -279,14 +363,18 @@
 === 2.0.0 / 2002-10-29
 
 * 2 major enhancements:
+
   * Rewrite of ZenTest.rb into actual OO design.
   * Added unit tests, finally...
 
 === 1.0.1 / 2002-09-28
 
 * 1 minor enhancement:
+
   * Only loads when a class is detected, allows some scripts to be skipped.
+
 * 3 bug fixes:
+
   * Cleaned up output. Verbose when $DEBUG is true.
   * Added an error count that is output at end.
   * Better filtering or conversion on some method names.
@@ -294,4 +382,5 @@
 === 1.0.0 / 2002-09-24
 
 * 1 major enhancement:
+
   * Birthday!

data/Manifest.txt

@@ -6,8 +6,6 @@ Rakefile
 bin/autotest
 bin/multiruby
 bin/rails_test_audit
-bin/ruby_fork
-bin/ruby_fork_client
 bin/unit_diff
 bin/zentest
 example.txt
@@ -17,6 +15,7 @@ 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/fixtures.rb
@@ -35,7 +34,6 @@ lib/autotest/shame.rb
 lib/autotest/snarl.rb
 lib/autotest/timestamp.rb
 lib/functional_test_matrix.rb
-lib/ruby_fork.rb
 lib/test/rails.rb
 lib/test/rails/controller_test_case.rb
 lib/test/rails/functional_test_case.rb
@@ -56,7 +54,6 @@ test/test_rails_autotest.rb
 test/test_rails_controller_test_case.rb
 test/test_rails_helper_test_case.rb
 test/test_rails_view_test_case.rb
-test/test_ruby_fork.rb
 test/test_unit_diff.rb
 test/test_zentest.rb
 test/test_zentest_assertions.rb

data/Rakefile

@@ -9,7 +9,7 @@ require './lib/zentest.rb'
 Hoe.new("ZenTest", ZenTest::VERSION) do |p|
   p.author = ['Ryan Davis', 'Eric Hodel']
 
-  changes = p.paragraphs_of("History.txt", 0..1).join("\n\n")
+  changes = p.paragraphs_of("History.txt", 0..4).join("\n\n")
   urls, summary, *description = p.paragraphs_of("README.txt", 1, 3, 3..8)
 
   p.url = urls.gsub(/^\* /, '').split(/\n/)

data/example.txt

@@ -4,7 +4,8 @@
 What do we do to get people writing tests?
 What do we do to get people writing tests first?
 
-I didn't know it's name, but apparently it's the Lettuce Principal.
+I didn't know it's name, but apparently it's the Lettuce Principal,
+(see http://blog.toolshed.com/2003/03/the_lettuce_pri.html).
 
 	We NEED to make testing as easy as possible to get them testing.
 

data/lib/autotest.rb

@@ -124,6 +124,8 @@ class Autotest
   end
 
   attr_accessor(:exceptions,
+                :extra_class_map,
+                :extra_files,
                 :files,
                 :files_to_test,
                 :interrupted,
@@ -137,9 +139,11 @@ class Autotest
                 :wants_to_quit)
 
   def initialize
+    @exceptions = []
+    @extra_class_map = {}
+    @extra_files = []
     @files = Hash.new Time.at(0)
     @files_to_test = Hash.new { |h,k| h[k] = [] }
-    @exceptions = false
     @libs = %w[. lib test].join(File::PATH_SEPARATOR)
     @output = $stderr
     @sleep = 1
@@ -155,6 +159,12 @@ class Autotest
     }
 
     hook :initialize
+
+    if @exceptions.empty? then
+      @exceptions = nil
+    else
+      @exceptions = Regexp.union(*@exceptions)
+    end
   end
 
   # Repeatedly run failed tests, then all tests, then
@@ -195,10 +205,11 @@ class Autotest
   # Look for files to test then run the tests and
   # handle the results.
   def run_tests
+    hook :run_command
+
     find_files_to_test # failed + changed/affected
     cmd = make_test_cmd @files_to_test
 
-    hook :run_command
     puts cmd
 
     old_sync = $stdout.sync
@@ -212,7 +223,11 @@ class Autotest
           putc c
           line << c
           if c == ?\n then
-            @results << line.pack("c*")
+            @results << if RUBY_VERSION >= "1.9" then
+                          line.join
+                        else
+                          line.pack "c*"
+                        end
             line.clear
           end
         end
@@ -229,6 +244,10 @@ class Autotest
   ############################################################
   # Utility Methods, not essential to reading of logic
 
+  def add_mapping(regexp, &proc)
+    self.test_mappings[regexp] = proc
+  end
+
   def add_sigint_handler
     trap 'INT' do
       if @interrupted then
@@ -257,7 +276,7 @@ class Autotest
   def path_to_classname(s)
     sep = File::SEPARATOR
     f = s.sub(/^test#{sep}/, '').sub(/\.rb$/, '').split(sep)
-    f = f.map { |path| path.split(/_/).map { |seg| seg.capitalize }.join }
+    f = f.map { |path| path.split(/_|(\d+)/).map { |seg| seg.capitalize }.join }
     f = f.map { |path| path =~ /^Test/ ? path : "Test#{path}"  }
     f.join('::')
   end
@@ -267,6 +286,7 @@ class Autotest
     filters = Hash.new { |h,k| h[k] = [] }
 
     class_map = Hash[*@files.keys.grep(/^test/).map { |f| [path_to_classname(f), f] }.flatten]
+    class_map.merge!(self.extra_class_map)
 
     failed.each do |method, klass|
       if class_map.has_key? klass then
@@ -284,8 +304,9 @@ class Autotest
   # a Hash mapping filename to modification time.
   def find_files
     result = {}
-    Find.find '.' do |f|
-      Find.prune if @exceptions and f =~ @exceptions and test ?d, f
+    targets = ['.'] + self.extra_files
+    Find.find(*targets) do |f|
+      Find.prune if @exceptions and f =~ @exceptions
 
       next if test ?d, f
       next if f =~ /(swp|~|rej|orig)$/        # temporary/patch files