Add WithWorkingDir option

Author: SimonBaeumer

README.md

@@ -35,6 +35,7 @@ Default option functions:
  - `cmd.WithStandardStreams`
  - `cmd.WithTimeout(time.Duration)`
  - `cmd.WithoutTimeout`
+ - `cmd.WithWorkingDir(string)`
 
 #### Example
 

command.go

@@ -6,7 +6,6 @@ import (
 	"io"
 	"os"
 	"os/exec"
-	"regexp"
 	"syscall"
 	"time"
 )
@@ -89,21 +88,20 @@ func WithoutTimeout(c *Command) {
 	c.Timeout = 0
 }
 
+// WithWorkingDir sets the current working directory
+func WithWorkingDir(dir string) func(c *Command) {
+	return func(c *Command) {
+		c.WorkingDir = dir
+	}
+}
+
 // AddEnv adds an environment variable to the command
 // If a variable gets passed like ${VAR_NAME} the env variable will be read out by the current shell
 func (c *Command) AddEnv(key string, value string) {
 	value = os.ExpandEnv(value)
 	c.Env = append(c.Env, fmt.Sprintf("%s=%s", key, value))
 }
 
-//Read all environment variables from the given value
-//with the syntax ${VAR_NAME}
-func parseEnvVariableFromShell(val string) []string {
-	reg := regexp.MustCompile(`\$\{.*?\}`)
-	matches := reg.FindAllString(val, -1)
-	return matches
-}
-
 //Stdout returns the output to stdout
 func (c *Command) Stdout() string {
 	c.isExecuted("Stdout")

command_linux.go

@@ -2,14 +2,9 @@ package cmd
 
 import (
 	"os/exec"
-	"strings"
 )
 
 func createBaseCommand(c *Command) *exec.Cmd {
 	cmd := exec.Command("/bin/sh", "-c", c.Command)
 	return cmd
 }
-
-func (c *Command) removeLineBreaks(text string) string {
-	return strings.Trim(text, "\n")
-}

command_linux_test.go

@@ -74,3 +74,10 @@ func TestCommand_WithoutTimeout(t *testing.T) {
 	assert.Nil(t, err)
 	assert.Equal(t, "hello\n", cmd.Stdout())
 }
+
+func TestCommand_WithInvalidDir(t *testing.T) {
+	cmd := NewCommand("echo hello", WithWorkingDir("/invalid"))
+	err := cmd.Execute()
+	assert.NotNil(t, err)
+	assert.Equal(t, "chdir /invalid: no such file or directory", err.Error())
+}