lib/pod_builder/command/build.rb in pod-builder-1.2.0 vs lib/pod_builder/command/build.rb in pod-builder-1.2.1
- old
+ new
@@ -11,10 +11,12 @@
unless argument_pods.count > 0
return -1
end
+ raise "\n\nPlease rename your Xcode installation path removing spaces, current `#{`xcode-select -p`.strip()}`\n" if `xcode-select -p`.strip().include?(" ")
+
Podfile.sanity_check()
check_not_building_subspecs(argument_pods)
install_update_repo = options.fetch(:update_repos, true)
installer, analyzer = Analyze.installer_at(PodBuilder::basepath, install_update_repo)
@@ -134,11 +136,11 @@
end
return pods
end
- def self.expected_common_dependencies(pods_to_build, buildable_items)
+ def self.expected_common_dependencies(pods_to_build, buildable_items, options)
warned_expected_pod_list = []
expected_pod_list = []
errors = []
pods_to_build.each do |pod_to_build|
@@ -159,20 +161,24 @@
expected_list = expected_pod_list.join(" ")
if !warned_expected_pod_list.include?(expected_list)
errors.push("Can't build #{pod_to_build.name} because it has common dependencies (#{dependency}) with #{buildable_pod.name}.\n\nUse `pod_builder build #{expected_list}` instead or use `pod_builder build -a #{pod_to_build.name}` to automatically resolve missing dependencies\n\n")
errors.uniq!
warned_expected_pod_list.push(expected_list)
+
+ if options.has_key?(:auto_resolve_dependencies)
+ puts "`#{pod_to_build.name}` has the following dependencies:\n`#{pod_to_build.dependency_names.join("`, `")}`\nWhich are in common with `#{buildable_pod.name}` and requires it to be recompiled\n\n".yellow
+ end
end
end
end
end
end
return expected_pod_list, errors
end
- def self.expected_parent_dependencies(pods_to_build, buildable_items)
+ def self.expected_parent_dependencies(pods_to_build, buildable_items, options)
expected_pod_list = []
errors = []
buildable_items_dependencies = buildable_items.map(&:dependency_names).flatten.uniq
pods_to_build.each do |pod_to_build|
@@ -277,10 +283,10 @@
loop do
pods_to_build = buildable_items.select { |x| argument_pods.include?(x.root_name) }
pods_to_build += other_subspecs(pods_to_build, buildable_items)
tmp_buildable_items = buildable_items - pods_to_build
- expected_pods, errors = fn.call(pods_to_build, tmp_buildable_items)
+ expected_pods, errors = fn.call(pods_to_build, tmp_buildable_items, options)
if expected_pods.count > 0
if !options.has_key?(:auto_resolve_dependencies) && expected_pods.count > 0
raise "\n\n#{errors.join("\n")}".red
else
argument_pods = expected_pods.uniq