68 lines
2.7 KiB
Diff
68 lines
2.7 KiB
Diff
From 9f0ec0233f618cbb862629816b22491c3df79578 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?V=C3=ADt=20Ondruch?= <vondruch@redhat.com>
|
|
Date: Tue, 31 Mar 2015 16:37:44 +0200
|
|
Subject: [PATCH 3/4] Add ruby_version_dir_name support for RubyGems.
|
|
|
|
---
|
|
lib/rubygems/defaults.rb | 7 ++++---
|
|
test/rubygems/test_gem.rb | 5 +++--
|
|
2 files changed, 7 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/lib/rubygems/defaults.rb b/lib/rubygems/defaults.rb
|
|
index d4ff4a262c..3f9a5bf590 100644
|
|
--- a/lib/rubygems/defaults.rb
|
|
+++ b/lib/rubygems/defaults.rb
|
|
@@ -34,7 +34,7 @@ def self.default_spec_cache_dir
|
|
# specified in the environment
|
|
|
|
def self.default_dir
|
|
- @default_dir ||= File.join(RbConfig::CONFIG["rubylibprefix"], "gems", RbConfig::CONFIG["ruby_version"])
|
|
+ @default_dir ||= File.join(RbConfig::CONFIG["rubylibprefix"], "gems", RbConfig::CONFIG["ruby_version_dir_name"] || RbConfig::CONFIG["ruby_version"])
|
|
end
|
|
|
|
##
|
|
@@ -103,7 +103,8 @@ def self.user_dir
|
|
gem_dir = File.join(Gem.user_home, ".gem")
|
|
gem_dir = File.join(Gem.data_home, "gem") unless File.exist?(gem_dir)
|
|
parts = [gem_dir, ruby_engine]
|
|
- parts << RbConfig::CONFIG["ruby_version"] unless RbConfig::CONFIG["ruby_version"].empty?
|
|
+ ruby_version_dir_name = RbConfig::CONFIG["ruby_version_dir_name"] || RbConfig::CONFIG["ruby_version"]
|
|
+ parts << ruby_version_dir_name unless ruby_version_dir_name.empty?
|
|
File.join parts
|
|
end
|
|
|
|
@@ -234,7 +235,7 @@ def self.vendor_dir # :nodoc:
|
|
return nil unless RbConfig::CONFIG.key? "vendordir"
|
|
|
|
File.join RbConfig::CONFIG["vendordir"], "gems",
|
|
- RbConfig::CONFIG["ruby_version"]
|
|
+ RbConfig::CONFIG["ruby_version_dir_name"] || RbConfig::CONFIG["ruby_version"]
|
|
end
|
|
|
|
##
|
|
diff --git a/test/rubygems/test_gem.rb b/test/rubygems/test_gem.rb
|
|
index b25068405d..e9fef4a311 100644
|
|
--- a/test/rubygems/test_gem.rb
|
|
+++ b/test/rubygems/test_gem.rb
|
|
@@ -1395,7 +1395,8 @@ def test_self_use_paths
|
|
|
|
def test_self_user_dir
|
|
parts = [@userhome, ".gem", Gem.ruby_engine]
|
|
- parts << RbConfig::CONFIG["ruby_version"] unless RbConfig::CONFIG["ruby_version"].empty?
|
|
+ ruby_version_dir_name = RbConfig::CONFIG["ruby_version_dir_name"] || RbConfig::CONFIG["ruby_version"]
|
|
+ parts << ruby_version_dir_name unless ruby_version_dir_name.empty?
|
|
|
|
FileUtils.mkdir_p File.join(parts)
|
|
|
|
@@ -1471,7 +1472,7 @@ def test_self_vendor_dir
|
|
vendordir(File.join(@tempdir, "vendor")) do
|
|
expected =
|
|
File.join RbConfig::CONFIG["vendordir"], "gems",
|
|
- RbConfig::CONFIG["ruby_version"]
|
|
+ RbConfig::CONFIG["ruby_version_dir_name"] || RbConfig::CONFIG["ruby_version"]
|
|
|
|
assert_equal expected, Gem.vendor_dir
|
|
end
|
|
--
|
|
2.1.0
|
|
|