diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | lib/rdoc/ri/paths.rb | 46 |
2 files changed, 29 insertions, 21 deletions
@@ -1,3 +1,7 @@ +Tue Feb 12 10:16:47 2008 Eric Hodel <drbrain@segment7.net> + + * lib/rdoc/ri/paths.rb: Restore require rubygems check. + Tue Feb 12 02:42:27 2008 Yukihiro Matsumoto <matz@ruby-lang.org> * range.c (range_include): specialize single character string diff --git a/lib/rdoc/ri/paths.rb b/lib/rdoc/ri/paths.rb index aba9b6f69e..035d0fc242 100644 --- a/lib/rdoc/ri/paths.rb +++ b/lib/rdoc/ri/paths.rb @@ -42,30 +42,34 @@ module RDoc::RI::Paths # This is the search path for 'ri' PATH = [ SYSDIR, SITEDIR, HOMEDIR ].find_all {|p| p && File.directory?(p)} - require 'rubygems' unless defined?(Gem) and Gem::Enable - - # HACK dup'd from Gem.latest_partials and friends - all_paths = [] - - all_paths = Gem.path.map do |dir| - Dir[File.join(dir, 'doc', '*', 'ri')] - end.flatten - - ri_paths = {} - - all_paths.each do |dir| - base = File.basename File.dirname(dir) - if base =~ /(.*)-((\d+\.)*\d+)/ then - name, version = $1, $2 - ver = Gem::Version.new version - if ri_paths[name].nil? or ver > ri_paths[name][0] then - ri_paths[name] = [ver, dir] + begin + require 'rubygems' unless defined?(Gem) and Gem::Enable + + # HACK dup'd from Gem.latest_partials and friends + all_paths = [] + + all_paths = Gem.path.map do |dir| + Dir[File.join(dir, 'doc', '*', 'ri')] + end.flatten + + ri_paths = {} + + all_paths.each do |dir| + base = File.basename File.dirname(dir) + if base =~ /(.*)-((\d+\.)*\d+)/ then + name, version = $1, $2 + ver = Gem::Version.new version + if ri_paths[name].nil? or ver > ri_paths[name][0] then + ri_paths[name] = [ver, dir] + end end end - end - GEMDIRS = ri_paths.map { |k,v| v.last }.sort - GEMDIRS.each { |dir| PATH << dir } + GEMDIRS = ri_paths.map { |k,v| v.last }.sort + GEMDIRS.each { |dir| PATH << dir } + rescue LoadError + GEMDIRS = [] + end # Returns the selected documentation directories as an Array, or PATH if no # overriding directories were given. |