cutest 1.2.0.rc2 → 1.2.0.rc3

data/bin/cutest

@@ -1,69 +1,16 @@
 #!/usr/bin/env ruby
 
-require_relative "../lib/cutest"
-
 if ARGV.empty?
   puts "usage: cutest [-r lib] [-v] file ..."
   exit
 end
 
-class Cutest
-
-  # Clap: Command line argument parsing.
-  # http://github.com/soveran/clap
-  # http://rubygems.org/gems/clap
-  class Clap
-    VERSION = "0.0.2"
-
-    attr :argv
-    attr :opts
-
-    def self.run(args, opts)
-      new(args, opts).run
-    end
-
-    def initialize(argv, opts)
-      @argv = argv.dup
-      @opts = opts
-    end
-
-    def run
-      args = []
-
-      while argv.any?
-
-        item = argv.shift
-        flag = opts[item]
-
-        if flag
-
-          # Work around lambda semantics in 1.8.7.
-          arity = [flag.arity, 0].max
-
-          # Raise if there are not enough parameters
-          # available for the flag.
-          if argv.size < arity
-            raise ArgumentError
-          end
-
-          # Call the lambda with N items from argv,
-          # where N is the lambda's arity.
-          flag.call(*argv.shift(arity))
-        else
-
-          # Collect the items that don't correspond to
-          # flags.
-          args << item
-        end
-      end
-
-      args
-    end
-  end
-end
+require_relative "../lib/cutest"
+require_relative "../lib/cutest/vendor/clap"
 
-files = Cutest::Clap.run ARGV,
+files = Clap.run ARGV,
   "-r"      => lambda { |file| require file },
+  "-o"      => lambda { |name| cutest[:only] = name },
   "-v"      => lambda { puts Cutest::VERSION }
 
 if files.any?

data/lib/cutest.rb

@@ -1,7 +1,9 @@
 class Cutest
-  VERSION = "1.2.0.rc2"
-  FILTER = %r[/(ruby|jruby|rbx)[-/]([0-9\.])+]
-  CACHE = Hash.new { |h, k| h[k] = File.readlines(k) }
+  unless defined?(VERSION)
+    VERSION = "1.2.0.rc3"
+    FILTER = %r[/(ruby|jruby|rbx)[-/]([0-9\.])+]
+    CACHE = Hash.new { |h, k| h[k] = File.readlines(k) }
+  end
 
   def self.run(files)
     files.each do |file|
@@ -28,6 +30,8 @@ class Cutest
         trace = $!.backtrace
         pivot = trace.index { |line| line.match(file) }
 
+        puts "\n  test: %s" % cutest[:test]
+
         if pivot
           other = trace[0..pivot].select { |line| line !~ FILTER }
           other.reverse.each { |line| display_trace(line) }
@@ -134,8 +138,10 @@ private
   def test(name = nil, &block)
     cutest[:test] = name
 
-    prepare.each { |blk| blk.call }
-    block.call(setup && setup.call)
+    if !cutest[:only] || cutest[:only] == name
+      prepare.each { |blk| blk.call }
+      block.call(setup && setup.call)
+    end
   end
 
   # Assert that value is not nil or false.

data/lib/cutest/vendor/clap.rb

@@ -0,0 +1,46 @@
+class Clap
+  attr :argv
+  attr :opts
+
+  def self.run(args, opts)
+    new(args, opts).run
+  end
+
+  def initialize(argv, opts)
+    @argv = argv.dup
+    @opts = opts
+  end
+
+  def run
+    args = []
+
+    while argv.any?
+
+      item = argv.shift
+      flag = opts[item]
+
+      if flag
+
+        # Work around lambda semantics in 1.8.7.
+        arity = [flag.arity, 0].max
+
+        # Raise if there are not enough parameters
+        # available for the flag.
+        if argv.size < arity
+          raise ArgumentError
+        end
+
+        # Call the lambda with N items from argv,
+        # where N is the lambda's arity.
+        flag.call(*argv.shift(arity))
+      else
+
+        # Collect the items that don't correspond to
+        # flags.
+        args << item
+      end
+    end
+
+    args
+  end
+end

data/test/run.rb

@@ -7,7 +7,9 @@ test "output of successful run" do
 end
 
 test "output of failed run" do
-  expected = "  line: assert false\n" +
+  expected = "\n" +
+             "  test: failed assertion\n" +
+             "  line: assert false\n" +
              "  file: test/fixtures/failure.rb +2\n\n" +
              "Cutest::AssertionFailed: expression returned false\n\n"
 
@@ -17,7 +19,9 @@ test "output of failed run" do
 end
 
 test "output of failed run" do
-  expected = "  line: raise \"Oops\"\n" +
+  expected = "\n" +
+             "  test: some unhandled exception\n" +
+             "  line: raise \"Oops\"\n" +
              "  file: test/fixtures/exception.rb +2\n\n" +
              "RuntimeError: Oops\n\n"
 
@@ -27,7 +31,9 @@ test "output of failed run" do
 end
 
 test "output of custom assertion" do
-  expected = "  line: assert_empty \"foo\"\n" +
+  expected = "\n" +
+             "  test: failed custom assertion\n" +
+             "  line: assert_empty \"foo\"\n" +
              "  file: test/fixtures/fail_custom_assertion.rb +7\n\n" +
              "Cutest::AssertionFailed: not empty\n\n"
 
@@ -37,7 +43,9 @@ test "output of custom assertion" do
 end
 
 test "output of failure in nested file" do
-  expected = "  line: assert false\n" +
+  expected = "\n" +
+             "  test: failed assertion\n" +
+             "  line: assert false\n" +
              "  file: test/fixtures/failure.rb +2\n\n" +
              "Cutest::AssertionFailed: expression returned false\n\n"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cutest
 version: !ruby/object:Gem::Version
-  version: 1.2.0.rc2
+  version: 1.2.0.rc3
   prerelease: 6
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-16 00:00:00.000000000 Z
+date: 2012-08-31 00:00:00.000000000 Z
 dependencies: []
 description: Run tests in separate processes to avoid shared state.
 email:
@@ -24,6 +24,7 @@ files:
 - LICENSE
 - README.markdown
 - Rakefile
+- lib/cutest/vendor/clap.rb
 - lib/cutest.rb
 - cutest.gemspec
 - test/assert.rb