tdoc 0.12.0 → 0.12.1

data/README.rdoc

@@ -44,6 +44,7 @@ The text between the horizontal lines is included with the ':include:' directive
 ==Now we are back in the README.rdoc file.
 
 example:
-    >>FOOBAR
-    =>'foobar'
+
+    >> @foo
+    => "bar"
 

data/bin/tdoc.rb

@@ -7,7 +7,6 @@ require 'irb'
 $: << 'lib'
 
 LINST='^[#|\s]*'
-LINSTM='[#|\s]*'
 EXTENSIONS={:tests => '.rdoc',:requires => '.rb'}
 DEFAULT_FILE=["README#{EXTENSIONS[:tests]}"]
 
@@ -43,7 +42,7 @@ def mk_test_context(file, test_case=nil)
   end
   opts[:requires].each {|r| require "#{r}" if FileTest.exist? "#{r}" }
   opts[:tests].delete_if {|c| c.match(/#{test_name}/)}
-  setup_text=text.match(/#{LINSTM}setup\s+(.*?)#{LINSTM}end\s+/m).to_a[1]
+  setup_text=text.sub(/(.*)\n#{LINST}setup\s*\n/m,'').sub(/\n#{LINST}end(.*)/m,'') if text.match(/#{LINST}setup\s*$/)
   tests=text.split(/#{LINST}[Ee]xamples?:/).to_a[1..-1].to_a.map do |test|
     test.gsub!(/#{LINST}>>\s*(.+)\n#{LINST}=>\s*(.+)/) {|m| 
       expected, actual=[$2,$1]
@@ -64,7 +63,7 @@ def mk_test_context(file, test_case=nil)
   context_proc=lambda {
     context test_name do
       setup do
-        eval setup_text.to_a.join ';'
+        eval setup_text.to_a.join(';') 
       end
       tests.each do |test|
         should test[0] do

data/lib/rdoc/parsers/tdoc.rb

@@ -1,6 +1,7 @@
 class RDoc::Parser::Tdoc < RDoc::Parser::Simple
   LINST='^[#|\s]*'
   LINSTM='[#|\s]*'
+  EXTENSIONS={:tests => '.rdoc',:requires => '.rb'}
   parse_files_matching(/\.rdoc/)
   def initialize(top_level, file_name, content, options, stats)
     super
@@ -10,7 +11,15 @@ class RDoc::Parser::Tdoc < RDoc::Parser::Simple
     content=File.read(file_name)
     test_name=File.basename(file_name,'.rdoc')
     test_dir=File.dirname(file_name)
-    content.gsub!(/(#{LINST}):include:\s*(.+)/) {|foo| indent=$1;process_includes($2).sub(/^/,indent)}
+    content.gsub!(/(#{LINST}):include:\s*(.+)/) do |foo|
+      indent=$1
+      fn=$2
+      if fn.match(/#{EXTENSIONS[:requires]}/)
+        "\nThe following examples require the file '#{fn}', whose contents follow:\n#{process_includes(fn).gsub(/^/,indent + '  ')}\n"
+      else
+        process_includes(fn).gsub(/^/,indent)
+      end
+    end
     content.sub!(/(#{LINST})setup\s+(.*?)#{LINSTM}end\s+/m) {|foo| 
       indent=$1
       "The following code: \n#{$2.gsub(/^/,indent+'  ')}\nprecedes each of the following examples.\n\n"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tdoc
 version: !ruby/object:Gem::Version 
-  version: 0.12.0
+  version: 0.12.1
 platform: ruby
 authors: 
 - Herb Daily