merge: branch 'release/0.8.0'

Gopkg.toml

@@ -41,6 +41,10 @@
   name = "gopkg.in/yaml.v2"
   version = "2.2.1"
 
+[[constraint]]
+  name = "livingit.de/code/go-hookhelper"
+  version = "0.1.0"
+
 [prune]
   go-tests = true
   unused-packages = true

README.md

@@ -65,6 +65,7 @@ Essentially this just removes the hook, so it would remove any other hook also.
 
 |Version|Description|
 |---|---|
+|0.8.0|add support for Co-authored-by|
 |0.7.0|rename binary|
 |0.6.2|code quality improvements|
 |0.6.1|code quality improvements|

hook/v2/validate_body.go

@@ -1,11 +1,18 @@
 package v2
 
-import "fmt"
+import (
+	"fmt"
+	"strings"
+)
 
 // validateBody runs all rules for a commit message body
 func (cfg *Configuration) validateBody(commitMessage []string) bool {
 	result := true
 	for _, line := range commitMessage {
+		if strings.HasPrefix(line, "Co-authored-by") {
+			fmt.Println("Co-authored-by found, not checking line length")
+			continue
+		}
 		if len(line) > cfg.BodyLineLength {
 			if cfg.EnforceBodyLineLength {
 				result = false

hook/v2/validate_body_test.go

@@ -0,0 +1,48 @@
+package v2
+
+import "testing"
+
+func TestLineLengthLastLine(t *testing.T) {
+	body := []string{
+		"this is a normal length line",
+		"01234567890123456789012345678901234567890123456789012345678901234567890123456789",
+	}
+	cfg := &Configuration{
+		BodyLineLength:        72,
+		EnforceBodyLineLength: true,
+	}
+	if cfg.validateBody(body) {
+		t.Log("line is too long, validation did not get it")
+		t.Fail()
+	}
+}
+
+func TestLineLengthFirstLine(t *testing.T) {
+	body := []string{
+		"01234567890123456789012345678901234567890123456789012345678901234567890123456789",
+		"this is a normal length line",
+	}
+	cfg := &Configuration{
+		BodyLineLength:        72,
+		EnforceBodyLineLength: true,
+	}
+	if cfg.validateBody(body) {
+		t.Log("line is too long, validation did not get it")
+		t.Fail()
+	}
+}
+
+func TestLineLengthCoAuthored(t *testing.T) {
+	body := []string{
+		"this is a normal length line",
+		"Co-authored-by: This is the name <this-is-a-long@email-address-to-get-over71.de>",
+	}
+	cfg := &Configuration{
+		BodyLineLength:        72,
+		EnforceBodyLineLength: true,
+	}
+	if !cfg.validateBody(body) {
+		t.Log("co-authored lines should not be enforced to be max characters long")
+		t.Fail()
+	}
+}

vendor/livingit.de/code/go-hookhelper/README.md

@@ -0,0 +1,9 @@
+# helper methods for git-hook projects
+
+some common helper methods used across git hook projects
+
+## History
+
+|Version|Description|
+|---|---|
+|0.1.0|Initial version|

vendor/livingit.de/code/go-hookhelper/optimistic_version.go

@@ -0,0 +1,24 @@
+package hookhelper
+
+import "errors"
+
+// OptimisticVersion returns the calculated optimistic version
+func OptimisticVersion(global, local []byte, globalVersion, localVersion string) (string, error) {
+	if nil != global {
+		if nil != local && localVersion != "" {
+			if localVersion == globalVersion && globalVersion == "" {
+				return "", errors.New("you have to provide versions for global and local config")
+			}
+			if localVersion != globalVersion {
+				return "", errors.New("version mismatch for global and project version")
+			}
+		}
+		return globalVersion, nil
+	}
+
+	if nil != local {
+		return localVersion, nil
+	}
+
+	return "", errors.New("no suitable versioned configuration found")
+}