1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[rubygems/rubygems] [PathSupport] Simplify logic: If Gem.default_dir is writable, use it.

Browse Source 
I couldn't find a cross-platform way to check "can I create this directory?"

So I removed that, and went back to the original simpler logic of
"if the directory is writable, use it."

https://github.com/rubygems/rubygems/commit/3aa86a56db
This commit is contained in:
Ellen Marie Dash 2023-10-06 19:18:07 -04:00 committed by Hiroshi SHIBATA
parent 45a5ea5a0a
commit f37e9f42b9
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/rubygems/path_support.rb
View File

@ -30,15 +30,12 @@ class Gem::PathSupport
def initialize(env) def initialize(env)
# Current implementation of @home, which is exposed as `Gem.paths.home`: # Current implementation of @home, which is exposed as `Gem.paths.home`:
# 1. If `env["GEM_HOME"]` is defined in the environment: `env["GEM_HOME"]`. # 1. If `env["GEM_HOME"]` is defined in the environment: `env["GEM_HOME"]`.
# 2. If `Gem.default_dir` is writable OR it does not exist and it's parent # 2. If `Gem.default_dir` is writable: `Gem.default_dir`.
# directory is writable: `Gem.default_dir`.
# 3. Otherwise: `Gem.user_dir`. # 3. Otherwise: `Gem.user_dir`.
if env.key?("GEM_HOME") if env.key?("GEM_HOME")
@home = normalize_home_dir(env["GEM_HOME"]) @home = normalize_home_dir(env["GEM_HOME"])
elsif File.writable?(Gem.default_dir) || \ elsif File.writable?(Gem.default_dir)
(!File.exist?(Gem.default_dir) && File.writable?(File.expand_path("..", Gem.default_dir)))
@home = normalize_home_dir(Gem.default_dir) @home = normalize_home_dir(Gem.default_dir)
else else
# If `GEM_HOME` is not set AND we can't use `Gem.default_dir`, # If `GEM_HOME` is not set AND we can't use `Gem.default_dir`,