Merge pull request #14 from dnephin/use-filewatcher-env-vars

Support env vars for some flags

dobi.yaml

@@ -33,8 +33,9 @@ job=watch:
   use: builder
   mounts: [source]
   interactive: true
-  command: scripts/watch
-  env: ['TESTFLAGS={env.TESTFLAGS:}']
+  command: |
+      filewatcher -x vendor ./dist/gotestsum -- -test.timeout 10s
+  env: ['GOTESTSUM_FORMAT=short-verbose']
 
 job=test-unit:
   use: builder

dobifiles/Dockerfile

@@ -8,7 +8,7 @@ ENV     PS1="# "
 
 
 FROM    golang as tools
-ARG     FILEWATCHER=v0.2.1
+ARG     FILEWATCHER=v0.3.0
 RUN     go get -d github.com/dnephin/filewatcher && \
         cd /go/src/github.com/dnephin/filewatcher && \
         git checkout -q "$FILEWATCHER" && \

main.go

@@ -57,20 +57,30 @@ Formats:
 `)
 	}
 	flags.BoolVar(&opts.debug, "debug", false, "enabled debug")
-	flags.StringVar(&opts.format, "format", "short",
+	flags.StringVar(&opts.format, "format",
+		lookEnvWithDefault("GOTESTSUM_FORMAT", "short"),
 		"print format of test input")
 	flags.BoolVar(&opts.rawCommand, "raw-command", false,
 		"don't prepend 'go test -json' to the 'go test' command")
-	flags.StringVar(&opts.jsonFile, "jsonfile", "",
+	flags.StringVar(&opts.jsonFile, "jsonfile",
+		lookEnvWithDefault("GOTESTSUM_JSONFILE", ""),
 		"write all TestEvents to file")
-	flags.StringVar(&opts.junitFile, "junitfile", "",
+	flags.StringVar(&opts.junitFile, "junitfile",
+		lookEnvWithDefault("GOTESTSUM_JUNITFILE", ""),
 		"write a JUnit XML file")
 	flags.BoolVar(&opts.noColor, "no-color", false, "disable color output")
 	flags.StringSliceVar(&opts.noSummary, "no-summary", nil,
 		"do not print summary of: failed, skipped, errors")
 	return flags, opts
 }
 
+func lookEnvWithDefault(key, defValue string) string {
+	if value, ok := os.LookupEnv(key); ok {
+		return value
+	}
+	return defValue
+}
+
 type options struct {
 	args       []string
 	format     string
@@ -132,13 +142,20 @@ func goTestCmdArgs(opts *options) []string {
 	case opts.rawCommand:
 		return args
 	case len(args) == 0:
-		return append(defaultArgs, "-json", "./...")
+		return append(defaultArgs, "-json", pathFromEnv("./..."))
 	case !hasJSONArg(args):
 		defaultArgs = append(defaultArgs, "-json")
 	}
+	if testPath := pathFromEnv(""); testPath != "" {
+		args = append(args, testPath)
+	}
 	return append(defaultArgs, args...)
 }
 
+func pathFromEnv(defaultPath string) string {
+	return lookEnvWithDefault("TEST_DIRECTORY", defaultPath)
+}
+
 func hasJSONArg(args []string) bool {
 	for _, arg := range args {
 		if arg == "-json" || arg == "--json" {