overcommit 0.52.1 → 0.53.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d754f1b3cae9fb7a74e38645a47a52e84337692b53ac32be7079296ef6f0c4ef
-  data.tar.gz: 1065cb959d9285aca1541fc5ed6523e7c237dfc5f0fb6acbd129c1edc4c772c4
+  metadata.gz: 7f21bd45048df18d59d884ff63d79c3d3304116125497e788e1127b53c449c52
+  data.tar.gz: 5e7c92a6e7c241b4f3f0498fe42347fde0863317f4e7097adb89e6ebd44fb0b4
 SHA512:
-  metadata.gz: dee7031b48c46a3b42f27701dd922d63468340498f3745d11a1c5bbe2a573e408a2d1fe266b96313d319dc3e43eb8401d4624cf4e94d835df850b25efea859dd
-  data.tar.gz: 69389da703ab37e63f35d7267b70a6a1a8fb3c7afd80cdadbe6f2ff32fe27428c45276b34b2286dd01930e0a9c78f5d2bc44f707c5980f501460897a79aebcf3
+  metadata.gz: 3c7182368533a88cbccabcf3dfdee1df57bbdc37b5a865a4f3bc37d30eb128d5af5ac655932141a68687a3fb56500dbe443e56f26b82fa43d10e12cc0ee8cf44
+  data.tar.gz: 8ef215e68656618666eebe1a48369a924731e909674a27cc42172427ace29104ba67d0cdaafa72c22b8693deb9baaf81d41c6355653111d5775d6a81f5f1260b

data/config/default.yml

@@ -1297,6 +1297,13 @@ PrePush:
     flags: ['--bootstrap', 'vendor/autoload.php', 'tests']
     install_command: 'composer require --dev phpunit/phpunit'
 
+  Pronto:
+    enabled: false
+    description: 'Analyzing with pronto'
+    required_executable: 'pronto'
+    install_command: 'gem install pronto'
+    flags: ['run', '--exit-code']
+
   ProtectedBranches:
     enabled: false
     description: 'Check for illegal pushes to protected branches'

data/lib/overcommit/hook/base.rb

@@ -84,7 +84,8 @@ module Overcommit::Hook
     end
 
     def skip?
-      @config['skip']
+      @config['skip'] ||
+        (@config['skip_if'] ? execute(@config['skip_if']).success? : false)
     end
 
     def run?

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

@@ -12,21 +12,14 @@ module Overcommit::Hook::PreCommit
     def run
       messages = []
 
-      applicable_files.each do |file|
-        result = execute(command, args: [file])
-        if result.status
-          rows = result.stdout.split("\n")
-
-          # Discard the csv header
-          rows.shift
-
-          # Push each of the errors in the particular file into the array
-          rows.map do |row|
-            messages << row
-          end
-        end
+      result = execute(command, args: applicable_files)
+      if result.status
+        messages = result.stdout.split("\n")
+        # Discard the csv header
+        messages.shift
       end
 
+      return :fail if messages.empty? && !result.success?
       return :pass if messages.empty?
 
       parse_messages(messages)

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

@@ -1,23 +1,12 @@
 # frozen_string_literal: true
 
+require 'overcommit/hook/shared/pronto'
+
 module Overcommit::Hook::PreCommit
   # Runs `pronto`
   #
   # @see https://github.com/mmozuras/pronto
   class Pronto < Base
-    MESSAGE_TYPE_CATEGORIZER = lambda do |type|
-      type.include?('E') ? :error : :warning
-    end
-
-    def run
-      result = execute(command)
-      return :pass if result.success?
-
-      extract_messages(
-        result.stdout.split("\n"),
-        /^(?<file>(?:\w:)?[^:]+):(?<line>\d+) (?<type>[^ ]+)/,
-        MESSAGE_TYPE_CATEGORIZER,
-      )
-    end
+    include Overcommit::Hook::Shared::Pronto
   end
 end

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

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'forwardable'
+require 'overcommit/utils/messages_utils'
 
 module Overcommit::Hook::PrePush
   # Functionality common to all pre-push hooks.
@@ -17,6 +18,10 @@ module Overcommit::Hook::PrePush
 
     private
 
+    def extract_messages(*args)
+      Overcommit::Utils::MessagesUtils.extract_messages(*args)
+    end
+
     def exclude_remotes
       @config['exclude_remotes'] || []
     end

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

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+require 'overcommit/hook/shared/pronto'
+
+module Overcommit::Hook::PrePush
+  # Runs `pronto`
+  #
+  # @see https://github.com/mmozuras/pronto
+  class Pronto < Base
+    include Overcommit::Hook::Shared::Pronto
+  end
+end

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

@@ -17,7 +17,7 @@ module Overcommit::Hook::PrepareCommitMsg
       Overcommit::Utils.log.debug("Writing #{commit_message_filename} with #{new_template}")
 
       modify_commit_message do |old_contents|
-        "#{new_template}\n#{old_contents}"
+        "#{new_template} #{old_contents}"
       end
 
       :pass

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

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Overcommit::Hook::Shared
+  # Shared code used by all Pronto hooks. Runs pronto linter.
+  module Pronto
+    MESSAGE_TYPE_CATEGORIZER = lambda do |type|
+      type.include?('E') ? :error : :warning
+    end
+
+    def run
+      result = execute(command)
+      return :pass if result.success?
+
+      extract_messages(
+        result.stdout.split("\n"),
+        /^(?<file>(?:\w:)?[^:]+):(?<line>\d+) (?<type>[^ ]+)/,
+        MESSAGE_TYPE_CATEGORIZER,
+      )
+    end
+  end
+end

data/lib/overcommit/printer.rb

@@ -51,6 +51,7 @@ module Overcommit
     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
     end
 

data/lib/overcommit/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: overcommit
 version: !ruby/object:Gem::Version
-  version: 0.52.1
+  version: 0.53.0
 platform: ruby
 authors:
 - Shane da Silva
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-04 00:00:00.000000000 Z
+date: 2020-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: childprocess
@@ -216,6 +216,7 @@ files:
 - lib/overcommit/hook/pre_push/golangci_lint.rb
 - lib/overcommit/hook/pre_push/minitest.rb
 - lib/overcommit/hook/pre_push/php_unit.rb
+- lib/overcommit/hook/pre_push/pronto.rb
 - lib/overcommit/hook/pre_push/protected_branches.rb
 - lib/overcommit/hook/pre_push/pytest.rb
 - lib/overcommit/hook/pre_push/python_nose.rb
@@ -231,6 +232,7 @@ files:
 - lib/overcommit/hook/shared/composer_install.rb
 - lib/overcommit/hook/shared/index_tags.rb
 - lib/overcommit/hook/shared/npm_install.rb
+- lib/overcommit/hook/shared/pronto.rb
 - lib/overcommit/hook/shared/rake_target.rb
 - lib/overcommit/hook/shared/submodule_status.rb
 - lib/overcommit/hook/shared/yarn_install.rb