Fix some Rubocop lints

Major offense is the use of redundant `return` in order to avoid having
to specify square brackets for the tuple that gets returned.

Change-Id: Ied0f10a81f2753ca721d5961c08bfb5f93f587cf
Reviewed-on: http://gerrit.causes.com/36062
Tested-by: jenkins <jenkins@causes.com>
Reviewed-by: Shane da Silva <shane@causes.com>

Author: Shane da Silva

lib/overcommit/hook/commit_msg/gerrit_change_id.rb

@@ -8,7 +8,9 @@ module Overcommit::Hook::CommitMsg
   class GerritChangeId < Base
     def run
       result = execute([SCRIPT_LOCATION, commit_message_file])
-      return (result.success? ? :good : :bad), result.stdout
+      return :good if result.success?
+
+      [:bad, result.stdout]
     end
 
   private

lib/overcommit/hook/pre_commit/coffee_lint.rb

@@ -8,7 +8,8 @@ def run
 
       result = execute(%w[coffeelint --quiet] + applicable_files)
       return :good if result.success?
-      return :bad, result.stdout
+
+      [:bad, result.stdout]
     end
   end
 end

lib/overcommit/hook/pre_commit/css_lint.rb

@@ -7,8 +7,9 @@ def run
       end
 
       result = execute(%w[csslint --quiet --format=compact] + applicable_files)
-      output = result.stdout
-      return (output !~ /Error - (?!Unknown @ rule)/ ? :good : :bad), output
+      return :good if result.stdout !~ /Error - (?!Unknown @ rule)/
+
+      [:bad, result.stdout]
     end
   end
 end

lib/overcommit/hook/pre_commit/haml_lint.rb

@@ -19,8 +19,9 @@ def run
       end
 
       return :bad, error_lines.join("\n") unless error_lines.empty?
-      return :warn, "Modified files have lints (on lines you didn't modify)\n" <<
-                    warning_lines.join("\n")
+
+      [:warn, "Modified files have lints (on lines you didn't modify)\n" <<
+              warning_lines.join("\n")]
     end
   end
 end

lib/overcommit/hook/pre_commit/js_hint.rb

@@ -9,7 +9,9 @@ def run
       result = execute(%w[jshint] + applicable_files)
       output = result.stdout
 
-      return (output.empty? ? :good : :bad), output
+      return :good if output.empty?
+
+      [:bad, output]
     end
   end
 end

lib/overcommit/hook/pre_commit/jscs.rb

@@ -24,8 +24,9 @@ def run
       end
 
       return :bad, error_lines.join("\n") unless error_lines.empty?
-      return :warn, "Modified files have lints (on lines you didn't modify)\n" <<
-                    warning_lines.join("\n")
+
+      [:warn, "Modified files have lints (on lines you didn't modify)\n" <<
+              warning_lines.join("\n")]
     end
   end
 end

lib/overcommit/hook/pre_commit/python_flake8.rb

@@ -7,8 +7,9 @@ def run
       end
 
       result = execute(%w[flake8] + applicable_files)
+      return :good if result.success?
 
-      return (result.success? ? :good : :bad), result.stdout
+      [:bad, result.stdout]
     end
   end
 end

lib/overcommit/hook/pre_commit/rubocop.rb

@@ -21,8 +21,9 @@ def run
       end
 
       return :bad, error_lines.join("\n") unless error_lines.empty?
-      return :warn, "Modified files have lints (on lines you didn't modify)\n" <<
-                    warning_lines.join("\n")
+
+      [:warn, "Modified files have lints (on lines you didn't modify)\n" <<
+              warning_lines.join("\n")]
     end
   end
 end

lib/overcommit/hook/pre_commit/scss_lint.rb

@@ -19,8 +19,9 @@ def run
       end
 
       return :bad, error_lines.join("\n") unless error_lines.empty?
-      return :warn, "Modified files have lints (on lines you didn't modify)\n" <<
-                    warning_lines.join("\n")
+
+      [:warn, "Modified files have lints (on lines you didn't modify)\n" <<
+              warning_lines.join("\n")]
     end
   end
 end

lib/overcommit/hook/pre_commit/travis_lint.rb

@@ -8,7 +8,8 @@ def run
 
       result = execute(%w[travis-lint] + applicable_files)
       return :good if result.success?
-      return :bad, result.stdout.strip
+
+      [:bad, result.stdout.strip]
     end
   end
 end

lib/overcommit/hook/pre_commit/yaml_syntax.rb

@@ -4,19 +4,19 @@ module Overcommit::Hook::PreCommit
   # Checks the syntax of any modified YAML files.
   class YamlSyntax < Base
     def run
-      clean = true
       output = []
 
       applicable_files.each do |file|
         begin
           YAML.load_file(file)
         rescue ArgumentError => e
           output << "#{e.message} parsing #{file}"
-          clean = false
         end
       end
 
-      return (clean ? :good : :bad), output
+      return :good if output.empty?
+
+      [:bad, output]
     end
   end
 end

lib/overcommit/hook_context/post_checkout.rb

@@ -1,4 +1,6 @@
 module Overcommit::HookContext
+  # Contains helpers related to contextual information used by post-checkout
+  # hooks.
   class PostCheckout < Base
     # Returns the ref of the HEAD that we transitioned from.
     def previous_head

lib/overcommit/installer.rb

@@ -78,7 +78,8 @@ def install_hook_symlinks
         Overcommit::Utils.supported_hook_types.each do |hook_type|
           unless can_replace_file?(hook_type)
             raise Overcommit::Exceptions::PreExistingHooks,
-                  "Hook '#{File.expand_path(hook_type)}' already exists and was not installed by Overcommit"
+                  "Hook '#{File.expand_path(hook_type)}' already exists and " <<
+                  'was not installed by Overcommit'
           end
           FileUtils.ln_sf('overcommit-hook', hook_type)
         end

spec/overcommit/hook/commit_msg/text_width_spec.rb

@@ -81,7 +81,7 @@
       let(:commit_msg) { <<-MSG }
         Some summary
 
-        This line is longer than 80 characters which can clearly be seen by counting the number of characters.
+        This line is longer than #{'A' * 80} characters.
       MSG
 
       it { should warn 'Line 3 of commit message has > 80 characters' }
@@ -103,7 +103,7 @@
       let(:commit_msg) { <<-MSG }
         A subject line that is way too long. A subject line that is way too long.
 
-        A message line that is way too long. A message line that is way too long. A message line that is way too long.
+        This line is longer than #{'A' * 80} characters.
       MSG
 
       it { should warn /keep.*subject <= 70.*\n.*line 3.*> 80.*/im }

template-dir/hooks/overcommit-hook

@@ -5,7 +5,7 @@
 # to manage your hooks for you.
 
 # Required for Ruby 1.8 compatibility (for older OSX versions)
-if RUBY_VERSION.split('.')[0..1] == ['1', '8']
+if RUBY_VERSION.split('.')[0..1] == %w[1 8]
   require 'rubygems'
 end