rpms/ruby
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ConfigMap was deprecated in favor or RbConfig.

Browse Source 
1d2feefde4
This commit is contained in:
Vít Ondruch 2015-02-03 10:30:45 +01:00
parent c5abc51c7c
commit 76bbf0976d
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
operating_system.rb
View File

@ -27,8 +27,8 @@ module Gem
def default_locations def default_locations
@default_locations ||= { @default_locations ||= {
:system => previous_but_one_dir_to(ConfigMap[:vendordir], ConfigMap[:RUBY_INSTALL_NAME]), :system => previous_but_one_dir_to(RbConfig::CONFIG['vendordir'], RbConfig::CONFIG['RUBY_INSTALL_NAME']),
:local => previous_but_one_dir_to(ConfigMap[:sitedir], ConfigMap[:RUBY_INSTALL_NAME]) :local => previous_but_one_dir_to(RbConfig::CONFIG['sitedir'], RbConfig::CONFIG['RUBY_INSTALL_NAME'])
} }
end end
@ -39,15 +39,15 @@ module Gem
def default_dirs def default_dirs
@libdir ||= case RUBY_PLATFORM @libdir ||= case RUBY_PLATFORM
when 'java' when 'java'
ConfigMap[:datadir] RbConfig::CONFIG['datadir']
else else
ConfigMap[:libdir] RbConfig::CONFIG['libdir']
end end
@default_dirs ||= Hash[default_locations.collect do |destination, path| @default_dirs ||= Hash[default_locations.collect do |destination, path|
[destination, { [destination, {
:bin_dir => File.join(path, ConfigMap[:bindir].split(File::SEPARATOR).last), :bin_dir => File.join(path, RbConfig::CONFIG['bindir'].split(File::SEPARATOR).last),
:gem_dir => File.join(path, ConfigMap[:datadir].split(File::SEPARATOR).last, 'gems'), :gem_dir => File.join(path, RbConfig::CONFIG['datadir'].split(File::SEPARATOR).last, 'gems'),
:ext_dir => File.join(path, @libdir.split(File::SEPARATOR).last, 'gems') :ext_dir => File.join(path, @libdir.split(File::SEPARATOR).last, 'gems')
}] }]
end] end]