<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array">
    <added>
      <filename>textmate/DocTest (Markdown).textmate</filename>
    </added>
    <added>
      <filename>textmate/DocTest (Ruby).textmate</filename>
    </added>
    <added>
      <filename>textmate/DocTest (Text).textmate</filename>
    </added>
  </added>
  <modified type="array">
    <modified>
      <diff>@@ -1,20 +1,18 @@
 = Ruby DocTest
 
-This work is originally from tablatom and drnic:
+Official repository:
 	* http://github.com/tablatom/rubydoctest
 
-The new repository for 0.5 and up is at:
-	* http://github.com/canadaduane/rubydoctest
+Wiki documentation:
+	* http://github.com/tablatom/rubydoctest/wikis
 
 == Description:
 
 Ruby version of Python's doctest tool, but a bit different. Ruby DocTest
-allows you to put your tests right in with your Ruby code. It also allows you
-to put tests in a separate documentation file and have the tests run
-automatically.
+allows you to:
 
-There are two fundamental &quot;modes&quot; that Ruby DocTest works in: ruby source file
-mode (&quot;:ruby&quot;) and doctest mode (&quot;:doctest&quot;).  See the examples section below.
+	1. Write tests in irb format and keep them as comments next to your Ruby code.
+	2. Write markdown documents with irb format tests embedded in them.
 
 == Synopsis:
 
@@ -25,7 +23,8 @@ rubydoctest comes as an executable that takes a list of files:
 
 == Examples:
 	
-Here is how you might use RubyDocTest within an .rb file:
+Here is how you might use RubyDocTest within a ruby source file (say called five.rb):
+
 	# doctest: Add 5 and 5 to get 10
 	# &gt;&gt; five_and_five
 	# =&gt; 10
@@ -47,28 +46,7 @@ Here is an example doctest file (say called simple.doctest):
 		&gt;&gt; 1 + 2
 		=&gt; 4
 
-	Test a some multiline statements
-
-		&gt;&gt; 
-			class Person
-				attr_accessor :name
-			end
-
-		&gt;&gt; Person
-		=&gt; Person
-		&gt;&gt; p = Person.new
-		&gt;&gt; p.name = &quot;Tom&quot;
-		&gt;&gt; p.name
-		=&gt; &quot;Tom&quot;
-
-
-		&gt;&gt; &quot;a
-			b&quot;
-		=&gt; &quot;a\nb&quot;
-
-		&gt;&gt; 1 +
-		?&gt; 2
-		=&gt; 3
+See the doc directory of this project for more .doctest examples and documentation.
 
 == Installation:
 
@@ -78,7 +56,7 @@ Major releases:
 
 Build from source:
 
-	git clone git://github.com/canadaduane/rubydoctest.git
+	git clone git://github.com/tablatom/rubydoctest.git
 	cd rubydoctest
 	rake manifest:refresh &amp;&amp; rake install
 </diff>
      <filename>README.txt</filename>
    </modified>
    <modified>
      <diff>@@ -2,11 +2,21 @@
 
 if ARGV.empty?
   puts &lt;&lt;-DIRECTIONS
-  USAGE: rubydoctest [ --html ] [ --plain ] [ --trace ] [ --debugger ] &lt;files&gt;
+  USAGE: rubydoctest [options] &lt;files&gt;
   
   rubydoctest parses Ruby files (.rb) or DocTest files (.doctest) for irb-style
   sessions in comments, and runs the commented sessions as tests.
   
+  Options:
+    Output Format:
+      --html  - output in HTML format
+      --plain - force output in plain text (no Ansi colors)
+    
+    Debug:
+      --ignore-interactive - do not heed !!! special directives
+      --trace     - turn backtrace on to debug Ruby DocTest
+      --debugger  - include ruby-debug library / gem
+  
   See http://github.com/tablatom/rubydoctest/wikis for more information.
   DIRECTIONS
   exit 0
@@ -18,6 +28,7 @@ requires = ['rubygems', File.dirname(__FILE__) + &quot;/../lib/rubydoctest&quot;]
 requires &lt;&lt; 'ruby-debug' if options.include?(&quot;--debugger&quot;)
 ruby_lines = []
 ruby_lines &lt;&lt; &quot;RubyDocTest.trace = true;&quot; if options.include?(&quot;--trace&quot;)
+ruby_lines &lt;&lt; &quot;RubyDocTest.ignore_interactive = true;&quot; if options.include?(&quot;--ignore-interactive&quot;)
 
 requires = requires.map {|lib| &quot;require '#{lib}'; &quot;}.join
 </diff>
      <filename>bin/rubydoctest</filename>
    </modified>
    <modified>
      <diff>@@ -7,7 +7,7 @@ require &quot;runner&quot;
 module RubyDocTest
   
   class &lt;&lt; self
-    attr_accessor :trace
+    attr_accessor :trace, :ignore_interactive
     attr_writer :output_format
     
     def output_format</diff>
      <filename>lib/rubydoctest.rb</filename>
    </modified>
    <modified>
      <diff>@@ -114,7 +114,7 @@ module RubyDocTest
       ok, fail, err = 0, 0, 0
       @tests.each do |t|
         if SpecialDirective === t and t.name == &quot;!!!&quot;
-          start_irb
+          start_irb unless RubyDocTest.ignore_interactive
         else
           begin
             if t.pass?</diff>
      <filename>lib/runner.rb</filename>
    </modified>
    <modified>
      <diff>@@ -1,7 +1,8 @@
 namespace :test do
   desc &quot;Run doctests&quot;
   task :doctest do
-    sh &quot;ruby #{File.dirname(__FILE__)}/../bin/rubydoctest #{File.dirname(__FILE__)}/../test/doctest&quot;
+    sh &quot;ruby #{File.dirname(__FILE__)}/../bin/rubydoctest #{File.dirname(__FILE__)}/../lib/*.rb&quot;
+    sh &quot;ruby #{File.dirname(__FILE__)}/../bin/rubydoctest #{File.dirname(__FILE__)}/../doc/*.doctest&quot;
   end
   
   namespace :doctest do</diff>
      <filename>tasks/doctests.rake</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>aab168fdb48a14adc8896e78f252e0130c4c3eed</id>
    </parent>
  </parents>
  <author>
    <name>Duane Johnson</name>
    <email>duane.johnson@gmail.com</email>
  </author>
  <url>http://github.com/tablatom/rubydoctest/commit/4acf602ea5e12946bb6a75de5ae8bb859ea4fdf1</url>
  <id>4acf602ea5e12946bb6a75de5ae8bb859ea4fdf1</id>
  <committed-date>2008-06-21T20:38:21-07:00</committed-date>
  <authored-date>2008-06-21T20:38:21-07:00</authored-date>
  <message>Added TextMate language grammars.
- Added --ignore-interactive command-line option (ignores '!!!' special directive)
- Fixed that 'rake test:doctest' was not using new command line standards</message>
  <tree>0b2571536e9a89365c22c8fbd2a06420b242a10b</tree>
  <committer>
    <name>Duane Johnson</name>
    <email>duane.johnson@gmail.com</email>
  </committer>
</commit>
