mofo 0.1.1 → 0.1.2

data/vendor/testspec-0.3.0/doc/created.rid

@@ -0,0 +1 @@
+Wed Jan 24 12:13:34 CET 2007

data/vendor/{testspec-0.2.0/rdoc → testspec-0.3.0/doc}/files/README.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Wed Oct 18 18:21:27 CEST 2006</td>
+      <td>Wed Jan 24 12:13:27 CET 2007</td>
     </tr>
     </table>
   </div>
@@ -71,7 +71,7 @@
     <div id="description">
       <h1>test/spec, a BDD interface for Test::Unit</h1>
 <p>
-Copyright (C) 2006 Christian Neukirchen &lt;<a
+Copyright (C) 2006, 2007 Christian Neukirchen &lt;<a
 href="mailto:chneukirchen@gmail.com">chneukirchen@gmail.com</a>&gt;
 </p>
 <h2>What is test/spec?</h2>
@@ -126,7 +126,8 @@ should not do any harm, but if you know a way around it, please tell me.)
 </p>
 <p>
 test/spec adds two global methods, <a
-href="../classes/Object.html#M000001">Object#should</a> and Kernel.context.
+href="../classes/Object.html#M000001">Object#should</a> and <a
+href="../classes/Kernel.html#M000002">Kernel.context</a>.
 </p>
 <p>
 You can use <tt>assert_*</tt> freely in specify-blocks; <a
@@ -220,6 +221,58 @@ a.</tt><em>predicate</em><tt>?</tt>)
 If you write an useful general-purpose assertion, I&#8217;d like to hear of
 it and may add it to the test/spec distribution.
 </p>
+<h2>Messaging/Blaming</h2>
+<p>
+With more complex assertions, it may be helpful to provide a message to
+show if the assertion has failed. This can be done with the Should#blaming
+or Should#messaging methods:
+</p>
+<pre>
+    RUBY_VERSION.should.messaging(&quot;Ruby too old.&quot;).be &gt; &quot;1.8.4&quot;
+
+    (1 + 1).should.blaming(&quot;weird math&quot;).not.equal 11
+</pre>
+<h2>Custom shoulds (&quot;Matchers&quot;)</h2>
+<p>
+To capture recurring patterns in parts of your specifications, you can
+define custom &quot;shoulds&quot; (RSpec calls them &quot;matchers&quot;)
+in your contexts, or include modules of them:
+</p>
+<pre>
+    context &quot;Numbers&quot;
+      class EqualString &lt; Test::Spec::CustomShould
+        def matches?(other)
+          object == other.to_s
+        end
+      end
+
+      def equal_string(str)
+        EqualString.new(str)
+      end
+
+      specify &quot;should have to_s&quot;
+        42.should equal_string(&quot;42&quot;)
+      end
+    end
+</pre>
+<p>
+Alternatively, your implementation can define CustomShould#assumptions,
+where you can use test/spec assertions instead of Boolean predicates:
+</p>
+<pre>
+    class EqualString &lt; Test::Spec::CustomShould
+      def assumptions(other)
+        object.should.equal other.to_s
+      end
+    end
+</pre>
+<p>
+A CustomShould by default takes one argument, which is placed in
+self.object for your convenience.
+</p>
+<p>
+You can CustomShould#failure_message to provide a better error message.
+</p>
 <h2>SpecDox and RDox</h2>
 <p>
 test/spec adds two additional test runners to Test::Unit, based on the
@@ -260,6 +313,12 @@ SpecDox and RDox work for Test::Unit too:
 
     3 specifications (30 requirements), 0 failures
 </pre>
+<h2>Disabled specifications</h2>
+<p>
+Akin to the usual Test::Unit practice, tests quickly can be disabled by
+replacing <tt>specify</tt> with <tt>xspecify</tt>. test/spec will count the
+disabled tests when you run it with SpecDox or RDox.
+</p>
 <h2>specrb</h2>
 <p>
 Since version 0.2, test/spec features a standalone test runner called
@@ -282,6 +341,20 @@ Test::Unit suites, too.
 <p>
 Run <tt>specrb &#8212;help</tt> for the usage.
 </p>
+<h2>Installing with RubyGems</h2>
+<p>
+Since version 0.3, a Gem of test/spec is available. You can install with:
+</p>
+<pre>
+    gem install test-spec
+</pre>
+<p>
+I also provide a local mirror of the gems (and development snapshots) at my
+site:
+</p>
+<pre>
+    gem install test-spec --source http://chneukirchen.org/releases/gems
+</pre>
 <h2>History</h2>
 <ul>
 <li>September 29th, 2006: First public release 0.1.
@@ -307,6 +380,34 @@ Run <tt>specrb &#8212;help</tt> for the usage.
 </li>
 <li>Standalone test/spec runner, specrb
 
+</li>
+</ul>
+</li>
+<li>January 24th, 2007: Third public release 0.3.
+
+<ul>
+<li>should.be_close, should.be_an_instance_of, should.be_a_kind_of, and
+should.be_nil have been deprecated. Use the dot-variants of them. These
+assertions will be removed in 1.0.
+
+</li>
+<li>specrb -a now includes -Ilib by default for easier out-of-the-box testing.
+
+</li>
+<li>Added custom shoulds.
+
+</li>
+<li>Added messaging/blaming.
+
+</li>
+<li>Added disabling of specifications.
+
+</li>
+<li>Small bug fixes.
+
+</li>
+<li>Gem available.
+
 </li>
 </ul>
 </li>
@@ -324,6 +425,12 @@ href="http://chneukirchen.org/repos/testspec">chneukirchen.org/repos/testspec</a
 <ul>
 <li>Eero Saynatkari for writing <tt>should.output</tt>.
 
+</li>
+<li>Jean-Michel Garnier for packaging the first gem.
+
+</li>
+<li>Mikko Lehtonen for testing the gem.
+
 </li>
 <li>Thomas Fuchs for script.aculo.us BDD testing which convinced me.
 
@@ -340,7 +447,7 @@ href="http://chneukirchen.org/repos/testspec">chneukirchen.org/repos/testspec</a
 </ul>
 <h2>Copying</h2>
 <p>
-Copyright (C) 2006 Christian Neukirchen &lt;<a
+Copyright (C) 2006, 2007 Christian Neukirchen &lt;<a
 href="http://purl.org/net/chneukirchen">purl.org/net/chneukirchen</a>&gt;
 </p>
 <p>

data/vendor/{testspec-0.2.0/rdoc → testspec-0.3.0/doc}/files/ROADMAP.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Wed Oct 18 18:21:27 CEST 2006</td>
+      <td>Wed Jan 24 12:13:27 CET 2007</td>
     </tr>
     </table>
   </div>
@@ -70,10 +70,7 @@
 
     <div id="description">
       <table>
-<tr><td valign="top">Version 0.3 (November 2006):</td><td>deprecate underscore forms.
-
-</td></tr>
-<tr><td valign="top">Version 1.0 (Late November 2006):</td><td>first stable release.
+<tr><td valign="top">Version 1.0 (February 2006):</td><td>first stable release.
 
 </td></tr>
 </table>

data/vendor/{testspec-0.2.0/rdoc → testspec-0.3.0/doc}/files/SPECS.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Wed Oct 18 18:21:29 CEST 2006</td>
+      <td>Wed Jan 24 12:13:33 CET 2007</td>
     </tr>
     </table>
   </div>
@@ -239,16 +239,16 @@ should_ignore_missing
 <li>should.raise should return the exception
 
 </li>
-<li>has should.be_an_instance_of
+<li>has should.be.an.instance_of
 
 </li>
-<li>has should.be_nil
+<li>has should.be.nil
 
 </li>
 <li>has should.include
 
 </li>
-<li>has should.be_a_kind_of
+<li>has should.be.a.kind_of
 
 </li>
 <li>has should.match
@@ -259,6 +259,9 @@ should_ignore_missing
 </li>
 <li>has should.not.raise
 
+</li>
+<li>has should.not.satisfy
+
 </li>
 <li>has should.not.be
 
@@ -292,6 +295,24 @@ should_ignore_missing
 </li>
 <li>is robust against careless users
 
+</li>
+<li>should detect warnings
+
+</li>
+<li>should message/blame faults
+
+</li>
+<li>should allow for custom shoulds
+
+</li>
+<li>disabled specification (disabled)
+
+</li>
+</ul>
+<h3>more disabled</h3>
+<ul>
+<li>this is intentional (disabled)
+
 </li>
 </ul>
 <h2>setup/teardown</h2>
@@ -328,7 +349,7 @@ should_ignore_missing
 </li>
 </ul>
 <p>
-70 specifications (267 requirements), 0 failures
+76 specifications, 2 disabled (414 requirements), 0 failures
 </p>
 
     </div>

data/vendor/{testspec-0.2.0/rdoc → testspec-0.3.0/doc}/files/lib/test/spec/dox_rb.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Wed Oct 18 18:21:27 CEST 2006</td>
+      <td>Wed Jan 24 12:13:27 CET 2007</td>
     </tr>
     </table>
   </div>

data/vendor/{testspec-0.2.0/rdoc → testspec-0.3.0/doc}/files/lib/test/spec/rdox_rb.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Wed Oct 18 18:21:27 CEST 2006</td>
+      <td>Wed Jan 24 12:13:27 CET 2007</td>
     </tr>
     </table>
   </div>

data/vendor/{testspec-0.2.0/rdoc → testspec-0.3.0/doc}/files/lib/test/spec/should-output_rb.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Wed Oct 18 18:21:27 CEST 2006</td>
+      <td>Wed Jan 24 12:13:27 CET 2007</td>
     </tr>
     </table>
   </div>
@@ -80,6 +80,7 @@ Code adapted from rs, written by Eero Saynatkari.
 
       <div class="name-list">
       fileutils&nbsp;&nbsp;
+      tmpdir&nbsp;&nbsp;
       </div>
     </div>
 

data/vendor/{testspec-0.2.0/rdoc → testspec-0.3.0/doc}/files/lib/test/spec_rb.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Wed Oct 18 18:21:27 CEST 2006</td>
+      <td>Wed Jan 24 12:13:27 CET 2007</td>
     </tr>
     </table>
   </div>
@@ -73,7 +73,7 @@
 test/spec &#8212; a BDD interface for Test::Unit
 </p>
 <p>
-Copyright (C) 2006 Christian Neukirchen &lt;<a
+Copyright (C) 2006, 2007 Christian Neukirchen &lt;<a
 href="mailto:chneukirchen@gmail.com">chneukirchen@gmail.com</a>&gt;
 </p>
 <p>

data/vendor/{testspec-0.2.0/rdoc → testspec-0.3.0/doc}/fr_class_index.html

@@ -23,6 +23,7 @@
     <a href="classes/Kernel.html">Kernel</a><br />
     <a href="classes/Object.html">Object</a><br />
     <a href="classes/Test/Spec.html">Test::Spec</a><br />
+    <a href="classes/Test/Spec/CustomShould.html">Test::Spec::CustomShould</a><br />
     <a href="classes/Test/Spec/DefinitionError.html">Test::Spec::DefinitionError</a><br />
     <a href="classes/Test/Spec/Should.html">Test::Spec::Should</a><br />
     <a href="classes/Test/Spec/ShouldNot.html">Test::Spec::ShouldNot</a><br />

data/vendor/testspec-0.3.0/doc/fr_method_index.html

@@ -0,0 +1,102 @@
+
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html 
+     PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<!--
+
+    Methods
+
+  -->
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+  <title>Methods</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+  <link rel="stylesheet" href="rdoc-style.css" type="text/css" />
+  <base target="docwin" />
+</head>
+<body>
+<div id="index">
+  <h1 class="section-bar">Methods</h1>
+  <div id="index-entries">
+    <a href="classes/Test/Spec/Should.html#M000055">< (Test::Spec::Should)</a><br />
+    <a href="classes/Test/Spec/Should.html#M000056"><= (Test::Spec::Should)</a><br />
+    <a href="classes/Test/Spec/Should.html#M000041">== (Test::Spec::Should)</a><br />
+    <a href="classes/Test/Spec/ShouldNot.html#M000017">== (Test::Spec::ShouldNot)</a><br />
+    <a href="classes/Test/Spec/Should.html#M000057">=== (Test::Spec::Should)</a><br />
+    <a href="classes/Test/Spec/ShouldNot.html#M000020">=~ (Test::Spec::ShouldNot)</a><br />
+    <a href="classes/Test/Spec/Should.html#M000045">=~ (Test::Spec::Should)</a><br />
+    <a href="classes/Test/Spec/Should.html#M000053">> (Test::Spec::Should)</a><br />
+    <a href="classes/Test/Spec/Should.html#M000054">>= (Test::Spec::Should)</a><br />
+    <a href="classes/Test/Spec/Should.html#M000049">_raise (Test::Spec::Should)</a><br />
+    <a href="classes/Test/Spec/ShouldNot.html#M000021">_raise (Test::Spec::ShouldNot)</a><br />
+    <a href="classes/Test/Spec/Should.html#M000035">a (Test::Spec::Should)</a><br />
+    <a href="classes/Test/Spec/TestCase.html#M000004">add (Test::Spec::TestCase)</a><br />
+    <a href="classes/Test/Spec/Should.html#M000033">add_assertion (Test::Spec::Should)</a><br />
+    <a href="classes/Test/Unit/UI/SpecDox/TestRunner.html#M000066">add_fault (Test::Unit::UI::SpecDox::TestRunner)</a><br />
+    <a href="classes/Test/Spec/Should.html#M000034">an (Test::Spec::Should)</a><br />
+    <a href="classes/Test/Spec/CustomShould.html#M000031">assumptions (Test::Spec::CustomShould)</a><br />
+    <a href="classes/Test/Spec/Should.html#M000043">be (Test::Spec::Should)</a><br />
+    <a href="classes/Test/Spec/ShouldNot.html#M000018">be (Test::Spec::ShouldNot)</a><br />
+    <a href="classes/Test/Spec/ShouldNot.html#M000024">be_nil (Test::Spec::ShouldNot)</a><br />
+    <a href="classes/Test/Spec/Should.html#M000038">blaming (Test::Spec::Should)</a><br />
+    <a href="classes/Test/Spec/Should.html#M000042">close (Test::Spec::Should)</a><br />
+    <a href="classes/Test/Spec/TestCase/InstanceMethods.html#M000013">context (Test::Spec::TestCase::InstanceMethods)</a><br />
+    <a href="classes/Kernel.html#M000002">context (Kernel)</a><br />
+    <a href="classes/Test/Spec/TestCase/ClassMethods.html#M000005">context (Test::Spec::TestCase::ClassMethods)</a><br />
+    <a href="classes/Test/Spec/Should.html#M000040">equal (Test::Spec::Should)</a><br />
+    <a href="classes/Test/Spec/ShouldNot.html#M000016">equal (Test::Spec::ShouldNot)</a><br />
+    <a href="classes/Test/Spec/CustomShould.html#M000029">failure_message (Test::Spec::CustomShould)</a><br />
+    <a href="classes/Test/Unit/UI/RDox/TestRunner.html#M000063">finished (Test::Unit::UI::RDox::TestRunner)</a><br />
+    <a href="classes/Test/Unit/UI/SpecDox/TestRunner.html#M000068">finished (Test::Unit::UI::SpecDox::TestRunner)</a><br />
+    <a href="classes/Test/Spec/Should.html#M000052">include (Test::Spec::Should)</a><br />
+    <a href="classes/Test/Unit/UI/RDox/TestRunner.html#M000064">indent (Test::Unit::UI::RDox::TestRunner)</a><br />
+    <a href="classes/Test/Unit/UI/SpecDox/TestRunner.html#M000076">indent (Test::Unit::UI::SpecDox::TestRunner)</a><br />
+    <a href="classes/Test/Spec/TestCase/ClassMethods.html#M000010">init (Test::Spec::TestCase::ClassMethods)</a><br />
+    <a href="classes/Test/Spec/Should.html#M000046">instance_of (Test::Spec::Should)</a><br />
+    <a href="classes/Test/Spec/Should.html#M000047">kind_of (Test::Spec::Should)</a><br />
+    <a href="classes/Test/Spec/ShouldNot.html#M000019">match (Test::Spec::ShouldNot)</a><br />
+    <a href="classes/Test/Spec/Should.html#M000044">match (Test::Spec::Should)</a><br />
+    <a href="classes/Test/Spec/CustomShould.html#M000030">matches? (Test::Spec::CustomShould)</a><br />
+    <a href="classes/Test/Spec/Should.html#M000037">messaging (Test::Spec::Should)</a><br />
+    <a href="classes/Test/Spec/ShouldNot.html#M000027">method_missing (Test::Spec::ShouldNot)</a><br />
+    <a href="classes/Test/Spec/Should.html#M000059">method_missing (Test::Spec::Should)</a><br />
+    <a href="classes/Test/Spec/CustomShould.html#M000028">new (Test::Spec::CustomShould)</a><br />
+    <a href="classes/Test/Spec/Should.html#M000032">new (Test::Spec::Should)</a><br />
+    <a href="classes/Test/Spec/TestCase.html#M000003">new (Test::Spec::TestCase)</a><br />
+    <a href="classes/Test/Spec/ShouldNot.html#M000014">new (Test::Spec::ShouldNot)</a><br />
+    <a href="classes/Test/Spec/TestCase/InstanceMethods.html#M000011">new (Test::Spec::TestCase::InstanceMethods)</a><br />
+    <a href="classes/Test/Spec/ShouldNot.html#M000023">nil (Test::Spec::ShouldNot)</a><br />
+    <a href="classes/Test/Spec/Should.html#M000051">nil (Test::Spec::Should)</a><br />
+    <a href="classes/Test/Spec/Should.html#M000036">not (Test::Spec::Should)</a><br />
+    <a href="classes/Test/Spec/ShouldNot.html#M000025">not (Test::Spec::ShouldNot)</a><br />
+    <a href="classes/Test/Spec/Should.html#M000060">output (Test::Spec::Should)</a><br />
+    <a href="classes/Test/Unit/UI/SpecDox/TestRunner.html#M000074">output_heading (Test::Unit::UI::SpecDox::TestRunner)</a><br />
+    <a href="classes/Test/Unit/UI/RDox/TestRunner.html#M000061">output_heading (Test::Unit::UI::RDox::TestRunner)</a><br />
+    <a href="classes/Test/Unit/UI/SpecDox/TestRunner.html#M000073">output_item (Test::Unit::UI::SpecDox::TestRunner)</a><br />
+    <a href="classes/Test/Unit/UI/RDox/TestRunner.html#M000062">output_item (Test::Unit::UI::RDox::TestRunner)</a><br />
+    <a href="classes/Test/Unit/UI/SpecDox/TestRunner.html#M000072">output_no_nl (Test::Unit::UI::SpecDox::TestRunner)</a><br />
+    <a href="classes/Test/Unit/UI/SpecDox/TestRunner.html#M000069">output_result (Test::Unit::UI::SpecDox::TestRunner)</a><br />
+    <a href="classes/Test/Spec/ShouldNot.html#M000026">pass (Test::Spec::ShouldNot)</a><br />
+    <a href="classes/Test/Spec/Should.html#M000058">pass (Test::Spec::Should)</a><br />
+    <a href="classes/Test/Spec/TestCase/InstanceMethods.html#M000012">position (Test::Spec::TestCase::InstanceMethods)</a><br />
+    <a href="classes/Test/Spec/Should.html#M000048">respond_to (Test::Spec::Should)</a><br />
+    <a href="classes/Test/Spec/ShouldNot.html#M000015">satisfy (Test::Spec::ShouldNot)</a><br />
+    <a href="classes/Test/Spec/Should.html#M000039">satisfy (Test::Spec::Should)</a><br />
+    <a href="classes/Test/Spec/TestCase/ClassMethods.html#M000008">setup (Test::Spec::TestCase::ClassMethods)</a><br />
+    <a href="classes/Test/Unit/UI/SpecDox/TestRunner.html#M000065">setup_mediator (Test::Unit::UI::SpecDox::TestRunner)</a><br />
+    <a href="classes/Object.html#M000001">should (Object)</a><br />
+    <a href="classes/Test/Spec/TestCase/ClassMethods.html#M000006">specify (Test::Spec::TestCase::ClassMethods)</a><br />
+    <a href="classes/Test/Unit/UI/SpecDox/TestRunner.html#M000067">started (Test::Unit::UI::SpecDox::TestRunner)</a><br />
+    <a href="classes/Test/Spec/TestCase/ClassMethods.html#M000009">teardown (Test::Spec::TestCase::ClassMethods)</a><br />
+    <a href="classes/Test/Unit/UI/SpecDox/TestRunner.html#M000071">test_finished (Test::Unit::UI::SpecDox::TestRunner)</a><br />
+    <a href="classes/Test/Unit/UI/SpecDox/TestRunner.html#M000070">test_started (Test::Unit::UI::SpecDox::TestRunner)</a><br />
+    <a href="classes/Test/Spec/ShouldNot.html#M000022">throw (Test::Spec::ShouldNot)</a><br />
+    <a href="classes/Test/Spec/Should.html#M000050">throw (Test::Spec::Should)</a><br />
+    <a href="classes/Test/Unit/UI/SpecDox/TestRunner.html#M000075">unmangle (Test::Unit::UI::SpecDox::TestRunner)</a><br />
+    <a href="classes/Test/Spec/TestCase/ClassMethods.html#M000007">xspecify (Test::Spec::TestCase::ClassMethods)</a><br />
+  </div>
+</div>
+</body>
+</html>

data/vendor/{testspec-0.2.0 → testspec-0.3.0}/lib/test/spec.rb

@@ -1,7 +1,7 @@
 #
 # test/spec -- a BDD interface for Test::Unit
 #
-# Copyright (C) 2006  Christian Neukirchen <mailto:chneukirchen@gmail.com>
+# Copyright (C) 2006, 2007  Christian Neukirchen <mailto:chneukirchen@gmail.com>
 #
 # This work is licensed under the same terms as Ruby itself.
 #
@@ -24,9 +24,9 @@ module Test                     # :nodoc:
 end
 
 module Test::Spec
-  VERSION = "0.1"
+  VERSION = "0.3"
   
-  CONTEXTS = {}
+  CONTEXTS = {}                 # :nodoc:
 
   class DefinitionError < StandardError
   end
@@ -34,8 +34,16 @@ module Test::Spec
   class Should
     include Test::Unit::Assertions
 
-    def initialize(object)
+    def self.deprecated_alias(to, from)    # :nodoc:
+      define_method(to) { |*args|
+        warn "Test::Spec::Should##{to} is deprecated and will be removed in future versions."
+        __send__ from, *args
+      }
+    end
+
+    def initialize(object, message=nil)
       @object = object
+      @message = message
     end
 
     $TEST_SPEC_TESTCASE = nil
@@ -52,96 +60,121 @@ module Test::Spec
       self
     end
 
-    def not
-      ShouldNot.new(@object)
+    def not(*args)
+      case args.size
+      when 0
+        ShouldNot.new(@object, @message)
+      when 1
+        ShouldNot.new(@object, @message).pass(args.first)
+      else
+        raise ArgumentError, "#not takes zero or one argument(s)."
+      end
     end
 
+    def messaging(message)
+      @message = message.to_s
+      self
+    end
+    alias blaming messaging
 
     def satisfy(&block)
-      assert_block("satisfy block failed.") {
+      assert_block(@message || "satisfy block failed.") {
         yield @object
       }
     end
 
     def equal(value)
-      assert_equal value, @object
+      assert_equal value, @object, @message
     end
     alias == equal
 
     def close(value, delta)
-      assert_in_delta value, @object, delta
+      assert_in_delta value, @object, delta, @message
     end
-    alias be_close close
+    deprecated_alias :be_close, :close
 
     def be(*value)
       case value.size
       when 0
         self
       when 1
-        assert_same value.first, @object
+        if CustomShould === value.first 
+          pass value.first
+        else
+          assert_same value.first, @object, @message
+        end
       else
         raise ArgumentError, "should.be needs zero or one argument"
       end
     end
 
     def match(value)
-      assert_match value, @object
+      assert_match value, @object, @message
     end
     alias =~ match
 
     def instance_of(klass)
-      assert_instance_of klass, @object
+      assert_instance_of klass, @object, @message
     end
-    alias be_an_instance_of instance_of
+    deprecated_alias :be_an_instance_of, :instance_of
 
     def kind_of(klass)
-      assert_kind_of klass, @object
+      assert_kind_of klass, @object, @message
     end
-    alias be_a_kind_of kind_of
+    deprecated_alias :be_a_kind_of, :kind_of
 
     def respond_to(method)
-      assert_respond_to @object, method
+      assert_respond_to @object, method, @message
     end
 
     def _raise(*args)
       args = [RuntimeError]  if args.empty?
-      assert_raise(*args, &@object)
+      assert_raise(*(args + [@message]), &@object)
     end
 
     def throw(*args)
-      assert_throws(*args, &@object)
+      assert_throws(*(args + [@message]), &@object)
     end
 
     def nil
-      assert_nil @object
+      assert_nil @object, @message
     end
-    alias be_nil nil
+    deprecated_alias :be_nil, :nil
 
 
     def include(value)
-      msg = build_message(nil, "<?> expected to include ?, but it didn't.",
+      msg = build_message(@message, "<?> expected to include ?, but it didn't.",
                           @object, value)
       assert_block(msg) { @object.include?(value) }
     end
 
     def >(value)
-      assert_operator @object, :>, value
+      assert_operator @object, :>, value, @message
     end
 
     def >=(value)
-      assert_operator @object, :>=, value
+      assert_operator @object, :>=, value, @message
     end
 
     def <(value)
-      assert_operator @object, :<, value
+      assert_operator @object, :<, value, @message
     end
 
     def <=(value)
-      assert_operator @object, :<=, value
+      assert_operator @object, :<=, value, @message
     end
 
     def ===(value)
-      assert_operator @object, :===, value
+      assert_operator @object, :===, value, @message
+    end
+
+    def pass(custom)
+      _wrap_assertion {
+        assert_nothing_raised(Test::Unit::AssertionFailedError,
+                              @message || custom.failure_message) {
+          assert custom.matches?(@object), @message || custom.failure_message
+        }
+      }
     end
 
     def method_missing(name, *args)
@@ -150,7 +183,7 @@ module Test::Spec
       
       if @object.respond_to?("#{name}?")
         assert @object.__send__("#{name}?", *args),
-               "#{name}? expected to be true."
+          "#{name}? expected to be true. #{@message}"
       else
         super
       end
@@ -160,12 +193,19 @@ module Test::Spec
   class ShouldNot
     include Test::Unit::Assertions
 
-    def initialize(object)
+    def initialize(object, message=nil)
       @object = object
+      @message = message
+    end
+
+    def satisfy(&block)
+      assert_block(@message || "not.satisfy block succeded.") {
+        not yield @object
+      }
     end
     
     def equal(value)
-      assert_not_equal value, @object
+      assert_not_equal value, @object, @message
     end
     alias == equal
 
@@ -174,7 +214,11 @@ module Test::Spec
       when 0
         self
       when 1
-        assert_not_same value.first, @object
+        if CustomShould === value.first 
+          pass value.first
+        else
+          assert_not_same value.first, @object, @message
+        end
       else
         Kernel.raise ArgumentError, "should.be needs zero or one argument"
       end
@@ -182,42 +226,80 @@ module Test::Spec
 
     def match(value)
       # Icky Regexp check
-      assert_no_match value, @object
+      assert_no_match value, @object, @message
     end
     alias =~ match
 
     def _raise(*args)
-      assert_nothing_raised(*args, &@object)
+      assert_nothing_raised(*(args+[@message]), &@object)
     end
 
     def throw
-      assert_nothing_thrown(&@object)
+      assert_nothing_thrown(@message, &@object)
     end
 
     def nil
-      assert_not_nil @object
+      assert_not_nil @object, @message
     end
-    alias be_nil nil 
 
+    def be_nil
+      warn "Test::Spec::ShouldNot#be_nil is deprecated and will be removed in future versions."
+      self.nil
+    end
 
-    def not
-      Should.new(@object)
+    def not(*args)
+      case args.size
+      when 0
+        Should.new(@object, @message)
+      when 1
+        Should.new(@object, @message).pass(args.first)
+      else
+        raise ArgumentError, "#not takes zero or one argument(s)."
+      end
     end
 
+    def pass(custom)
+      _wrap_assertion {
+        begin
+          assert !custom.matches?(@object), @message || custom.failure_message
+        end
+      }
+    end
 
     def method_missing(name, *args)
       # This will make raise call Kernel.raise, and self.raise call _raise.
       return _raise(*args)  if name == :raise
 
       if @object.respond_to?("#{name}?")
-        assert_block("#{name}? expected to be false.") {
+        assert_block("#{name}? expected to be false. #{@message}") {
           not @object.__send__("#{name}?", *args)
         }
       else
         super
       end
     end
+    
+  end
 
+  class CustomShould
+    attr_accessor :object
+    
+    def initialize(obj)
+      self.object = obj
+    end
+
+    def failure_message
+      "#{self.class.name} failed"
+    end
+
+    def matches?(*args, &block)
+      assumptions(*args, &block)
+      true
+    end
+
+    def assumptions(*args, &block)
+      raise NotImplementedError, "you need to supply a #{self.class}#matches? method"
+    end
   end
 end
 
@@ -277,6 +359,14 @@ class Test::Spec::TestCase
       
       define_method("test_spec {%s} %03d [%s]" % [name, count, specname], &block)
     end
+
+    def xspecify(specname, &block)
+      raise ArgumentError, "xspecify needs a block"  if block.nil?
+
+      specify specname do
+        @_result.add_disabled(specname)
+      end
+    end
     
     def setup(&block)
       setups << block
@@ -322,6 +412,24 @@ class Test::Spec::TestCase
   end
 end
 
+class Test::Spec::Disabled < Test::Unit::Failure    # :nodoc:
+  def initialize(name)
+    @name = name
+  end
+
+  def single_character_display
+    "D"
+  end
+
+  def short_display
+    @name
+  end
+
+  def long_display
+    @name + " is disabled"
+  end
+end
+
 
 # Monkey-patch test/unit to run tests in an optionally specified order.
 module Test::Unit               # :nodoc:
@@ -346,19 +454,35 @@ module Test::Unit               # :nodoc:
       @tests.first.respond_to?(:position) ? @tests.first.position : 0
     end
   end
+
+  class TestResult              # :nodoc:
+    # Records a disabled test.
+    def add_disabled(name)
+      notify_listeners(FAULT, Test::Spec::Disabled.new(name))
+      notify_listeners(CHANGED, self)
+    end  
+  end
 end
 
 
-# Global helpers
+
+#-- Global helpers
 
 class Object
-  def should
-    Test::Spec::Should.new(self)
+  def should(*args)
+    case args.size
+    when 0
+      Test::Spec::Should.new(self)
+    when 1
+      Test::Spec::Should.new(self).pass(args.first)
+    else
+      raise ArgumentError, "Object#should takes zero or one argument(s)."
+    end
   end
 end
 
 module Kernel
-  def context(name, &block)
+  def context(name, &block)     # :doc:
     (Test::Spec::CONTEXTS[name] ||= Test::Spec::TestCase.new(name)).add(&block)
   end