Unverified Commit 31b2b9cb authored by Samuel Giddins's avatar Samuel Giddins Committed by GitHub

Merge pull request #7437 from CocoaPods/seg-spec-with-source-method-name

[SpecWithSource] Rename #spec_source for consistency with LazySpecification
parents 64ec0edd 0b46ccd2
...@@ -7,7 +7,7 @@ GIT ...@@ -7,7 +7,7 @@ GIT
GIT GIT
remote: https://github.com/CocoaPods/Core.git remote: https://github.com/CocoaPods/Core.git
revision: b24b82511b8ed5a6f93e2a9f74bbdc9c33da8672 revision: 1f8ced657a224eabeba6958d130ee04058d91f60
branch: master branch: master
specs: specs:
cocoapods-core (1.4.0) cocoapods-core (1.4.0)
...@@ -180,7 +180,7 @@ GEM ...@@ -180,7 +180,7 @@ GEM
gh_inspector (1.1.1) gh_inspector (1.1.1)
git (1.3.0) git (1.3.0)
hashdiff (0.3.1) hashdiff (0.3.1)
i18n (0.9.3) i18n (0.9.5)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
inch (0.7.0) inch (0.7.0)
pry pry
......
...@@ -137,8 +137,9 @@ module Pod ...@@ -137,8 +137,9 @@ module Pod
group_by(&:first). group_by(&:first).
map do |vertex, spec_test_only_tuples| map do |vertex, spec_test_only_tuples|
test_only = spec_test_only_tuples.all? { |tuple| tuple[1] } test_only = spec_test_only_tuples.all? { |tuple| tuple[1] }
spec_source = vertex.payload.respond_to?(:spec_source) && vertex.payload.spec_source payload = vertex.payload
ResolverSpecification.new(vertex.payload, test_only, spec_source) spec_source = payload.respond_to?(:spec_source) && payload.spec_source
ResolverSpecification.new(payload, test_only, spec_source)
end. end.
sort_by(&:name) sort_by(&:name)
end end
......
...@@ -3,10 +3,10 @@ module Pod ...@@ -3,10 +3,10 @@ module Pod
class Specification class Specification
class Set class Set
class SpecWithSource < DelegateClass(Specification) class SpecWithSource < DelegateClass(Specification)
attr_reader :spec_repo attr_reader :spec_source
def initialize(spec, source) def initialize(spec, source)
super(spec) super(spec)
@spec_repo = source @spec_source = source
end end
undef is_a? undef is_a?
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment