nobu	2009-01-22 16:28:35 +0900 (Thu, 22 Jan 2009)

  New Revision: 21736

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

  Log:
    * lib/rubygems/installer.rb (Gem::Installer#initialize): fixed
      typos.
    * test/rubygems/test_gem.rb (test_self_dir): removed false
      assertions.
    
    * test/rubygems/test_gem.rb (test_self_set_paths): checks if paths
      are included.
    
    * test/rubygems/test_gem_commands_install_command.rb
      (test_execute_remote): checks diagnostic message too.
    
    * test/rubygems/test_gem_installer.rb (load): uses Gem.ruby.
    
    * test/rubygems/gemutilities.rb (Gem.ruby): initializes from the
      environment variable to run without installation.
    
    * test/rubygems/gemutilities.rb (RubyGemTestCase#util_build_gem):
      creates cache directory.

  Modified files:
    trunk/ChangeLog
    trunk/lib/rubygems/installer.rb
    trunk/test/rubygems/gemutilities.rb
    trunk/test/rubygems/test_gem.rb
    trunk/test/rubygems/test_gem_commands_install_command.rb
    trunk/test/rubygems/test_gem_installer.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 21735)
+++ ChangeLog	(revision 21736)
@@ -1,3 +1,25 @@
+Thu Jan 22 16:29:50 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* lib/rubygems/installer.rb (Gem::Installer#initialize): fixed
+	  typos.
+
+	* test/rubygems/test_gem.rb (test_self_dir): removed false
+	  assertions.
+
+	* test/rubygems/test_gem.rb (test_self_set_paths): checks if paths
+	  are included.
+
+	* test/rubygems/test_gem_commands_install_command.rb
+	  (test_execute_remote): checks diagnostic message too.
+
+	* test/rubygems/test_gem_installer.rb (load): uses Gem.ruby.
+
+	* test/rubygems/gemutilities.rb (Gem.ruby): initializes from the
+	  environment variable to run without installation.
+
+	* test/rubygems/gemutilities.rb (RubyGemTestCase#util_build_gem):
+	  creates cache directory.
+
 Thu Jan 22 16:12:51 2009  NAKAMURA Usaku  <usa@r...>
 
 	* revert previous revision.  it's already out-of-date.
Index: lib/rubygems/installer.rb
===================================================================
--- lib/rubygems/installer.rb	(revision 21735)
+++ lib/rubygems/installer.rb	(revision 21736)
@@ -118,8 +118,8 @@
 
     begin
       FileUtils.mkdir_p @gem_home
-    rescue Errno::EACCESS, Errno::ENOTDIR
-      # We'll divert to ~/.gems below
+    rescue Errno::EACCES, Errno::ENOTDIR
+      # We'll divert to ~/.gem below
     end
 
     if not File.writable? @gem_home or
Index: test/rubygems/test_gem.rb
===================================================================
--- test/rubygems/test_gem.rb	(revision 21735)
+++ test/rubygems/test_gem.rb	(revision 21736)
@@ -152,11 +152,6 @@
 
   def test_self_dir
     assert_equal @gemhome, Gem.dir
-
-    Gem::DIRECTORIES.each do |filename|
-      assert File.directory?(File.join(Gem.dir, filename)),
-             "expected #{filename} to exist"
-    end
   end
 
   def test_self_ensure_gem_directories
@@ -483,9 +478,10 @@
     other = File.join @tempdir, 'other'
     path = [@userhome, other].join File::PATH_SEPARATOR
     Gem.send :set_paths, path
+    path = Gem.path
 
-    assert File.exist?(File.join(@userhome, 'gems'))
-    assert File.exist?(File.join(other, 'gems'))
+    assert_equal path[0], @userhome
+    assert_equal path[1], other
   end
 
   def test_self_set_paths_nonexistent_home
Index: test/rubygems/test_gem_commands_install_command.rb
===================================================================
--- test/rubygems/test_gem_commands_install_command.rb	(revision 21735)
+++ test/rubygems/test_gem_commands_install_command.rb	(revision 21736)
@@ -112,9 +112,18 @@
 
     @cmd.options[:args] = [@a2.name]
 
+    err = ""
+    class << err
+      alias write <<
+    end
     use_ui @ui do
       e = assert_raises Gem::SystemExitException do
-        @cmd.execute
+        stderr, $stderr = $stderr, err
+        begin
+          @cmd.execute
+        ensure
+          $stderr = stderr
+        end
       end
       assert_equal 0, e.exit_code
     end
@@ -127,6 +136,7 @@
     assert_equal "Installing RDoc documentation for #{@a2.full_name}...",
                  out.shift
     assert out.empty?, out.inspect
+    assert_match /^Updating class cache with \d+ classes/, err
   end
 
   def test_execute_two
Index: test/rubygems/test_gem_installer.rb
===================================================================
--- test/rubygems/test_gem_installer.rb	(revision 21735)
+++ test/rubygems/test_gem_installer.rb	(revision 21736)
@@ -508,7 +508,7 @@
 
     @installer.generate_bin
 
-    default_shebang = File.join(Config::CONFIG['bindir'], Config::CONFIG['ruby_install_name'])
+    default_shebang = Gem.ruby
     shebang_line = open("#{@gemhome}/bin/my_exec") { |f| f.readlines.first }
     assert_match(/\A#!/, shebang_line)
     assert_match(/#{default_shebang}/, shebang_line)
Index: test/rubygems/gemutilities.rb
===================================================================
--- test/rubygems/gemutilities.rb	(revision 21735)
+++ test/rubygems/gemutilities.rb	(revision 21736)
@@ -24,6 +24,8 @@
 require File.join(File.expand_path(File.dirname(__FILE__)), 'mockgemui')
 
 module Gem
+  @ruby = ENV['RUBY']
+
   def self.searcher=(searcher)
     MUTEX.synchronize do @searcher = searcher end
   end
@@ -252,8 +254,10 @@
         Gem::Builder.new(spec).build
       end
 
+      cache_dir = File.join(@gemhome, 'cache')
+      FileUtils.mkdir_p cache_dir
       FileUtils.mv "#{spec.full_name}.gem",
-                   File.join(@gemhome, 'cache', "#{spec.original_name}.gem")
+                   File.join(cache_dir, "#{spec.original_name}.gem")
     end
   end
 

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