diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/rdoc/ri/paths.rb | 7 | ||||
| -rw-r--r-- | test/rdoc/test_rdoc_ri_paths.rb | 9 |
3 files changed, 13 insertions, 8 deletions
@@ -1,3 +1,8 @@ +Sun Dec 26 12:16:29 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * lib/rdoc/ri/paths.rb (RDoc::RI::Paths::HOMEDIR): no exception if + HOME is not set. [ruby-core:33867] + Sun Dec 26 11:39:11 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> * parse.y (stmt): missing ripper rule. i.e., `a::B ||= c 1'. diff --git a/lib/rdoc/ri/paths.rb b/lib/rdoc/ri/paths.rb index ec4d16b857..f44b0e1e95 100644 --- a/lib/rdoc/ri/paths.rb +++ b/lib/rdoc/ri/paths.rb @@ -19,12 +19,7 @@ module RDoc::RI::Paths SYSDIR = File.join base, "system" SITEDIR = File.join base, "site" - homedir = File.expand_path('~') || - ENV['HOME'] || ENV['USERPROFILE'] || ENV['HOMEPATH'] - - HOMEDIR = if homedir then - File.join homedir, ".rdoc" - end + HOMEDIR = File.expand_path('~/.rdoc') rescue nil #:startdoc: @gemdirs = nil diff --git a/test/rdoc/test_rdoc_ri_paths.rb b/test/rdoc/test_rdoc_ri_paths.rb index e6f33d7d5e..91e6abbfbd 100644 --- a/test/rdoc/test_rdoc_ri_paths.rb +++ b/test/rdoc/test_rdoc_ri_paths.rb @@ -1,10 +1,11 @@ require 'rubygems' -require 'minitest/autorun' +require 'test/unit' require 'tmpdir' require 'fileutils' require 'rdoc/ri/paths' +require_relative '../ruby/envutil' -class TestRDocRIPaths < MiniTest::Unit::TestCase +class TestRDocRIPaths < Test::Unit::TestCase def setup RDoc::RI::Paths.instance_variable_set :@gemdirs, %w[/nonexistent/gemdir] @@ -39,5 +40,9 @@ class TestRDocRIPaths < MiniTest::Unit::TestCase assert_equal '/nonexistent/gemdir', path.shift end + def test_homeless + bug4202 = '[ruby-core:33867]' + assert(assert_in_out_err([{"HOME"=>nil}, *%w"-rrdoc/ri/paths -e;"], bug4202).success?, bug4202) + end end |