Commit 2a673e23 authored by Marius Rackwitz's avatar Marius Rackwitz

[TargetInspector] Inject the #installation_root via the constructor

Instead of refering to the global configuration
parent 5abe739a
...@@ -651,7 +651,8 @@ module Pod ...@@ -651,7 +651,8 @@ module Pod
inspection_result = {} inspection_result = {}
UI.section 'Inspecting targets to integrate' do UI.section 'Inspecting targets to integrate' do
podfile.target_definition_list.each do |target_definition| podfile.target_definition_list.each do |target_definition|
results = TargetInspector.new(target_definition).inspect! inspector = TargetInspector.new(target_definition, config.installation_root)
results = inspector.inspect!
inspection_result[target_definition] = results inspection_result[target_definition] = results
UI.message('Using `ARCHS` setting to build architectures of ' \ UI.message('Using `ARCHS` setting to build architectures of ' \
"target `#{target_definition.label}`: (`#{results.archs.join('`, `')}`)") "target `#{target_definition.label}`: (`#{results.archs.join('`, `')}`)")
......
...@@ -2,19 +2,25 @@ module Pod ...@@ -2,19 +2,25 @@ module Pod
class Installer class Installer
class Analyzer class Analyzer
class TargetInspector class TargetInspector
include Config::Mixin
# @return [TargetDefinition] the target definition to inspect # @return [TargetDefinition] the target definition to inspect
# #
attr_accessor :target_definition attr_accessor :target_definition
# @return [Pathname] the root of the CocoaPods installation where the
# Podfile is located
attr_accessor :installation_root
# Initialize a new instance # Initialize a new instance
# #
# @param [TargetDefinition] target_definition # @param [TargetDefinition] target_definition
# the target definition # @see #target_definition
#
# @param [Pathname] installation_root
# @see #installation_root
# #
def initialize(target_definition) def initialize(target_definition, installation_root)
@target_definition = target_definition @target_definition = target_definition
@installation_root = installation_root
end end
# Inspect the #target_definition # Inspect the #target_definition
...@@ -51,7 +57,7 @@ module Pod ...@@ -51,7 +57,7 @@ module Pod
# #
def compute_project_path def compute_project_path
if target_definition.user_project_path if target_definition.user_project_path
path = config.installation_root + target_definition.user_project_path path = installation_root + target_definition.user_project_path
path = "#{path}.xcodeproj" unless File.extname(path) == '.xcodeproj' path = "#{path}.xcodeproj" unless File.extname(path) == '.xcodeproj'
path = Pathname.new(path) path = Pathname.new(path)
unless path.exist? unless path.exist?
...@@ -59,7 +65,7 @@ module Pod ...@@ -59,7 +65,7 @@ module Pod
"`#{path}` for the target `#{target_definition.label}`." "`#{path}` for the target `#{target_definition.label}`."
end end
else else
xcodeprojs = config.installation_root.children.select { |e| e.fnmatch('*.xcodeproj') } xcodeprojs = installation_root.children.select { |e| e.fnmatch('*.xcodeproj') }
if xcodeprojs.size == 1 if xcodeprojs.size == 1
path = xcodeprojs.first path = xcodeprojs.first
else else
......
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