aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordrbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-01-25 01:04:18 +0000
committerdrbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-01-25 01:04:18 +0000
commit5e3ebde7c8dc9f6fff12a8f69e73aa0ff5ba0556 (patch)
tree8644dc7b622f52106decaf82521b76801dc40223
parente2d341d9e529fbf6e63264c851d7a9a4a89c3406 (diff)
downloadruby-5e3ebde7c8dc9f6fff12a8f69e73aa0ff5ba0556.tar.gz
* lib/rubygems/compatibility.rb: Hide compatibility shims from RDoc
* lib/rubygems/config_file.rb: Hide RbConfig use from RDoc * lib/rubygems/test_case.rb: Added note to use realpath when 1.8 support is dropped. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38932 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog9
-rw-r--r--lib/rubygems/compatibility.rb2
-rw-r--r--lib/rubygems/config_file.rb4
-rw-r--r--lib/rubygems/test_case.rb2
4 files changed, 17 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 15d827a61a..b2ce8e6e06 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Fri Jan 25 10:04:07 2013 Eric Hodel <drbrain@segment7.net>
+
+ * lib/rubygems/compatibility.rb: Hide compatibility shims from RDoc
+
+ * lib/rubygems/config_file.rb: Hide RbConfig use from RDoc
+
+ * lib/rubygems/test_case.rb: Added note to use realpath when 1.8
+ support is dropped.
+
Fri Jan 25 09:14:43 2013 Eric Hodel <drbrain@segment7.net>
* lib/rdoc/generator/darkfish.rb: Fixed debug message. RDoc bug #174
diff --git a/lib/rubygems/compatibility.rb b/lib/rubygems/compatibility.rb
index 1137407bc5..e053a99ca3 100644
--- a/lib/rubygems/compatibility.rb
+++ b/lib/rubygems/compatibility.rb
@@ -1,3 +1,5 @@
+# :stopdoc:
+
# This file contains all sorts of little compatibility hacks that we've
# had to introduce over the years. Quarantining them into one file helps
# us know when we can get rid of them.
diff --git a/lib/rubygems/config_file.rb b/lib/rubygems/config_file.rb
index 61ee3b73eb..81ee32a1d6 100644
--- a/lib/rubygems/config_file.rb
+++ b/lib/rubygems/config_file.rb
@@ -50,6 +50,8 @@ class Gem::ConfigFile
PLATFORM_DEFAULTS = {}
+ # :stopdoc:
+
system_config_path =
begin
require "etc"
@@ -77,6 +79,8 @@ class Gem::ConfigFile
end
end
+ # :startdoc:
+
SYSTEM_WIDE_CONFIG_FILE = File.join system_config_path, 'gemrc'
##
diff --git a/lib/rubygems/test_case.rb b/lib/rubygems/test_case.rb
index 9776fb55b9..47fb9d4962 100644
--- a/lib/rubygems/test_case.rb
+++ b/lib/rubygems/test_case.rb
@@ -133,6 +133,8 @@ class Gem::TestCase < MiniTest::Unit::TestCase
# This makes the tempdir consistent on OS X.
# File.expand_path Dir.tmpdir #=> "/var/..."
# Dir.chdir Dir.tmpdir do File.expand_path '.' end #=> "/private/var/..."
+ # TODO use File#realpath above instead of #expand_path once 1.8 support is
+ # dropped.
Dir.chdir @tempdir do
@tempdir = File.expand_path '.'
@tempdir.untaint