overcommit 0.58.0 → 0.59.0

data/lib/overcommit/hook/pre_commit/sqlint.rb

@@ -5,7 +5,7 @@ module Overcommit::Hook::PreCommit
   #
   # @see https://github.com/purcell/sqlint
   class Sqlint < Base
-    MESSAGE_REGEX = /(?<file>(?:\w:)?.+):(?<line>\d+):\d+:(?<type>\w+)/
+    MESSAGE_REGEX = /(?<file>(?:\w:)?.+):(?<line>\d+):\d+:(?<type>\w+)/.freeze
 
     MESSAGE_TYPE_CATEGORIZER = lambda do |type|
       type == 'ERROR' ? :error : :warning

data/lib/overcommit/hook/pre_commit/standard.rb

@@ -5,7 +5,7 @@ module Overcommit::Hook::PreCommit
   #
   # @see https://github.com/feross/standard
   class Standard < Base
-    MESSAGE_REGEX = /^\s*(?<file>(?:\w:)?[^:]+):(?<line>\d+)/
+    MESSAGE_REGEX = /^\s*(?<file>(?:\w:)?[^:]+):(?<line>\d+)/.freeze
 
     def run
       result = execute(command, args: applicable_files)

data/lib/overcommit/hook/pre_commit/stylelint.rb

@@ -8,12 +8,13 @@ module Overcommit::Hook::PreCommit
     # example of output:
     # index.css: line 4, col 4, error - Expected indentation of 2 spaces (indentation)
 
-    MESSAGE_REGEX = /^(?<file>.+):\D*(?<line>\d+).*$/
+    MESSAGE_REGEX = /^(?<file>[^:]+):\D*(?<line>\d+).*$/.freeze
 
     def run
       result = execute(command, args: applicable_files)
       output = result.stdout.chomp
       return :pass if result.success? && output.empty?
+
       extract_messages(
         output.split("\n"),
         MESSAGE_REGEX

data/lib/overcommit/hook/pre_commit/swift_lint.rb

@@ -4,7 +4,7 @@ module Overcommit::Hook::PreCommit
   # Runs `swiftlint lint` against modified Swift files.
   # @see https://github.com/realm/SwiftLint
   class SwiftLint < Base
-    MESSAGE_REGEX = /^(?<file>(?:\w:)?[^:]+):(?<line>\d+)[^ ]* (?<type>[^ ]+):(?<message>.*)/
+    MESSAGE_REGEX = /^(?<file>(?:\w:)?[^:]+):(?<line>\d+)[^ ]* (?<type>[^ ]+):(?<message>.*)/.freeze
 
     def run
       result = execute(command, args: applicable_files)

data/lib/overcommit/hook/pre_commit/ts_lint.rb

@@ -8,7 +8,7 @@ module Overcommit::Hook::PreCommit
     # "src/file/anotherfile.ts[298, 1]: exceeds maximum line length of 140"
     # or
     # "ERROR: src/AccountController.ts[4, 28]: expected call-signature to have a typedef"
-    MESSAGE_REGEX = /^(?<type>.+: )?(?<file>.+?(?=\[))[^\d]+(?<line>\d+).*?/
+    MESSAGE_REGEX = /^(?<type>.+: )?(?<file>.+?(?=\[))[^\d]+(?<line>\d+).*?/.freeze
 
     def run
       result = execute(command, args: applicable_files)
@@ -19,9 +19,9 @@ module Overcommit::Hook::PreCommit
       type_categorizer = ->(type) { type.nil? || type.include?('ERROR') ? :error : :warning }
 
       extract_messages(
-          output_lines,
-          MESSAGE_REGEX,
-          type_categorizer
+        output_lines,
+        MESSAGE_REGEX,
+        type_categorizer
       )
     end
   end

data/lib/overcommit/hook/pre_commit/w3c_css.rb

@@ -42,10 +42,10 @@ module Overcommit::Hook::PreCommit
     def opts
       @opts ||= {
         validator_uri: config['validator_uri'],
-        proxy_server:  config['proxy_server'],
-        proxy_port:    config['proxy_port'],
-        proxy_user:    config['proxy_user'],
-        proxy_pass:    config['proxy_pass']
+        proxy_server: config['proxy_server'],
+        proxy_port: config['proxy_port'],
+        proxy_user: config['proxy_user'],
+        proxy_pass: config['proxy_pass']
       }
     end
 

data/lib/overcommit/hook/pre_commit/w3c_html.rb

@@ -42,10 +42,10 @@ module Overcommit::Hook::PreCommit
     def opts
       @opts ||= {
         validator_uri: config['validator_uri'],
-        proxy_server:  config['proxy_server'],
-        proxy_port:    config['proxy_port'],
-        proxy_user:    config['proxy_user'],
-        proxy_pass:    config['proxy_pass']
+        proxy_server: config['proxy_server'],
+        proxy_port: config['proxy_port'],
+        proxy_user: config['proxy_user'],
+        proxy_pass: config['proxy_pass']
       }
     end
 

data/lib/overcommit/hook/pre_commit/xml_lint.rb

@@ -5,7 +5,7 @@ module Overcommit::Hook::PreCommit
   #
   # @see http://xmlsoft.org/xmllint.html
   class XmlLint < Base
-    MESSAGE_REGEX = /^(?<file>(?:\w:)?[^:]+):(?<line>\d+):/
+    MESSAGE_REGEX = /^(?<file>(?:\w:)?[^:]+):(?<line>\d+):/.freeze
 
     def run
       result = execute(command, args: applicable_files)

data/lib/overcommit/hook/pre_commit/yaml_lint.rb

@@ -11,7 +11,7 @@ module Overcommit::Hook::PreCommit
       :(?<col>\d+)
       :\s\[(?<type>\w+)\]
       \s(?<msg>.+)$
-    /x
+    /x.freeze
 
     def run
       result = execute(command, args: applicable_files)

data/lib/overcommit/hook/pre_commit/yaml_syntax.rb

@@ -8,9 +8,13 @@ module Overcommit::Hook::PreCommit
 
       applicable_files.each do |file|
         begin
-          YAML.load_file(file)
-        rescue ArgumentError, Psych::SyntaxError => e
-          messages << Overcommit::Hook::Message.new(:error, file, nil, e.message)
+          YAML.load_file(file, aliases: true)
+        rescue ArgumentError
+          begin
+            YAML.load_file(file)
+          rescue ArgumentError, Psych::SyntaxError => e
+            messages << Overcommit::Hook::Message.new(:error, file, nil, e.message)
+          end
         end
       end
 

data/lib/overcommit/hook/pre_commit/yard_coverage.rb

@@ -1,4 +1,3 @@
-
 # frozen_string_literal: true
 
 module Overcommit::Hook::PreCommit

data/lib/overcommit/hook/pre_push/cargo_test.rb

@@ -6,6 +6,7 @@ module Overcommit::Hook::PrePush
     def run
       result = execute(command)
       return :pass if result.success?
+
       [:fail, result.stdout]
     end
   end

data/lib/overcommit/hook/prepare_commit_msg/base.rb

@@ -12,6 +12,7 @@ module Overcommit::Hook::PrepareCommitMsg
 
     def modify_commit_message
       raise 'This expects a block!' unless block_given?
+
       # NOTE: this assumes all the hooks of the same type share the context's
       # memory. If that's not the case, this won't work.
       lock.synchronize do

data/lib/overcommit/hook/prepare_commit_msg/replace_branch.rb

@@ -29,7 +29,7 @@ module Overcommit::Hook::PrepareCommitMsg
   # - 'squash'   - if squashing
   #
   class ReplaceBranch < Base
-    DEFAULT_BRANCH_PATTERN = /\A(\d+)-(\w+).*\z/
+    DEFAULT_BRANCH_PATTERN = /\A(\d+)-(\w+).*\z/.freeze
 
     def run
       return :pass if skip?

data/lib/overcommit/hook/shared/bower_install.rb

@@ -9,6 +9,7 @@ module Overcommit::Hook::Shared
     def run
       result = execute(command)
       return :fail, result.stderr unless result.success?
+
       :pass
     end
   end

data/lib/overcommit/hook/shared/bundle_install.rb

@@ -9,6 +9,7 @@ module Overcommit::Hook::Shared
     def run
       result = execute(command)
       return :fail, result.stdout unless result.success?
+
       :pass
     end
   end

data/lib/overcommit/hook/shared/composer_install.rb

@@ -9,6 +9,7 @@ module Overcommit::Hook::Shared
     def run
       result = execute(command)
       return :fail, result.stdout unless result.success?
+
       :pass
     end
   end

data/lib/overcommit/hook/shared/npm_install.rb

@@ -9,6 +9,7 @@ module Overcommit::Hook::Shared
     def run
       result = execute(command)
       return :fail, result.stderr unless result.success?
+
       :pass
     end
   end

data/lib/overcommit/hook/shared/pronto.rb

@@ -1,21 +1,33 @@
 # frozen_string_literal: true
 
 module Overcommit::Hook::Shared
-  # Shared code used by all Pronto hooks. Runs pronto linter.
+  # Shared code used by all Pronto hooks. Runs pronto linters.
+
+  # @see https://github.com/prontolabs/pronto
   module Pronto
     MESSAGE_TYPE_CATEGORIZER = lambda do |type|
       type.include?('E') ? :error : :warning
     end
 
+    MESSAGE_REGEX = /^(?<file>(?:\w:)?[^:]+):(?<line>\d+) (?<type>[^ ]+)/.freeze
+
     def run
       result = execute(command)
       return :pass if result.success?
 
-      extract_messages(
-        result.stdout.split("\n"),
-        /^(?<file>(?:\w:)?[^:]+):(?<line>\d+) (?<type>[^ ]+)/,
+      # e.g. runtime errors
+      generic_errors = extract_messages(
+        result.stderr.split("\n"),
+        /^(?<type>[a-z]+)/i
+      )
+
+      pronto_infractions = extract_messages(
+        result.stdout.split("\n").select { |line| line.match?(MESSAGE_REGEX) },
+        MESSAGE_REGEX,
         MESSAGE_TYPE_CATEGORIZER,
       )
+
+      generic_errors + pronto_infractions
     end
   end
 end

data/lib/overcommit/hook/shared/yarn_install.rb

@@ -9,6 +9,7 @@ module Overcommit::Hook::Shared
     def run
       result = execute(command)
       return :fail, result.stderr unless result.success?
+
       :pass
     end
   end

data/lib/overcommit/hook_context/helpers/file_modifications.rb

@@ -11,6 +11,7 @@ module Overcommit::HookContext
 
         cmd = Overcommit::Utils.parent_command
         return unless cmd
+
         amend_pattern = 'commit(\s.*)?\s--amend(\s|$)'
 
         # Since the ps command can return invalid byte sequences for commands

data/lib/overcommit/hook_context/helpers/stash_unstaged_changes.rb

@@ -26,6 +26,7 @@ module Overcommit::HookContext
       # Returns whether the current git branch is empty (has no commits).
       def initial_commit?
         return @initial_commit unless @initial_commit.nil?
+
         @initial_commit = Overcommit::GitRepo.initial_commit?
       end
 
@@ -63,6 +64,7 @@ module Overcommit::HookContext
         (staged_files + unstaged_files).each do |file|
           next if Overcommit::Utils.broken_symlink?(file)
           next unless File.exist?(file) # Ignore renamed files (old file no longer exists)
+
           @modified_times[file] = File.mtime(file)
         end
       end
@@ -101,6 +103,7 @@ module Overcommit::HookContext
         @modified_times.each do |file, time|
           next if Overcommit::Utils.broken_symlink?(file)
           next unless File.exist?(file)
+
           File.utime(time, time, file)
         end
       end

data/lib/overcommit/hook_context/post_commit.rb

@@ -27,6 +27,7 @@ module Overcommit::HookContext
     # @return [true,false]
     def initial_commit?
       return @initial_commit unless @initial_commit.nil?
+
       @initial_commit = !Overcommit::Utils.execute(%w[git rev-parse HEAD~]).success?
     end
   end

data/lib/overcommit/hook_context/pre_push.rb

@@ -76,6 +76,7 @@ module Overcommit::HookContext
 
       def overwritten_commits
         return @overwritten_commits if defined? @overwritten_commits
+
         result = Overcommit::Subprocess.spawn(%W[git rev-list #{remote_sha1} ^#{local_sha1}])
         if result.success?
           result.stdout.split("\n")

data/lib/overcommit/hook_context/run_all.rb

@@ -36,6 +36,7 @@ module Overcommit::HookContext
 
     def initial_commit?
       return @initial_commit unless @initial_commit.nil?
+
       @initial_commit = Overcommit::GitRepo.initial_commit?
     end
 

data/lib/overcommit/hook_context.rb

@@ -9,11 +9,11 @@ module Overcommit::HookContext
     require "overcommit/hook_context/#{underscored_hook_type}"
 
     Overcommit::HookContext.const_get(hook_type_class).new(config, args, input)
-  rescue LoadError, NameError => error
+  rescue LoadError, NameError => e
     # Could happen when a symlink was created for a hook type Overcommit does
     # not yet support.
     raise Overcommit::Exceptions::HookContextLoadError,
-          "Unable to load '#{hook_type}' hook context: '#{error}'",
-          error.backtrace
+          "Unable to load '#{hook_type}' hook context: '#{e}'",
+          e.backtrace
   end
 end

data/lib/overcommit/hook_loader/base.rb

@@ -38,10 +38,10 @@ module Overcommit::HookLoader
         Overcommit::Hook.const_get(@context.hook_class_name).
                          const_get(hook_name).
                          new(@config, @context)
-      rescue LoadError, NameError => error
+      rescue LoadError, NameError => e
         raise Overcommit::Exceptions::HookLoadError,
-              "Unable to load hook '#{hook_name}': #{error}",
-              error.backtrace
+              "Unable to load hook '#{hook_name}': #{e}",
+              e.backtrace
       end
     end
   end

data/lib/overcommit/hook_loader/plugin_hook_loader.rb

@@ -93,10 +93,10 @@ module Overcommit::HookLoader
       end
 
       hook_module.const_set(hook_name, hook_class).new(@config, @context)
-    rescue LoadError, NameError => error
+    rescue LoadError, NameError => e
       raise Overcommit::Exceptions::HookLoadError,
-            "Unable to load hook '#{hook_name}': #{error}",
-            error.backtrace
+            "Unable to load hook '#{hook_name}': #{e}",
+            e.backtrace
     end
   end
 end

data/lib/overcommit/hook_runner.rb

@@ -94,6 +94,7 @@ module Overcommit
       loop do
         hook = @lock.synchronize { @hooks_left.pop }
         break unless hook
+
         run_hook(hook)
       end
     end
@@ -159,12 +160,12 @@ module Overcommit
         return if should_skip?(hook)
 
         status, output = hook.run_and_transform
-      rescue Overcommit::Exceptions::MessageProcessingError => ex
+      rescue Overcommit::Exceptions::MessageProcessingError => e
         status = :fail
-        output = ex.message
-      rescue StandardError => ex
+        output = e.message
+      rescue StandardError => e
         status = :fail
-        output = "Hook raised unexpected error\n#{ex.message}\n#{ex.backtrace.join("\n")}"
+        output = "Hook raised unexpected error\n#{e.message}\n#{e.backtrace.join("\n")}"
       end
 
       @failed = true if status == :fail
@@ -202,7 +203,7 @@ module Overcommit
 
       # Load plugin hooks after so they can subclass existing hooks
       @hooks += HookLoader::PluginHookLoader.new(@config, @context, @log).load_hooks
-    rescue LoadError => ex
+    rescue LoadError => e
       # Include a more helpful message that will probably save some confusion
       message = 'A load error occurred. ' +
         if @config['gemfile']
@@ -212,8 +213,8 @@ module Overcommit
         end
 
       raise Overcommit::Exceptions::HookLoadError,
-            "#{message}\n#{ex.message}",
-            ex.backtrace
+            "#{message}\n#{e.message}",
+            e.backtrace
     end
   end
 end

data/lib/overcommit/hook_signer.rb

@@ -52,6 +52,7 @@ module Overcommit
 
     def signable_file?(file)
       return unless file
+
       sep = Overcommit::OS.windows? ? '\\' : File::SEPARATOR
       file.start_with?(".#{sep}") ||
         file.start_with?(Overcommit::Utils.repo_root)

data/lib/overcommit/installer.rb

@@ -4,7 +4,7 @@ require 'fileutils'
 
 module Overcommit
   # Manages the installation of Overcommit hooks in a git repository.
-  class Installer # rubocop:disable ClassLength
+  class Installer # rubocop:disable Metrics/ClassLength
     TEMPLATE_DIRECTORY = File.join(Overcommit::HOME, 'template-dir')
     MASTER_HOOK = File.join(TEMPLATE_DIRECTORY, 'hooks', 'overcommit-hook')
 
@@ -174,6 +174,7 @@ module Overcommit
       repo_config_file = File.join(@target, Overcommit::CONFIG_FILE_NAME)
 
       return if File.exist?(repo_config_file)
+
       FileUtils.cp(File.join(Overcommit::HOME, 'config', 'starter.yml'), repo_config_file)
     end
 

data/lib/overcommit/logger.rb

@@ -31,6 +31,11 @@ module Overcommit
       log
     end
 
+    # Flushes the [IO] object for partial lines
+    def flush
+      @out.flush if @out.respond_to? :flush
+    end
+
     # Write a line of output.
     #
     # A newline character will always be appended.

data/lib/overcommit/printer.rb

@@ -43,16 +43,14 @@ module Overcommit
     end
 
     def interrupt_triggered
-      log.newline
-      log.error 'Interrupt signal received. Stopping hooks...'
+      log.error "\nInterrupt signal received. Stopping hooks..."
     end
 
     # Executed when a hook run was interrupted/cancelled by user.
     def run_interrupted
       log.newline
       log.warning '⚠  Hook run interrupted by user'
-      log.warning '⚠  If files appear modified/missing, check your stash to recover them'
-      log.newline
+      log.warning "⚠  If files appear modified/missing, check your stash to recover them\n"
     end
 
     # Executed when one or more hooks by the end of the run.
@@ -91,6 +89,7 @@ module Overcommit
       log.partial hook.description
       log.partial '.' * [70 - hook.description.length - hook_name.length, 0].max
       log.partial hook_name
+      log.flush
     end
 
     def print_result(hook, status, output) # rubocop:disable Metrics/CyclomaticComplexity

data/lib/overcommit/subprocess.rb

@@ -2,6 +2,7 @@
 
 require 'childprocess'
 require 'tempfile'
+require 'overcommit/os'
 
 module Overcommit
   # Manages execution of a child process, collecting the exit status and
@@ -38,7 +39,7 @@ module Overcommit
         if options[:input]
           begin
             process.io.stdin.puts(options[:input])
-          rescue StandardError # rubocop:disable Lint/HandleExceptions
+          rescue StandardError
             # 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.
@@ -51,7 +52,7 @@ module Overcommit
         err.rewind
         out.rewind
 
-        Result.new(process.exit_code, out.read, err.read)
+        Result.new(process.exit_code, to_utf8(out.read), to_utf8(err.read))
       end
 
       # Spawns a new process in the background using the given array of
@@ -83,6 +84,27 @@ module Overcommit
         %w[cmd.exe /c] + [args.join(' ')]
       end
 
+      # Convert string from current locale to utf-8
+      #
+      # When running commands under windows the command output is using
+      # current system locale (depends on system lanuage) not UTF-8
+      #
+      # @param process [String]
+      # @return [String]
+      def to_utf8(string)
+        # Our encoding code doesn't work on the GitHub Actions Windows
+        # environment for unknown reasons, so just skip it in CI.
+        return string if OS.windows? && ENV['GITHUB_ACTIONS']
+
+        if Encoding.locale_charmap == 'UTF-8'
+          return string
+        end
+
+        ec = Encoding::Converter.new(Encoding.locale_charmap, 'UTF-8')
+        # Convert encoding, alternatively simple: string.scrub will suffice
+        ec.convert(string)
+      end
+
       # @param process [ChildProcess]
       # @return [Array<IO>]
       def assign_output_streams(process)

data/lib/overcommit/utils/messages_utils.rb

@@ -52,6 +52,7 @@ module Overcommit::Utils
 
       def extract_line(match, message)
         return unless match.names.include?('line')
+
         Integer(match[:line])
       rescue ArgumentError, TypeError
         raise Overcommit::Exceptions::MessageProcessingError,

data/lib/overcommit/version.rb

@@ -2,5 +2,5 @@
 
 # Defines the gem version.
 module Overcommit
-  VERSION = '0.58.0'
+  VERSION = '0.59.0'
 end

data/template-dir/hooks/commit-msg

@@ -29,15 +29,22 @@ end
 # Check if Overcommit should invoke a Bundler context for loading gems
 require 'yaml'
 # rubocop:disable Style/RescueModifier
-if gemfile = YAML.load_file('.overcommit.yml')['gemfile'] rescue nil
+gemfile =
+  begin
+    YAML.load_file('.overcommit.yml', aliases: true)['gemfile']
+  rescue ArgumentError
+    YAML.load_file('.overcommit.yml')['gemfile']
+  end rescue nil
+
+if gemfile
   ENV['BUNDLE_GEMFILE'] = gemfile
   require 'bundler'
 
   begin
     Bundler.setup
-  rescue Bundler::BundlerError => ex
-    puts "Problem loading '#{gemfile}': #{ex.message}"
-    puts "Try running:\nbundle install --gemfile=#{gemfile}" if ex.is_a?(Bundler::GemNotFound)
+  rescue Bundler::BundlerError => e
+    puts "Problem loading '#{gemfile}': #{e.message}"
+    puts "Try running:\nbundle install --gemfile=#{gemfile}" if e.is_a?(Bundler::GemNotFound)
     exit 78 # EX_CONFIG
   end
 end
@@ -80,37 +87,37 @@ begin
   status = runner.run
 
   exit(status ? 0 : 65) # 65 = EX_DATAERR
-rescue Overcommit::Exceptions::ConfigurationError => error
-  puts error
+rescue Overcommit::Exceptions::ConfigurationError => e
+  puts e
   exit 78 # EX_CONFIG
-rescue Overcommit::Exceptions::HookContextLoadError => error
-  puts error
+rescue Overcommit::Exceptions::HookContextLoadError => e
+  puts e
   puts 'Are you running an old version of Overcommit?'
   exit 69 # EX_UNAVAILABLE
 rescue Overcommit::Exceptions::HookLoadError,
-       Overcommit::Exceptions::InvalidHookDefinition => error
-  puts error.message
-  puts error.backtrace
+       Overcommit::Exceptions::InvalidHookDefinition => e
+  puts e.message
+  puts e.backtrace
   exit 78 # EX_CONFIG
 rescue Overcommit::Exceptions::HookSetupFailed,
-       Overcommit::Exceptions::HookCleanupFailed => error
-  puts error.message
+       Overcommit::Exceptions::HookCleanupFailed => e
+  puts e.message
   exit 74 # EX_IOERR
 rescue Overcommit::Exceptions::HookCancelled
   puts 'You cancelled the hook run'
   exit 130 # Ctrl-C cancel
-rescue Overcommit::Exceptions::InvalidGitRepo => error
-  puts error
+rescue Overcommit::Exceptions::InvalidGitRepo => e
+  puts e
   exit 64 # EX_USAGE
-rescue Overcommit::Exceptions::ConfigurationSignatureChanged => error
-  puts error
+rescue Overcommit::Exceptions::ConfigurationSignatureChanged => e
+  puts e
   puts "For more information, see #{Overcommit::REPO_URL}#security"
   exit 1
 rescue Overcommit::Exceptions::InvalidHookSignature
   exit 1
-rescue StandardError => error
-  puts error.message
-  puts error.backtrace
+rescue StandardError => e
+  puts e.message
+  puts e.backtrace
   puts "Report this bug at #{Overcommit::BUG_REPORT_URL}"
   exit 70 # EX_SOFTWARE
 end