summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authordrbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-08-05 21:21:55 +0000
committerdrbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-08-05 21:21:55 +0000
commited93a37bd53c156d611476e29bbea02473e508ca (patch)
treea9ee19d3166720d1321ceb9aca3874f1c9a423d4 /bin
parentcd3477004e55df0771daea0db8fcb5f50946ec78 (diff)
* lib/rdoc: Update to 3.9.1. Fixes === lines in verbatim sections.
Fixes :nodoc: on class aliases. Fixes :stopdoc: creating references to Object. Fixes spacing when class comments are merged in ri. Fixes `ri []` crash. Fixes bug report URL when rdoc crashes. Adds :doc: and :nodoc: to allow hiding of implementation details in ruby. Makes `rdoc` and `ri` gem-aware. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@32868 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'bin')
-rwxr-xr-xbin/rdoc9
-rwxr-xr-xbin/ri7
2 files changed, 14 insertions, 2 deletions
diff --git a/bin/rdoc b/bin/rdoc
index 8fafd01b0f..20d866c220 100755
--- a/bin/rdoc
+++ b/bin/rdoc
@@ -5,8 +5,13 @@
#
# Copyright (c) 2003 Dave Thomas
# Released under the same terms as Ruby
-#
-# $Revision$
+
+begin
+ gem 'rdoc'
+rescue NameError => e # --disable-gems
+ raise unless e.name == :gem
+rescue Gem::LoadError
+end
require 'rdoc/rdoc'
diff --git a/bin/ri b/bin/ri
index 243557403c..7fbed0c099 100755
--- a/bin/ri
+++ b/bin/ri
@@ -1,5 +1,12 @@
#!/usr/bin/env ruby
+begin
+ gem 'rdoc'
+rescue NameError => e # --disable-gems
+ raise unless e.name == :gem
+rescue Gem::LoadError
+end
+
require 'rdoc/ri/driver'
RDoc::RI::Driver.run ARGV