tdoc 0.2.0 → 0.3.0

data/README.rdoc

@@ -10,6 +10,7 @@ Tdoc combines rdoc, test::unit and shoulda, and concepts from rubytestdoc.
 - Tdoc understands the following directives:
   - tdoc_require
   - tdoc_context
+    - RDoc's standard :include: directive now does the same thing as tdoc_context
   - tdoc_setup
   - examples
 - within each examples block, Tdoc will convert cut and pastes from irb into assert_equal blocks, so
@@ -19,22 +20,11 @@ Tdoc combines rdoc, test::unit and shoulda, and concepts from rubytestdoc.
     assert_equal "asdf","asdf"
   Tdoc will then include all assertions within the context created from the example block
 
-  tdoc_require: rubygems
+  :include:rdoc/example.rdoc
 
-  examples: simple irb  with 1 assertion
-    
-    >> "asdf"
-    => "asdf"
-    >> x="foo"
-    => "foo"
-    >> x
-    => "foo"
-    assert_raise ZeroDivisionError do; 1/0 ;end
-
-
-  usage:
+usage:
 
-    tdoc [test_directory] [extention]
+  tdoc [test_directory] [extention]
 
 
 

data/bin/tdoc.rb

@@ -2,26 +2,56 @@
 require 'rubygems'
 require 'test/unit'
 require 'shoulda'
+require 'optparse'
 
 $: << 'lib'
 
-TEST_DIR=ARGV[0] || 'tdoc/'
-EXTENTION=ARGV[1] || '.tdoc'
 LINST='^[#|\s]*'
 
+def process
+  mk_context(@opts[:filename])
+end
+@opts={}
+OptionParser.new do |o|
+  o.on('-d DIRECTORY') { |d| @opts[:directory]=d}
+  o.on('-f FILENAME') { |f| @opts[:filename]=f}
+  o.on('-e EXTENTION') { |e| @opts[:extension]=e}
+  o.on('-h') { puts o; exit }
+  o.parse!
+end
+
+if @opts.empty?#for backward compatibility
+  TEST_DIR=ARGV[0] || 'tdoc/'
+  EXTENTION=ARGV[1] || '.tdoc'
+else
+  TEST_DIR=@opts[:directory] || 'rdoc/'
+  EXTENTION=@opts[:extension] || '.rdoc'
+end
+
+def mk_tests(test_dir)
+  files=Dir.glob("#{test_dir}*#{EXTENTION}")
+  files.each { |file| mk_context(file)}
+end
 def mk_context(file,test_case=nil)
   test_name=File.basename(file).sub(EXTENTION,'')
   unless test_case
-    test_case=eval "::Test#{test_name.capitalize}=Class.new(Test::Unit::TestCase)"
+    test_case=Class.new(Test::Unit::TestCase)
+    Object.const_set(:"Test#{test_name.capitalize}", test_case)
   end
   text=File.read(file)
   directives=text.scan(/#{LINST}tdoc_(.+?):\s*(.+)/).inject({}) {|h,d| h[d[0].to_sym]||=[];h[d[0].to_sym] << d[1];h}
   directives[:require].to_a.each {|r| require r}
+  directives[:context]||=[]
+  text.scan(/#{LINST}:include:\s*(.+)/).each do |i|
+    i[0].split(',').each do |file|
+      directives[:context] << file unless file.match(/^blob/)
+    end
+  end
   directives[:context].to_a.each {|c| mk_context "#{TEST_DIR}#{c}", test_case}
   tests=text.split(/#{LINST}[Ee]xamples?:/).to_a[1..-1].to_a.map do |test|
     test.gsub!(/#{LINST}>>\s*(.+)\n#{LINST}=>\s*(.+)/) {|m| "assert_equal #{$1}, #{$2}"}
     lines=test.split(/\n/)
-    test_text=lines.map {|l| l.match(/#{LINST}(assert.+)/) && $1}.compact.join ";"
+    test_text=lines.map {|l| l.match(/#{LINST}(assert.+)/) && $1}.compact.join ";\n"
     [lines[0], test_text]
   end
   test_case.context test_name do 
@@ -30,16 +60,16 @@ def mk_context(file,test_case=nil)
     end
     tests.each do |test|
       should test[0] do
-        eval test[1]
+        eval test[1] 
       end
     end
   end
 end
-def mk_tests(test_dir)
-  files=Dir.glob("#{test_dir}*#{EXTENTION}")
-  files.each { |file| mk_context(file)}
+if Object.const_defined?(:TEST_DIR)
+  mk_tests(TEST_DIR)
+else
+  process
 end
-mk_tests(TEST_DIR)
 
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tdoc
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Herb Daily
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-25 00:00:00 -03:00
+date: 2011-11-26 00:00:00 -03:00
 default_executable: tdoc.rb
 dependencies: 
 - !ruby/object:Gem::Dependency