From 1c66e047f6e5f4c30935f30787bf0e2ddc193ca9 Mon Sep 17 00:00:00 2001
From: Koichi ITO <koic.ito@gmail.com>
Date: Thu, 15 Aug 2019 21:56:18 +0900
Subject: [PATCH] Bump RuboCop to 0.74.0

### Summary

RuboCop 0.74.0 has been released.
https://github.com/rubocop-hq/rubocop/releases/tag/v0.74.0

And rubocop-0-74 channel is available in Code Climate.
https://github.com/codeclimate/codeclimate/releases/tag/v0.85.5

This PR specifies the same RuboCop Performance (1.3.0) and RuboCop Rails (2.0.0)
versions as Code Climate's Gemfile.lock.
https://github.com/codeclimate/codeclimate-rubocop/blob/channel/rubocop-0-74/Gemfile.lock#L51-L55

Also, the `EnforcedStyle` of `Layout/IndentationConsistency` has been renamed
from `EnforcedStyle: rails` to `EnforcedStyle: indented_internal_methods`

- https://github.com/rubocop-hq/rubocop/pull/7113
- https://github.com/rubocop-hq/rubocop/pull/7163

And this commit disables `Layout/SpaceAroundOperators`
that was changed from RuboCop 0.74 by rubocop-hq/rubocop#7211.

cf. https://github.com/rails/rails/pull/36943#issuecomment-521659529
---
 .codeclimate.yml |  2 +-
 .rubocop.yml     |  5 +----
 Gemfile.lock     | 10 +++++-----
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/.codeclimate.yml b/.codeclimate.yml
index 952b330d8c..ce7f8cf903 100644
--- a/.codeclimate.yml
+++ b/.codeclimate.yml
@@ -25,6 +25,6 @@ checks:
 plugins:
   rubocop:
     enabled: true
-    channel: rubocop-0-71
+    channel: rubocop-0-74
 
 exclude_patterns: []
diff --git a/.rubocop.yml b/.rubocop.yml
index e310351bf5..22365f5257 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -91,7 +91,7 @@ Layout/IndentFirstArgument:
 # extra level of indentation.
 Layout/IndentationConsistency:
   Enabled: true
-  EnforcedStyle: rails
+  EnforcedStyle: indented_internal_methods
 
 # Two spaces, no tabs (for indentation).
 Layout/IndentationWidth:
@@ -115,9 +115,6 @@ Layout/SpaceAroundEqualsInParameterDefault:
 Layout/SpaceAroundKeyword:
   Enabled: true
 
-Layout/SpaceAroundOperators:
-  Enabled: true
-
 Layout/SpaceBeforeComma:
   Enabled: true
 
diff --git a/Gemfile.lock b/Gemfile.lock
index 70067c4fb9..9d14a54a68 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -281,8 +281,8 @@ GEM
     image_processing (1.7.1)
       mini_magick (~> 4.0)
       ruby-vips (>= 2.0.13, < 3)
-    jaro_winkler (1.5.2)
-    jaro_winkler (1.5.2-java)
+    jaro_winkler (1.5.3)
+    jaro_winkler (1.5.3-java)
     jdbc-mysql (5.1.46)
     jdbc-postgres (42.1.4)
     jdbc-sqlite3 (3.20.1)
@@ -407,15 +407,15 @@ GEM
       resque (>= 1.26)
       rufus-scheduler (~> 3.2)
     retriable (3.1.2)
-    rubocop (0.71.0)
+    rubocop (0.74.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.6)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 1.7)
-    rubocop-performance (1.1.0)
-      rubocop (>= 0.67.0)
+    rubocop-performance (1.3.0)
+      rubocop (>= 0.68.0)
     rubocop-rails (2.0.0)
       rack (>= 2.0)
       rubocop (>= 0.70.0)