Improve handling of ri's --help and --version options

Explicitly handle ri's --help and --version options instead of
relying on OptionParser's default behavior. This makes both options
appear in the ri --help text.

This also fixes `ri -h' which did not work as expected: instead of
displaying the help text, ri entered the interactive mode, apparently
ignoring the option.

Author: stomar

lib/rdoc/ri/driver.rb

@@ -242,6 +242,22 @@ def self.process_args argv
         options[:formatter] = RDoc::Markup.const_get "To#{value.capitalize}"
       end
 
+      opt.separator nil
+
+      opt.on("--help", "-h",
+             "Show help and exit.") do
+        puts opts
+        exit
+      end
+
+      opt.separator nil
+
+      opt.on("--version", "-v",
+             "Output version information and exit.") do
+        puts "#{opts.program_name} #{opts.version}"
+        exit
+      end
+
       opt.separator nil
       opt.separator "Data source options:"
       opt.separator nil