Commit 3364111c authored by Fabio Pelosin's avatar Fabio Pelosin

[Spec::Linter] Minor tweaks.

parent 607b8333
...@@ -135,7 +135,8 @@ module Pod ...@@ -135,7 +135,8 @@ module Pod
@specs_to_lint ||= begin @specs_to_lint ||= begin
podspecs_to_lint.map do |podspec| podspecs_to_lint.map do |podspec|
root_spec = Specification.from_file(podspec) root_spec = Specification.from_file(podspec)
root_spec.recursive_subspecs.any? ? root_spec.recursive_subspecs : root_spec # TODO if a spec has a main subspec require it's subspecs recursively
root_spec.main_subspec == root_spec ? root_spec : root_spec.subspecs
end.flatten end.flatten
end end
end end
...@@ -312,7 +313,6 @@ module Pod ...@@ -312,7 +313,6 @@ module Pod
text = @file.read text = @file.read
messages = [] messages = []
messages << "Missing license type" unless license[:type] messages << "Missing license type" unless license[:type]
messages << "Missing license file or text" unless license[:file] || license[:text]
messages << "The summary is not meaningful" if spec.summary =~ /A short description of/ messages << "The summary is not meaningful" if spec.summary =~ /A short description of/
messages << "The description is not meaningful" if spec.description && spec.description =~ /An optional longer description of/ messages << "The description is not meaningful" if spec.description && spec.description =~ /An optional longer description of/
messages << "The summary should end with a dot" if @spec.summary !~ /.*\./ messages << "The summary should end with a dot" if @spec.summary !~ /.*\./
...@@ -358,9 +358,9 @@ module Pod ...@@ -358,9 +358,9 @@ module Pod
def process_xcode_build_output(output) def process_xcode_build_output(output)
output_by_line = output.split("\n") output_by_line = output.split("\n")
selected_lines = output_by_line.select do |l| selected_lines = output_by_line.select do |l|
l.include?('error') && (l !~ /errors? generated\./) \ l.include?('error:') && (l !~ /errors? generated\./) \
|| l.include?('warning') && (l !~ /warnings? generated\./)\ || l.include?('warning:') && (l !~ /warnings? generated\./)\
|| l.include?('note') || l.include?('note:')
end end
selected_lines.map do |l| selected_lines.map do |l|
new = l.gsub(/\/tmp\/CocoaPods\/Lint\/Pods\//,'') # Remove the unnecessary tmp path new = l.gsub(/\/tmp\/CocoaPods\/Lint\/Pods\//,'') # Remove the unnecessary tmp path
...@@ -380,7 +380,8 @@ module Pod ...@@ -380,7 +380,8 @@ module Pod
messages = [] messages = []
messages += check_spec_files_exists(:source_files, '*.{h,m,mm,c,cpp}') messages += check_spec_files_exists(:source_files, '*.{h,m,mm,c,cpp}')
messages += check_spec_files_exists(:resources) messages += check_spec_files_exists(:resources)
messages << "#{platform_name}: license[:file] = '#{spec.license[:file]}' -> did not match any file" if spec.license[:file] && pod_dir.glob(spec.license[:file]).empty? messages << "license file not found = '#{spec.license[:file]}' -> did not match any file" if spec.license && spec.license[:file] && pod_dir.glob(spec.license[:file]).empty?
# messages << "Missing license file or text" unless license[:file] || license[:text]
messages.compact messages.compact
end end
end end
...@@ -393,7 +394,7 @@ module Pod ...@@ -393,7 +394,7 @@ module Pod
if pattern.directory? && options[:glob] if pattern.directory? && options[:glob]
pattern += options[:glob] pattern += options[:glob]
end end
result << "#{@platform}: [#{accessor} = '#{original_pattern}'] -> did not match any file" if pattern.glob.empty? result << "[#{accessor} = '#{original_pattern}'] -> did not match any file" if pattern.glob.empty?
end end
result result
end end
......
...@@ -67,9 +67,18 @@ module Pod ...@@ -67,9 +67,18 @@ module Pod
attr_writer :summary attr_writer :summary
#TODO: handle inheritance #TODO: relocate
def platform
@platform || ( @parent ? @parent.platform : Platform.new(nil) )
end
def platform=(platform)
@platform = Platform.new(*platform)
end
def available_platforms def available_platforms
@platform.nil? ? @define_for_platforms.map { |platform| Platform.new(platform, @deployment_target[platform]) } : [ platform ] platform.nil? ? @define_for_platforms.map { |platform| Platform.new(platform, @deployment_target[platform]) } : [ platform ]
end end
attr_writer :main_subspec attr_writer :main_subspec
...@@ -106,15 +115,6 @@ module Pod ...@@ -106,15 +115,6 @@ module Pod
end end
# TODO: First defined
def platform
@platform || ( @parent ? @parent.platform : Platform.new(nil) )
end
def platform=(platform)
@platform = Platform.new(*platform)
end
top_attr_accessor :defined_in_file top_attr_accessor :defined_in_file
top_attr_accessor :homepage top_attr_accessor :homepage
......
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