From 793f02e76b85d0a157df0eb337912aee96efbae4 Mon Sep 17 00:00:00 2001
From: dave <dave@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 16 Aug 2004 16:41:21 +0000
Subject: [PATCH] Get RDoc::usage playing better with OptionParser

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@6777 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog                 |  5 +++++
 lib/rdoc/ri/ri_driver.rb  |  9 ++++++++-
 lib/rdoc/ri/ri_options.rb | 10 ++++++----
 lib/rdoc/usage.rb         |  6 +++---
 4 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index dff18a8d85..b104aa50af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Aug 17 01:36:32 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/usage.rb: Remove extra indent. Tidy 'ri' option
+	  parsing so RDoc::usage plays better with OptionParser.
+
 Sat Aug 14 13:09:10 2004  Minero Aoki  <aamine@loveruby.net>
 
 	* lib/fileutils.rb: backport from CVS HEAD (rev1.44).
diff --git a/lib/rdoc/ri/ri_driver.rb b/lib/rdoc/ri/ri_driver.rb
index afefa67dc2..35c20a7a1a 100644
--- a/lib/rdoc/ri/ri_driver.rb
+++ b/lib/rdoc/ri/ri_driver.rb
@@ -12,7 +12,14 @@ class  RiDriver
 
   def initialize
     @options = RI::Options.instance
-    @options.parse
+
+    args = ARGV
+    if ENV["RI"]
+      args = ENV["RI"].split.concat(ARGV)
+    end
+
+    @options.parse(args)
+
     paths = @options.paths || RI::Paths::PATH
     if paths.empty?
       $stderr.puts "No ri documentation found in:"
diff --git a/lib/rdoc/ri/ri_options.rb b/lib/rdoc/ri/ri_options.rb
index b53a688126..ba420344f3 100644
--- a/lib/rdoc/ri/ri_options.rb
+++ b/lib/rdoc/ri/ri_options.rb
@@ -187,12 +187,14 @@ module RI
 
     # Parse command line options.
 
-    def parse
+    def parse(args)
     
       old_argv = ARGV.dup
-      if ENV["RI"]
-        ARGV.replace(ENV["RI"].split.concat(ARGV))
-      end
+#      if ENV["RI"]
+#        ARGV.replace(ENV["RI"].split.concat(ARGV))
+#      end
+
+     ARGV.replace(args)
 
       begin
 
diff --git a/lib/rdoc/usage.rb b/lib/rdoc/usage.rb
index afc9006ba9..73821dfae1 100644
--- a/lib/rdoc/usage.rb
+++ b/lib/rdoc/usage.rb
@@ -115,10 +115,10 @@ module RDoc
     end
 
     options = RI::Options.instance
-    if ENV["RI"]
-      options.parse
+    if args = ENV["RI"]
+      options.parse(args.split)
     end
-    formatter = options.formatter.new(options, "   ")
+    formatter = options.formatter.new(options, "")
     formatter.display_flow(flow)
   end