add support for multiple global env files

v2/ahoy.go

@@ -24,7 +24,7 @@ type Config struct {
 	AhoyAPI    string
 	Commands   map[string]Command
 	Entrypoint []string
-	Env        string
+	Env        []string
 }
 
 // Command is an ahoy command detailed in ahoy.yml files. Multiple
@@ -202,9 +202,11 @@ func getCommands(config Config) []cli.Command {
 	envVars := []string{}
 
 	// Get environment variables from the 'global' environment variable file, if it is defined.
-	if config.Env != "" {
-		globalEnvFile := filepath.Join(AhoyConf.srcDir, config.Env)
-		envVars = append(envVars, getEnvironmentVars(globalEnvFile)...)
+	if config.Env != nil {
+        for _, file := range config.Env {
+            globalEnvFile := filepath.Join(AhoyConf.srcDir, file)
+            envVars = append(envVars, getEnvironmentVars(globalEnvFile)...)
+        }
 	}
 
 	var keys []string

v2/testdata/env-multiple.ahoy.yml

@@ -0,0 +1,11 @@
+ahoyapi: v2
+env:
+  - .env
+  - .env.cmd
+commands:
+  test-global:
+    cmd: echo $GLOBAL
+  test-command:
+    cmd: echo $COMMAND 
+  test-overridden:
+    cmd: echo $TO_BE_OVERRIDDEN

v2/testdata/env.ahoy.yml

@@ -1,5 +1,6 @@
 ahoyapi: v2
-env: ./.env
+env: 
+  - .env
 commands:
   test-global:
     cmd: echo $GLOBAL

v2/tests/environment-variables.bats

@@ -2,6 +2,7 @@
 
 @test "Command-level variables can be defined and used" {
     run ./ahoy -f testdata/env.ahoy.yml test-cmd
+    echo "$output"
     [[ "$output" == "123456789" ]]
 }
 
@@ -19,3 +20,14 @@
     run ./ahoy -f testdata/env.ahoy.yml test-invalid-env
     [ $status -eq 1 ]
 }
+
+@test "Multiple global env files can be defined" {
+    run ./ahoy -f testdata/env-multiple.ahoy.yml test-global
+    [[ "$output" = "global" ]]
+
+    run ./ahoy -f testdata/env-multiple.ahoy.yml test-command
+    [[ "$output" = "123456789" ]]
+
+    run ./ahoy -f testdata/env-multiple.ahoy.yml test-overridden
+    [[ "$output" = "after" ]]
+}