diff options
author | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2023-03-22 13:14:27 +0900 |
---|---|---|
committer | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2023-03-23 17:18:49 +0900 |
commit | 8a364b8512b84530cadfe9f27557fa0306ad9856 (patch) | |
tree | d5576388a7177ec31651f439f913e24797edda5c /lib/rubygems | |
parent | 5efadf81393f3395837fede8f078ac97e485e4a5 (diff) |
[rubygems/rubygems] util/rubocop -A --only Style/MultilineTernaryOperator
https://github.com/rubygems/rubygems/commit/be853dfe3b
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/7582
Diffstat (limited to 'lib/rubygems')
-rw-r--r-- | lib/rubygems/basic_specification.rb | 6 | ||||
-rw-r--r-- | lib/rubygems/request.rb | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/lib/rubygems/basic_specification.rb b/lib/rubygems/basic_specification.rb index 51c043d5fc..3c69a5a2fe 100644 --- a/lib/rubygems/basic_specification.rb +++ b/lib/rubygems/basic_specification.rb @@ -174,11 +174,13 @@ class Gem::BasicSpecification begin fullpath = nil suffixes = Gem.suffixes - suffixes.find do |suf| + if suffixes.find do |suf| full_require_paths.find do |dir| File.file?(fullpath = "#{dir}/#{path}#{suf}") end - end ? fullpath : nil + end + fullpath + end end end end diff --git a/lib/rubygems/request.rb b/lib/rubygems/request.rb index 30e2582ac5..0303649d05 100644 --- a/lib/rubygems/request.rb +++ b/lib/rubygems/request.rb @@ -171,8 +171,7 @@ class Gem::Request no_env_proxy = env_proxy.nil? || env_proxy.empty? if no_env_proxy - return ["https", "http"].include?(downcase_scheme) ? - :no_proxy : get_proxy_from_env("http") + return ["https", "http"].include?(downcase_scheme) ? :no_proxy : get_proxy_from_env("http") end require "uri" |