diff options
| author | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-12-14 05:09:37 +0000 |
|---|---|---|
| committer | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-12-14 05:09:37 +0000 |
| commit | 1dfe3d93fa5d9ddabae8db067c5705ea6e551442 (patch) | |
| tree | f5d79304d50c36811dd97167236e01c69b8cfb5e /lib/rubygems/server.rb | |
| parent | 497f8904cb3f90a3abf5340a129811aceb96ee33 (diff) | |
| download | ruby-1dfe3d93fa5d9ddabae8db067c5705ea6e551442.tar.gz | |
* lib/rubygems/commands/rdoc_command.rb: When overwriting
documentation, remove existing documentation first.
* lib/rubygems/server.rb: Fixed documentation links.
* test/rubygems/test_gem_server.rb: Test for the above.
* lib/rubygems/rdoc.rb: Reduced diff with RDoc::RubyGemsHook
* test/rubygems/test_gem_rdoc.rb: ditto
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38372 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rubygems/server.rb')
| -rw-r--r-- | lib/rubygems/server.rb | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/lib/rubygems/server.rb b/lib/rubygems/server.rb index b640186b64..dd582193ee 100644 --- a/lib/rubygems/server.rb +++ b/lib/rubygems/server.rb @@ -79,7 +79,9 @@ class Gem::Server <b><%=spec["name"]%> <%=spec["version"]%></b> - <% if spec["rdoc_installed"] then %> + <% if spec["ri_installed"] then %> + <a href="<%=spec["doc_path"]%>">[rdoc]</a> + <% elsif spec["rdoc_installed"] then %> <a href="<%=spec["doc_path"]%>">[rdoc]</a> <% else %> <span title="rdoc not installed">[rdoc]</span> @@ -464,7 +466,7 @@ div.method-source-code pre { color: #ffdead; overflow: hidden; } def have_rdoc_4_plus? @have_rdoc_4_plus ||= - Gem::Requirement.new('>= 4').satisfied_by? Gem::RDoc.rdoc_version + Gem::Requirement.new('>= 4.0.0.preview2').satisfied_by? Gem::RDoc.rdoc_version end def latest_specs(req, res) @@ -604,6 +606,7 @@ div.method-source-code pre { color: #ffdead; overflow: hidden; } "homepage" => spec.homepage, "name" => spec.name, "rdoc_installed" => Gem::RDoc.new(spec).rdoc_installed?, + "ri_installed" => Gem::RDoc.new(spec).ri_installed?, "summary" => spec.summary, "version" => spec.version.to_s, } @@ -619,7 +622,7 @@ div.method-source-code pre { color: #ffdead; overflow: hidden; } "has_deps" => false, "homepage" => "http://docs.rubygems.org/", "name" => 'rubygems', - "rdoc_installed" => true, + "ri_installed" => true, "summary" => "RubyGems itself", "version" => Gem::VERSION, } |