fastri 0.3.0.1 → 0.3.1.1

data/CHANGES

@@ -1,5 +1,11 @@
 
 User-visible changes in FastRI
+Since version 0.3.0 (2007-01-29)
+================================
+* speed increases
+* works on Leopard and with non-standard RubyGems setups
+* -1 (--exact) option to disable second-guessing.
+* -a (--all) option to show the documentation for all matching entries
 
 Since version 0.2.1 (2006-11-23)
 ================================

data/README.en

@@ -16,7 +16,13 @@ Just run
 
 Usage
 =====
-There are two parts to FastRI:
+FastRI can be used either standalone or with a DRb server, for extra speed.
+
+The standalone client is qri and is used the same way as ri; run
+ $ qri -h
+to list the options.
+
+There are two parts to FastRI over DRb:
 * the server: fastri-server
 * the client: fri
 
@@ -25,8 +31,11 @@ without needing to indicate the DRb URIs manually. It can work across
 machines if you make sure the ring server is bound to the correct interface,
 and the ACL permissions are correct.
 
-Quickstart
-----------
+qri and fri are nearly identical, the only difference being that fri tries to
+use a FastRI service over DRb by default.
+
+fri Quickstart
+--------------
  $ fastri-server             (blocks)
 Later,
  $ fri String

data/Rakefile

@@ -52,7 +52,7 @@ EOF
   s.require_path = 'lib'
   s.author = "Mauricio Fernandez"
   s.email = "mfp@acm.org"
-  s.homepage = "http://eigenclass.org/hiki.rb?fastri"
+  s.homepage = "http://eigenclass.org/hiki/fastri"
   s.bindir = "bin"
   s.executables = %w[fri qri fastri-server ri-emacs]
   s.has_rdoc = true

data/bin/fri

@@ -3,7 +3,6 @@
 # Copyright (C) 2006 Mauricio Fernandez <mfp@acm.org>
 #
 
-require 'optparse'
 require 'fastri/util'
 require 'fastri/full_text_index'
 
@@ -39,119 +38,136 @@ options = {
   :extended => false,
   :index_file => File.join(FastRI::Util.find_home, ".fastri-index"),
   :local_mode => default_local_mode,
+  :do_second_guess => true,
+  :expand_choices => false,
 }
 
 override_addr_env = false
 
-optparser = OptionParser.new do |opts|
-  opts.version = FastRI::FASTRI_VERSION
-  opts.release = FastRI::FASTRI_RELEASE_DATE
-  opts.banner = "Usage: #{File.basename($0)} [options] <query>"
 
-  opts.on("-L", "--local", "Try to use local index instead of DRb service.",
-                           *[("(default)" if default_local_mode)].compact) do
-    options[:local_mode] = true
-  end
-  opts.on("--index-file=FILE", "Use index file (forces --local mode).",
-          "(default: #{options[:index_file]})") do |file|
-    options[:index_file] = file
-    options[:local_mode] = true
-  end
-  opts.on("-R", "--remote", "Use DRb service. #{'(default)' unless default_local_mode}") do
-    options[:local_mode] = false
-  end
-  opts.on("-s", "--bind ADDR", "Bind to ADDR for incoming DRb connections.",
-          "(default: 127.0.0.1)") do |addr|
-    options[:addr] = addr
-    override_addr_env = true
-  end
+# only load optparse if actually needed
+# saves ~0.01-0.04s.
+if (arg = ARGV[0]) && arg[0, 1] == "-" or ARGV.empty?
+  require 'optparse'
+  optparser = OptionParser.new do |opts|
+    opts.version = FastRI::FASTRI_VERSION
+    opts.release = FastRI::FASTRI_RELEASE_DATE
+    opts.banner = "Usage: #{File.basename($0)} [options] <query>"
 
-  order_mapping = {
-    'e' => :exact,   'E' => :exact_ci,   'n' => :nested, 'N' => :nested_ci,
-    'p' => :partial, 'P' => :partial_ci, 'x' => :nested_partial,
-    'X' => :nested_partial_ci, 'a' => :anywhere, 'A' => :anywhere_ci,
-    'm' => :namespace_partial, 'M' => :namespace_partial_ci,
-    'f' => :full_partial, 'F' => :full_partial_ci,
-  }
-  opts.on("-O", "--order ORDER", "Specify lookup order.",
-          "(default: eEnNpPxX)", "Uppercase: case-indep.",
-          "e:exact n:nested p:partial (completion)",
-          "x:nested and partial m:complete namespace",
-          "f:complete both class and method",
-          "a:match method name anywhere") do |order|
-    options[:lookup_order] = order.split(//).map{|x| order_mapping[x]}.compact
-  end
+    opts.on("-L", "--local", "Try to use local index instead of DRb service.",
+                             *[("(default)" if default_local_mode)].compact) do
+      options[:local_mode] = true
+    end
+    opts.on("--index-file=FILE", "Use index file (forces --local mode).",
+            "(default: #{options[:index_file]})") do |file|
+      options[:index_file] = file
+      options[:local_mode] = true
+    end
+    opts.on("-R", "--remote", "Use DRb service. #{'(default)' unless default_local_mode}") do
+      options[:local_mode] = false
+    end
+    opts.on("-s", "--bind ADDR", "Bind to ADDR for incoming DRb connections.",
+            "(default: 127.0.0.1)") do |addr|
+      options[:addr] = addr
+      override_addr_env = true
+    end
 
-  opts.on("-e", "--extended", "Show all methods for given namespace.") do
-    options[:extended]  = true
-    options[:use_pager] = true
-    options[:format]    = "plain"
-  end
+    order_mapping = {
+      'e' => :exact,   'E' => :exact_ci,   'n' => :nested, 'N' => :nested_ci,
+      'p' => :partial, 'P' => :partial_ci, 'x' => :nested_partial,
+      'X' => :nested_partial_ci, 'a' => :anywhere, 'A' => :anywhere_ci,
+      'm' => :namespace_partial, 'M' => :namespace_partial_ci,
+      'f' => :full_partial, 'F' => :full_partial_ci,
+    }
+    opts.on("-O", "--order ORDER", "Specify lookup order.",
+            "(default: eEnNpPxX)", "Uppercase: case-indep.",
+            "e:exact n:nested p:partial (completion)",
+            "x:nested and partial m:complete namespace",
+            "f:complete both class and method",
+            "a:match method name anywhere") do |order|
+      options[:lookup_order] = order.split(//).map{|x| order_mapping[x]}.compact
+    end
 
-  opts.on("--show-matches", "Only show matching entries."){ options[:show_matches] = true }
+    opts.on("-1", "--exact", "Does not do second guess(exact query).") do
+      options[:do_second_guess] = false
+      options[:lookup_order] = [ :exact ]
+    end
+    opts.on("-a", "--all", "Show info for all methods in Multiple choices",
+            "(default: don't)") do
+      options[:expand_choices] = true
+    end
 
-  opts.on("--classes", "List all known classes/modules.") do 
-    options[:use_pager]    = true
-    options[:list_classes] = true
-  end
-  opts.on("--methods", "List all known methods.") do 
-    options[:use_pager]    = true
-    options[:list_methods] = true
-  end
-  opts.on("-l", "--list-names", "List all known namespaces/methods.") do
-    options[:use_pager]    = true
-    options[:list_classes] = true
-    options[:list_methods] = true
-  end
+    opts.on("-e", "--extended", "Show all methods for given namespace.") do
+      options[:extended]  = true
+      options[:use_pager] = true
+      options[:format]    = "plain"
+    end
 
-  opts.on("-S", "--full-text", "Perform full-text search.") do 
-    options[:do_full_text] = true
-    options[:use_pager]    = true if options[:use_pager].nil?
-    options[:format]       = "plain"
-  end
+    opts.on("--show-matches", "Only show matching entries."){ options[:show_matches] = true }
 
-  opts.on("-F", "--full-text-dir DIR", "Use full-text index in DIR",
-          "(default: #{options[:full_text_dir]})") do |dir|
-    options[:full_text_dir] = dir if dir
-    options[:do_full_text]  = true
-    options[:use_pager]     = true
-    options[:format]        = "plain"
-  end
+    opts.on("--classes", "List all known classes/modules.") do 
+      options[:use_pager]    = true
+      options[:list_classes] = true
+    end
+    opts.on("--methods", "List all known methods.") do 
+      options[:use_pager]    = true
+      options[:list_methods] = true
+    end
+    opts.on("-l", "--list-names", "List all known namespaces/methods.") do
+      options[:use_pager]    = true
+      options[:list_classes] = true
+      options[:list_methods] = true
+    end
 
-  opts.on("-f", "--format FMT", "Format to use when displaying output:",
-          "   ansi, plain (default: #{options[:format]})") do |format|
-    options[:format] = format
-  end
+    opts.on("-S", "--full-text", "Perform full-text search.") do 
+      options[:do_full_text] = true
+      options[:use_pager]    = true if options[:use_pager].nil?
+      options[:format]       = "plain"
+    end
 
-  opts.on("-P", "--[no-]pager", "Use pager.", "(default: don't)") do |usepager|
-    options[:use_pager] = usepager
-    options[:format] = "plain" if usepager
-  end
+    opts.on("-F", "--full-text-dir DIR", "Use full-text index in DIR",
+            "(default: #{options[:full_text_dir]})") do |dir|
+      options[:full_text_dir] = dir if dir
+      options[:do_full_text]  = true
+      options[:use_pager]     = true
+      options[:format]        = "plain"
+    end
 
-  opts.on("-T", "Don't use a pager."){ options[:use_pager] = false }
+    opts.on("-f", "--format FMT", "Format to use when displaying output:",
+            "   ansi, plain (default: #{options[:format]})") do |format|
+      options[:format] = format
+    end
 
-  opts.on("--pager-cmd PAGER", "Use pager PAGER.", "(default: don't)") do |pager|
-    options[:pager]     = pager
-    options[:use_pager] = true
-    options[:format]    = "plain"
-  end
+    opts.on("-P", "--[no-]pager", "Use pager.", "(default: don't)") do |usepager|
+      options[:use_pager] = usepager
+      options[:format] = "plain" if usepager
+    end
 
-  opts.on("-w", "--width WIDTH", "Set the width of the output.") do |width|
-    w = width.to_i
-    options[:width] = w > 0 ? w : options[:width]
+    opts.on("-T", "Don't use a pager."){ options[:use_pager] = false }
+
+    opts.on("--pager-cmd PAGER", "Use pager PAGER.", "(default: don't)") do |pager|
+      options[:pager]     = pager
+      options[:use_pager] = true
+      options[:format]    = "plain"
+    end
+
+    opts.on("-w", "--width WIDTH", "Set the width of the output.") do |width|
+      w = width.to_i
+      options[:width] = w > 0 ? w : options[:width]
+    end
+
+    opts.on("-h", "--help", "Show this help message") do 
+      puts opts
+      exit
+    end
   end
+  optparser.parse!
 
-  opts.on("-h", "--help", "Show this help message") do 
-    puts opts
+  if !options[:list_classes] && !options[:list_methods] && ARGV.empty?
+    puts optparser
     exit
   end
-end
-optparser.parse!
-
-if !options[:list_classes] && !options[:list_methods] && ARGV.empty?
-  puts optparser
-  exit
-end
+end # lazy optparse loading
 
 # {{{ try to find where the method comes from exactly
 include FastRI::Util::MagicHelp
@@ -308,6 +324,7 @@ info_options = {
   :width     => options[:width],
   :lookup_order => options[:lookup_order],
   :extended  => options[:extended],
+  :expand_choices => options[:expand_choices],
 }
 
 # {{{ list classes or methods
@@ -326,7 +343,7 @@ ARGV.each do |term|
     # second-guess the correct method type only as the last resort.
     if result
       puts result
-    elsif (new_query = FastRI::Util.change_query_method_type(help_query)) != help_query
+    elsif options[:do_second_guess] and (new_query = FastRI::Util.change_query_method_type(help_query)) != help_query
       puts service.info(new_query)
     else
       puts nil

data/bin/qri

@@ -3,7 +3,6 @@
 # Copyright (C) 2006 Mauricio Fernandez <mfp@acm.org>
 #
 
-require 'optparse'
 require 'fastri/util'
 require 'fastri/full_text_index'
 
@@ -39,119 +38,136 @@ options = {
   :extended => false,
   :index_file => File.join(FastRI::Util.find_home, ".fastri-index"),
   :local_mode => default_local_mode,
+  :do_second_guess => true,
+  :expand_choices => false,
 }
 
 override_addr_env = false
 
-optparser = OptionParser.new do |opts|
-  opts.version = FastRI::FASTRI_VERSION
-  opts.release = FastRI::FASTRI_RELEASE_DATE
-  opts.banner = "Usage: #{File.basename($0)} [options] <query>"
 
-  opts.on("-L", "--local", "Try to use local index instead of DRb service.",
-                           *[("(default)" if default_local_mode)].compact) do
-    options[:local_mode] = true
-  end
-  opts.on("--index-file=FILE", "Use index file (forces --local mode).",
-          "(default: #{options[:index_file]})") do |file|
-    options[:index_file] = file
-    options[:local_mode] = true
-  end
-  opts.on("-R", "--remote", "Use DRb service. #{'(default)' unless default_local_mode}") do
-    options[:local_mode] = false
-  end
-  opts.on("-s", "--bind ADDR", "Bind to ADDR for incoming DRb connections.",
-          "(default: 127.0.0.1)") do |addr|
-    options[:addr] = addr
-    override_addr_env = true
-  end
+# only load optparse if actually needed
+# saves ~0.01-0.04s.
+if (arg = ARGV[0]) && arg[0, 1] == "-" or ARGV.empty?
+  require 'optparse'
+  optparser = OptionParser.new do |opts|
+    opts.version = FastRI::FASTRI_VERSION
+    opts.release = FastRI::FASTRI_RELEASE_DATE
+    opts.banner = "Usage: #{File.basename($0)} [options] <query>"
 
-  order_mapping = {
-    'e' => :exact,   'E' => :exact_ci,   'n' => :nested, 'N' => :nested_ci,
-    'p' => :partial, 'P' => :partial_ci, 'x' => :nested_partial,
-    'X' => :nested_partial_ci, 'a' => :anywhere, 'A' => :anywhere_ci,
-    'm' => :namespace_partial, 'M' => :namespace_partial_ci,
-    'f' => :full_partial, 'F' => :full_partial_ci,
-  }
-  opts.on("-O", "--order ORDER", "Specify lookup order.",
-          "(default: eEnNpPxX)", "Uppercase: case-indep.",
-          "e:exact n:nested p:partial (completion)",
-          "x:nested and partial m:complete namespace",
-          "f:complete both class and method",
-          "a:match method name anywhere") do |order|
-    options[:lookup_order] = order.split(//).map{|x| order_mapping[x]}.compact
-  end
+    opts.on("-L", "--local", "Try to use local index instead of DRb service.",
+                             *[("(default)" if default_local_mode)].compact) do
+      options[:local_mode] = true
+    end
+    opts.on("--index-file=FILE", "Use index file (forces --local mode).",
+            "(default: #{options[:index_file]})") do |file|
+      options[:index_file] = file
+      options[:local_mode] = true
+    end
+    opts.on("-R", "--remote", "Use DRb service. #{'(default)' unless default_local_mode}") do
+      options[:local_mode] = false
+    end
+    opts.on("-s", "--bind ADDR", "Bind to ADDR for incoming DRb connections.",
+            "(default: 127.0.0.1)") do |addr|
+      options[:addr] = addr
+      override_addr_env = true
+    end
 
-  opts.on("-e", "--extended", "Show all methods for given namespace.") do
-    options[:extended]  = true
-    options[:use_pager] = true
-    options[:format]    = "plain"
-  end
+    order_mapping = {
+      'e' => :exact,   'E' => :exact_ci,   'n' => :nested, 'N' => :nested_ci,
+      'p' => :partial, 'P' => :partial_ci, 'x' => :nested_partial,
+      'X' => :nested_partial_ci, 'a' => :anywhere, 'A' => :anywhere_ci,
+      'm' => :namespace_partial, 'M' => :namespace_partial_ci,
+      'f' => :full_partial, 'F' => :full_partial_ci,
+    }
+    opts.on("-O", "--order ORDER", "Specify lookup order.",
+            "(default: eEnNpPxX)", "Uppercase: case-indep.",
+            "e:exact n:nested p:partial (completion)",
+            "x:nested and partial m:complete namespace",
+            "f:complete both class and method",
+            "a:match method name anywhere") do |order|
+      options[:lookup_order] = order.split(//).map{|x| order_mapping[x]}.compact
+    end
 
-  opts.on("--show-matches", "Only show matching entries."){ options[:show_matches] = true }
+    opts.on("-1", "--exact", "Does not do second guess(exact query).") do
+      options[:do_second_guess] = false
+      options[:lookup_order] = [ :exact ]
+    end
+    opts.on("-a", "--all", "Show info for all methods in Multiple choices",
+            "(default: don't)") do
+      options[:expand_choices] = true
+    end
 
-  opts.on("--classes", "List all known classes/modules.") do 
-    options[:use_pager]    = true
-    options[:list_classes] = true
-  end
-  opts.on("--methods", "List all known methods.") do 
-    options[:use_pager]    = true
-    options[:list_methods] = true
-  end
-  opts.on("-l", "--list-names", "List all known namespaces/methods.") do
-    options[:use_pager]    = true
-    options[:list_classes] = true
-    options[:list_methods] = true
-  end
+    opts.on("-e", "--extended", "Show all methods for given namespace.") do
+      options[:extended]  = true
+      options[:use_pager] = true
+      options[:format]    = "plain"
+    end
 
-  opts.on("-S", "--full-text", "Perform full-text search.") do 
-    options[:do_full_text] = true
-    options[:use_pager]    = true if options[:use_pager].nil?
-    options[:format]       = "plain"
-  end
+    opts.on("--show-matches", "Only show matching entries."){ options[:show_matches] = true }
 
-  opts.on("-F", "--full-text-dir DIR", "Use full-text index in DIR",
-          "(default: #{options[:full_text_dir]})") do |dir|
-    options[:full_text_dir] = dir if dir
-    options[:do_full_text]  = true
-    options[:use_pager]     = true
-    options[:format]        = "plain"
-  end
+    opts.on("--classes", "List all known classes/modules.") do 
+      options[:use_pager]    = true
+      options[:list_classes] = true
+    end
+    opts.on("--methods", "List all known methods.") do 
+      options[:use_pager]    = true
+      options[:list_methods] = true
+    end
+    opts.on("-l", "--list-names", "List all known namespaces/methods.") do
+      options[:use_pager]    = true
+      options[:list_classes] = true
+      options[:list_methods] = true
+    end
 
-  opts.on("-f", "--format FMT", "Format to use when displaying output:",
-          "   ansi, plain (default: #{options[:format]})") do |format|
-    options[:format] = format
-  end
+    opts.on("-S", "--full-text", "Perform full-text search.") do 
+      options[:do_full_text] = true
+      options[:use_pager]    = true if options[:use_pager].nil?
+      options[:format]       = "plain"
+    end
 
-  opts.on("-P", "--[no-]pager", "Use pager.", "(default: don't)") do |usepager|
-    options[:use_pager] = usepager
-    options[:format] = "plain" if usepager
-  end
+    opts.on("-F", "--full-text-dir DIR", "Use full-text index in DIR",
+            "(default: #{options[:full_text_dir]})") do |dir|
+      options[:full_text_dir] = dir if dir
+      options[:do_full_text]  = true
+      options[:use_pager]     = true
+      options[:format]        = "plain"
+    end
 
-  opts.on("-T", "Don't use a pager."){ options[:use_pager] = false }
+    opts.on("-f", "--format FMT", "Format to use when displaying output:",
+            "   ansi, plain (default: #{options[:format]})") do |format|
+      options[:format] = format
+    end
 
-  opts.on("--pager-cmd PAGER", "Use pager PAGER.", "(default: don't)") do |pager|
-    options[:pager]     = pager
-    options[:use_pager] = true
-    options[:format]    = "plain"
-  end
+    opts.on("-P", "--[no-]pager", "Use pager.", "(default: don't)") do |usepager|
+      options[:use_pager] = usepager
+      options[:format] = "plain" if usepager
+    end
 
-  opts.on("-w", "--width WIDTH", "Set the width of the output.") do |width|
-    w = width.to_i
-    options[:width] = w > 0 ? w : options[:width]
+    opts.on("-T", "Don't use a pager."){ options[:use_pager] = false }
+
+    opts.on("--pager-cmd PAGER", "Use pager PAGER.", "(default: don't)") do |pager|
+      options[:pager]     = pager
+      options[:use_pager] = true
+      options[:format]    = "plain"
+    end
+
+    opts.on("-w", "--width WIDTH", "Set the width of the output.") do |width|
+      w = width.to_i
+      options[:width] = w > 0 ? w : options[:width]
+    end
+
+    opts.on("-h", "--help", "Show this help message") do 
+      puts opts
+      exit
+    end
   end
+  optparser.parse!
 
-  opts.on("-h", "--help", "Show this help message") do 
-    puts opts
+  if !options[:list_classes] && !options[:list_methods] && ARGV.empty?
+    puts optparser
     exit
   end
-end
-optparser.parse!
-
-if !options[:list_classes] && !options[:list_methods] && ARGV.empty?
-  puts optparser
-  exit
-end
+end # lazy optparse loading
 
 # {{{ try to find where the method comes from exactly
 include FastRI::Util::MagicHelp
@@ -308,6 +324,7 @@ info_options = {
   :width     => options[:width],
   :lookup_order => options[:lookup_order],
   :extended  => options[:extended],
+  :expand_choices => options[:expand_choices],
 }
 
 # {{{ list classes or methods
@@ -326,7 +343,7 @@ ARGV.each do |term|
     # second-guess the correct method type only as the last resort.
     if result
       puts result
-    elsif (new_query = FastRI::Util.change_query_method_type(help_query)) != help_query
+    elsif options[:do_second_guess] and (new_query = FastRI::Util.change_query_method_type(help_query)) != help_query
       puts service.info(new_query)
     else
       puts nil

data/bin/ri-emacs

@@ -29,7 +29,7 @@ require 'fastri/util'
 # {{{ cmdline parsing and service discovery
 # we bind to 127.0.0.1 by default, because otherwise Ruby will try with
 # 0.0.0.0, which results in a DNS request, adding way too much latency
-options = {:addr => "127.0.0.1"}
+options = {:addr => "127.0.0.1", :width => ENV['RI_EMACS_COLUMNS'] ? ENV['RI_EMACS_COLUMNS'].to_i : 72}
 override_addr_env = false
 optparser = OptionParser.new do |opts|
   opts.banner = "Usage: ri-emacs [options] <query>"
@@ -40,6 +40,10 @@ optparser = OptionParser.new do |opts|
     override_addr_env = true
   end
 
+  opts.on("-w", "--width WIDTH", "Set the width of the output.") do |width|
+    options[:width] = width
+  end
+
   opts.on("-h", "--help", "Show this help message") do 
     puts opts
     exit
@@ -75,8 +79,9 @@ service = ring_server.read([:name, :FastRI, nil, nil])[2]
 class EventLoop
   include FastRI::Util::MagicHelp
 
-  def initialize(ri)
+  def initialize(ri, options)
     @ri = ri
+    @opts = options
   end
 
   def run
@@ -171,11 +176,11 @@ class EventLoop
   end
 
   def display_(what, keyw)
-    data = @ri.__send__(what, magic_help(keyw))
+    data = @ri.__send__(what, magic_help(keyw), :width => @opts[:width])
     if data
       puts data
     elsif (new_keyw = FastRI::Util.change_query_method_type(keyw)) != keyw
-      puts @ri.__send__(what, new_keyw)
+      puts @ri.__send__(what, new_keyw, :width => @opts[:width])
     end
     puts "RI_EMACS_END_OF_INFO"
   end
@@ -192,6 +197,6 @@ end
 
 #{{{ event loop
 #$stdout.sync = true # better not set sync=true, causes problems with emacs
-EventLoop.new(service).run
+EventLoop.new(service, options).run
 
 # vi: set sw=2 expandtab:

data/lib/fastri/ri_service.rb

@@ -181,6 +181,7 @@ class RiService
     :formatter => :ansi,
     :width     => 72,
     :extended  => false,
+    :expand_choices => false,
   }
 
   def matches(keyword, options = {})
@@ -224,6 +225,9 @@ class RiService
         formatter.draw_line("Multiple choices:")
         formatter.blankline
         formatter.wrap(entries.map{|x| x.full_name}.join(", "))
+        entries.each do |entry|
+          display.display_method_info(@ri_reader.get_method(entry)) if entry.type == :method
+        end if options[:expand_choices]
       end
     end
   rescue RiError

data/lib/fastri/util.rb

@@ -7,13 +7,27 @@ unless defined? ::Gem
   require 'rbconfig'
   module Gem
     def self.path
-      ENV['GEM_HOME'] || default_dir
+      [ENV['GEM_HOME'], ENV['GEM_PATH'], default_dir].compact.flatten
     end
     def self.default_dir
       if defined? RUBY_FRAMEWORK_VERSION
-        return File.join(File.dirname(Config::CONFIG["sitedir"]), "Gems")
+        paths = []
+        paths << APPLE_GEM_HOME if defined? APPLE_GEM_HOME
+        path = File.join(File.dirname(Config::CONFIG["sitedir"]), "Gems")
+        newpath = File.join(path, Config::CONFIG['ruby_version'])
+        # RubyGems post r1498 appends the ruby version to the path. This
+        # modification was included in the RubyGems shipped with 10.5.0.
+        if File.directory?(newpath)
+          # try new path first, user might have upgraded RubyGems and left old
+          # installation behind
+          paths + [ newpath ]
+        else
+          # pre-10.5.0 or older RubyGems
+          paths + [ path ]
+        end
       else
-        File.join(Config::CONFIG['libdir'], 'ruby', 'gems', Config::CONFIG['ruby_version'])
+        [ File.join(Config::CONFIG['libdir'], 'ruby', 'gems',
+                   Config::CONFIG['ruby_version']) ]
       end
     end
   end
@@ -34,10 +48,10 @@ module Util
   # (once per version).
   def gem_directories_unique
     return [] unless defined? Gem
-    gemdirs = Dir["#{Gem.path}/doc/*/ri"]
+    gemdirs = Gem.path.map{|p| Dir["#{p}/doc/*/ri"]}.flatten
     gems = Hash.new{|h,k| h[k] = []}
     gemdirs.each do |path|
-      gemname, version = %r{/([^/]+)-(.*)/ri$}.match(path).captures
+      gemname, version = %r{/([^/]+)-([^-]*)/ri$}.match(path).captures
       if gemname.nil? # doesn't follow any conventions :(
         gems[path[%r{/([^/]+)/ri$}, 1]] << [nil, path]
       else

data/lib/fastri/version.rb

@@ -2,8 +2,8 @@
 #
 
 module FastRI
-  FASTRI_VERSION      = "0.3.0"
-  FASTRI_RELEASE_DATE = "2007-01-29"
+  FASTRI_VERSION      = "0.3.1"
+  FASTRI_RELEASE_DATE = "2008-02-02"
   FASTRI_INDEX_FORMAT = "0.1.0"
   FASTRI_FT_INDEX_FORMAT = "1.0.0"
   FASTRI_FT_INDEX_FORMAT_MAJOR = "1"

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
+rubygems_version: 0.9.1
 specification_version: 1
 name: fastri
 version: !ruby/object:Gem::Version 
-  version: 0.3.0.1
-date: 2007-01-29 00:00:00 +01:00
+  version: 0.3.1.1
+date: 2008-02-02 00:00:00 +01:00
 summary: RI docs across machines, faster and smarter than ri.
 require_paths: 
 - lib
 email: mfp@acm.org
-homepage: http://eigenclass.org/hiki.rb?fastri
+homepage: http://eigenclass.org/hiki/fastri
 rubyforge_project: 
 description: FastRI is an alternative to the ri command-line tool. It is *much* faster, and also allows you to offer RI lookup services over DRb. FastRI is smarter than ri, and can find classes anywhere in the hierarchy without specifying the "full path". FastRI can perform fast full-text searches. It also knows about gems, and can tell you e.g. which extensions to a core class were added by a specific gem.
 autorequire: 
@@ -59,35 +59,35 @@ files:
 - bin/fastri-server
 - bin/ri-emacs
 - lib/fastri/ri_index.rb
-- lib/fastri/ri_service.rb
 - lib/fastri/version.rb
+- lib/fastri/name_descriptor.rb
+- lib/fastri/ri_service.rb
 - lib/fastri/util.rb
-- lib/fastri/full_text_indexer.rb
 - lib/fastri/full_text_index.rb
-- lib/fastri/name_descriptor.rb
+- lib/fastri/full_text_indexer.rb
 - CHANGES
 - COPYING
 - LEGAL
 - LICENSE
 - Rakefile
 - README.en
-- test/test_ri_index.rb
 - test/test_full_text_index.rb
-- test/test_functional_ri_service.rb
-- test/test_full_text_indexer.rb
 - test/test_name_descriptor.rb
-- test/test_util.rb
 - test/test_integration_full_text_index.rb
+- test/test_full_text_indexer.rb
+- test/test_functional_ri_service.rb
+- test/test_util.rb
+- test/test_ri_index.rb
 - setup.rb
 - pre-install.rb
 test_files: 
-- test/test_ri_index.rb
 - test/test_full_text_index.rb
-- test/test_functional_ri_service.rb
-- test/test_full_text_indexer.rb
 - test/test_name_descriptor.rb
-- test/test_util.rb
 - test/test_integration_full_text_index.rb
+- test/test_full_text_indexer.rb
+- test/test_functional_ri_service.rb
+- test/test_util.rb
+- test/test_ri_index.rb
 rdoc_options: 
 - --title
 - "FastRI: better, faster ri"