Merge pull request #913 from rubocop-hq/fix-edge-rubocop-0.84-offences

Fix RuboCop edge 0.84 offences

.rubocop.yml

@@ -16,16 +16,8 @@ AllCops:
 Layout/HashAlignment:
   Enabled: false
 
-Metrics/BlockLength:
-  Exclude:
-    - rubocop-rspec.gemspec
-    - Rakefile
-    - '**/*.rake'
-    - spec/**/*.rb
-
-Naming/FileName:
-  Exclude:
-    - lib/rubocop-rspec.rb
+Layout/LineLength:
+  Max: 80 # default: 120
 
 Layout/MultilineMethodCallIndentation:
   EnforcedStyle: indented
@@ -42,6 +34,17 @@ Lint/InterpolationCheck:
   Exclude:
     - spec/**/*.rb
 
+Metrics/BlockLength:
+  Exclude:
+    - rubocop-rspec.gemspec
+    - Rakefile
+    - '**/*.rake'
+    - spec/**/*.rb
+
+Naming/FileName:
+  Exclude:
+    - lib/rubocop-rspec.rb
+
 RSpec/ExampleLength:
   Max: 30
 

Rakefile

@@ -42,9 +42,12 @@ task confirm_config: :build_config do
   _, stdout, _, process =
     Open3.popen3('git diff --exit-code config/default.yml')
 
-  unless process.value.success?
-    raise "default.yml is out of sync:\n\n#{stdout.read}\nRun bin/build_config"
-  end
+  raise <<~ERROR unless process.value.success?
+    default.yml is out of sync:
+
+    #{stdout.read}
+    Run bin/build_config
+  ERROR
 end
 
 desc 'Confirm documentation is up to date'