Commit def218ec authored by Kyle Fuller's avatar Kyle Fuller

Update to Rubocop 0.27.1

parent d31b291e
......@@ -42,6 +42,9 @@ Encoding:
TrailingComma:
EnforcedStyleForMultiline: comma
Style/MultilineOperationIndentation:
EnforcedStyle: indented
# Clashes with CLAide Command#validate!
GuardClause:
Enabled: false
......@@ -50,6 +53,25 @@ GuardClause:
Next:
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 ------------------------------------------#
HashSyntax:
......
......@@ -34,7 +34,7 @@ group :development do
# Integration tests
gem 'diffy'
gem 'clintegracon'
gem 'rubocop', '~> 0.26.0'
gem 'rubocop'
end
group :debugging do
......
......@@ -144,9 +144,9 @@ GEM
ffi (>= 0.5.0)
rb-kqueue (0.2.3)
ffi (>= 0.5.0)
rubocop (0.26.1)
rubocop (0.27.1)
astrolabe (~> 1.3)
parser (>= 2.2.0.pre.4, < 3.0)
parser (>= 2.2.0.pre.7, < 3.0)
powerpack (~> 0.0.6)
rainbow (>= 1.99.1, < 3.0)
ruby-progressbar (~> 1.4)
......@@ -187,7 +187,7 @@ DEPENDENCIES
pry
rake
rb-fsevent
rubocop (~> 0.26.0)
rubocop
ruby-prof
webmock
xcodeproj!
......@@ -216,9 +216,9 @@ module Pod
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 }]? ")
specs[index]
else
get_path_of_spec(@spec)
end
else
get_path_of_spec(@spec)
end
UI.puts File.read(filepath)
end
......
......@@ -27,7 +27,7 @@ module Pod
def self.default_ld_flags(target)
ld_flags = '-ObjC'
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'
end
ld_flags
......
......@@ -102,7 +102,7 @@ module Pod
frameworks = user_project.frameworks_group
native_targets_to_integrate.each do |native_target|
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)
native_target.frameworks_build_phase.add_file_reference(library)
end
......
......@@ -18,6 +18,6 @@ module OpenURI
#
def self.redirectable?(uri1, uri2)
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
......@@ -237,7 +237,7 @@ module Pod
version_msg = (min == max) ? min : "#{min} - #{max}"
raise Informative, "The `#{dir.basename}` repo requires " \
"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
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