Upgrade RuboCop 0.32.1 -> 0.33.0 for Travis

In the process, fix some new warnings that were introduced by the
upgrade.

Author: sds

Gemfile

@@ -4,6 +4,6 @@ source 'https://rubygems.org'
 gem 'coveralls'
 
 # Pin RuboCop for Travis builds.
-gem 'rubocop', '0.32.1'
+gem 'rubocop', '0.33.0'
 
 gemspec

lib/overcommit/configuration.rb

@@ -71,7 +71,7 @@ def all_plugin_hook_configs
       Overcommit::Utils.supported_hook_types.each do |hook_type|
         hook_type_class_name = Overcommit::Utils.camel_case(hook_type)
 
-        directory = File.join(plugin_directory, hook_type.gsub('-', '_'))
+        directory = File.join(plugin_directory, hook_type.tr('-', '_'))
         plugin_paths = Dir[File.join(directory, '*.rb')].sort
 
         hook_names = plugin_paths.map do |path|

lib/overcommit/hook_context/base.rb

@@ -49,7 +49,7 @@ def hook_type_name
     #
     # @return [String]
     def hook_script_name
-      hook_type_name.gsub('_', '-')
+      hook_type_name.tr('_', '-')
     end
 
     # Initializes anything related to the environment.

lib/overcommit/utils.rb

@@ -108,7 +108,7 @@ def supported_hook_types
         Dir[File.join(HOOK_DIRECTORY, '*')].
           select { |file| File.directory?(file) }.
           reject { |file| File.basename(file) == 'shared' }.
-          map { |file| File.basename(file).gsub('_', '-') }
+          map { |file| File.basename(file).tr('_', '-') }
       end
 
       # Returns a list of supported hook classes (PreCommit, CommitMsg, etc.)

lib/overcommit/utils/file_utils.rb

@@ -58,7 +58,7 @@ def win32_mklink_cmd(old_name, new_name)
       end
 
       def win32_fix_pathsep(path)
-        path.gsub('/', '\\')
+        path.tr('/', '\\')
       end
 
       def win32_symlink?(dir_output)

spec/overcommit/default_configuration_spec.rb

@@ -7,7 +7,7 @@
   Overcommit::Utils.supported_hook_types.each do |hook_type|
     hook_class = Overcommit::Utils.camel_case(hook_type)
 
-    Dir[File.join(Overcommit::HOOK_DIRECTORY, hook_type.gsub('-', '_'), '*')].
+    Dir[File.join(Overcommit::HOOK_DIRECTORY, hook_type.tr('-', '_'), '*')].
       map { |hook_file| Overcommit::Utils.camel_case(File.basename(hook_file, '.rb')) }.
       each do |hook|
       next if hook == 'Base'

spec/overcommit/hook/pre_commit/author_email_spec.rb

@@ -1,10 +1,10 @@
 require 'spec_helper'
 
 describe Overcommit::Hook::PreCommit::AuthorEmail do
-  let(:config)  { Overcommit::ConfigurationLoader.default_configuration }
+  let(:config) { Overcommit::ConfigurationLoader.default_configuration }
   let(:context) { double('context') }
   subject { described_class.new(config, context) }
-  let(:result)  { double('result') }
+  let(:result) { double('result') }
 
   before do
     result.stub(:stdout).and_return(email)

spec/overcommit/hook/pre_commit/author_name_spec.rb

@@ -1,10 +1,10 @@
 require 'spec_helper'
 
 describe Overcommit::Hook::PreCommit::AuthorName do
-  let(:config)  { Overcommit::ConfigurationLoader.default_configuration }
+  let(:config) { Overcommit::ConfigurationLoader.default_configuration }
   let(:context) { double('context') }
   subject { described_class.new(config, context) }
-  let(:result)  { double('result') }
+  let(:result) { double('result') }
 
   before do
     result.stub(:stdout).and_return(name)

spec/support/matchers/hook.rb

@@ -56,7 +56,7 @@ def failure_message(actual, error_message)
 end
 
 # Can't use 'fail' as it is a reserved word.
-RSpec::Matchers.define :fail_hook  do |*args|
+RSpec::Matchers.define :fail_hook do |*args|
   check_matcher = HookMatcher.new(:fail, args)
 
   match do