Finish adding file-order option

Author: dylanhitt

.githooks/pre-commit

@@ -1,14 +1,14 @@
 #!/usr/bin/env bash
 
-# FMT_FILES=`gofmt -l . | grep -v "vendor/"`
-# if [[ $FMT_FILES != "" ]]; then
-#     echo "Some files aren't formatted, please run 'go fmt ./...' to format your source code before committing"
-#     echo "${FMT_FILES}"
-#     exit 1
-# fi
+FMT_FILES=`gofmt -l . | grep -v "vendor/"`
+if [[ $FMT_FILES != "" ]]; then
+    echo "Some files aren't formatted, please run 'go fmt ./...' to format your source code before committing"
+    echo "${FMT_FILES}"
+    exit 1
+fi
 
-# vetcount=`go vet ./... 2>&1  | wc -l`
-# if [ $vetcount -gt 0 ]; then
-#     echo "Some files aren't passing vet heuristics, please run 'go vet ./...' to see the errors it flags and correct your source code before committing"
-#     exit 1
-# fi
+vetcount=`go vet ./... 2>&1  | wc -l`
+if [ $vetcount -gt 0 ]; then
+    echo "Some files aren't passing vet heuristics, please run 'go vet ./...' to see the errors it flags and correct your source code before committing"
+    exit 1
+fi

cmd/commander/commander.go

@@ -2,13 +2,14 @@ package main
 
 import (
 	"fmt"
-	"github.com/SimonBaeumer/commander/pkg/app"
-	"github.com/urfave/cli"
 	"io/ioutil"
 	"log"
 	"os"
 	"path"
 	"strings"
+
+	"github.com/SimonBaeumer/commander/pkg/app"
+	"github.com/urfave/cli"
 )
 
 var version string
@@ -58,6 +59,11 @@ func createTestCommand() cli.Command {
 				Usage:  "More output for debugging",
 				EnvVar: "COMMANDER_VERBOSE",
 			},
+			cli.BoolFlag{
+				Name:   "file-order",
+				Usage:  "Preserve file order",
+				EnvVar: "COMMANDER_FILE_ORDER",
+			},
 		},
 		Action: func(c *cli.Context) error {
 			if c.Bool("verbose") {

pkg/app/app.go

@@ -13,6 +13,7 @@ const (
 type AddCommandContext struct {
 	Verbose    bool
 	NoColor    bool
+	FileOrder  bool
 	Concurrent int
 }
 
@@ -21,6 +22,7 @@ func NewAddContextFromCli(c *cli.Context) AddCommandContext {
 	return AddCommandContext{
 		Verbose:    c.Bool("verbose"),
 		NoColor:    c.Bool("no-color"),
+		FileOrder:  c.Bool("file-order"),
 		Concurrent: c.Int("concurrent"),
 	}
 }

pkg/app/test_command.go

@@ -45,7 +45,7 @@ func TestCommand(input string, title string, ctx AddCommandContext) error {
 		return fmt.Errorf("Error " + err.Error())
 	}
 
-	out := output.NewCliOutput(!ctx.NoColor, true)
+	out := output.NewCliOutput(!ctx.NoColor, ctx.FileOrder)
 	if !out.Start(results) {
 		return fmt.Errorf("Test suite failed, use --verbose for more detailed output")
 	}

pkg/output/cli.go

@@ -93,6 +93,7 @@ func (w *OutputWriter) Start(results <-chan runtime.TestResult) bool {
 
 	w.fprintf("")
 	for _, e := range fileErrors {
+		w.fprintf("File Errors:")
 		w.fprintf(e)
 	}
 	return failed == 0

pkg/output/cli_test.go

@@ -12,7 +12,7 @@ import (
 )
 
 func Test_NewCliOutput(t *testing.T) {
-	got := NewCliOutput(true)
+	got := NewCliOutput(true, true)
 	assert.IsType(t, OutputWriter{}, got)
 }
 

pkg/runtime/runtime_test.go

@@ -1,13 +1,14 @@
 package runtime
 
 import (
-	"github.com/stretchr/testify/assert"
 	"testing"
 	"time"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func Test_NewRuntime(t *testing.T) {
-	runtime := NewRuntime(Node{Name: "test"}, Node{Name: "test2"})
+	runtime := NewRuntime("myfile", Node{Name: "test"}, Node{Name: "test2"})
 
 	assert.Len(t, runtime.Nodes, 3)
 }
@@ -70,6 +71,7 @@ func TestRuntime_WithRetriesAndInterval(t *testing.T) {
 
 func Test_Runtime_getExecutor(t *testing.T) {
 	r := NewRuntime(
+		"myfile",
 		Node{Name: "ssh-host", Type: "ssh"},
 		Node{Name: "localhost", Type: "local"},
 		Node{Name: "default", Type: ""},