Increases code coverage and updates devcontainer

.devcontainer/devcontainer.json

@@ -5,6 +5,7 @@
         "ghcr.io/devcontainers-contrib/features/starship:1": {},
         "ghcr.io/azutake/devcontainer-features/go-packages-install:0": {
             "packages": [
+                "github.com/devops-kung-fu/hookz@latest",
                 "github.com/jandelgado/gcov2lcov@latest",
                 "github.com/kisielk/errcheck@latest",
                 "github.com/fzipp/gocyclo/cmd/gocyclo@latest",
@@ -16,7 +17,8 @@
     "customizations": {
         "vscode": {
             "settings": {
-                "terminal.integrated.fontFamily": "DroidSansMNerdFont-Regular",
+                "terminal.integrated.customGlyphs": true,
+                "terminal.integrated.fontFamily": "'0xProto Nerd Font', 'Droid Sans Mono', 'monospace', monospace",
                 "editor.formatOnSave": true,
                 "go.buildTags": "",
                 "go.toolsEnvVars": {
@@ -40,7 +42,10 @@
                     "editor.codeActionsOnSave": {
                         "source.organizeImports": "always"
                     }
-                }
+                },
+                "markiscodecoverage.coverageThreshold": 95,
+                "markiscodecoverage.enableOnStartup": true,
+                "markiscodecoverage.searchCriteria": "*.lcov*"
             },
             "extensions": [
                 "ms-vscode.go",
@@ -61,5 +66,5 @@
             ]
         }
     },
-    "postCreateCommand": "go mod download && go mod tidy && mkdir -p ~/.local/share/fonts && cd ~/.local/share/fonts && curl -fLO https://github.com/ryanoasis/nerd-fonts/raw/HEAD/patched-fonts/DroidSansMono/DroidSansMNerdFont-Regular.otf"
+    "postCreateCommand": "/usr/bin/bash ./.devcontainer/post-create.sh > ~/post-create.log"
 }

.devcontainer/post-create.sh

@@ -0,0 +1,6 @@
+mkdir -p $HOME/.local/share/fonts
+wget https://github.com/ryanoasis/nerd-fonts/releases/download/v3.1.1/0xProto.zip
+unzip 0xProto.zip -d $HOME/.local/share/fonts
+rm 0xProto.zip
+
+starship preset nerd-font-symbols -o ~/.config/starship.toml

cmd/common.go

@@ -4,36 +4,30 @@ import (
 	"errors"
 	"fmt"
 	"log"
-	"os"
 
 	"github.com/devops-kung-fu/common/util"
 
 	"github.com/devops-kung-fu/hookz/lib"
 )
 
-func noConfig() {
+func NoConfig() {
 	fmt.Println(".hookz.yaml file not found")
 	fmt.Println("\nTo create a sample configuration run:")
 	fmt.Println("        hookz init config")
 	fmt.Println("\nRun 'hookz --help' for usage.")
 	fmt.Println()
-	os.Exit(1)
-}
-
-func badYaml() {
-	util.PrintErr(errors.New("configuration in .hookz.yaml is not valid YAML syntax"))
-	os.Exit(1)
 }
 
 // CheckConfig ensures that there is a .hookz.yaml file locally and the version is supported by the current version of hookz
-func CheckConfig() (config lib.Configuration) {
-	config, err := lib.ReadConfig(Afs, version)
+func CheckConfig() (config lib.Configuration, err error) {
+	config, err = lib.ReadConfig(Afs, version)
+	var returnErr error
 	if err != nil && err.Error() == "NO_CONFIG" {
-		noConfig()
+		returnErr = errors.New("NO_CONFIG")
 	} else if err != nil && err.Error() == "BAD_YAML" {
-		badYaml()
+		returnErr = errors.New("configuration in .hookz.yaml is not valid YAML syntax")
 	}
-	return
+	return config, returnErr
 }
 
 // InstallSources installs all go repositories that are found in the Sources section of the .hookz.yaml file.

cmd/common_test.go

@@ -0,0 +1,41 @@
+package cmd
+
+import (
+	"testing"
+
+	"github.com/devops-kung-fu/common/util"
+	"github.com/stretchr/testify/assert"
+
+	"github.com/devops-kung-fu/hookz/lib"
+)
+
+func Test_InstallSources(t *testing.T) {
+	sources := []lib.Source{
+		{
+			Source: "github.com/devops-kung-fu/hinge@latest",
+		},
+	}
+	output := util.CaptureOutput(func() {
+		_ = InstallSources(sources)
+	})
+
+	assert.NotNil(t, output)
+	assert.Contains(t, output, "go install github.com/devops-kung-fu/hinge@latest\n")
+
+	sources = []lib.Source{
+		{
+			Source: "yeah",
+		},
+	}
+	output = util.CaptureOutput(func() {
+		_ = InstallSources(sources)
+	})
+	assert.Contains(t, output, "exit status 1\n")
+}
+
+func TestNoConfig(t *testing.T) {
+	output := util.CaptureOutput(func() {
+		NoConfig()
+	})
+	assert.NotNil(t, output)
+}

cmd/init.go

@@ -31,7 +31,15 @@ var (
 			util.DoIf(Verbose, func() {
 				util.PrintInfo("Creating hooks")
 			})
-			config := CheckConfig()
+			config, err := CheckConfig()
+			if err != nil {
+				if err != nil && err.Error() == "NO_CONFIG" {
+					NoConfig()
+				} else {
+					util.PrintErr(err)
+				}
+				os.Exit(1)
+			}
 			_ = InstallSources(config.Sources)
 			if util.IsErrorBool(lib.WriteHooks(Afs, config, Verbose, VerboseOutput)) {
 				return

cmd/reset.go

@@ -1,6 +1,8 @@
 package cmd
 
 import (
+	"os"
+
 	"github.com/devops-kung-fu/common/util"
 	"github.com/spf13/cobra"
 
@@ -19,7 +21,15 @@ var (
 			if util.IsErrorBool(lib.RemoveHooks(Afs, Verbose)) {
 				return
 			}
-			config := CheckConfig()
+			config, err := CheckConfig()
+			if err != nil {
+				if err != nil && err.Error() == "NO_CONFIG" {
+					NoConfig()
+				} else {
+					util.PrintErr(err)
+				}
+				os.Exit(1)
+			}
 			_ = InstallSources(config.Sources)
 			if util.IsErrorBool(lib.WriteHooks(Afs, config, Verbose, VerboseOutput)) {
 				return

cmd/update.go

@@ -1,6 +1,8 @@
 package cmd
 
 import (
+	"os"
+
 	"github.com/devops-kung-fu/common/util"
 	"github.com/spf13/cobra"
 
@@ -16,7 +18,15 @@ var (
 			util.DoIf(Verbose, func() {
 				util.PrintInfo("Updating sources and executables")
 			})
-			config := CheckConfig()
+			config, err := CheckConfig()
+			if err != nil {
+				if err != nil && err.Error() == "NO_CONFIG" {
+					NoConfig()
+				} else {
+					util.PrintErr(err)
+				}
+				os.Exit(1)
+			}
 			_ = InstallSources(config.Sources)
 			updateCount, _ := lib.UpdateExecutables(Afs, config)
 			util.DoIf(updateCount == 0, func() {

lib/hookwriter.go

@@ -120,10 +120,7 @@ func buildExec(afs *afero.Afero, action *Action) (err error) {
 	}
 	if action.Exec == nil && action.Script != nil {
 		scriptFileName, _ := CreateScriptFile(afs, *action.Script)
-		path, err := os.Getwd()
-		if err != nil {
-			return err
-		}
+		path, _ := os.Getwd()
 		fullScriptFileName := fmt.Sprintf("%s/%s/%s", path, ".git/hooks", scriptFileName)
 		action.Exec = &fullScriptFileName
 	}