Commit def218ec authored by Kyle Fuller's avatar Kyle Fuller

Update to Rubocop 0.27.1

parent d31b291e
...@@ -42,6 +42,9 @@ Encoding: ...@@ -42,6 +42,9 @@ Encoding:
TrailingComma: TrailingComma:
EnforcedStyleForMultiline: comma EnforcedStyleForMultiline: comma
Style/MultilineOperationIndentation:
EnforcedStyle: indented
# Clashes with CLAide Command#validate! # Clashes with CLAide Command#validate!
GuardClause: GuardClause:
Enabled: false Enabled: false
...@@ -50,6 +53,25 @@ GuardClause: ...@@ -50,6 +53,25 @@ GuardClause:
Next: Next:
Enabled: false Enabled: false
# Arbitrary max lengths for classes simply do not work and enabling this will
# lead to a never ending stream of annoyance and changes.
Metrics/ClassLength:
Enabled: false
# No enforced convention here.
Metrics/BlockNesting:
Enabled: false
# It will be obvious which code is complex, Rubocop should only lint simple
# rules for us.
Metrics/AbcSize:
Enabled: false
# It will be obvious which code is complex, Rubocop should only lint simple
# rules for us.
Metrics/CyclomaticComplexity:
Enabled: false
#- CocoaPods support for Ruby 1.8.7 ------------------------------------------# #- CocoaPods support for Ruby 1.8.7 ------------------------------------------#
HashSyntax: HashSyntax:
......
...@@ -34,7 +34,7 @@ group :development do ...@@ -34,7 +34,7 @@ group :development do
# Integration tests # Integration tests
gem 'diffy' gem 'diffy'
gem 'clintegracon' gem 'clintegracon'
gem 'rubocop', '~> 0.26.0' gem 'rubocop'
end end
group :debugging do group :debugging do
......
...@@ -144,9 +144,9 @@ GEM ...@@ -144,9 +144,9 @@ GEM
ffi (>= 0.5.0) ffi (>= 0.5.0)
rb-kqueue (0.2.3) rb-kqueue (0.2.3)
ffi (>= 0.5.0) ffi (>= 0.5.0)
rubocop (0.26.1) rubocop (0.27.1)
astrolabe (~> 1.3) astrolabe (~> 1.3)
parser (>= 2.2.0.pre.4, < 3.0) parser (>= 2.2.0.pre.7, < 3.0)
powerpack (~> 0.0.6) powerpack (~> 0.0.6)
rainbow (>= 1.99.1, < 3.0) rainbow (>= 1.99.1, < 3.0)
ruby-progressbar (~> 1.4) ruby-progressbar (~> 1.4)
...@@ -187,7 +187,7 @@ DEPENDENCIES ...@@ -187,7 +187,7 @@ DEPENDENCIES
pry pry
rake rake
rb-fsevent rb-fsevent
rubocop (~> 0.26.0) rubocop
ruby-prof ruby-prof
webmock webmock
xcodeproj! xcodeproj!
...@@ -216,9 +216,9 @@ module Pod ...@@ -216,9 +216,9 @@ module Pod
specs = get_path_of_spec(@spec, @show_all).split(/\n/) specs = get_path_of_spec(@spec, @show_all).split(/\n/)
index = choose_from_array(specs, "Which spec would you like to print [1-#{ specs.count }]? ") index = choose_from_array(specs, "Which spec would you like to print [1-#{ specs.count }]? ")
specs[index] specs[index]
else else
get_path_of_spec(@spec) get_path_of_spec(@spec)
end end
UI.puts File.read(filepath) UI.puts File.read(filepath)
end end
......
...@@ -27,7 +27,7 @@ module Pod ...@@ -27,7 +27,7 @@ module Pod
def self.default_ld_flags(target) def self.default_ld_flags(target)
ld_flags = '-ObjC' ld_flags = '-ObjC'
if target.target_definition.podfile.set_arc_compatibility_flag? && if target.target_definition.podfile.set_arc_compatibility_flag? &&
target.spec_consumers.any?(&:requires_arc?) target.spec_consumers.any?(&:requires_arc?)
ld_flags << ' -fobjc-arc' ld_flags << ' -fobjc-arc'
end end
ld_flags ld_flags
......
...@@ -102,7 +102,7 @@ module Pod ...@@ -102,7 +102,7 @@ module Pod
frameworks = user_project.frameworks_group frameworks = user_project.frameworks_group
native_targets_to_integrate.each do |native_target| native_targets_to_integrate.each do |native_target|
library = frameworks.files.select { |f| f.path == target.product_name }.first || library = frameworks.files.select { |f| f.path == target.product_name }.first ||
frameworks.new_product_ref_for_target(target.name, :static_library) frameworks.new_product_ref_for_target(target.name, :static_library)
unless native_target.frameworks_build_phase.files_references.include?(library) unless native_target.frameworks_build_phase.files_references.include?(library)
native_target.frameworks_build_phase.add_file_reference(library) native_target.frameworks_build_phase.add_file_reference(library)
end end
......
...@@ -18,6 +18,6 @@ module OpenURI ...@@ -18,6 +18,6 @@ module OpenURI
# #
def self.redirectable?(uri1, uri2) def self.redirectable?(uri1, uri2)
uri1.scheme.downcase == uri2.scheme.downcase || uri1.scheme.downcase == uri2.scheme.downcase ||
(/\A(?:http|ftp)\z/i =~ uri1.scheme && /\A(?:https?|ftp)\z/i =~ uri2.scheme) (/\A(?:http|ftp)\z/i =~ uri1.scheme && /\A(?:https?|ftp)\z/i =~ uri2.scheme)
end end
end end
...@@ -237,7 +237,7 @@ module Pod ...@@ -237,7 +237,7 @@ module Pod
version_msg = (min == max) ? min : "#{min} - #{max}" version_msg = (min == max) ? min : "#{min} - #{max}"
raise Informative, "The `#{dir.basename}` repo requires " \ raise Informative, "The `#{dir.basename}` repo requires " \
"CocoaPods #{version_msg} (currently using #{Pod::VERSION})\n".red + "CocoaPods #{version_msg} (currently using #{Pod::VERSION})\n".red +
'Update CocoaPods, or checkout the appropriate tag in the repo.' 'Update CocoaPods, or checkout the appropriate tag in the repo.'
end end
needs_sudo = path_writable?(__FILE__) needs_sudo = path_writable?(__FILE__)
......
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