overcommit 0.51.0 → 0.52.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: be2c25e83a10d44e88ecee58e5b2638e31e13562b0b272aa68e47656b095c582
-  data.tar.gz: 2b568ff85f265e88387b05b88e41146f2a341b3d22f571c461910c1833a76359
+  metadata.gz: 9d272167cf4a2702f9a368d4c4cb0ade3236256c13166d2e18e4bfc9a1f52dd4
+  data.tar.gz: 2241202866ac631d15ee8925364db27794342badd181d18a7effd8a0cbe5a60f
 SHA512:
-  metadata.gz: 4ae077600ff211f4bbc13a6dd97e1fe8ab4a625fb8918751f1238ee7b9d832f686cdaa42e9e2f1be5f2da0a150fd008532e45a3c45b48f23a3bb118a1d190597
-  data.tar.gz: 4db41972b13aa4c47c230fca0828f4a1d8d7491a09e8e753f0db27bd9f8cf1906b618ad0612e7dbfc84aa3e532529e4d2b41092f85e7bad91b303cd7f7e01017
+  metadata.gz: bc3efeeb6257f78b5fb490613808375ce52281b4f250bce2275a90a7105f9ce88191de56ab985b00944abffa04650b1cb700d3ecc7bbba0ddae9da139561b7dc
+  data.tar.gz: ee4d8d6006e42c77b936adc2efe62d93742ce461dd2f117165feadfd82dcebde152b1531a984ea91370ec0005a6b108f1e1f5b683641a5d5d2fe90f4ae63a498

data/config/default.yml

@@ -337,6 +337,23 @@ PreCommit:
     flags: ['-IEHnw']
     keywords: ['FContext','FDescribe','FIt','FMeasure','FSpecify','FWhen']
 
+  GoFmt:
+    enabled: true
+    description: 'Fix with go fmt'
+    required_executable: 'go'
+    command: ['go', 'fmt']
+    parallelize: false
+    include: '**/*.go'
+
+  GolangciLint:
+    enabled: false
+    description: 'Analyze with golangci-lint'
+    required_executable: 'golangci-lint'
+    install_command: 'go get github.com/golangci/golangci-lint/cmd/golangci-lint'
+    flags: ['--out-format=line-number', '--print-issued-lines=false']
+    command: ['golangci-lint', 'run']
+    include: '**/*.go'
+
   GoLint:
     enabled: false
     description: 'Analyze with golint'
@@ -1253,6 +1270,20 @@ PrePush:
     required_executable: 'git-lfs'
     install_command: 'brew install git-lfs'
 
+  GolangciLint:
+    enabled: false
+    description: 'Analyze with golangci-lint'
+    required_executable: 'golangci-lint'
+    install_command: 'go get github.com/golangci/golangci-lint/cmd/golangci-lint'
+    flags: ['--out-format=line-number', '--print-issued-lines=false']
+    command: ['golangci-lint', 'run']
+
+  GoTest:
+    enabled: false
+    description: 'Run go test suite'
+    required_executable: 'go'
+    command: ['go', 'test', './...']
+
   Minitest:
     enabled: false
     description: 'Run Minitest test suite'

data/lib/overcommit/hook/base.rb

@@ -79,12 +79,17 @@ module Overcommit::Hook
       @config['enabled'] != false
     end
 
+    def excluded?
+      exclude_branches.any? { |p| File.fnmatch(p, current_branch) }
+    end
+
     def skip?
       @config['skip']
     end
 
     def run?
       enabled? &&
+      !excluded? &&
         !(@config['requires_files'] && applicable_files.empty?)
     end
 
@@ -276,5 +281,13 @@ module Overcommit::Hook
         status
       end
     end
+
+    def exclude_branches
+      @config['exclude_branches'] || []
+    end
+
+    def current_branch
+      @current_branch ||= Overcommit::GitRepo.current_branch
+    end
   end
 end

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

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Overcommit::Hook::PreCommit
+  # Runs go fmt for all modified Go files
+  class GoFmt < Base
+    def run
+      errors = []
+      applicable_files.each do |file|
+        result = execute(command, args: [file])
+        errors << (result.stdout + result.stderr) unless result.success?
+      end
+      return :pass if errors.empty?
+
+      [:fail, errors.join("\n")]
+    end
+  end
+end

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

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Overcommit::Hook::PreCommit
+  # Runs `golangci-lint run` against any modified packages
+  #
+  # @see https://github.com/golangci/golangci-lint
+  class GolangciLint < Base
+    def run
+      packages = applicable_files.map { |f| File.dirname(f) }.uniq
+      result = execute(command, args: packages)
+      return :pass if result.success?
+      return [:fail, result.stderr] unless result.stderr.empty?
+
+      extract_messages(
+        result.stdout.split("\n"),
+        /^(?<file>(?:\w:)?[^:]+):(?<line>\d+)/,
+        nil
+      )
+    end
+  end
+end

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

@@ -19,9 +19,9 @@ module Overcommit::Hook::PreCommit
       json_messages.map do |message|
         Overcommit::Hook::Message.new(
           :error,
-          message[:filename],
-          message[:line],
-          message[:description]
+          message['filename'],
+          message['line'],
+          "#{message['filename']}:#{message['line']} #{message['rule']} #{message['description']}"
         )
       end
     end

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

@@ -8,5 +8,21 @@ module Overcommit::Hook::PrePush
     extend Forwardable
 
     def_delegators :@context, :remote_name, :remote_url, :pushed_refs
+
+    def run?
+      super &&
+        !exclude_remotes.include?(remote_name) &&
+        (include_remote_ref_deletions? || !@context.remote_ref_deletion?)
+    end
+
+    private
+
+    def exclude_remotes
+      @config['exclude_remotes'] || []
+    end
+
+    def include_remote_ref_deletions?
+      @config['include_remote_ref_deletions']
+    end
   end
 end

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

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Overcommit::Hook::PrePush
+  # Runs `go test ./...` command on prepush
+  class GoTest < Base
+    def run
+      result = execute(command)
+      return :pass if result.success?
+
+      output = result.stdout + result.stderr
+      [:fail, output]
+    end
+  end
+end

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

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Overcommit::Hook::PrePush
+  # Runs golangci-lint
+  #
+  # @see https://github.com/golangci/golangci-lint
+  class GolangciLint < Base
+    def run
+      result = execute(command)
+      return :pass if result.success?
+
+      output = result.stdout + result.stderr
+      [:fail, output]
+    end
+  end
+end

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

@@ -1,7 +1,9 @@
 # frozen_string_literal: true
 
 module Overcommit::Hook::PrePush
-  # Prevents destructive updates to specified branches.
+  # Prevents updates to specified branches.
+  # Accepts a 'destructive_only' option globally or per branch
+  # to only prevent destructive updates.
   class ProtectedBranches < Base
     def run
       return :pass unless illegal_pushes.any?
@@ -17,32 +19,55 @@ module Overcommit::Hook::PrePush
 
     def illegal_pushes
       @illegal_pushes ||= pushed_refs.select do |pushed_ref|
-        protected?(pushed_ref.remote_ref) && allow_non_destructive?(pushed_ref)
+        protected?(pushed_ref)
       end
     end
 
-    def protected?(remote_ref)
+    def protected?(ref)
+      find_pattern(ref.remote_ref)&.destructive?(ref)
+    end
+
+    def find_pattern(remote_ref)
       ref_name = remote_ref[%r{refs/heads/(.*)}, 1]
-      return false if ref_name.nil?
-      protected_branch_patterns.any? do |pattern|
-        File.fnmatch(pattern, ref_name)
+      return if ref_name.nil?
+
+      patterns.find do |pattern|
+        File.fnmatch(pattern.to_s, ref_name)
       end
     end
 
-    def protected_branch_patterns
-      @protected_branch_patterns ||= Array(config['branches']).
-        concat(Array(config['branch_patterns']))
+    def patterns
+      @patterns ||= fetch_patterns
     end
 
-    def destructive_only?
+    def fetch_patterns
+      branch_configurations.map do |pattern|
+        if pattern.is_a?(Hash)
+          Pattern.new(pattern.keys.first, pattern['destructive_only'])
+        else
+          Pattern.new(pattern, global_destructive_only?)
+        end
+      end
+    end
+
+    def branch_configurations
+      config['branches'].to_a + config['branch_patterns'].to_a
+    end
+
+    def global_destructive_only?
       config['destructive_only'].nil? || config['destructive_only']
     end
 
-    def allow_non_destructive?(ref)
-      if destructive_only?
-        ref.destructive?
-      else
-        true
+    Pattern = Struct.new('Pattern', :name, :destructive_only) do
+      alias_method :to_s, :name
+      alias_method :destructive_only?, :destructive_only
+
+      def destructive?(ref)
+        if destructive_only?
+          ref.destructive?
+        else
+          true
+        end
       end
     end
   end

data/lib/overcommit/hook_context/pre_push.rb

@@ -13,6 +13,15 @@ module Overcommit::HookContext
       @args[1]
     end
 
+    def remote_ref_deletion?
+      return @remote_ref_deletion if defined?(@remote_ref_deletion)
+
+      @remote_ref_deletion ||= input_lines.
+                               first.
+                               split(' ').
+                               first == '(deleted)'
+    end
+
     def pushed_refs
       input_lines.map do |line|
         PushedRef.new(*line.split(' '))

data/lib/overcommit/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: overcommit
 version: !ruby/object:Gem::Version
-  version: 0.51.0
+  version: 0.52.0
 platform: ruby
 authors:
 - Shane da Silva
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-02 00:00:00.000000000 Z
+date: 2019-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: childprocess
@@ -139,8 +139,10 @@ files:
 - lib/overcommit/hook/pre_commit/foodcritic.rb
 - lib/overcommit/hook/pre_commit/forbidden_branches.rb
 - lib/overcommit/hook/pre_commit/ginkgo_focus.rb
+- lib/overcommit/hook/pre_commit/go_fmt.rb
 - lib/overcommit/hook/pre_commit/go_lint.rb
 - lib/overcommit/hook/pre_commit/go_vet.rb
+- lib/overcommit/hook/pre_commit/golangci_lint.rb
 - lib/overcommit/hook/pre_commit/hadolint.rb
 - lib/overcommit/hook/pre_commit/haml_lint.rb
 - lib/overcommit/hook/pre_commit/hard_tabs.rb
@@ -210,6 +212,8 @@ files:
 - lib/overcommit/hook/pre_push/base.rb
 - lib/overcommit/hook/pre_push/brakeman.rb
 - lib/overcommit/hook/pre_push/cargo_test.rb
+- lib/overcommit/hook/pre_push/go_test.rb
+- 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/protected_branches.rb