Commit 1ec1ead4 authored by Samuel Giddins's avatar Samuel Giddins

[FileAccessor] Access root-only values from the spec consumer

parent 4c8c6d58
...@@ -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: cc77e5194b892786a698f67f272f13cefeca5f17 revision: 014afb20ee157ea25c53f55c7d50a9e3c6591766
branch: master branch: master
specs: specs:
cocoapods-core (1.0.0.beta.4) cocoapods-core (1.0.0.beta.4)
...@@ -115,7 +115,7 @@ PATH ...@@ -115,7 +115,7 @@ PATH
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
activesupport (4.2.5.1) activesupport (4.2.5.2)
i18n (~> 0.7) i18n (~> 0.7)
json (~> 1.7, >= 1.7.7) json (~> 1.7, >= 1.7.7)
minitest (~> 5.1) minitest (~> 5.1)
......
...@@ -259,8 +259,8 @@ module Pod ...@@ -259,8 +259,8 @@ module Pod
# @return [Pathname] The of the prefix header file of the specification. # @return [Pathname] The of the prefix header file of the specification.
# #
def prefix_header def prefix_header
if spec_consumer.prefix_header_file if file = spec_consumer.prefix_header_file
path_list.root + spec_consumer.prefix_header_file path_list.root + file
end end
end end
...@@ -274,8 +274,8 @@ module Pod ...@@ -274,8 +274,8 @@ module Pod
# specification or auto-detected. # specification or auto-detected.
# #
def license def license
if spec_consumer.spec.root.license[:file] if file = spec_consumer.license[:file]
path_list.root + spec_consumer.spec.root.license[:file] path_list.root + file
else else
path_list.glob([GLOB_PATTERNS[:license]]).first path_list.glob([GLOB_PATTERNS[:license]]).first
end end
...@@ -284,7 +284,7 @@ module Pod ...@@ -284,7 +284,7 @@ module Pod
# @return [Pathname, Nil] The path of the custom module map file of the # @return [Pathname, Nil] The path of the custom module map file of the
# specification, if specified. # specification, if specified.
def module_map def module_map
if module_map = spec_consumer.spec.root.module_map if module_map = spec_consumer.module_map
path_list.root + module_map path_list.root + module_map
end end
end end
......
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