Auto merge of #5686 - koic:update_rubocop_0_49_1, r=segiddins

[RuboCop] Update to 0.49.1

This PR will bump RuboCop to 0.49.1. The following is a change in this PR.

## Change department from Style to Layout

Some Cop's departments have changed as follows in RuboCop 0.49.0.
It is a change related to this PR.

### .rubocop.yml

Prior Name | New Name
--- | ---
Style/AccessModifierIndentation | Layout/AccessModifierIndentation
Style/AlignParameters | Layout/AlignParameters
Style/MultilineOperationIndentation | Layout/MultilineOperationIndentation
Style/SpaceInsideBlockBraces | Layout/SpaceInsideBlockBraces
Style/DotPosition | Layout/DotPosition

### .rubocop_todo.yml

Prior Name | New Name
--- | ---
Style/EmptyLineAfterMagicComment | Layout/EmptyLineAfterMagicComment
Style/EmptyLinesAroundExceptionHandlingKeywords | Layout/EmptyLinesAroundExceptionHandlingKeywords
Style/ExtraSpacing | Layout/ExtraSpacing
Style/IndentArray | Layout/IndentArray
Style/IndentHeredoc | Layout/IndentHeredoc
Style/MultilineMethodCallIndentation | Layout/MultilineMethodCallIndentation
Style/SpaceAroundOperators | Layout/SpaceAroundOperators
Style/SpaceInsideBlockBraces | Layout/SpaceInsideBlockBraces

cf. https://github.com/bbatsov/rubocop/commit/54166bf76ba76b14f1bbc8a34165f175dbc3f227

## New Cops

The following are a new Cops added in RuboCop 0.49.0.

- [Performance/Caller](http://rubocop.readthedocs.io/en/latest/cops_performance/#performancecaller)
- [Style/FormatStringToken](http://rubocop.readthedocs.io/en/latest/cops_style/#styleformatstringtoken)

Thanks.

4 files changed, 91 insertions, 78 deletions

diff --git a/.rubocop.yml b/.rubocop.yml
index 96c9106550..d1241ec52f 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -21,35 +21,40 @@ Lint/EndAlignment:
 Lint/UnusedMethodArgument:
   Enabled: false
 
-# Style
+# Layout
 
-Style/AccessModifierIndentation:
+Layout/AccessModifierIndentation:
   EnforcedStyle: outdent
 
+Layout/AlignParameters:
+  EnforcedStyle: with_fixed_indentation
+
+Layout/MultilineOperationIndentation:
+  EnforcedStyle: indented
+
+Layout/SpaceInsideBlockBraces:
+  SpaceBeforeBlockParameters: false
+
+Layout/DotPosition:
+  EnforcedStyle: trailing
+
+# Style
+
 Style/Alias:
   EnforcedStyle: prefer_alias_method
 
-Style/AlignParameters:
-  EnforcedStyle: with_fixed_indentation
-
 Style/FrozenStringLiteralComment:
   EnforcedStyle: always
 
 Style/MultilineBlockChain:
   Enabled: false
 
-Style/MultilineOperationIndentation:
-  EnforcedStyle: indented
-
 Style/PerlBackrefs:
   Enabled: false
 
 Style/SingleLineBlockParams:
   Enabled: false
 
-Style/SpaceInsideBlockBraces:
-  SpaceBeforeBlockParameters: false
-
 Style/TrivialAccessors:
   Enabled: false
 
@@ -83,9 +88,6 @@ Style/HashSyntax:
 Style/Lambda:
   Enabled: false
 
-Style/DotPosition:
-  EnforcedStyle: trailing
-
 Style/EachWithObject:
   Enabled: false
 
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 1e8b11e46c..74a89bab6f 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,17 +1,72 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2017-05-09 12:52:15 +0900 using RuboCop version 0.48.1.
+# on 2017-05-30 06:35:02 +0900 using RuboCop version 0.49.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 27
+# Offense count: 310
+# Cop supports --auto-correct.
+Layout/EmptyLineAfterMagicComment:
+  Enabled: false
+
+# Offense count: 2
+# Cop supports --auto-correct.
+Layout/EmptyLinesAroundExceptionHandlingKeywords:
+  Exclude:
+    - 'Rakefile'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: AllowForAlignment, ForceEqualSignAlignment.
+Layout/ExtraSpacing:
+  Exclude:
+    - 'lib/bundler/cli.rb'
+
+# Offense count: 10
+# Cop supports --auto-correct.
+# Configuration parameters: SupportedStyles, IndentationWidth.
+# SupportedStyles: special_inside_parentheses, consistent, align_brackets
+Layout/IndentArray:
+  EnforcedStyle: consistent
+
+# Offense count: 35
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: auto_detection, squiggly, active_support, powerpack, unindent
+Layout/IndentHeredoc:
+  Enabled: false
+
+# Offense count: 3
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
+# SupportedStyles: aligned, indented, indented_relative_to_receiver
+Layout/MultilineMethodCallIndentation:
+  Exclude:
+    - 'lib/bundler/cli/common.rb'
+    - 'spec/bundler/plugin/source_list_spec.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+# Configuration parameters: AllowForAlignment.
+Layout/SpaceAroundOperators:
+  Exclude:
+    - 'lib/bundler/retry.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: EnforcedStyle, SupportedStyles, EnforcedStyleForEmptyBraces, SupportedStylesForEmptyBraces, SpaceBeforeBlockParameters.
+# SupportedStyles: space, no_space
+# SupportedStylesForEmptyBraces: space, no_space
+Layout/SpaceInsideBlockBraces:
+  Exclude:
+    - 'lib/bundler/installer/parallel_installer.rb'
+
+# Offense count: 25
 Lint/AmbiguousBlockAssociation:
   Exclude:
-    - 'lib/bundler/capistrano.rb'
     - 'lib/bundler/definition.rb'
-    - 'lib/bundler/installer/parallel_installer.rb'
     - 'lib/bundler/resolver.rb'
     - 'spec/bundler/compact_index_client/updater_spec.rb'
     - 'spec/commands/init_spec.rb'
@@ -74,12 +129,18 @@ Lint/UselessAssignment:
     - 'lib/bundler/index.rb'
     - 'lib/bundler/installer.rb'
 
-# Offense count: 2079
+# Offense count: 2085
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
 Metrics/LineLength:
   Max: 207
 
+# Offense count: 2
+Performance/Caller:
+  Exclude:
+    - 'lib/bundler/rubygems_integration.rb'
+    - 'spec/support/builders.rb'
+
 # Offense count: 7
 # Cop supports --auto-correct.
 Performance/RedundantBlockCall:
@@ -162,17 +223,6 @@ Style/ConditionalAssignment:
 Style/Documentation:
   Enabled: false
 
-# Offense count: 308
-# Cop supports --auto-correct.
-Style/EmptyLineAfterMagicComment:
-  Enabled: false
-
-# Offense count: 2
-# Cop supports --auto-correct.
-Style/EmptyLinesAroundExceptionHandlingKeywords:
-  Exclude:
-    - 'Rakefile'
-
 # Offense count: 17
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
@@ -186,12 +236,11 @@ Style/EmptyMethod:
     - 'lib/bundler/ui/silent.rb'
     - 'spec/support/artifice/fail.rb'
 
-# Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: AllowForAlignment, ForceEqualSignAlignment.
-Style/ExtraSpacing:
-  Exclude:
-    - 'lib/bundler/cli.rb'
+# Offense count: 1
+# Configuration parameters: SupportedStyles.
+# SupportedStyles: annotated, template
+Style/FormatStringToken:
+  EnforcedStyle: template
 
 # Offense count: 2
 # Configuration parameters: AllowedVariables.
@@ -227,20 +276,6 @@ Style/IfUnlessModifierOfIfUnless:
   Exclude:
     - 'spec/support/helpers.rb'
 
-# Offense count: 10
-# Cop supports --auto-correct.
-# Configuration parameters: SupportedStyles, IndentationWidth.
-# SupportedStyles: special_inside_parentheses, consistent, align_brackets
-Style/IndentArray:
-  EnforcedStyle: consistent
-
-# Offense count: 35
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: auto_detection, squiggly, active_support, powerpack, unindent
-Style/IndentHeredoc:
-  Enabled: false
-
 # Offense count: 9
 # Cop supports --auto-correct.
 # Configuration parameters: InverseMethods, InverseBlocks.
@@ -263,6 +298,7 @@ Style/MethodMissing:
     - 'spec/support/builders.rb'
 
 # Offense count: 1
+# Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: separated, grouped
 Style/MixinGrouping:
@@ -290,15 +326,6 @@ Style/MultilineIfModifier:
 
 # Offense count: 3
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
-# SupportedStyles: aligned, indented, indented_relative_to_receiver
-Style/MultilineMethodCallIndentation:
-  Exclude:
-    - 'lib/bundler/cli/common.rb'
-    - 'spec/bundler/plugin/source_list_spec.rb'
-
-# Offense count: 3
-# Cop supports --auto-correct.
 Style/NestedParenthesizedCalls:
   Exclude:
     - 'lib/bundler/resolver.rb'
@@ -360,22 +387,6 @@ Style/RedundantParentheses:
   Exclude:
     - 'lib/bundler/cli/console.rb'
 
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: AllowForAlignment.
-Style/SpaceAroundOperators:
-  Exclude:
-    - 'lib/bundler/retry.rb'
-
-# Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, EnforcedStyleForEmptyBraces, SupportedStylesForEmptyBraces, SpaceBeforeBlockParameters.
-# SupportedStyles: space, no_space
-# SupportedStylesForEmptyBraces: space, no_space
-Style/SpaceInsideBlockBraces:
-  Exclude:
-    - 'lib/bundler/installer/parallel_installer.rb'
-
 # Offense count: 2
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles, AllowSafeAssignment.
diff --git a/Rakefile b/Rakefile
index 3cb8a73c83..d458888994 100644
--- a/Rakefile
+++ b/Rakefile
@@ -39,7 +39,7 @@ namespace :spec do
     deps = Hash[BUNDLER_SPEC.development_dependencies.map do |d|
       [d.name, d.requirement.to_s]
     end]
-    deps["rubocop"] ||= "= 0.48.1" if RUBY_VERSION >= "2.0.0" # can't go in the gemspec because of the ruby version requirement
+    deps["rubocop"] ||= "= 0.49.1" if RUBY_VERSION >= "2.0.0" # can't go in the gemspec because of the ruby version requirement
 
     # JRuby can't build ronn or rdiscount, so we skip that
     if defined?(RUBY_ENGINE) && RUBY_ENGINE == "jruby"
@@ -93,7 +93,7 @@ begin
 
   if RUBY_VERSION >= "2.0.0"
     # can't go in the gemspec because of the ruby version requirement
-    gem "rubocop", "= 0.48.1"
+    gem "rubocop", "= 0.49.1"
     require "rubocop/rake_task"
     RuboCop::RakeTask.new
   end
diff --git a/bin/rubocop b/bin/rubocop
index c98433bb18..98ce0c89c2 100755
--- a/bin/rubocop
+++ b/bin/rubocop
@@ -10,7 +10,7 @@ bundler_spec.dependencies.each do |dep|
   gem dep.name, dep.requirement
 end
 
-gem "rubocop", "= 0.48.1"
+gem "rubocop", "= 0.49.1"
 
 Gem.finish_resolve if Gem.respond_to?(:finish_resolve)