Fix ri location information for gem, one line per class on ri output

Author: drbrain

History.txt

@@ -1,20 +1,21 @@
 === 2.3.0 / 200?-??-??
 
 * X Major Enhancements
-  * RDoc now automatically loads rdoc/discover.rb files from installed gems.
-  * RDoc now uses Michael Granger's Darkfish generator by default.
+  * rdoc/discover.rb files are loaded automatically from installed gems
+  * Michael Granger's Darkfish generator is now the default
   * Various rdoc generation speedups by Hongli Lai.  Patches #22555, #22556,
     #22557, #22562, #22565.
 
 * Y Minor Enhancements
   * Added a space after the commas in ri class method lists.  RubyForge
     enhancement #22182.
   * Improved ri --interactive
-  * Generators can now override generated file locations.
-  * Moved unmaintained CHM generator to it's own package.
-  * Moved unmaintained extra HTML templates to their own package.
-  * Removed experimental texinfo generator.
-  * Converted to minitest.
+  * Generators can now override generated file locations
+  * Moved unmaintained CHM generator to it's own package
+  * Moved unmaintained extra HTML templates to their own package
+  * Removed experimental texinfo generator
+  * Converted to minitest
+  * Known classes and modules list outputs once per line now for grep
 
 * Z Bug Fixes
   * Fix missing superclass in ri output
@@ -30,6 +31,7 @@
   * RDoc now only accepts adjacent comments for rb_define_module and
     rb_define_class
   * C file RDoc is no longer included in token stream
+  * Scan all gem paths to match gem name for ri output
 
 === 2.2.1 / 2008-09-24
 This version provides some minor fixes and enhancements to 2.2.0 intended

lib/rdoc/ri/display.rb

@@ -280,7 +280,9 @@ def list_known_classes(classes)
         @formatter.draw_line "Known classes and modules"
         @formatter.blankline
 
-        @formatter.wrap classes.sort.join(', ')
+        classes.sort.each do |klass|
+          @formatter.wrap klass
+        end
       end
     end
   end

lib/rdoc/ri/driver.rb

@@ -595,6 +595,9 @@ def interactive
         formatter.raw_print_line "#{e.message}\n"
       end
     end
+
+  rescue Interrupt
+    exit
   end
 
   ##
@@ -670,13 +673,17 @@ def create_cache_for(klassname, path)
         if system_file then
           method["source_path"] = "Ruby #{RDoc::RI::Paths::VERSION}"
         else
-          if(f =~ %r%gems/[\d.]+/doc/([^/]+)%) then
-            ext_path = "gem #{$1}"
-          else
-            ext_path = f
+          gem = Gem.path.any? do |path|
+            pattern = File.join Regexp.escape(path), 'doc', '(.*?)', ''
+
+            f =~ /^#{pattern}/
           end
 
-          method["source_path"] = ext_path
+          method["source_path"] = if gem then
+                                    "gem #{$1}"
+                                  else
+                                    f
+                                  end
         end
 
         name = method["full_name"]