merge: branch 'release/1.0.1'

better gitlab ci handling

.commit-hook.yaml

@@ -17,8 +17,3 @@ external-tools:
     command:
       - make
       - test
-  - severity: error
-    name: linter
-    command:
-      - make
-      - lint

README.md

@@ -68,6 +68,7 @@ Essentially this just removes the hook, so it would remove any other hook also.
 
 |Version|Description|
 |---|---|
+|1.0.1|better gitlab ci handling|
 |1.0.0|update to use go modules|
 |0.9.0|add support for GitLab CI linter|
 ||fix a bug where body lines where multiplied by the number of ignore expressions|

cmd/methods/commands.go

@@ -12,7 +12,7 @@ import (
 func UninstallHook() int {
 	err := subcommands.Uninstall(".git")
 	if err != nil {
-		fmt.Fprintln(os.Stderr, "error:", err)
+		_, _ = fmt.Fprintln(os.Stderr, "error:", err)
 		return 1
 	}
 	return 0
@@ -23,11 +23,11 @@ func InstallHook() int {
 	if helper.DirectoryExists(".git") {
 		err := subcommands.Install(".git")
 		if err != nil {
-			fmt.Fprintln(os.Stderr, "error:", err)
+			_, _ = fmt.Fprintln(os.Stderr, "error:", err)
 			return 1
 		}
 	} else {
-		fmt.Fprintln(os.Stderr, "error: no git repository")
+		_, _ = fmt.Fprintln(os.Stderr, "error: no git repository")
 		return 1
 	}
 	return 0

hook/types.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 
 	"livingit.de/code/git-commit/hook/config"
-	"livingit.de/code/git-commit/hook/v2"
+	v2 "livingit.de/code/git-commit/hook/v2"
 	"livingit.de/code/go-hookhelper"
 	"livingit.de/code/versioned"
 )

hook/v2/gitlab_ci_linter.go

@@ -12,11 +12,15 @@ func (cfg *Configuration) validateGitLabCI() (result bool) {
 		return true
 	}
 
+	if !ciConfigExists() && cfg.GitLabCIFile == "" {
+		return true
+	}
+
 	var (
 		cmd *exec.Cmd
 	)
 
-	fmt.Println("running GitLab CI linter")
+	_, _ = fmt.Println("running GitLab CI linter")
 
 	pathToLinter, err := exec.LookPath("gitlab-ci-linter")
 	if err != nil {
@@ -45,3 +49,11 @@ func (cfg *Configuration) validateGitLabCI() (result bool) {
 
 	return true
 }
+
+func ciConfigExists() bool {
+	info, err := os.Stat(".gitlab-ci.yml")
+	if os.IsNotExist(err) {
+		return false
+	}
+	return !info.IsDir()
+}