Add RDoc to build. Add --ri-system to RDoc

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@5382 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

4 files changed, 83 insertions, 38 deletions

diff --git a/lib/.document b/lib/.document
index dc9eab9a8d..d01d7d7f8f 100644
--- a/lib/.document
+++ b/lib/.document
@@ -1,4 +1,29 @@
 # We only run RDoc on the top-level files in here: we skip
 # all the helper stuff in sub-directories
 
-*.rb
\ No newline at end of file
+# Eventually, we hope to see...
+# *.rb
+
+# But for now
+
+benchmark.rb
+cgi.rb
+complex.rb
+date.rb
+fileutils.rb
+find.rb
+generator.rb
+logger.rb
+matrix.rb
+observer.rb
+optionparser.rb
+pathname.rb
+set.rb
+shellwords.rb
+singleton.rb
+tempfile.rb
+test/unit.rb
+thread.rb
+thwait.rb
+time.rb
+yaml.rb
\ No newline at end of file
diff --git a/lib/rdoc/parsers/parse_rb.rb b/lib/rdoc/parsers/parse_rb.rb
index d050829915..6a10479b4d 100644
--- a/lib/rdoc/parsers/parse_rb.rb
+++ b/lib/rdoc/parsers/parse_rb.rb
@@ -1999,6 +1999,10 @@ module RDoc
           break
         when TkLBRACE
           nest += 1
+        when TkLBRACE
+          nest += 1
+        when TkLBRACE
+          nest += 1
         when TkRBRACE
           nest -= 1
           break if nest <= 0
@@ -2041,7 +2045,8 @@ module RDoc
           "#{@scanner.lex_state} #{nest}") if $DEBUG
         case tk
         when TkSEMICOLON
-          break
+          nest -= 1
+          break if nest <= 0
         when TkLPAREN, TkfLPAREN
           nest += 1
         when TkDO
@@ -2112,7 +2117,8 @@ module RDoc
           "#{@scanner.lex_state} #{nest}") if $DEBUG
         case tk
         when TkSEMICOLON
-          break
+          nest -= 1
+          break if nest <= 0
         when TkLPAREN, TkfLPAREN
           nest += 1
         when end_token
diff --git a/lib/rdoc/ri/ri_options.rb b/lib/rdoc/ri/ri_options.rb
index fe323ed45f..f0ba69f4d3 100644
--- a/lib/rdoc/ri/ri_options.rb
+++ b/lib/rdoc/ri/ri_options.rb
@@ -25,6 +25,9 @@ module RI
     # the formatting we apply to the output
     attr_reader :formatter
 
+    # the directory we search for original documentation
+    attr_reader :doc_dir
+
     module OptionList
       
       OPTION_LIST = [
@@ -34,12 +37,16 @@ module RI
         [ "--classes",      "-c",   nil,
           "Display the names of classes and modules we\n" +
           "know about"],
+
+        [ "--doc-dir",      "-d",   "<dirname>",
+          "A directory to search for documentation. If not\n"+
+          "specified, we search the standard rdoc/ri directories."],
                                                            
         [ "--format",       "-f",   "<name>",
          "Format to use when displaying output:\n" +
          "   " + RI::TextFormatter.list + "\n" +
          "Use 'bs' (backspace) with most pager programs.\n" +
-         "To use ANSI, either also use the -T option, or\n\n" +
+         "To use ANSI, either also use the -T option, or\n" +
          "tell your pager to allow control characters\n" +
          "(for example using the -R option to less)"],
 
@@ -116,54 +123,56 @@ module RI
               ri 'Array.[]'
               ri compact\\!
 
-      EOT
-
-      if short_form
-        puts "For help on options, type 'ri -h'"
-        puts "For a list of classes I know about, type 'ri -c'"
-      else
-        puts "Options:\n\n"
-        OPTION_LIST.each do |long, short, arg, desc|
-          opt = sprintf("%20s", "#{long}, #{short}")
-          oparg = sprintf("%-7s", arg)
-          print "#{opt} #{oparg}"
-          desc = desc.split("\n")
-          if arg.nil? || arg.length < 7  
-            puts desc.shift
-          else
+        EOT
+
+        if short_form
+          puts "For help on options, type 'ri -h'"
+          puts "For a list of classes I know about, type 'ri -c'"
+        else
+          puts "Options:\n\n"
+          OPTION_LIST.each do|long, short, arg, desc|
+            opt = sprintf("%15s", "#{long}, #{short}")
+            if arg
+              opt << " " << arg
+            end
+            print opt
+            desc = desc.split("\n")
+            if opt.size < 17
+              print " "*(18-opt.size)
+              puts desc.shift
+            else
+              puts
+            end
+            desc.each do |line|
+              puts(" "*18 + line)
+            end
             puts
           end
-          desc.each do |line|
-            puts(" "*28 + line)
-          end
-          puts
+          exit 0
         end
-
-        exit 0
       end
     end
 
-  end
-
     # Parse command line options.
 
     def parse
-
+    
       @use_stdout   = !STDOUT.tty?
       @width        = 72
       @formatter    = RI::TextFormatter.for("plain") 
-      @list_classes = false
+        @list_classes = false
 
       begin
-        
+
         go = GetoptLong.new(*OptionList.options)
         go.quiet = true
-        
+
         go.each do |opt, arg|
           case opt
           when "--help"      then OptionList.usage
           when "--no-pager"  then @use_stdout = true
           when "--classes"   then @list_classes = true
+          when "--doc-dir"   then @doc_dir = arg
 
           when "--format"
             @formatter = RI::TextFormatter.for(arg)
@@ -181,12 +190,18 @@ module RI
             end
           end
         end
-        
+
       rescue GetoptLong::InvalidOption, GetoptLong::MissingArgument => error
         OptionList.error(error.message)
-        
+
       end
     end
+
+    # Return the doc_dir as an array, or nil if no overriding doc dir was given
+    def paths
+      @doc_dir ? [ @doc_dir ] : nil
+    end
   end
+
 end
 
diff --git a/lib/test/unit.rb b/lib/test/unit.rb
index 7d2c464500..a784359136 100644
--- a/lib/test/unit.rb
+++ b/lib/test/unit.rb
@@ -1,3 +1,6 @@
+require 'test/unit/testcase'
+require 'test/unit/autorunner'
+
 # = Test::Unit - Ruby Unit Testing Framework
 # 
 # == Introduction
@@ -255,12 +258,8 @@
 # missing points, etc., in this document (or any other).
 
 
-
-
-require 'test/unit/testcase'
-require 'test/unit/autorunner'
-
 module Test
+  # For documentation, see module Test
   module Unit
     def self.run=(flag)
       @run = flag