diff options
| author | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2019-02-14 12:59:03 +0000 |
|---|---|---|
| committer | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2019-02-14 12:59:03 +0000 |
| commit | 4ae3df42f723d25b0fe4ba6b2689d607b01c6f48 (patch) | |
| tree | 26c5f5cf033f79373e63b10f684df07898b7cd8f /lib/rubygems/dependency.rb | |
| parent | d1e6304a891fc5e9cc63e50520bdc798fb95b829 (diff) | |
Merge RubyGems master@9be7858f7f17eae3058204f3c03e4b798ba18b9c
This version contains the some style changes by RuboCop.
* https://github.com/rubygems/rubygems/commit/9d810be0ede925fb2e3af535848582c3f8e0e72f
* https://github.com/rubygems/rubygems/commit/61ea98a727fb1b76b6fac52d74107ee4b02aaef2
* https://github.com/rubygems/rubygems/commit/795893dce3c5f8540804fc08144cc6a90f086b13
* https://github.com/rubygems/rubygems/commit/9be7858f7f17eae3058204f3c03e4b798ba18b9c
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@67074 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rubygems/dependency.rb')
| -rw-r--r-- | lib/rubygems/dependency.rb | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/rubygems/dependency.rb b/lib/rubygems/dependency.rb index 33ba1968d1..3c91392cdd 100644 --- a/lib/rubygems/dependency.rb +++ b/lib/rubygems/dependency.rb @@ -277,16 +277,16 @@ class Gem::Dependency def matching_specs(platform_only = false) env_req = Gem.env_requirement(name) - matches = Gem::Specification.stubs_for(name).find_all { |spec| + matches = Gem::Specification.stubs_for(name).find_all do |spec| requirement.satisfied_by?(spec.version) && env_req.satisfied_by?(spec.version) - }.map(&:to_spec) + end.map(&:to_spec) Gem::BundlerVersionFinder.filter!(matches) if name == "bundler".freeze if platform_only - matches.reject! { |spec| + matches.reject! do |spec| spec.nil? || !Gem::Platform.match(spec.platform) - } + end end matches @@ -333,4 +333,5 @@ class Gem::Dependency matches.first end + end |