From d5e810dbd24cb92dc86d2d5b048f239315b15ba8 Mon Sep 17 00:00:00 2001
From: drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 7 Jan 2014 01:19:28 +0000
Subject: 	* ChangeLog: 	* lib/rubygems/basic_specification.rb (class
 Gem): 	* lib/rubygems/commands/contents_command.rb (prefix or only the files
 that are requir): 	* lib/rubygems/commands/install_command.rb (to write
 the specification by hand): 	* lib/rubygems/commands/setup_command.rb
 (class Gem): 	* lib/rubygems/commands/setup_command.rb (TEXT): 	*
 lib/rubygems/compatibility.rb (module Gem): 	* lib/rubygems/defaults.rb
 (module Gem): 	* lib/rubygems/deprecate.rb (module Gem): 	*
 lib/rubygems/installer.rb (class Gem): 	* lib/rubygems/platform.rb
 (class Gem): 	* lib/rubygems/rdoc.rb (class Gem): 	*
 lib/rubygems/request_set/lockfile.rb (class Gem): 	*
 lib/rubygems/resolver/installer_set.rb (class Gem): 	*
 lib/rubygems/resolver.rb (class Gem): 	* lib/rubygems/specification.rb (class
 Gem): 	* lib/rubygems/test_case.rb (class Gem): 	*
 lib/rubygems/test_case.rb (Also): 	* lib/rubygems/uninstaller.rb (class
 Gem): 	* lib/rubygems.rb (module Gem): 	* test/rubygems/test_gem.rb
 (class TestGem): 	* test/rubygems/test_gem_commands_contents_command.rb
 (lib): 	* test/rubygems/test_gem_commands_environment_command.rb
 (class TestGemCommandsEnvironmentCommand): 	*
 test/rubygems/test_gem_commands_install_command.rb (ERROR): 	*
 test/rubygems/test_gem_commands_update_command.rb (class
 TestGemCommandsUpdateCommand): 	*
 test/rubygems/test_gem_dependency_installer.rb (class
 TestGemDependencyInstaller): 	* test/rubygems/test_gem_installer.rb (load
 Gem): 	* test/rubygems/test_gem_installer.rb (gem): 	*
 test/rubygems/test_gem_request_set_lockfile.rb (GEM): 	*
 test/rubygems/test_gem_request_set_lockfile.rb (DEPENDENCIES): 	*
 test/rubygems/test_gem_specification.rb (dependencies): 	*
 test/rubygems/test_gem_specification.rb (duplicate dependency on b): 	*
 test/rubygems/test_gem_uninstaller.rb (class TestGemUninstaller):

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44515 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/rubygems/test_case.rb | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'lib/rubygems/test_case.rb')

diff --git a/lib/rubygems/test_case.rb b/lib/rubygems/test_case.rb
index 8dc37d6720..ff261f7816 100644
--- a/lib/rubygems/test_case.rb
+++ b/lib/rubygems/test_case.rb
@@ -294,10 +294,10 @@ class Gem::TestCase < MiniTest::Unit::TestCase
 
     Gem.searcher = nil
     Gem::SpecFetcher.fetcher = nil
-    @orig_BASERUBY = Gem::ConfigMap[:BASERUBY]
-    Gem::ConfigMap[:BASERUBY] = Gem::ConfigMap[:ruby_install_name]
+    @orig_BASERUBY = RbConfig::CONFIG['BASERUBY']
+    RbConfig::CONFIG['BASERUBY'] = RbConfig::CONFIG['ruby_install_name']
 
-    @orig_arch = Gem::ConfigMap[:arch]
+    @orig_arch = RbConfig::CONFIG['arch']
 
     if win_platform?
       util_set_arch 'i386-mswin32'
@@ -315,8 +315,8 @@ class Gem::TestCase < MiniTest::Unit::TestCase
   def teardown
     $LOAD_PATH.replace @orig_LOAD_PATH if @orig_LOAD_PATH
 
-    Gem::ConfigMap[:BASERUBY] = @orig_BASERUBY
-    Gem::ConfigMap[:arch] = @orig_arch
+    RbConfig::CONFIG['BASERUBY'] = @orig_BASERUBY
+    RbConfig::CONFIG['arch'] = @orig_arch
 
     if defined? Gem::RemoteFetcher then
       Gem::RemoteFetcher.fetcher = nil
@@ -898,7 +898,7 @@ Also, a list:
   # Set the platform to +arch+
 
   def util_set_arch(arch)
-    Gem::ConfigMap[:arch] = arch
+    RbConfig::CONFIG['arch'] = arch
     platform = Gem::Platform.new arch
 
     Gem.instance_variable_set :@platforms, nil
-- 
cgit v1.2.3