Merge pull request #246 from lets-cli/fix-env-override

fix env (-E) override

Author: kindermax

cmd/subcommand.go

@@ -156,8 +156,8 @@ func isHidden(cmdName string, showAll bool) bool {
 // newSubcommand creates new cobra root subcommand from config.Command.
 func newSubcommand(command *config.Command, conf *config.Config, showAll bool, out io.Writer) *cobra.Command {
 	subCmd := &cobra.Command{
-		Use:   command.Name,
-		Short: short(command.Description),
+		Use:    command.Name,
+		Short:  short(command.Description),
 		Hidden: isHidden(command.Name, showAll),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			command.Args = append(command.Args, prepareArgs(command.Name, os.Args)...)

config/config/command.go

@@ -78,6 +78,9 @@ func (c *Command) UnmarshalYAML(unmarshal func(interface{}) error) error {
 	c.Cmds = cmd.Cmd
 	c.Description = cmd.Description
 	c.Env = cmd.Env
+	if c.Env == nil {
+		c.Env = &Envs{}
+	}
 
 	// support for deprecated eval_env
 	if !cmd.EvalEnv.Empty() {

tests/override_env.bats

@@ -0,0 +1,43 @@
+load test_helpers
+
+setup() {
+    load "${BATS_UTILS_PATH}/bats-support/load.bash"
+    load "${BATS_UTILS_PATH}/bats-assert/load.bash"
+    cd ./tests/override_env
+}
+
+@test "override_env: should use default global env for running command" {
+    run lets say_hello_global_env
+    assert_success
+    assert_line --index 0 "Hello John"
+}
+
+@test "override_env: should use default command env for running command" {
+    run lets say_hello_command_env
+    assert_success
+    assert_line --index 0 "Hello Rick"
+}
+
+@test "override_env: should override global env for running command with -E" {
+    run lets -E NAME=Morty say_hello_global_env
+    assert_success
+    assert_line --index 0 "Hello Morty"
+}
+
+@test "override_env: should override command env for running command with -E" {
+    run lets -E NAME=Morty say_hello_command_env
+    assert_success
+    assert_line --index 0 "Hello Morty"
+}
+
+@test "override_env: should override command env for running command with --env" {
+    run lets --env NAME=Morty say_hello_command_env
+    assert_success
+    assert_line --index 0 "Hello Morty"
+}
+
+@test "override_env: should set env variable for command with -E even if there is no either global or command env var" {
+    run lets -E FOO=BAR print-foo
+    assert_success
+    assert_line --index 0 "FOO=BAR"
+}

tests/set_env/lets.yaml tests/override_env/lets.yamltests/set_env/lets.yaml renamed to tests/override_env/lets.yaml

@@ -4,11 +4,11 @@ env:
   NAME: "John"
 
 commands:
-  say_hello_global:
+  say_hello_global_env:
     description: Say hello
     cmd: echo "Hello ${NAME}"
 
-  say_hello:
+  say_hello_command_env:
     description: Say hello
     env:
       NAME: Rick
@@ -17,3 +17,6 @@ commands:
   say_command:
     description: Say command name
     cmd: echo $LETS_COMMAND_NAME
+
+  print-foo:
+    cmd: echo FOO=${FOO}