diff options
| author | Sutou Kouhei <kou@clear-code.com> | 2020-01-09 14:53:54 +0900 |
|---|---|---|
| committer | Sutou Kouhei <kou@clear-code.com> | 2020-01-15 06:27:03 +0900 |
| commit | 98455338da687ecb062eb5fb20483bd491911b3e (patch) | |
| tree | f11430707aff12e6cf9d0f766ea2a4b5d89a7fe8 | |
| parent | 500bb685cd75b919e72f0068565fd6112f33ce09 (diff) | |
| download | bundler-98455338da687ecb062eb5fb20483bd491911b3e.tar.gz | |
Rename SpecGroup#spec to SpecGroup#spec_for
| -rw-r--r-- | lib/bundler/resolver.rb | 5 | ||||
| -rw-r--r-- | lib/bundler/resolver/spec_group.rb | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/lib/bundler/resolver.rb b/lib/bundler/resolver.rb index a2ac4ef4ab..8a95273a0f 100644 --- a/lib/bundler/resolver.rb +++ b/lib/bundler/resolver.rb @@ -148,8 +148,9 @@ module Bundler end selected_sgs = [] search.each do |sg| - next unless sg.for?(platform) - spec_platform = sg.spec(platform).platform + spec = sg.spec_for(platform) + next if spec.nil? + spec_platform = spec.platform if spec_platform && spec_platform != Gem::Platform::RUBY # Add a spec group for "non platform specific spec" as the fallback # spec group. diff --git a/lib/bundler/resolver/spec_group.rb b/lib/bundler/resolver/spec_group.rb index 70c6de9e0c..4ebb747956 100644 --- a/lib/bundler/resolver/spec_group.rb +++ b/lib/bundler/resolver/spec_group.rb @@ -46,12 +46,12 @@ module Bundler copied_sg end - def spec(platform) + def spec_for(platform) @specs[platform] end def for?(platform) - !spec(platform).nil? + !spec_for(platform).nil? end def to_s |