diff options
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | lib/rdoc/ri/gemdirs.rb | 28 | ||||
| -rw-r--r-- | lib/rdoc/ri/paths.rb | 28 |
3 files changed, 41 insertions, 27 deletions
@@ -1,3 +1,15 @@ +Fri Aug 21 07:25:45 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * lib/rdoc/ri/gemdirs.rb: split from lib/rdoc/ri/paths.rb to ge + rid of loading rubygems and searching all gems always. + +Fri Aug 21 07:14:52 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * configure.in (RUBY_PROGRAM_VERSION, RUBY_RELEASE_DATE): extracts + from version.h for cross-compiling. + + * template/fake.rb.in (RUBY_VERSION, RUBY_DESCRIPTION): use above. + Fri Aug 21 00:08:01 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * lib/rdoc/ri/paths.rb (RDoc::RI::Paths): Gem::Enable has been obsolete. diff --git a/lib/rdoc/ri/gemdirs.rb b/lib/rdoc/ri/gemdirs.rb new file mode 100644 index 0000000000..0bca992bca --- /dev/null +++ b/lib/rdoc/ri/gemdirs.rb @@ -0,0 +1,28 @@ +module RDoc::RI::Paths + begin + require 'rubygems' unless defined?(Gem) + + # 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| + if %r"/([^/]*)-((?:\d+\.)*\d+)/ri\z" =~ dir + name, version = $1, $2 + ver = Gem::Version.new(version) + if !ri_paths[name] or ver > ri_paths[name][0] + ri_paths[name] = [ver, dir] + end + end + end + + GEMDIRS = ri_paths.map { |k,v| v.last }.sort + rescue LoadError + GEMDIRS = [] + end +end diff --git a/lib/rdoc/ri/paths.rb b/lib/rdoc/ri/paths.rb index 562720c379..399fbbab00 100644 --- a/lib/rdoc/ri/paths.rb +++ b/lib/rdoc/ri/paths.rb @@ -51,33 +51,7 @@ module RDoc::RI::Paths SITEDIR = File.join(base, "site") HOMEDIR = (File.expand_path("~/.#{rdoc}") rescue nil) - begin - require 'rubygems' unless defined?(Gem) - - # 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 - - GEMDIRS = ri_paths.map { |k,v| v.last }.sort - rescue LoadError - GEMDIRS = [] - end + autoload(:GEMDIRS, File.expand_path('../gemdirs.rb', __FILE__)) # Returns the selected documentation directories as an Array, or PATH if no # overriding directories were given. |