ihelp 0.4.4 → 0.4.5

data/lib/ihelp.rb

@@ -4,6 +4,7 @@ begin
   if $ihelp_full_text_search != false
     require 'rubygems'
     require 'ferret'
+    require 'stringio'
     require 'fileutils'
     $ihelp_full_text_search = true
   end
@@ -97,6 +98,11 @@ end
 #
 # Changelog:
 #
+# 0.4.5
+#   Use RI environment variable to pass config to ri (thanks to Parragh Szabolcs.)
+#   Bugfix for missing stringio (thanks to Marcel M. Cary.)
+#   Show first thousand hits instead of a mere ten.
+#
 # 0.4.0
 #   Full-text documentation search using Ferret.
 #
@@ -110,7 +116,7 @@ end
 # Author: Ilmari Heikkinen <kig misfiring net>
 #
 module IHelp
-  HELP_VERSION = "0.4.4"
+  HELP_VERSION = "0.4.5"
 end
 
 
@@ -471,7 +477,8 @@ module IHelp
             info_str = ri_driver.get_info_str(anc.name, meth_str, instance)
           }
           # Avoid returning Object in case of no help.
-          if ancest == Object and meth_str.nil? and klass_name != Object.name
+          if ((ancest == Object and meth_str.nil? and klass_name != 'Object') or 
+              (ancest == IHelp and meth_str.nil? and klass_name != 'IHelp'))
             info_str = nil
           end
         end
@@ -490,7 +497,7 @@ module IHelp
     # Create new IHelpDriver, with the given args
     # passed to @options, which is a RI::Options.instance
     #
-    def initialize(args = [])
+    def initialize(args = (ENV["RI"] || "").split)
       @options = RI::Options.instance
       @options.parse(args)
 
@@ -558,15 +565,11 @@ module IHelp
     # Get info for the method in the given methods.
     #
     def get_method_info_str(requested_method_name, methods)
-      if methods.size == 1
-        @ri_reader.get_method(methods.first)
-      else
-        entries = methods.find_all {|m| m.name == requested_method_name}
-        return nil if entries.empty?
-        method = nil
-        entries.find{|entry| method = @ri_reader.get_method(entry)}
-        method
-      end
+      entries = methods.find_all {|m| m.name == requested_method_name}
+      return nil if entries.empty?
+      method = nil
+      entries.find{|entry| method = @ri_reader.get_method(entry)}
+      method
     end
 
   end
@@ -738,7 +741,7 @@ module IHelp
 
     def display
       return @display if @display
-      @display = RI::Options.instance.displayer.clone
+      @display = IHelp.ri_driver.display
       if ENV["PAGER"].to_s.size > 0
         unless ENV["PAGER"] =~ /(^|\/)less\b.* -[a-zA-Z]*[rR]/
           IHelp.no_colors = true
@@ -778,8 +781,8 @@ module IHelp
     #
     # See Ferret::QueryParser for query string format.
     #
-    def search(query, *a)
-      result = @index.search(query, *a)
+    def search(query)
+      result = @index.search(query, :limit => 1000)
       init_display
       if IHelp.no_colors or `which less`.strip.empty?
         pre_tag = "<<"
@@ -792,7 +795,7 @@ module IHelp
       end
       page do
         puts
-        puts "=== #{result.total_hits} hits#{", showing first 10" if result.total_hits > 10} ".ljust(72,"=")
+        puts "=== #{result.total_hits} hits#{", showing first 1000" if result.total_hits > 1000} ".ljust(72,"=")
         puts
         result.hits.each_with_index do |hit, i|
           id, score = hit.doc, hit.score
@@ -1009,7 +1012,7 @@ if __FILE__ == $0
       }
       IHelp.instance_variable_set(
         :@ri_driver,
-        IHelp::IHelpDriver.new(IHelp::RI_ARGS))
+        IHelp::IHelpDriver.new([]))
     end
 
     def test_simple_help

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: ihelp
 version: !ruby/object:Gem::Version 
-  version: 0.4.4
-date: 2006-11-18 00:00:00 +02:00
+  version: 0.4.5
+date: 2007-01-05 00:00:00 +02:00
 summary: Interactive help
 require_paths: 
 - lib