Commit d6442c62 authored by Fabio Pelosin's avatar Fabio Pelosin

[Pod::Command::Spec] Fix lint for multiplatform pods

parent 819d1eb0
...@@ -113,11 +113,13 @@ module Pod ...@@ -113,11 +113,13 @@ module Pod
if is_repo || @quick if is_repo || @quick
build_messages, file_patterns_errors = [], [] build_messages, file_patterns_errors = [], []
else else
platform_names(spec).each do |platform_name|
set_up_lint_environment set_up_lint_environment
build_messages = build_errors_for_spec(spec, file, is_repo) build_messages = build_errors_for_spec(spec, file, platform_name)
file_patterns_errors = file_patterns_errors_for_spec(spec, file, is_repo) file_patterns_errors = file_patterns_errors_for_spec(spec, file, platform_name)
tear_down_lint_environment tear_down_lint_environment
end end
end
build_errors = build_messages.select {|msg| msg.include?('error')} build_errors = build_messages.select {|msg| msg.include?('error')}
build_warnings = build_messages - build_errors build_warnings = build_messages - build_errors
...@@ -229,9 +231,9 @@ module Pod ...@@ -229,9 +231,9 @@ module Pod
# #
# It returns a array of messages # It returns a array of messages
# #
def build_errors_for_spec(spec, file, is_repo) def build_errors_for_spec(spec, file, platform_name)
messages = [] messages = []
platform_names(spec).each do |platform_name| puts "\n\nGenerating build errors for #{platform_name} platform".yellow.reversed if config.verbose?
podfile = podfile_from_spec(spec, file, platform_name) podfile = podfile_from_spec(spec, file, platform_name)
Installer.new(podfile).install! Installer.new(podfile).install!
...@@ -239,8 +241,7 @@ module Pod ...@@ -239,8 +241,7 @@ module Pod
output = Dir.chdir(config.project_pods_root) { `xcodebuild 2>&1` } output = Dir.chdir(config.project_pods_root) { `xcodebuild 2>&1` }
clean_output = process_xcode_build_output(output).map {|l| "#{platform_name}: #{l}"} clean_output = process_xcode_build_output(output).map {|l| "#{platform_name}: #{l}"}
messages += clean_output messages += clean_output
puts("\n" + output) if config.verbose? puts(output) if config.verbose?
end
messages messages
end end
...@@ -268,25 +269,23 @@ module Pod ...@@ -268,25 +269,23 @@ module Pod
# #
# It returns a array of messages # It returns a array of messages
# #
def file_patterns_errors_for_spec(spec, file, is_repo) def file_patterns_errors_for_spec(spec, file, platform_name)
Dir.chdir(config.project_pods_root + spec.name ) do Dir.chdir(config.project_pods_root + spec.name ) do
messages = [] messages = []
messages += check_spec_files_exists(spec, :source_files) messages += check_spec_files_exists(spec, :source_files, platform_name)
messages += check_spec_files_exists(spec, :resources) messages += check_spec_files_exists(spec, :resources, platform_name)
messages.compact messages.compact
end end
end end
def check_spec_files_exists(spec, accessor) def check_spec_files_exists(spec, accessor, platform_name)
result = [] result = []
platform_names(spec).each do |platform_name|
patterns = spec.send(accessor)[platform_name] patterns = spec.send(accessor)[platform_name]
unless patterns.empty? unless patterns.empty?
patterns.each do |pattern| patterns.each do |pattern|
result << "#{platform_name}: [#{accessor} = '#{pattern}'] -> did not match any file" if Pathname.pwd.glob(pattern).empty? result << "#{platform_name}: [#{accessor} = '#{pattern}'] -> did not match any file" if Pathname.pwd.glob(pattern).empty?
end end
end end
end
result result
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