Update RuboCop 0.49.1 -> 0.52.1 for CI

While here, we had to update the minimum Ruby version from 2.0 to 2.1
since RuboCop no longer supports Ruby 2.0.

Ruby 2.0 has been marked EOL since February 2016, so it seems reasonable
to disable support for it.

While here, we had to fix a lot of RuboCop warnings.

Author: sds

.rubocop.yml

@@ -1,3 +1,6 @@
+AllCops:
+  TargetRubyVersion: 2.1
+
 Layout/ClosingParenthesisIndentation:
   Enabled: false
 
@@ -54,6 +57,22 @@ Metrics/MethodLength:
 Metrics/ModuleLength:
   Enabled: false
 
+Naming/FileName:
+  Exclude:
+    - 'template-dir/hooks/*'
+    - 'Gemfile'
+    - 'Rakefile'
+    - '*.gemspec'
+
+# Renaming `has_something?` to `something?` obfuscates whether it is a "is-a" or
+# a "has-a" relationship.
+Naming/PredicateName:
+  Enabled: false
+
+# commit_sha1 is indeed how we want to write such a variable, so ignore this cop
+Naming/VariableNumber:
+  Enabled: false
+
 # Enforcing this results in a lot of unnecessary indentation.
 Style/ClassAndModuleChildren:
   Enabled: false
@@ -62,16 +81,6 @@ Style/Documentation:
   Exclude:
     - 'spec/overcommit/**/*'
 
-Style/Encoding:
-  EnforcedStyle: when_needed
-
-Style/FileName:
-  Exclude:
-    - 'template-dir/hooks/*'
-    - 'Gemfile'
-    - 'Rakefile'
-    - '*.gemspec'
-
 Style/FormatString:
   Enabled: false
 
@@ -112,11 +121,6 @@ Style/PercentLiteralDelimiters:
     '%W': '[]'
     '%x': '{}'
 
-# Renaming `has_something?` to `something?` obfuscates whether it is a "is-a" or
-# a "has-a" relationship.
-Style/PredicateName:
-  Enabled: false
-
 Style/RescueModifier:
   Exclude:
     - 'bin/overcommit'
@@ -140,7 +144,3 @@ Style/TrailingCommaInArguments:
 
 Style/TrailingCommaInLiteral:
   Enabled: false
-
-# commit_sha1 is indeed how we want to write such a variable, so ignore this cop
-Style/VariableNumber:
-  Enabled: false

Gemfile

@@ -10,4 +10,4 @@ gem 'rspec', '~> 3.0'
 gem 'coveralls', '~> 0.8'
 
 # Pin RuboCop for Travis builds.
-gem 'rubocop', '0.49.1'
+gem 'rubocop', '0.52.1'

lib/overcommit/configuration_loader.rb

@@ -72,7 +72,7 @@ def load_file(file)
       config
     rescue Overcommit::Exceptions::ConfigurationSignatureChanged
       raise
-    rescue => error
+    rescue StandardError => error
       raise Overcommit::Exceptions::ConfigurationError,
             "Unable to load configuration from '#{file}': #{error}",
             error.backtrace

lib/overcommit/configuration_validator.rb

@@ -95,7 +95,7 @@ def check_hook_name_format(hash)
       errors = []
 
       Overcommit::Utils.supported_hook_type_classes.each do |hook_type|
-        hash.fetch(hook_type, {}).each do |hook_name, _|
+        hash.fetch(hook_type, {}).each_key do |hook_name|
           next if hook_name == 'ALL'
 
           unless hook_name =~ /\A[A-Za-z0-9]+\z/
@@ -175,3 +175,4 @@ def check_for_verify_plugin_signatures_option(hash)
     end
   end
 end
+# rubocop:enable Metrics/ClassLength, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity, Metrics/MethodLength, Metrics/LineLength

lib/overcommit/hook_runner.rb

@@ -156,7 +156,7 @@ def run_hook(hook) # rubocop:disable Metrics/CyclomaticComplexity
       rescue Overcommit::Exceptions::MessageProcessingError => ex
         status = :fail
         output = ex.message
-      rescue => ex
+      rescue StandardError => ex
         status = :fail
         output = "Hook raised unexpected error\n#{ex.message}\n#{ex.backtrace.join("\n")}"
       end

lib/overcommit/printer.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'monitor'
 
 module Overcommit

lib/overcommit/subprocess.rb

@@ -36,7 +36,7 @@ def spawn(args, options = {})
         if options[:input]
           begin
             process.io.stdin.puts(options[:input])
-          rescue # rubocop:disable Lint/HandleExceptions
+          rescue StandardError # rubocop:disable Lint/HandleExceptions
             # Silently ignore if the standard input stream of the spawned
             # process is closed before we get a chance to write to it. This
             # happens on JRuby a lot.

overcommit.gemspec

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative './lib/overcommit/constants'
 require_relative './lib/overcommit/version'
 
@@ -23,7 +25,7 @@ Gem::Specification.new do |s|
                             Dir['libexec/**/*'] +
                             Dir['template-dir/**/*']
 
-  s.required_ruby_version = '>= 2'
+  s.required_ruby_version = '>= 2.1'
 
   s.add_dependency          'childprocess', '~> 0.6', '>= 0.6.3'
   s.add_dependency          'iniparse', '~> 1.4'

spec/overcommit/hook/commit_msg/capitalized_subject_spec.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'spec_helper'
 
 describe Overcommit::Hook::CommitMsg::CapitalizedSubject do

spec/overcommit/hook/commit_msg/spell_check_spec.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 require 'spec_helper'
 
 describe Overcommit::Hook::CommitMsg::SpellCheck do
@@ -21,12 +19,12 @@
 
     context 'with no misspellings' do
       before do
-        result.stub(:stdout).and_return(<<-EOS)
+        result.stub(:stdout).and_return(<<-MSG)
 @(#) International Ispell Version 3.2.06 (but really Hunspell 1.3.3)
 *
 *
 *
-        EOS
+        MSG
       end
 
       it { should pass }
@@ -35,25 +33,25 @@
     context 'with misspellings' do
       context 'with suggestions' do
         before do
-          result.stub(:stdout).and_return(<<-EOS)
+          result.stub(:stdout).and_return(<<-MSG)
 @(#) International Ispell Version 3.2.06 (but really Hunspell 1.3.3)
 *
 & msg 10 4: MSG, mag, ms, mg, meg, mtg, mug, mpg, mfg, ms g
 *
-          EOS
+          MSG
         end
 
         it { should warn(/^Potential misspelling: \w+. Suggestions: .+$/) }
       end
 
       context 'with no suggestions' do
         before do
-          result.stub(:stdout).and_return(<<-EOS)
+          result.stub(:stdout).and_return(<<-MSG)
 @(#) International Ispell Version 3.2.06 (but really Hunspell 1.3.3)
 *
 # supercalifragilisticexpialidocious 4
 *
-          EOS
+          MSG
         end
 
         it { should warn(/^Potential misspelling: \w+.$/) }
@@ -65,9 +63,9 @@
     let(:result) { double('result') }
 
     before do
-      result.stub(success?: false, stderr: <<-EOS)
+      result.stub(success?: false, stderr: <<-MSG)
 Can't open affix or dictionary files for dictionary named "foo".
-      EOS
+      MSG
     end
 
     it { should fail_hook }

spec/overcommit/hook/pre_commit/bundle_audit_spec.rb

@@ -36,25 +36,23 @@
       let(:result) do
         double(
           success?: false,
-          stdout: <<-EOF
+          stdout: <<-MSG
 Name: rest-client
 Version: 1.6.9
 Advisory: CVE-2015-1820
 Criticality: Unknown
 URL: https://github.com/rest-client/rest-client/issues/369
 Title: rubygem-rest-client: session fixation vulnerability via Set-Cookie headers in 30x redirection responses
 Solution: upgrade to >= 1.8.0
-
 Name: rest-client
 Version: 1.6.9
 Advisory: CVE-2015-3448
 Criticality: Unknown
 URL: http://www.osvdb.org/show/osvdb/117461
 Title: Rest-Client Gem for Ruby logs password information in plaintext
 Solution: upgrade to >= 1.7.3
-
 Vulnerabilities found!
-EOF
+MSG
         )
       end
 
@@ -64,10 +62,10 @@
     let(:result) do
       double(
         success?: false,
-        stdout: <<-EOF
+        stdout: <<-MSG
 Insecure Source URI found: git://github.com/xxx/overcommit.git
 Vulnerabilities found!
-EOF
+MSG
       )
     end
 

spec/overcommit/hook/pre_commit/bundle_outdated_spec.rb

@@ -35,9 +35,8 @@
 
     context 'and it reports some outdated gems' do
       let(:result) do
-        double(stdout: <<-EOF
+        double(stdout: <<-MSG
 Warning: the running version of Bundler is older than the version that created the lockfile. We suggest you upgrade to the latest version of Bundler by running `gem install bundler`.
-
 airbrake (newest 5.3.0, installed 5.2.3, requested ~> 5.0)
 aws-sdk (newest 2.3.3, installed 2.3.1, requested ~> 2)
 font-awesome-rails (newest 4.6.2.0, installed 4.6.1.0)
@@ -48,7 +47,7 @@
 aws-sdk-resources (newest 2.3.3, installed 2.3.1)
 config (newest 1.1.1, installed 1.1.0)
 ruby_parser (newest 3.8.2, installed 3.8.1)
-EOF
+MSG
         )
       end
 
@@ -57,10 +56,9 @@
 
     context 'and it reports bundle up to date' do
       let(:result) do
-        double(stdout: <<-EOF
+        double(stdout: <<-MSG
 Warning: the running version of Bundler is older than the version that created the lockfile. We suggest you upgrade to the latest version of Bundler by running `gem install bundler`.
-
-EOF
+MSG
         )
       end
 

spec/overcommit/hook/pre_commit/fasterer_spec.rb

@@ -24,20 +24,17 @@
     let(:result) do
       double(
         success?: false,
-        stdout: <<-EOF
+        stdout: <<-MSG
 spec/models/product_spec.rb
 Using each_with_index is slower than while loop. Occurred at lines: 52.
-
 1 files inspected, 1 offense detected
 spec/models/book_spec.rb
 Using each_with_index is slower than while loop. Occurred at lines: 32.
-
 1 files inspected, 1 offense detected
 spec/models/blog_spec.rb
 Using each_with_index is slower than while loop. Occurred at lines: 12.
-
 2 files inspected, 0 offense detected
-      EOF
+      MSG
       )
     end
 
@@ -48,12 +45,11 @@
     let(:result) do
       double(
         success?: false,
-        stdout: <<-EOF
+        stdout: <<-MSG
 spec/models/product_spec.rb
 Using each_with_index is slower than while loop. Occurred at lines: 52.
-
 1 files inspected, 1 offense detected
-      EOF
+      MSG
       )
     end
 

spec/overcommit/hook/pre_commit/foodcritic_spec.rb

@@ -42,10 +42,10 @@
           double(
             success?: false,
             stderr: '',
-            stdout: <<-EOF,
+            stdout: <<-MSG,
             FC023: Prefer conditional attributes: recipes/default.rb:11
             FC065: Ensure source_url is set in metadata: metadata.rb:1
-            EOF
+            MSG
           )
         end
 
@@ -104,10 +104,10 @@
           double(
             success?: false,
             stderr: '',
-            stdout: <<-EOF,
+            stdout: <<-MSG,
             FC023: Prefer conditional attributes: cookbooks/cookbook_a/recipes/default.rb:11
             FC065: Ensure source_url is set in metadata: cookbooks/cookbook_b/metadata.rb:1
-            EOF
+            MSG
           )
         end
 

spec/overcommit/hook/pre_commit/hadolint_spec.rb

@@ -27,17 +27,17 @@
     let(:result_dockerfile) do
       double(
         success?: false,
-        stdout: <<-EOF
+        stdout: <<-MSG
 Dockerfile:5 DL3015 Avoid additional packages by specifying `--no-install-recommends`
-      EOF
+      MSG
       )
     end
     let(:result_dockerfile_web) do
       double(
         success?: false,
-        stdout: <<-EOF
+        stdout: <<-MSG
 Dockerfile.web:13 DL3020 Use COPY instead of ADD for files and folders
-      EOF
+      MSG
       )
     end
 
@@ -48,9 +48,9 @@
     let(:result_dockerfile) do
       double(
         success?: false,
-        stdout: <<-EOF
+        stdout: <<-MSG
 Dockerfile:11 SC2086 Double quote to prevent globbing and word splitting.
-      EOF
+      MSG
       )
     end
     let(:result_dockerfile_web) do