- 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...)

5 files changed, 26 insertions, 27 deletions

diff --git a/Rakefile b/Rakefile
index 9ba14ea..bd859c5 100644
--- a/Rakefile
+++ b/Rakefile
@@ -11,20 +11,28 @@ def EXTRA_FILES.in folder
   end
 end
 
-for task_file in Dir['rake_tasks/*.rake']
-  load task_file
-end
-
-task :default => 'gem:make'
+task :default => :test
 
 task :upload => %w( gem:upload doc:upload example:upload )
 
+def ruby command
+  params =
+    if RUBY == 'rbx'
+      '-I/usr/local/lib/ruby/1.8'
+    else
+      '-w'
+    end
+  cmd = "#{RUBY} #{params} #{command}"
+  puts cmd
+  system cmd
+end
+
 task '19' do
   RUBY.replace 'ruby19'
 end
 
 task '18' do
-  RUBY.replace '18ruby'
+  RUBY.replace 'ruby'
 end
 
 task 'yarv' do
@@ -39,6 +47,7 @@ task 'rubinius' do
   RUBY.replace 'rbx'
 end
 
-if ruby = ENV['ruby']
-  RUBY.replace ruby
-end
\ No newline at end of file
+for task_file in Dir['rake_tasks/*.rake']
+  load task_file
+end
+
diff --git a/lib/coderay.rb b/lib/coderay.rb
index bb6e183..7d5bafe 100644
--- a/lib/coderay.rb
+++ b/lib/coderay.rb
@@ -134,7 +134,7 @@ module CodeRay
   # Minor: odd for beta, even for stable
   # Teeny: development state
   # Revision: Subversion Revision number (generated on rake)
-  VERSION = '0.7.7'
+  VERSION = '0.7.8'
 
   require 'coderay/tokens'
   require 'coderay/scanner'
diff --git a/rake_tasks/benchmark.rake b/rake_tasks/benchmark.rake
index e14537a..423a66a 100644
--- a/rake_tasks/benchmark.rake
+++ b/rake_tasks/benchmark.rake
@@ -1,6 +1,6 @@
 desc 'Do a benchmark'
 task :benchmark do
-  system "#{RUBY} -wIlib bench/bench.rb ruby div 1000"
+  ruby "-Ilib bench/bench.rb ruby div 1000"
 end
 
 task :bench => :benchmark
diff --git a/rake_tasks/test.rake b/rake_tasks/test.rake
index 4e245c0..1033565 100644
--- a/rake_tasks/test.rake
+++ b/rake_tasks/test.rake
@@ -1,17 +1,17 @@
 namespace :test do

   desc 'run all sample tests'

   task :samples do

-    system "#{RUBY} -w ./sample/suite.rb"

+    ruby "./sample/suite.rb"

   end

   

   desc 'run functional tests'

   task :functional do

-    system "#{RUBY} -w ./test/functional/suite.rb"

+    ruby "./test/functional/suite.rb"

   end

   

   desc 'run all scanner tests'

   task :scanners do

-    system "#{RUBY} -w ./test/scanners/suite.rb"

+    ruby "./test/scanners/suite.rb"

   end

   

   desc 'clean test output files'

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