added test

Author: brainexe

Makefile

@@ -1,3 +1,8 @@
 
+.PHONY: test
+
 git-log-exec:
 	go build -o git-log-exec *.go
+
+test:
+	go test ./...

dumper.go

@@ -0,0 +1,82 @@
+package main
+
+import (
+	"encoding/csv"
+	"fmt"
+	"io"
+	"os"
+	"time"
+
+	"github.com/schollz/progressbar/v2"
+)
+
+type entry struct {
+	commit    string
+	timestamp int
+	data      string
+}
+
+func DumpHistory(directory string, command string, output io.Writer, limit int, after string, before string) error {
+	var err error
+
+	if command == "" {
+		return fmt.Errorf("No command given\n")
+	}
+
+	if directory != "" {
+		err = os.Chdir(directory)
+		if err != nil {
+			return fmt.Errorf("Invalid directory: %s\n", directory)
+		}
+	}
+
+	// make sure we leave a clean state afterwards
+	branch, err := execute("git", "rev-parse", "--abbrev-ref", "HEAD")
+	if err != nil {
+		return err
+	}
+	defer execute("git", "checkout", branch)
+
+	commits, err := getCommits(limit, after, before)
+	if err != nil {
+		return err
+	}
+
+	bar := progressbar.New(len(commits))
+	result := make([]entry, 0, len(commits))
+
+	for _, commit := range commits {
+		bar.Add(1)
+		result = append(result, evaluate(commit, command))
+	}
+
+	return writeCsv(result, output)
+}
+
+func writeCsv(logs []entry, file io.Writer) error {
+	writer := csv.NewWriter(file)
+	err := writer.Write([]string{
+		"time",
+		"result",
+		"commit",
+	})
+
+	if err != nil {
+		return err
+	}
+
+	for _, row := range logs {
+		err := writer.Write([]string{
+			time.Unix(int64(row.timestamp), 0).Format(time.RFC3339),
+			row.data,
+			row.commit,
+		})
+		if err != nil {
+			return err
+		}
+	}
+
+	writer.Flush()
+
+	return nil
+}

git.go

@@ -6,9 +6,7 @@ import (
 	"strings"
 )
 
-func getCommits(branch string, limit int, after string, before string) ([]entry, error) {
-	checkout(branch)
-
+func getCommits(limit int, after string, before string) ([]entry, error) {
 	args := []string{
 		"log",
 		"--pretty=\"%h %ct\"",
@@ -53,9 +51,3 @@ func getCommits(branch string, limit int, after string, before string) ([]entry,
 
 	return commits, nil
 }
-
-func checkout(branch string) error {
-	_, err := execute("git", "checkout", branch)
-
-	return err
-}

go.mod

@@ -2,4 +2,7 @@ module github.com/brainexe/git-log-exec
 
 go 1.13
 
-require github.com/schollz/progressbar/v2 v2.15.0
+require (
+	github.com/schollz/progressbar/v2 v2.15.0
+	github.com/stretchr/testify v1.3.0
+)

integration_test.go

@@ -0,0 +1,43 @@
+package main
+
+import (
+	"bufio"
+	"bytes"
+	"io/ioutil"
+	"os"
+	"os/exec"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+const GitDir = "git_directory"
+
+func TestRemoteRepo(t *testing.T) {
+	t.Run("slack-bot-1", func(t *testing.T) {
+		before := ""
+		after := "2019-09-04T17:14:43+02:00"
+		limit := 20
+
+		test(t, "../tests/test1.csv", "ls * | wc -l", "https://github.com/innogames/slack-bot.git", limit, before, after)
+	})
+}
+
+func test(t *testing.T, expectedFile string, command string, gitUrl string, limit int, after string, before string) {
+	os.RemoveAll(GitDir)
+	cmd := exec.Command("git", "clone", gitUrl, GitDir)
+	out, err := cmd.CombinedOutput()
+	assert.NoError(t, err, string(out))
+	defer os.RemoveAll(GitDir)
+
+	var actual bytes.Buffer
+	err = DumpHistory(GitDir, command, bufio.NewWriter(&actual), limit, after, before)
+	assert.NoError(t, err)
+
+	if expectedFile != "" {
+		expected, err := ioutil.ReadFile(expectedFile)
+		assert.NoError(t, err, expected)
+
+		assert.Equal(t, string(expected), actual.String())
+	}
+}

main.go

@@ -6,28 +6,18 @@ import (
 	"os"
 	"os/exec"
 	"strings"
-
-	"github.com/schollz/progressbar/v2"
 )
 
-type entry struct {
-	commit    string
-	timestamp int
-	data      string
-}
-
-var directory string
-var command string
-var branch string
-var outputFile string
-var limit int
-var after string
-var before string
-
 func main() {
+	var directory string
+	var command string
+	var outputFile string
+	var limit int
+	var after string
+	var before string
+
 	flag.StringVar(&directory, "directory", "", "git workspace (by default current directory)")
 	flag.StringVar(&command, "command", "", "command to execute")
-	flag.StringVar(&branch, "branch", "master", "git branch to check")
 	flag.StringVar(&outputFile, "output", "out.csv", "output csv file")
 	flag.StringVar(&after, "after", "", "optional begin date of history search")
 	flag.StringVar(&before, "before", "", "optional end date of history search")
@@ -36,37 +26,14 @@ func main() {
 
 	// if no parameter given, use history of current history
 	var err error
-	if directory == "" {
-		directory, err = os.Getwd()
-		checkError(err)
-	}
-
-	if stat, err := os.Stat(directory); err != nil || !stat.IsDir() {
-		fmt.Printf("Invalid directory: %s\n", directory)
-		flag.PrintDefaults()
-		os.Exit(1)
-	}
-
-	commits, err := getCommits(branch, limit, after, before)
-	checkError(err)
-
-	bar := progressbar.New(len(commits))
-	result := make([]entry, 0, len(commits))
-
-	for _, commit := range commits {
-		bar.Add(1)
-		result = append(result, evaluate(commit))
-	}
-
-	// checkout to initial version
-	checkout(branch)
 
 	out, err := os.Create(outputFile)
 	checkError(err)
 	defer out.Close()
 
-	err = writeCsv(result, out)
+	err = DumpHistory(directory, command, out, limit, after, before)
 	checkError(err)
+
 	fmt.Printf("\nWrote file %s\n", outputFile)
 }
 
@@ -77,25 +44,25 @@ func checkError(err error) {
 	}
 }
 
-func evaluate(commit entry) entry {
-	checkout(commit.commit)
+func evaluate(commit entry, command string) entry {
+	execute("git", "checkout", commit.commit)
 
 	stdout, _ := execute("sh", "-c", command)
 
-	commit.data = strings.TrimSpace(stdout)
+	data := strings.SplitN(stdout, "\n", 2)
+	commit.data = data[0]
 
 	return commit
 }
 
 func execute(name string, args ...string) (string, error) {
 	cmd := exec.Command(name, args...)
-	cmd.Dir = directory
 	out, err := cmd.CombinedOutput()
 
 	if err != nil {
 		fmt.Fprintf(os.Stderr, "Command '%s' failed: %s: %s", cmd.String(), err, string(out))
 		os.Exit(1)
 	}
 
-	return string(out), err
+	return strings.TrimSpace(string(out)), err
 }

tests/test1.csv

@@ -0,0 +1,11 @@
+time,result,commit
+2019-09-04T17:14:43+02:00,94,47529f9
+2019-09-04T11:03:08+02:00,94,18dc0e8
+2019-08-31T18:39:27+02:00,94,9c3d6ea
+2019-08-14T21:49:34+02:00,94,b1c0848
+2019-08-12T11:07:55+02:00,94,c210243
+2019-07-30T21:27:03+02:00,94,c9934c9
+2019-07-25T19:12:51+02:00,90,9824e7f
+2019-07-24T20:47:41+02:00,88,8c56c5d
+2019-07-23T19:04:47+02:00,88,73a7583
+2019-07-21T21:18:39+02:00,88,ddeb55b