cutest 1.1.3 → 1.2.0.rc1

data/bin/cutest

@@ -1,4 +1,6 @@
-require File.expand_path("../lib/cutest", File.dirname(__FILE__))
+#!/usr/bin/env ruby
+
+require_relative "../lib/cutest"
 
 if ARGV.empty?
   puts "usage: cutest [-r lib] [-v] file ..."
@@ -61,11 +63,9 @@ class Cutest
 end
 
 files = Cutest::Clap.run ARGV,
-  "-r"      => lambda { |file| Cutest::REQUIREMENTS.push(file) },
+  "-r"      => lambda { |file| require file },
   "-v"      => lambda { puts Cutest::VERSION }
 
-case files.size
-when 0 then exit
-when 1 then Cutest.run_file(files.first) && puts
-else        Cutest.run(Dir[*files])
+if files.any?
+  Cutest.run(Dir[*files])
 end

data/lib/cutest.rb

@@ -1,38 +1,13 @@
 class Cutest
-  VERSION = "1.1.3"
-  REQUIREMENTS = []
+  VERSION = "1.2.0.rc1"
   FILTER = %r[/(ruby|jruby|rbx)[-/]([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?
-  end
-
   def self.run(files)
     files.each do |file|
-      %x{cutest #{flags} #{file}}.chomp.display
+      run_file(file)
+
+      Process.wait
 
       break unless $?.success?
     end
@@ -41,23 +16,29 @@ class Cutest
   end
 
   def self.run_file(file)
-    begin
-      REQUIREMENTS.each { |r| require r }
+    fork do
+      begin
+        load(file)
+
+      rescue LoadError, SyntaxError
+        display_error
+        exit 1
 
-      load(file)
+      rescue StandardError
+        display_error
 
-    rescue LoadError, SyntaxError
-      display_error
-      exit 1
+        trace = $!.backtrace
+        pivot = trace.index { |line| line.match(file) }
 
-    rescue Exception
-      display_error
+        if pivot
+          other = trace[0..pivot].select { |line| line !~ FILTER }
+          other.reverse.each { |trace| display_trace(trace) }
+        else
+          display_trace(trace.first)
+        end
 
-      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
+        exit 1
+      end
     end
   end
 
@@ -66,17 +47,15 @@ class Cutest
   end
 
   def self.display_error
-    print Color.title("\n\n#{$!.class}: ")
-    print Color.exception("#{$!.message}\n\n")
-    print Color.reset
+    print "\n\n#{$!.class}: "
+    print "#{$!.message}\n\n"
   end
 
   def self.display_trace(line)
     fn, ln = line.split(":")
 
-    print Color.code("- #{code(fn, ln)}")
-    print Color.location(" #{fn} +#{ln}\n")
-    print Color.reset
+    puts "  line: #{code(fn, ln)}"
+    puts "  file: #{fn} +#{ln}"
   end
 
   class AssertionFailed < StandardError

data/test/fixtures/failure_in_loaded_file.rb

@@ -0,0 +1 @@
+load("test/fixtures/failure.rb")

data/test/run.rb

@@ -1,56 +1,47 @@
-require "stringio"
-
-def capture
-  stdout, $stdout = $stdout, StringIO.new
-  stderr, $stderr = $stderr, StringIO.new
-  yield
-  [$stdout.string, $stderr.string]
-ensure
-  $stdout = stdout
-  $stderr = stderr
-end
-
 test "output of successful run" do
   expected = ".\n"
 
-  stdout, stderr = capture do
-    Cutest.run(Dir["test/fixtures/success.rb"])
-  end
+  out = %x{./bin/cutest test/fixtures/success.rb}
 
-  assert_equal(stdout, expected)
+  assert_equal(expected, out)
 end
 
 test "output of failed run" do
-  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"
+  expected = "\n\nCutest::AssertionFailed: expression returned false\n\n" +
+             "  line: assert false\n" +
+             "  file: test/fixtures/failure.rb +2\n\n"
 
-  stdout, stderr = capture do
-    Cutest.run(Dir["test/fixtures/failure.rb"])
-  end
+  out = %x{./bin/cutest test/fixtures/failure.rb}
 
-  assert_equal(stdout, expected)
+  assert_equal(expected, out)
 end
 
 test "output of failed run" do
-  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"
+  expected = "\n\nRuntimeError: Oops\n\n" +
+             "  line: raise \"Oops\"\n" +
+             "  file: test/fixtures/exception.rb +2\n\n"
 
-  stdout, stderr = capture do
-    Cutest.run(Dir["test/fixtures/exception.rb"])
-  end
+  out = %x{./bin/cutest test/fixtures/exception.rb}
 
-  assert_equal(stdout, expected)
+  assert_equal(expected, out)
 end
 
 test "output of custom assertion" do
-  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"
+  expected = "\n\nCutest::AssertionFailed: not empty\n\n" +
+             "  line: assert_empty \"foo\"\n" +
+             "  file: test/fixtures/fail_custom_assertion.rb +7\n\n"
+
+  out = %x{./bin/cutest test/fixtures/fail_custom_assertion.rb}
+
+  assert_equal(expected, out)
+end
+
+test "output of failure in nested file" do
+  expected = "\n\nCutest::AssertionFailed: expression returned false\n\n" +
+             "  line: assert false\n" +
+             "  file: test/fixtures/failure.rb +2\n\n"
 
-  stdout, stderr = capture do
-    Cutest.run(Dir["test/fixtures/fail_custom_assertion.rb"])
-  end
+  out = %x{./bin/cutest test/fixtures/failure_in_loaded_file.rb}
 
-  assert_equal(stdout, expected)
+  assert_equal(expected, out)
 end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: cutest
 version: !ruby/object:Gem::Version
-  version: 1.1.3
-  prerelease: 
+  version: 1.2.0.rc1
+  prerelease: 6
 platform: ruby
 authors:
 - Damian Janowski
@@ -10,8 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-20 00:00:00.000000000 +02:00
-default_executable: 
+date: 2012-07-25 00:00:00.000000000 Z
 dependencies: []
 description: Run tests in separate processes to avoid shared state.
 email:
@@ -33,13 +32,14 @@ files:
 - test/fixtures/exception.rb
 - test/fixtures/fail_custom_assertion.rb
 - test/fixtures/failure.rb
+- test/fixtures/failure_in_loaded_file.rb
 - test/fixtures/success.rb
 - test/prepare.rb
 - test/run.rb
 - test/scopes.rb
 - test/setup.rb
-- bin/cutest
-has_rdoc: true
+- !binary |-
+  YmluL2N1dGVzdA==
 homepage: http://github.com/djanowski/cutest
 licenses: []
 post_install_message: 
@@ -55,12 +55,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Forking tests.