Update rubygems package to 1.6.2.

For complete changes, please refer:

	https://github.com/rubygems/rubygems/blob/master/History.txt

11 files changed, 144 insertions, 122 deletions

diff --git a/misc/rubygems/Makefile b/misc/rubygems/Makefile
index af7bb7d56b1..d9a0725c78b 100644
--- a/misc/rubygems/Makefile
+++ b/misc/rubygems/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.36 2011/02/23 10:32:24 taca Exp $
+# $NetBSD: Makefile,v 1.37 2011/03/23 14:35:04 taca Exp $
 
-DISTNAME=	rubygems-1.3.7
-PKGREVISION=	1
+DISTNAME=	rubygems-1.6.2
 CATEGORIES=	misc ruby
-MASTER_SITES=	http://rubyforge.org/frs/download.php/70696/
+MASTER_SITES=	http://production.cf.rubygems.org/rubygems/ \
+		http://rubyforge.org/frs/download.php/74445/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	taca@NetBSD.org
diff --git a/misc/rubygems/PLIST b/misc/rubygems/PLIST
index d2c00301b31..58a2033fc91 100644
--- a/misc/rubygems/PLIST
+++ b/misc/rubygems/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2010/09/16 12:02:05 taca Exp $
+@comment $NetBSD: PLIST,v 1.16 2011/03/23 14:35:04 taca Exp $
 bin/gem${RUBY_VER}
 ${RUBY_VENDORLIB}/gauntlet_rubygems.rb
 ${RUBY_VENDORLIB}/rbconfig/datadir.rb
@@ -19,7 +19,6 @@ ${RUBY_VENDORLIB}/rubygems/commands/help_command.rb
 ${RUBY_VENDORLIB}/rubygems/commands/install_command.rb
 ${RUBY_VENDORLIB}/rubygems/commands/list_command.rb
 ${RUBY_VENDORLIB}/rubygems/commands/lock_command.rb
-${RUBY_VENDORLIB}/rubygems/commands/mirror_command.rb
 ${RUBY_VENDORLIB}/rubygems/commands/outdated_command.rb
 ${RUBY_VENDORLIB}/rubygems/commands/owner_command.rb
 ${RUBY_VENDORLIB}/rubygems/commands/pristine_command.rb
@@ -58,7 +57,9 @@ ${RUBY_VENDORLIB}/rubygems/gemcutter_utilities.rb
 ${RUBY_VENDORLIB}/rubygems/indexer.rb
 ${RUBY_VENDORLIB}/rubygems/install_update_options.rb
 ${RUBY_VENDORLIB}/rubygems/installer.rb
+${RUBY_VENDORLIB}/rubygems/installer_test_case.rb
 ${RUBY_VENDORLIB}/rubygems/local_remote_options.rb
+${RUBY_VENDORLIB}/rubygems/mock_gem_ui.rb
 ${RUBY_VENDORLIB}/rubygems/old_format.rb
 ${RUBY_VENDORLIB}/rubygems/package.rb
 ${RUBY_VENDORLIB}/rubygems/package/f_sync_dir.rb
@@ -67,6 +68,7 @@ ${RUBY_VENDORLIB}/rubygems/package/tar_input.rb
 ${RUBY_VENDORLIB}/rubygems/package/tar_output.rb
 ${RUBY_VENDORLIB}/rubygems/package/tar_reader.rb
 ${RUBY_VENDORLIB}/rubygems/package/tar_reader/entry.rb
+${RUBY_VENDORLIB}/rubygems/package/tar_test_case.rb
 ${RUBY_VENDORLIB}/rubygems/package/tar_writer.rb
 ${RUBY_VENDORLIB}/rubygems/package_task.rb
 ${RUBY_VENDORLIB}/rubygems/platform.rb
@@ -76,10 +78,9 @@ ${RUBY_VENDORLIB}/rubygems/requirement.rb
 ${RUBY_VENDORLIB}/rubygems/security.rb
 ${RUBY_VENDORLIB}/rubygems/server.rb
 ${RUBY_VENDORLIB}/rubygems/source_index.rb
-${RUBY_VENDORLIB}/rubygems/source_info_cache.rb
-${RUBY_VENDORLIB}/rubygems/source_info_cache_entry.rb
 ${RUBY_VENDORLIB}/rubygems/spec_fetcher.rb
 ${RUBY_VENDORLIB}/rubygems/specification.rb
+${RUBY_VENDORLIB}/rubygems/test_case.rb
 ${RUBY_VENDORLIB}/rubygems/test_utilities.rb
 ${RUBY_VENDORLIB}/rubygems/text.rb
 ${RUBY_VENDORLIB}/rubygems/uninstaller.rb
diff --git a/misc/rubygems/distinfo b/misc/rubygems/distinfo
index 5313194c192..e3a7c5aa577 100644
--- a/misc/rubygems/distinfo
+++ b/misc/rubygems/distinfo
@@ -1,19 +1,20 @@
-$NetBSD: distinfo,v 1.27 2011/02/23 10:32:24 taca Exp $
+$NetBSD: distinfo,v 1.28 2011/03/23 14:35:04 taca Exp $
 
-SHA1 (rubygems-1.3.7.tgz) = 68ad2970963db9893b76acc8777be72a77c4bee4
-RMD160 (rubygems-1.3.7.tgz) = 2ea8e16d1535216045798258603d5f2f9e3dbfea
-Size (rubygems-1.3.7.tgz) = 290986 bytes
+SHA1 (rubygems-1.6.2.tgz) = 32bb7823eb28907c883e194fa7ce0fc1118eb8bc
+RMD160 (rubygems-1.6.2.tgz) = 1994ac432f178612a75ac8454d7962359b87cda5
+Size (rubygems-1.6.2.tgz) = 242518 bytes
 SHA1 (patch-aa) = 8fa88c8b44a792740a695571ce5e66fcbc6cbaca
 SHA1 (patch-ab) = 6e98c1d41e5bb9f824d60073354837ebf2e7d2d1
 SHA1 (patch-ac) = de613df5f7b17e3a9fe5cbc4febe6bebe479dff8
-SHA1 (patch-ad) = 8fd15e71a152e535879b945ec17a62128e59767d
-SHA1 (patch-af) = f8ba8859790d55bfadee6aadff97eda8218b5811
-SHA1 (patch-ag) = c5bfa929fe235f13577a7430d270d90129e55e57
-SHA1 (patch-ah) = e2ac7c3b589760de461190152279c71c37c0999a
+SHA1 (patch-ad) = 8d37e84782c0724428399507a5fee3b0eb6af2e6
+SHA1 (patch-af) = 0a9f3f4b2b323c9e5578a9080e45cf930b511bd1
+SHA1 (patch-ag) = 94caf33061c1c455388c5e027c13adf6b7811bd6
+SHA1 (patch-ah) = 36ec4d8524dfe2960f6afb7afcd34f8ed2368a60
 SHA1 (patch-aj) = eb079e5b072c65f8b60df33c6b53791bb5129b38
-SHA1 (patch-ak) = 07ae4c4b0585fb359802779f6b71a6f1fe0bf21b
 SHA1 (patch-al) = d0e26e23501274749831ff4bd9f4f8ff8bc774ab
 SHA1 (patch-am) = 83f22425e521ac577d91c17d9b0dcb79e086dc01
 SHA1 (patch-an) = f583e03e69aba2543a2b858a376eb81fb7a4a581
-SHA1 (patch-ao) = 672f0f4c79ef3d3aee949cc0154e7071c1437e1b
+SHA1 (patch-ao) = b78557ffaa2df6c251ad7bfce760574e0ef3157a
 SHA1 (patch-ap) = c70cd7cf263ef53fc4fde1fd9b499563dab1325b
+SHA1 (patch-lib_rubygems_require__paths__builder.rb) = d6da3c9e55ed3dd3ab35d9de71c7776cfdfb3fc4
+SHA1 (patch-test_rubygems_test__gem.rb) = 77496b0b8e2c23930d10aa4171667138b6fef33c
diff --git a/misc/rubygems/patches/patch-ad b/misc/rubygems/patches/patch-ad
index 3280a18f965..6818f108d04 100644
--- a/misc/rubygems/patches/patch-ad
+++ b/misc/rubygems/patches/patch-ad
@@ -1,20 +1,55 @@
-$NetBSD: patch-ad,v 1.7 2010/09/16 12:02:05 taca Exp $
+$NetBSD: patch-ad,v 1.8 2011/03/23 14:35:05 taca Exp $
 
-Add install_root option for pkgsrc's rubygems support.
+* Add install_root option for pkgsrc's rubygems support.
+* Disable Gem::QUICKLOADER_SUCKAGE while Ruby 1.9.2's rubygems generates
+  .require_paths file.
 
---- lib/rubygems/installer.rb.orig	2010-04-20 06:47:36.000000000 +0000
+--- lib/rubygems/installer.rb.orig	2011-03-04 00:01:24.000000000 +0000
 +++ lib/rubygems/installer.rb
-@@ -84,6 +84,9 @@ class Gem::Installer
+@@ -39,7 +39,8 @@ class Gem::Installer
+ 
+   include Gem::UserInteraction
+ 
+-  include Gem::RequirePathsBuilder if Gem::QUICKLOADER_SUCKAGE
++  # For gem based package compatibility, generate .require_paths file.
++  include Gem::RequirePathsBuilder # if Gem::QUICKLOADER_SUCKAGE
+ 
+   ##
+   # The directory a gem's executables will be installed into
+@@ -87,6 +88,9 @@ class Gem::Installer
+   # :force:: Overrides all version checks and security policy checks, except
    #          for a signed-gems-only policy.
    # :ignore_dependencies:: Don't raise if a dependency is missing.
-   # :install_dir:: The directory to install the gem into.
 +  # :install_root:: The directory to use as a buildroot for "destdir"-style
 +  #		  installation.  All paths during installation are relative
 +  #               to the buildroot.
+   # :install_dir:: The directory to install the gem into.
    # :format_executable:: Format the executable the same as the ruby executable.
    #                      If your ruby is ruby18, foo_exec will be installed as
-   #                      foo_exec18.
-@@ -99,6 +102,7 @@ class Gem::Installer
+@@ -174,7 +178,8 @@ class Gem::Installer
+     generate_bin
+     write_spec
+ 
+-    write_require_paths_file_if_needed if Gem::QUICKLOADER_SUCKAGE
++    # For gem based package compatibility, generate .require_paths file.
++    write_require_paths_file_if_needed # if Gem::QUICKLOADER_SUCKAGE
+ 
+     cached_gem = Gem.cache_gem(File.basename(@gem), @gem_home)
+     unless File.exist? cached_gem then
+@@ -263,7 +268,11 @@ class Gem::Installer
+     # If the user has asked for the gem to be installed in a directory that is
+     # the system gem directory, then use the system bin directory, else create
+     # (or use) a new bin dir under the gem_home.
+-    bindir = @bin_dir ? @bin_dir : Gem.bindir(@gem_home)
++    bindir = @bin_dir ? @bin_dir : (Gem.bindir @gem_home, @install_root)
++
++    unless @install_root.nil? or @install_root == ""
++      bindir = File.join(@install_root, bindir)
++    end
+ 
+     Dir.mkdir bindir unless File.exist? bindir
+     raise Gem::FilePermissionError.new(bindir) unless File.writable? bindir
+@@ -392,6 +401,7 @@ class Gem::Installer
        :exec_format  => false,
        :force        => false,
        :install_dir  => Gem.dir,
@@ -22,7 +57,7 @@ Add install_root option for pkgsrc's rubygems support.
        :source_index => Gem.source_index,
      }.merge options
  
-@@ -113,6 +117,11 @@ class Gem::Installer
+@@ -406,6 +416,11 @@ class Gem::Installer
      @bin_dir             = options[:bin_dir]
      @development         = options[:development]
      @source_index        = options[:source_index]
@@ -31,19 +66,6 @@ Add install_root option for pkgsrc's rubygems support.
 +      @install_root = File.expand_path install_root
 +      @gem_home = File.join(@install_root, @gem_home)
 +    end
+   end
  
-     begin
-       @format = Gem::Format.from_file_by_path @gem, @security_policy
-@@ -289,7 +298,11 @@ class Gem::Installer
-     # If the user has asked for the gem to be installed in a directory that is
-     # the system gem directory, then use the system bin directory, else create
-     # (or use) a new bin dir under the gem_home.
--    bindir = @bin_dir ? @bin_dir : Gem.bindir(@gem_home)
-+    bindir = @bin_dir ? @bin_dir : (Gem.bindir @gem_home, @install_root)
-+
-+    unless @install_root.nil? or @install_root == ""
-+      bindir = File.join(@install_root, bindir)
-+    end
- 
-     Dir.mkdir bindir unless File.exist? bindir
-     raise Gem::FilePermissionError.new(bindir) unless File.writable? bindir
+   def load_gem_file
diff --git a/misc/rubygems/patches/patch-af b/misc/rubygems/patches/patch-af
index 65057ddc416..d892b326021 100644
--- a/misc/rubygems/patches/patch-af
+++ b/misc/rubygems/patches/patch-af
@@ -1,11 +1,11 @@
-$NetBSD: patch-af,v 1.4 2010/09/10 03:48:40 taca Exp $
+$NetBSD: patch-af,v 1.5 2011/03/23 14:35:05 taca Exp $
 
 Add install_root option for pkgsrc's rubygems support.
 
---- lib/rubygems/commands/uninstall_command.rb.orig	2009-03-13 16:16:55.000000000 -0700
+--- lib/rubygems/commands/uninstall_command.rb.orig	2011-03-04 00:01:24.000000000 +0000
 +++ lib/rubygems/commands/uninstall_command.rb
-@@ -49,6 +49,11 @@ class Gem::Commands::UninstallCommand < 
-       options[:user_install] = value
+@@ -54,6 +54,11 @@ class Gem::Commands::UninstallCommand < 
+       options[:format_executable] = value
      end
  
 +    add_option('-B', '--install-root DIR',
diff --git a/misc/rubygems/patches/patch-ag b/misc/rubygems/patches/patch-ag
index 5594857c6e4..29fc3bf2a56 100644
--- a/misc/rubygems/patches/patch-ag
+++ b/misc/rubygems/patches/patch-ag
@@ -1,12 +1,12 @@
-$NetBSD: patch-ag,v 1.7 2010/09/10 03:48:40 taca Exp $
+$NetBSD: patch-ag,v 1.8 2011/03/23 14:35:05 taca Exp $
 
 Add install_root option for pkgsrc's rubygems support.
 
---- lib/rubygems/uninstaller.rb.orig	2009-06-22 22:54:36.000000000 +0000
+--- lib/rubygems/uninstaller.rb.orig	2011-03-04 00:01:24.000000000 +0000
 +++ lib/rubygems/uninstaller.rb
-@@ -51,6 +51,12 @@ class Gem::Uninstaller
-     @force_ignore = options[:ignore]
+@@ -52,6 +52,12 @@ class Gem::Uninstaller
      @bin_dir = options[:bin_dir]
+     @format_executable = options[:format_executable]
  
 +    install_root = options[:install_root]
 +    unless install_root.nil? or install_root == ""
@@ -17,16 +17,3 @@ Add install_root option for pkgsrc's rubygems support.
      # only add user directory if install_dir is not set
      @user_install = false
      @user_install = options[:user_install] unless options[:install_dir]
-@@ -124,7 +130,11 @@ class Gem::Uninstaller
-     return if spec.nil?
- 
-     unless spec.executables.empty? then
--      bindir = @bin_dir ? @bin_dir : Gem.bindir(spec.installation_path)
-+      bindir = @bin_dir ? @bin_dir : (Gem.bindir @gem_home, @install_root)
-+
-+      unless @install_root.nil? or @install_root == ""
-+        bindir = File.join(@install_root, bindir)
-+      end
- 
-       list = @source_index.find_name(spec.name).delete_if { |s|
-         s.version == spec.version
diff --git a/misc/rubygems/patches/patch-ah b/misc/rubygems/patches/patch-ah
index 6bafbfb4b4e..ae1c6ce416f 100644
--- a/misc/rubygems/patches/patch-ah
+++ b/misc/rubygems/patches/patch-ah
@@ -1,10 +1,10 @@
-$NetBSD: patch-ah,v 1.7 2010/09/16 12:02:05 taca Exp $
+$NetBSD: patch-ah,v 1.8 2011/03/23 14:35:05 taca Exp $
 
 Add install_root option for pkgsrc's rubygems support.
 
---- lib/rubygems.rb.orig	2010-05-14 03:59:10.000000000 +0000
+--- lib/rubygems.rb.orig	2011-03-09 03:30:40.000000000 +0000
 +++ lib/rubygems.rb
-@@ -348,7 +348,10 @@ module Gem
+@@ -408,7 +408,10 @@ module Gem
    ##
    # The path where gem executables are to be installed.
  
@@ -16,7 +16,7 @@ Add install_root option for pkgsrc's rubygems support.
      return File.join(install_dir, 'bin') unless
        install_dir.to_s == Gem.default_dir
      Gem.default_bindir
-@@ -589,12 +592,12 @@ module Gem
+@@ -668,12 +671,12 @@ module Gem
    ##
    # The index to insert activated gem paths into the $LOAD_PATH.
    #
@@ -29,13 +29,13 @@ Add install_root option for pkgsrc's rubygems support.
 -    index = $LOAD_PATH.index ConfigMap[:sitelibdir]
 +    index = $LOAD_PATH.index ConfigMap[:vendorlibdir]
  
-     $LOAD_PATH.each_with_index do |path, i|
-       if path.instance_variables.include?(:@gem_prelude_index) or
-@@ -704,6 +707,7 @@ module Gem
-     prefix = File.dirname dir
+     if QUICKLOADER_SUCKAGE then
+       $LOAD_PATH.each_with_index do |path, i|
+@@ -829,6 +832,7 @@ module Gem
+     prefix = File.dirname RUBYGEMS_DIR
  
-     if prefix == File.expand_path(ConfigMap[:sitelibdir]) or
-+       prefix == File.expand_path(ConfigMap[:vendorlibdir]) or
-        prefix == File.expand_path(ConfigMap[:libdir]) or
-        'lib' != File.basename(dir) then
-       nil
+     if prefix != File.expand_path(ConfigMap[:sitelibdir]) and
++       prefix != File.expand_path(ConfigMap[:vendorlibdir]) and
+        prefix != File.expand_path(ConfigMap[:libdir]) and
+        'lib' == File.basename(RUBYGEMS_DIR) then
+       prefix
diff --git a/misc/rubygems/patches/patch-ak b/misc/rubygems/patches/patch-ak
deleted file mode 100644
index 71d1253442f..00000000000
--- a/misc/rubygems/patches/patch-ak
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD: patch-ak,v 1.5 2010/09/16 12:02:05 taca Exp $
-
-Use vendordir instead of sitedir.
-
---- test/test_gem.rb.orig	2010-04-20 05:57:21.000000000 +0000
-+++ test/test_gem.rb
-@@ -426,18 +426,18 @@ class TestGem < RubyGemTestCase
-     Gem::ConfigMap[:libdir] = orig_libdir
-   end
- 
--  def test_self_prefix_sitelibdir
--    orig_sitelibdir = Gem::ConfigMap[:sitelibdir]
-+  def test_self_prefix_vendorlibdir
-+    orig_sitelibdir = Gem::ConfigMap[:vendorlibdir]
- 
-     file_name = File.expand_path __FILE__
-     prefix = File.dirname File.dirname(file_name)
-     prefix = File.dirname prefix if File.basename(prefix) == 'test'
- 
--    Gem::ConfigMap[:sitelibdir] = prefix
-+    Gem::ConfigMap[:vendorlibdir] = prefix
- 
-     assert_nil Gem.prefix
-   ensure
--    Gem::ConfigMap[:sitelibdir] = orig_sitelibdir
-+    Gem::ConfigMap[:vendorlibdir] = orig_sitelibdir
-   end
- 
-   def test_self_refresh
diff --git a/misc/rubygems/patches/patch-ao b/misc/rubygems/patches/patch-ao
index a5e8c53ba94..2133417db3d 100644
--- a/misc/rubygems/patches/patch-ao
+++ b/misc/rubygems/patches/patch-ao
@@ -1,32 +1,38 @@
-$NetBSD: patch-ao,v 1.2 2010/09/16 12:02:05 taca Exp $
+$NetBSD: patch-ao,v 1.3 2011/03/23 14:35:05 taca Exp $
 
 Don't hard code config file's path for gem.
 
---- lib/rubygems/config_file.rb.orig	2010-02-16 04:14:16.000000000 +0000
+--- lib/rubygems/config_file.rb.orig	2011-02-26 20:40:09.000000000 +0000
 +++ lib/rubygems/config_file.rb
-@@ -45,26 +45,7 @@ class Gem::ConfigFile
+@@ -45,32 +45,7 @@ class Gem::ConfigFile
  
    PLATFORM_DEFAULTS = {}
  
 -  system_config_path =
 -    begin
--      require 'Win32API'
+-      require "etc"
+-      Etc.sysconfdir
+-    rescue LoadError, NoMethodError
+-      begin
+-        # TODO: remove after we drop 1.8.7 and 1.9.1
+-        require 'Win32API'
 -
--      CSIDL_COMMON_APPDATA = 0x0023
--      path = 0.chr * 260
--      if RUBY_VERSION > '1.9' then
--        SHGetFolderPath = Win32API.new 'shell32', 'SHGetFolderPath', 'PLPLP',
--                                       'L', :stdcall
--        SHGetFolderPath.call nil, CSIDL_COMMON_APPDATA, nil, 1, path
--      else
--        SHGetFolderPath = Win32API.new 'shell32', 'SHGetFolderPath', 'LLLLP',
--                                       'L'
--        SHGetFolderPath.call 0, CSIDL_COMMON_APPDATA, 0, 1, path
--      end
+-        CSIDL_COMMON_APPDATA = 0x0023
+-        path = 0.chr * 260
+-        if RUBY_VERSION > '1.9' then
+-          SHGetFolderPath = Win32API.new 'shell32', 'SHGetFolderPath', 'PLPLP',
+-          'L', :stdcall
+-          SHGetFolderPath.call nil, CSIDL_COMMON_APPDATA, nil, 1, path
+-        else
+-          SHGetFolderPath = Win32API.new 'shell32', 'SHGetFolderPath', 'LLLLP',
+-          'L'
+-          SHGetFolderPath.call 0, CSIDL_COMMON_APPDATA, 0, 1, path
+-        end
 -
--      path.strip
--    rescue LoadError
--      '/etc'
+-        path.strip
+-      rescue LoadError
+-        "/etc"
+-      end
 -    end
 +  system_config_path = '@PKG_SYSCONFDIR@'
  
diff --git a/misc/rubygems/patches/patch-lib_rubygems_require__paths__builder.rb b/misc/rubygems/patches/patch-lib_rubygems_require__paths__builder.rb
new file mode 100644
index 00000000000..6cf52332739
--- /dev/null
+++ b/misc/rubygems/patches/patch-lib_rubygems_require__paths__builder.rb
@@ -0,0 +1,12 @@
+$NetBSD: patch-lib_rubygems_require__paths__builder.rb,v 1.1 2011/03/23 14:35:05 taca Exp $
+
+--- lib/rubygems/require_paths_builder.rb.orig	2011-03-04 00:01:24.000000000 +0000
++++ lib/rubygems/require_paths_builder.rb
+@@ -14,5 +14,5 @@ module Gem::RequirePathsBuilder
+       file.puts spec.bindir if spec.bindir
+     end
+   end
+-end if Gem::QUICKLOADER_SUCKAGE
+-
++end # if Gem::QUICKLOADER_SUCKAGE
++    # it could be enabled after 1.9.2's rubygem updated.
diff --git a/misc/rubygems/patches/patch-test_rubygems_test__gem.rb b/misc/rubygems/patches/patch-test_rubygems_test__gem.rb
new file mode 100644
index 00000000000..9143f5cc5d4
--- /dev/null
+++ b/misc/rubygems/patches/patch-test_rubygems_test__gem.rb
@@ -0,0 +1,22 @@
+$NetBSD: patch-test_rubygems_test__gem.rb,v 1.1 2011/03/23 14:35:05 taca Exp $
+
+--- test/rubygems/test_gem.rb.orig	2011-03-09 03:30:40.000000000 +0000
++++ test/rubygems/test_gem.rb
+@@ -822,13 +822,13 @@ class TestGem < Gem::TestCase
+     Gem::ConfigMap[:libdir] = orig_libdir
+   end
+ 
+-  def test_self_prefix_sitelibdir
+-    orig_sitelibdir = Gem::ConfigMap[:sitelibdir]
+-    Gem::ConfigMap[:sitelibdir] = @@project_dir
++  def test_self_prefix_vendorlibdir
++    orig_vendorlibdir = Gem::ConfigMap[:vendorlibdir]
++    Gem::ConfigMap[:vendorlibdir] = @@project_dir
+ 
+     assert_nil Gem.prefix
+   ensure
+-    Gem::ConfigMap[:sitelibdir] = orig_sitelibdir
++    Gem::ConfigMap[:vendorlibdir] = orig_vendorlibdir
+   end
+ 
+   def test_self_refresh