From 76bbf0976dbb90eb22dc6590cee81462844d4e24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Tue, 3 Feb 2015 10:30:45 +0100 Subject: [PATCH] ConfigMap was deprecated in favor or RbConfig. https://github.com/rubygems/rubygems/commit/1d2feefde46c774947b4e6e677852b2abd4bc2a9 --- operating_system.rb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/operating_system.rb b/operating_system.rb index 079564f..3a21b0b 100644 --- a/operating_system.rb +++ b/operating_system.rb @@ -27,8 +27,8 @@ module Gem def default_locations @default_locations ||= { - :system => previous_but_one_dir_to(ConfigMap[:vendordir], ConfigMap[:RUBY_INSTALL_NAME]), - :local => previous_but_one_dir_to(ConfigMap[:sitedir], ConfigMap[:RUBY_INSTALL_NAME]) + :system => previous_but_one_dir_to(RbConfig::CONFIG['vendordir'], RbConfig::CONFIG['RUBY_INSTALL_NAME']), + :local => previous_but_one_dir_to(RbConfig::CONFIG['sitedir'], RbConfig::CONFIG['RUBY_INSTALL_NAME']) } end @@ -39,15 +39,15 @@ module Gem def default_dirs @libdir ||= case RUBY_PLATFORM when 'java' - ConfigMap[:datadir] + RbConfig::CONFIG['datadir'] else - ConfigMap[:libdir] + RbConfig::CONFIG['libdir'] end @default_dirs ||= Hash[default_locations.collect do |destination, path| [destination, { - :bin_dir => File.join(path, ConfigMap[:bindir].split(File::SEPARATOR).last), - :gem_dir => File.join(path, ConfigMap[:datadir].split(File::SEPARATOR).last, 'gems'), + :bin_dir => File.join(path, RbConfig::CONFIG['bindir'].split(File::SEPARATOR).last), + :gem_dir => File.join(path, RbConfig::CONFIG['datadir'].split(File::SEPARATOR).last, 'gems'), :ext_dir => File.join(path, @libdir.split(File::SEPARATOR).last, 'gems') }] end]