fix: escape special chars in commit title / message and set default v…

…alues for empty repos

pkg/common/git.go

@@ -42,15 +42,32 @@ func GetSCMArguments(projectDir string) []string {
 	log.Debug("Using git repository at " + projectDir)
 	repository, repositoryErr := git.PlainOpen(projectDir)
 	if repositoryErr != nil {
-		log.Warn("No repository!")
-		return getDefaultInfo()
+		info = append(info, "NCI_REPOSITORY_KIND=none")
+		info = append(info, "NCI_REPOSITORY_REMOTE=local")
+		info = append(info, "NCI_COMMIT_REF_TYPE=unknown")
+		info = append(info, "NCI_COMMIT_REF_NAME=unknown")
+		info = append(info, "NCI_COMMIT_REF_SLUG=unknown")
+		info = append(info, "NCI_COMMIT_REF_RELEASE=unknown")
+		info = append(info, "NCI_COMMIT_SHA=")
+		info = append(info, "NCI_COMMIT_SHA_SHORT=")
+		info = append(info, "NCI_COMMIT_TITLE=")
+		info = append(info, "NCI_COMMIT_DESCRIPTION=")
+		return info
 	}
 
-	// get current reference
 	ref, refErr := repository.Head()
 	if refErr != nil {
-		log.Warn("Empty repository!")
-		return getDefaultInfo()
+		info = append(info, "NCI_REPOSITORY_KIND=none")
+		info = append(info, "NCI_REPOSITORY_REMOTE=local")
+		info = append(info, "NCI_COMMIT_REF_TYPE=unknown")
+		info = append(info, "NCI_COMMIT_REF_NAME=unknown")
+		info = append(info, "NCI_COMMIT_REF_SLUG=unknown")
+		info = append(info, "NCI_COMMIT_REF_RELEASE=unknown")
+		info = append(info, "NCI_COMMIT_SHA=")
+		info = append(info, "NCI_COMMIT_SHA_SHORT=")
+		info = append(info, "NCI_COMMIT_TITLE=")
+		info = append(info, "NCI_COMMIT_DESCRIPTION=")
+		return info
 	}
 	log.Debug("Git Ref " + ref.String())
 
@@ -147,20 +164,3 @@ func readLastLine(filename string) string {
 
 	return lastLine
 }
-
-func getDefaultInfo() []string {
-	var info []string
-
-	info = append(info, "NCI_REPOSITORY_KIND=none")
-	info = append(info, "NCI_REPOSITORY_REMOTE=local")
-	info = append(info, "NCI_COMMIT_REF_TYPE=unknown")
-	info = append(info, "NCI_COMMIT_REF_NAME=unknown")
-	info = append(info, "NCI_COMMIT_REF_SLUG=unknown")
-	info = append(info, "NCI_COMMIT_REF_RELEASE=unknown")
-	info = append(info, "NCI_COMMIT_SHA=")
-	info = append(info, "NCI_COMMIT_SHA_SHORT=")
-	info = append(info, "NCI_COMMIT_TITLE=")
-	info = append(info, "NCI_COMMIT_DESCRIPTION=")
-
-	return info
-}

pkg/common/git_test.go

@@ -2,42 +2,31 @@ package common
 
 import (
 	"testing"
-	"io/ioutil"
 	"os"
-
 	"gopkg.in/src-d/go-git.v4"
 )
 
 func TestOnInvalidGitDirectory(t *testing.T) {
-	var scmArgs = GetSCMArguments(GetGitDirectory()+"/../invalidpath")
-
 	// log all normalized values
+	var scmArgs = GetSCMArguments(GetGitDirectory()+"/tmp/invaliddir")
 	for _, envvar := range scmArgs {
 		t.Log(envvar)
 	}
 }
 
 func TestOnEmptyGitRepository(t *testing.T) {
-	// create empty repo
-	dir, dirErr := ioutil.TempDir("", "normalizeci")
-	if dirErr != nil {
-		t.Errorf(dirErr.Error())
-	}
-
-	// init empty repo
-	_, gitErr := git.PlainInit(dir, false)
-	if gitErr != nil {
-		t.Errorf(gitErr.Error())
+	// create git repo
+	var tmpDir = GetGitDirectory()+"/tmp/empty"
+	os.RemoveAll(GetGitDirectory()+"/tmp/empty")
+	_, err := git.PlainInit(tmpDir, true)
+	if err != nil {
+		t.Errorf(err.Error())
 	}
 
-	// call func
-	var scmArgs = GetSCMArguments(dir)
-
 	// log all normalized values
+	var scmArgs = GetSCMArguments(tmpDir)
 	for _, envvar := range scmArgs {
-		t.Log("Args:"+envvar)
+		t.Log(envvar)
 	}
-
-	// clean up
-	defer os.RemoveAll(dir)
+	os.RemoveAll(GetGitDirectory()+"/tmp/empty")
 }

src/app.go

@@ -73,8 +73,8 @@ func main() {
 		err := os.Setenv(entrySplit[0], entrySplit[1])
 		common.CheckForError(err)
 
-		// print via stdout
-		s := fmt.Sprintf("export %s=\"%s\"\n", entrySplit[0], entrySplit[1])
+		// print via stdout and escape values
+		s := fmt.Sprintf("export %s=\"%s\"\n", entrySplit[0], strings.ReplaceAll(entrySplit[1], "\"", "\\\""))
 		io.WriteString(os.Stdout, s) // Ignoring error for simplicity.
 	}
 }