Move the env loadings & command running into main package.

cmd/cmd.go

@@ -3,8 +3,8 @@ package main
 import (
 	"flag"
 	"fmt"
-	"os"
+	"log"
-	"os/exec"
+
 	"strings"
 
 	"github.com/joho/godotenv"
@@ -38,23 +38,17 @@ example
 	}
 
 	// load env
-	// TODO would be nicer for an empty rawEnvFilenames to give us an empty map
+	var envFilenames []string
-	// and then only call Load() once
+	if rawEnvFilenames != "" {
-	// other TODO error handling on Load()
+		envFilenames = strings.Split(rawEnvFilenames, ",")
-	if rawEnvFilenames == "" {
-		godotenv.Load()
-	} else {
-		envFilenames := strings.Split(rawEnvFilenames, ",")
-		godotenv.Load(envFilenames...)
 	}
 
 	// take rest of args and "exec" them
 	cmd := args[0]
 	cmdArgs := args[1:len(args)]
 
-	command := exec.Command(cmd, cmdArgs...)
+	err := godotenv.Exec(envFilenames, cmd, cmdArgs)
-	command.Stdin = os.Stdin
+	if err != nil {
-	command.Stdout = os.Stdout
+		log.Fatal(err)
-	command.Stderr = os.Stderr
+	}
-	command.Start()
 }

godotenv.go

@@ -19,6 +19,7 @@ import (
 	"bufio"
 	"errors"
 	"os"
+	"os/exec"
 	"strings"
 )
 
@@ -65,6 +66,16 @@ func Read(filenames ...string) (envMap map[string]string, err error) {
 	return
 }
 
+func Exec(filenames []string, cmd string, cmdArgs []string) error {
+	Load(filenames...)
+
+	command := exec.Command(cmd, cmdArgs...)
+	command.Stdin = os.Stdin
+	command.Stdout = os.Stdout
+	command.Stderr = os.Stderr
+	return command.Run()
+}
+
 func filenamesOrDefault(filenames []string) []string {
 	if len(filenames) == 0 {
 		return []string{".env"}