cutest 1.1.0.rc1 → 1.1.0.rc2

data/bin/cutest

@@ -68,6 +68,6 @@ files = Cutest::Clap.run ARGV,
 
 case files.size
 when 0 then exit
-when 1 then Cutest.run_file(files.first)
+when 1 then Cutest.run_file(files.first) && puts
 else        Cutest.run(Dir[*files])
 end

data/cutest.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name              = "cutest"
-  s.version           = "1.1.0.rc1"
+  s.version           = "1.1.0.rc2"
   s.summary           = "Forking tests."
   s.description       = "Run tests in separate processes to avoid shared state."
   s.authors           = ["Damian Janowski", "Michel Martens"]

data/lib/cutest.rb

@@ -1,6 +1,30 @@
 class Cutest
-  VERSION = "1.1.0.rc1"
+  VERSION = "1.1.0.rc2"
   REQUIREMENTS = []
+  FILTER = %r[/#{RUBY_ENGINE}[-/]([0-9\.])+]
+  CACHE = Hash.new { |h, k| h[k] = File.readlines(k) }
+
+  module Color
+    def self.title(str)
+      "\033[01;36m#{str}"
+    end
+
+    def self.exception(str)
+      "\033[1;33m#{str}"
+    end
+
+    def self.code(str)
+      "\033[00m#{str}"
+    end
+
+    def self.location(str)
+      "\033[01;30m#{str}"
+    end
+
+    def self.reset
+      "\033[00m"
+    end
+  end
 
   def self.flags
     "-r #{REQUIREMENTS.join(" ")}" if REQUIREMENTS.any?
@@ -9,6 +33,8 @@ class Cutest
   def self.run(files)
     files.each do |file|
       %x{cutest #{flags} #{file}}.chomp.display
+
+      break unless $?.success?
     end
 
     puts
@@ -21,20 +47,35 @@ class Cutest
       load(file)
 
     rescue LoadError, SyntaxError
-      puts ["\n", error([file, $!.message])]
-      exit
+      display_error
+      exit 1
 
     rescue Exception
-      fn, ln = $!.backtrace.first.split(":")
-      message = File.readlines(fn)[ln.to_i - 1]
-      puts "\n#{error(message.strip)} # #{$!.message}\n#{fn} +#{ln}"
+      display_error
+
+      trace = $!.backtrace
+      pivot = trace.index { |line| line.match(file) }
+      other = trace[0..pivot].select { |line| line !~ FILTER }
+      other.reverse.each { |trace| display_trace(trace) }
+      exit 1
     end
+  end
 
-    puts
+  def self.code(fn, ln)
+    CACHE[fn][ln.to_i - 1].strip
+  end
+
+  def self.display_error
+    print Color.title("\n\n#{$!.class}: ")
+    print Color.exception("#{$!.message}\n\n")
   end
 
-  def self.error(e)
-    "\033[01;36mException: \033[01;33m#{e}\033[00m"
+  def self.display_trace(line)
+    fn, ln = line.split(":")
+
+    print Color.code("- #{code(fn, ln)}")
+    print Color.location(" #{fn} +#{ln}\n")
+    print Color.reset
   end
 
   class AssertionFailed < StandardError
@@ -115,7 +156,7 @@ private
 
   # Assert that value is not nil or false.
   def assert(value)
-    flunk("assertion failed") unless value
+    flunk("expression returned #{value.inspect}") unless value
     success
   end
 

data/test/run.rb

@@ -21,7 +21,9 @@ test "output of successful run" do
 end
 
 test "output of failed run" do
-  expected = "\n\e[01;36mException: \e[01;33massert false\e[00m # assertion failed\ntest/fixtures/failure.rb +2\n\n"
+  expected = "\e[01;36m\n\nCutest::AssertionFailed: \e[1;33mexpression retur" +
+             "ned false\n\n\e[00m- assert false\e[01;30m test/fixtures/failu" +
+             "re.rb +2\n\e[00m\n"
 
   stdout, stderr = capture do
     Cutest.run(Dir["test/fixtures/failure.rb"])
@@ -31,7 +33,8 @@ test "output of failed run" do
 end
 
 test "output of failed run" do
-  expected = "\n\e[01;36mException: \e[01;33mraise \"Oops\"\e[00m # Oops\ntest/fixtures/exception.rb +2\n\n"
+  expected = "\e[01;36m\n\nRuntimeError: \e[1;33mOops\n\n\e[00m- raise \"Oop" +
+             "s\"\e[01;30m test/fixtures/exception.rb +2\n\e[00m\n"
 
   stdout, stderr = capture do
     Cutest.run(Dir["test/fixtures/exception.rb"])
@@ -41,7 +44,9 @@ test "output of failed run" do
 end
 
 test "output of custom assertion" do
-  expected = "\n\e[01;36mException: \e[01;33massert_empty \"foo\"\e[00m # not empty\ntest/fixtures/fail_custom_assertion.rb +7\n\n"
+  expected = "\e[01;36m\n\nCutest::AssertionFailed: \e[1;33mnot empty\n\n\e[" +
+             "00m- assert_empty \"foo\"\e[01;30m test/fixtures/fail_custom_a" +
+             "ssertion.rb +7\n\e[00m\n"
 
   stdout, stderr = capture do
     Cutest.run(Dir["test/fixtures/fail_custom_assertion.rb"])

metadata

@@ -2,7 +2,7 @@
 name: cutest
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 1.1.0.rc1
+  version: 1.1.0.rc2
 platform: ruby
 authors: 
 - Damian Janowski
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-22 00:00:00 Z
+date: 2011-05-07 00:00:00 Z
 dependencies: []
 
 description: Run tests in separate processes to avoid shared state.
@@ -61,7 +61,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.7.2
+rubygems_version: 1.8.1
 signing_key: 
 specification_version: 3
 summary: Forking tests.