Remove last vestiges of Ruby 1.8.7 support

We dropped support for Ruby 1.8.7 in Overcommit 0.14.0, but didn't get
around to updating the codebase to use Ruby 1.9 hashes and other such
style changes.

Change-Id: I9e86d4b2094a8bcb9a26b8e0863836bdda34be62
Reviewed-on: http://gerrit.causes.com/45275
Tested-by: jenkins <jenkins@brigade.com>
Reviewed-by: Shane da Silva <shane.dasilva@brigade.com>

Author: sds

.rubocop.yml

@@ -15,15 +15,8 @@ Documentation:
   Exclude:
     - 'spec/overcommit/**/*'
 
-# Ruby 1.8.7 only supports trailing dots in method chains, but Rubocop still
-# reports it as an error for method calls chained onto do...end blocks. That's
-# too much noise, so remove it.
-DotPosition:
-  Enabled: false
-
-# Ruby 1.8.7 doesn't have `each_with_object` defined.
-EachWithObject:
-  Enabled: false
+Style/DotPosition:
+  EnforcedStyle: trailing
 
 Encoding:
   EnforcedStyle: when_needed
@@ -43,10 +36,6 @@ FormatString:
 GuardClause:
   Enabled: false
 
-# Ruby 1.8.7 only supports hash rockets.
-HashSyntax:
-  EnforcedStyle: hash_rockets
-
 IfUnlessModifier:
   Enabled: false
 

lib/overcommit/configuration_validator.rb

@@ -26,15 +26,14 @@ def ensure_hook_type_sections_exist(hash)
     # together, since it's easier to merge two hashes than to have to check if
     # one of the values is nil.
     def convert_nils_to_empty_hashes(hash)
-      hash.inject({}) do |h, (key, value)|
+      hash.each_with_object({}) do |(key, value), h|
         h[key] =
           case value
           when nil  then {}
           when Hash then convert_nils_to_empty_hashes(value)
           else
             value
           end
-        h
       end
     end
   end

lib/overcommit/hook/pre_commit/image_optim.rb

@@ -28,7 +28,7 @@ def run
     private
 
     def optimize_images(image_paths)
-      image_optim = ::ImageOptim.new(:skip_missing_workers => true)
+      image_optim = ::ImageOptim.new(skip_missing_workers: true)
 
       optimized_images =
         image_optim.optimize_images(image_paths) do |path, optimized|

lib/overcommit/hook_context/pre_commit.rb

@@ -64,7 +64,7 @@ def cleanup_environment
     # Get a list of added, copied, or modified files that have been staged.
     # Renames and deletions are ignored, since there should be nothing to check.
     def modified_files
-      @modified_files ||= Overcommit::GitRepo.modified_files(:staged => true)
+      @modified_files ||= Overcommit::GitRepo.modified_files(staged: true)
     end
 
     # @deprecated
@@ -79,7 +79,7 @@ def modified_lines(file)
     def modified_lines_in_file(file)
       @modified_lines ||= {}
       @modified_lines[file] ||=
-        Overcommit::GitRepo.extract_modified_lines(file, :staged => true)
+        Overcommit::GitRepo.extract_modified_lines(file, staged: true)
     end
 
     private

spec/integration/committing_spec.rb

@@ -18,7 +18,7 @@
     repo do
       File.open('.overcommit.yml', 'w') { |f| f.write(config) }
       Overcommit::Installer.new(Overcommit::Logger.silent).
-                            run('.', :action => :install)
+                            run('.', action: :install)
       example.run
     end
   end
@@ -61,7 +61,7 @@
   around do |example|
     repo do
       Overcommit::Installer.new(Overcommit::Logger.silent).
-                            run('.', :action => :install)
+                            run('.', action: :install)
       File.open('.overcommit.yml', 'w') { |f| f.write(config) }
       File.open('test.txt', 'w') { |f| f.write(file_contents) }
       `git add test.txt`

spec/integration/disable_overcommit_spec.rb

@@ -6,7 +6,7 @@
   around do |example|
     repo do
       Overcommit::Installer.new(Overcommit::Logger.silent).
-                            run('.', :action => :install)
+                            run('.', action: :install)
       Overcommit::Utils.with_environment('OVERCOMMIT_DISABLE' => overcommit_disable) do
         `touch blah`
         `git add blah`

spec/integration/installing_overcommit_spec.rb

@@ -3,7 +3,7 @@
 describe 'installing Overcommit' do
   context 'when template directory points to the Overcommit template directory' do
     around do |example|
-      repo(:template_dir => Overcommit::Installer::TEMPLATE_DIRECTORY) do
+      repo(template_dir: Overcommit::Installer::TEMPLATE_DIRECTORY) do
         example.run
       end
     end

spec/integration/resolving_merge_conflict_spec.rb

@@ -30,7 +30,7 @@
       `git merge branch1`
       `git merge branch2` # Results in merge conflict
       Overcommit::Installer.new(Overcommit::Logger.silent).
-                            run('.', :action => :install)
+                            run('.', action: :install)
       `echo "Conflicts Resolved" > some-file`
       `git add some-file`
       example.run

spec/overcommit/cli_spec.rb

@@ -19,7 +19,7 @@
         Overcommit::Installer.any_instance.
                               should_receive(:run).
                               with('current-dir',
-                                   hash_including(:action => :install))
+                                   hash_including(action: :install))
         subject
       end
     end
@@ -45,7 +45,7 @@
         Overcommit::Installer.any_instance.
                               should_receive(:run).
                               with('current-dir',
-                                   hash_including(:action => :uninstall))
+                                   hash_including(action: :uninstall))
         subject
       end
 
@@ -56,7 +56,7 @@
           Overcommit::Installer.any_instance.
                                 should_receive(:run).
                                 with('target-dir',
-                                     hash_including(:action => :uninstall))
+                                     hash_including(action: :uninstall))
           subject
         end
       end
@@ -69,7 +69,7 @@
         Overcommit::Installer.any_instance.
                               should_receive(:run).
                               with('current-dir',
-                                   hash_including(:action => :install))
+                                   hash_including(action: :install))
         subject
       end
 
@@ -80,7 +80,7 @@
           Overcommit::Installer.any_instance.
                                 should_receive(:run).
                                 with('target-dir',
-                                     hash_including(:action => :install))
+                                     hash_including(action: :install))
           subject
         end
       end

spec/overcommit/configuration_spec.rb

@@ -62,8 +62,8 @@
     subject { config.enabled_builtin_hooks(context) }
 
     before do
-      context.stub(:hook_class_name => 'PreCommit',
-                   :hook_type_name => 'pre_commit')
+      context.stub(hook_class_name: 'PreCommit',
+                   hook_type_name: 'pre_commit')
     end
 
     it 'includes hooks that are not disabled' do

spec/overcommit/installer_spec.rb

@@ -5,7 +5,7 @@
   let(:installer) { described_class.new(logger) }
 
   describe '#run' do
-    let(:options) { { :action => :install } }
+    let(:options) { { action: :install } }
     subject { installer.run(target.to_s, options) }
 
     context 'when the target is not a directory' do
@@ -45,7 +45,7 @@
 
         context 'and Overcommit hooks were previously installed' do
           before do
-            installer.run(target, :action => :install)
+            installer.run(target, action: :install)
           end
 
           it 'keeps the master hook' do
@@ -77,7 +77,7 @@
           end
 
           context 'and the force option is specified' do
-            let(:options) { super().merge(:force => true) }
+            let(:options) { super().merge(force: true) }
 
             it 'does not raise an error' do
               expect { subject }.to_not raise_error
@@ -126,11 +126,11 @@
       end
 
       context 'and an uninstall is requested' do
-        let(:options) { { :action => :uninstall } }
+        let(:options) { { action: :uninstall } }
 
         context 'and Overcommit hooks were previously installed' do
           before do
-            installer.run(target, :action => :install)
+            installer.run(target, action: :install)
           end
 
           it 'removes the master hook from the hooks directory' do

spec/support/matchers/hook.rb

@@ -1,7 +1,7 @@
 # General spec matcher logic for checking hook status and output.
 class HookMatcher
   def initialize(status, args)
-    options = args.empty? ? {} : { :message => args.first }
+    options = args.empty? ? {} : { message: args.first }
     @expected_status = status
     @expected_message = options[:message]
   end

template-dir/hooks/overcommit-hook

@@ -18,11 +18,6 @@ if ENV['OVERCOMMIT_DISABLE'].to_i != 0 || ENV['OVERCOMMIT_DISABLED'].to_i != 0
   exit
 end
 
-# Required for Ruby 1.8 compatibility (for older OSX versions)
-if RUBY_VERSION.split('.')[0..1] == %w[1 8]
-  require 'rubygems'
-end
-
 hook_type = File.basename($0)
 if hook_type == 'overcommit-hook'
   puts "Don't run `overcommit-hook` directly; it is intended to be symlinked " \
@@ -68,7 +63,7 @@ begin
 
   # Ensure master hook is up-to-date
   installer = Overcommit::Installer.new(logger)
-  if installer.run(Overcommit::Utils.repo_root, :action => :update)
+  if installer.run(Overcommit::Utils.repo_root, action: :update)
     exec($0, *ARGV) # Execute the updated hook with all original arguments
   end