- fixed a bug in coderay_suite (break outside of loop?)

- made test and bench tasks run with all implementations
- included term/ansicolor in lib (will need in some day anyway) as svn:external
  (this also means that tests will be colorful on all rubys)
- incremented CodeRay version number (we're near...)

1 files changed, 3 insertions, 13 deletions

diff --git a/test/scanners/coderay_suite.rb b/test/scanners/coderay_suite.rb
index 04b385a..bc00d6c 100644
--- a/test/scanners/coderay_suite.rb
+++ b/test/scanners/coderay_suite.rb
@@ -6,18 +6,8 @@ $:.unshift File.join($mydir, '..', '..', 'lib')
 require 'coderay'
 
 debug, $DEBUG = $DEBUG, false
-# Try to load Term::ANSIColor...
-begin
-  require 'term-ansicolor'
-rescue LoadError
-  begin
-    require 'rubygems'
-    gem 'term-ansicolor'
-    require 'term/ansicolor'
-  rescue LoadError
-    # ignore
-  end
-end unless ENV['nocolor']
+
+require 'term/ansicolor' unless ENV['nocolor']
 
 if defined? Term::ANSIColor
   class String
@@ -328,7 +318,7 @@ module CodeRay
       rescue
         flunk 'highlighting test failed!' unless ENV['noassert']
         ok = false
-        break
+        return
       end
       File.open(name + '.actual.html', 'w') { |f| f.write highlighted }
       print "\b" * 'highlighting...'.size