Annotate enum.c. Add pager support, and report on methods in included modules

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

1 files changed, 19 insertions, 1 deletions

diff --git a/bin/ri b/bin/ri
index 4103f3a7a8..d5277e1a7a 100755
--- a/bin/ri
+++ b/bin/ri
@@ -66,7 +66,7 @@ class  RiDisplay
     STDOUT.reopen(@save_stdout)
     @save_stdout = nil
     paged = false
-    for pager in [ ENV['pager'], "less", "more <" ].compact.uniq
+    for pager in [ ENV['PAGER'], "less", "more <", 'pager' ].compact.uniq
       if system("#{pager} #{path}")
         paged = true
         break
@@ -129,6 +129,24 @@ def display_class_info(class_entry)
   display_flow(klass.comment)
   @formatter.draw_line
 
+  unless klass.includes.empty?
+    @formatter.blankline
+    @formatter.wrap("Includes:", "")
+    incs = []
+    klass.includes.each do |inc|
+      inc_desc = @ri_reader.find_class_by_name(inc.name)
+      if inc_desc
+        str = inc.name + "("
+        str << inc_desc.instance_methods.map{|m| m.name}.join(", ")
+        str << ")"
+        incs << str
+      else
+        incs << inc.name
+      end
+    end
+    @formatter.wrap(incs.sort.join(', '))
+  end
+
   unless klass.constants.empty?
     @formatter.blankline
     @formatter.wrap("Constants:", "")