diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/rdoc/ri/ri_driver.rb | 9 | ||||
| -rw-r--r-- | lib/rdoc/ri/ri_options.rb | 10 | ||||
| -rw-r--r-- | lib/rdoc/usage.rb | 6 |
4 files changed, 22 insertions, 8 deletions
@@ -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 02:48:16 2004 Dave Thomas <dave@pragprog.com> * lib/rdoc/usage.rb: Added. Allows command line programs 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 |