nobu	2010-12-26 12:16:34 +0900 (Sun, 26 Dec 2010)

  New Revision: 30382

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=30382

  Log:
    * lib/rdoc/ri/paths.rb (RDoc::RI::Paths::HOMEDIR): no exception if
      HOME is not set.  [ruby-core:33867]

  Modified files:
    trunk/ChangeLog
    trunk/lib/rdoc/ri/paths.rb
    trunk/test/rdoc/test_rdoc_ri_paths.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 30381)
+++ ChangeLog	(revision 30382)
@@ -1,3 +1,8 @@
+Sun Dec 26 12:16:29 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* 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@r...>
 
 	* parse.y (stmt): missing ripper rule.  i.e., `a::B ||= c 1'.
Index: lib/rdoc/ri/paths.rb
===================================================================
--- lib/rdoc/ri/paths.rb	(revision 30381)
+++ lib/rdoc/ri/paths.rb	(revision 30382)
@@ -19,12 +19,7 @@
   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
Index: test/rdoc/test_rdoc_ri_paths.rb
===================================================================
--- test/rdoc/test_rdoc_ri_paths.rb	(revision 30381)
+++ test/rdoc/test_rdoc_ri_paths.rb	(revision 30382)
@@ -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 @@
     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
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/