Upgrade Rubocop for Travis builds from 0.25.0 -> 0.26.0

In the process, we've also decided to switch access modifiers from
outdented style to indented, keeping us in line with the defaults.

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

Author: sds

.rubocop.yml

@@ -1,9 +1,6 @@
 AmbiguousRegexpLiteral:
   Enabled: false
 
-AccessModifierIndentation:
-  EnforcedStyle: outdent
-
 AssignmentInCondition:
   Enabled: false
 

bin/overcommit

@@ -5,6 +5,4 @@ require 'overcommit/cli'
 
 logger = Overcommit::Logger.new(STDOUT)
 
-Overcommit::CLI.new(ARGV, logger).tap do |cli|
-  cli.run
-end
+Overcommit::CLI.new(ARGV, logger).run

lib/overcommit/cli.rb

@@ -21,7 +21,7 @@ def run
       end
     end
 
-  private
+    private
 
     attr_reader :log
 

lib/overcommit/configuration.rb

@@ -66,11 +66,11 @@ def apply_environment!(hook_context, env)
       end
     end
 
-  protected
+    protected
 
     attr_reader :hash
 
-  private
+    private
 
     def built_in_hook?(hook_context, hook_name)
       hook_name = Overcommit::Utils.snake_case(hook_name)

lib/overcommit/configuration_loader.rb

@@ -21,7 +21,7 @@ def default_configuration
         @default_config ||= load_from_file(DEFAULT_CONFIG_PATH)
       end
 
-    private
+      private
 
       # Loads a configuration, ensuring it extends the default configuration.
       def load_file(file)

lib/overcommit/configuration_validator.rb

@@ -9,7 +9,7 @@ def validate(hash)
       hash
     end
 
-  private
+    private
 
     # Ensures that keys for all supported hook types exist (PreCommit,
     # CommitMsg, etc.)

lib/overcommit/hook/base.rb

@@ -74,7 +74,7 @@ def applicable_files
       @applicable_files ||= modified_files.select { |file| applicable_file?(file) }
     end
 
-  private
+    private
 
     def requires_modified_files?
       @config['requires_files']

lib/overcommit/hook/post_checkout/index_tags.rb

@@ -12,7 +12,7 @@ def run
       :pass
     end
 
-  private
+    private
 
     SCRIPT_LOCATION = Overcommit::Utils.script_path('index-tags')
 

lib/overcommit/hook/pre_commit/image_optim.rb

@@ -25,7 +25,7 @@ def run
       :pass
     end
 
-  private
+    private
 
     def optimize_images(image_paths)
       image_optim = ::ImageOptim.new(:pngout => false)

lib/overcommit/hook/pre_commit/rails_schema_up_to_date.rb

@@ -28,7 +28,7 @@ def run # rubocop:disable CyclomaticComplexity, PerceivedComplexity
       :pass
     end
 
-  private
+    private
 
     def migration_files
       @migration_files ||= applicable_files.select do |file|

lib/overcommit/hook_context/commit_msg.rb

@@ -23,7 +23,7 @@ def commit_message_file
       @args[0]
     end
 
-  private
+    private
 
     def raw_commit_message_lines
       ::IO.readlines(commit_message_file)

lib/overcommit/hook_context/pre_commit.rb

@@ -67,7 +67,7 @@ def modified_lines(file)
       @modified_lines[file] ||= Overcommit::GitRepo.extract_modified_lines(file, :staged => true)
     end
 
-  private
+    private
 
     # Clears the working tree so that the stash can be applied.
     def clear_working_tree

lib/overcommit/hook_loader/base.rb

@@ -20,7 +20,7 @@ def load_hooks
       raise NotImplementedError
     end
 
-  private
+    private
 
     attr_reader :log
 

lib/overcommit/hook_loader/plugin_hook_loader.rb

@@ -18,12 +18,12 @@ def load_hooks
       end
     end
 
-  private
+    private
 
     def check_for_modified_plugins(plugin_paths)
       modified_plugins = plugin_paths.
         map { |path| Overcommit::HookSigner.new(path, @config, @context) }.
-        select { |signer| signer.signature_changed? }
+        select(&:signature_changed?)
 
       return if modified_plugins.empty?
 
@@ -45,7 +45,7 @@ def check_for_modified_plugins(plugin_paths)
         raise Overcommit::Exceptions::HookCancelled
       end
 
-      modified_plugins.each { |signer| signer.update_signature! }
+      modified_plugins.each(&:update_signature!)
     end
   end
 end

lib/overcommit/hook_runner.rb

@@ -31,7 +31,7 @@ def run
       end
     end
 
-  private
+    private
 
     attr_reader :log
 

lib/overcommit/hook_signer.rb

@@ -38,7 +38,7 @@ def update_signature!
       end
     end
 
-  private
+    private
 
     # Calculates a hash of a hook using a combination of its configuration and
     # file contents.

lib/overcommit/installer.rb

@@ -23,7 +23,7 @@ def run(target, options)
       end
     end
 
-  private
+    private
 
     attr_reader :log
 

lib/overcommit/logger.rb

@@ -42,7 +42,7 @@ def bold_warning(str)
       color('1;33', str)
     end
 
-  private
+    private
 
     def color(code, str)
       log(@out.tty? ? "\033[#{code}m#{str}\033[0m" : str)

lib/overcommit/printer.rb

@@ -59,7 +59,7 @@ def end_hook(hook, status, output)
       print_result(hook, status, output)
     end
 
-  private
+    private
 
     def print_header(hook)
       hook_name = "[#{hook.name}] "

lib/overcommit/user_input.rb

@@ -13,7 +13,7 @@ def get
       @io.gets
     end
 
-  private
+    private
 
     # Git hooks are not interactive and will close STDIN by default.
     def reopen_tty

lib/overcommit/utils.rb

@@ -42,7 +42,7 @@ def supported_hook_types
       # Returns a list of supported hook classes (PreCommit, CommitMsg, etc.)
       def supported_hook_type_classes
         supported_hook_types.map do |file|
-          file.split('-').map { |part| part.capitalize }.join
+          file.split('-').map(&:capitalize).join
         end
       end
 

overcommit.gemspec

@@ -30,5 +30,5 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'image_optim', '~> 0.15.0'
   s.add_development_dependency 'rspec', '~> 3.0'
-  s.add_development_dependency 'rubocop', '0.25.0' # Pin for Travis builds
+  s.add_development_dependency 'rubocop', '0.26.0' # Pin for Travis builds
 end