Parsing string args correctly

builder.go

@@ -1,6 +1,8 @@
 package main
 
 import (
+	"bufio"
+	"bytes"
 	"fmt"
 	"log"
 	"os"
@@ -41,8 +43,12 @@ func NewBuilder(c config) (*Bob, error) {
 		return nil, err
 	}
 
-	parseCmd := func(cmd string) []string {
-		c := strings.Split(cmd, " ")
+	parseCmd := func(cmd string) (c []string) {
+		s := bufio.NewScanner(strings.NewReader(cmd))
+		s.Split(splitFunc)
+		for s.Scan() {
+			c = append(c, s.Text())
+		}
 
 		// check for environment variables inside script
 		if strings.Contains(cmd, "$$") {
@@ -73,6 +79,39 @@ func NewBuilder(c config) (*Bob, error) {
 	}, nil
 }
 
+func splitFunc(data []byte, atEOF bool) (advance int, token []byte, err error) {
+	advance, token, err = bufio.ScanWords(data, atEOF)
+	if err != nil {
+		return
+	}
+
+	if len(token) == 0 {
+		return
+	}
+
+	b := token[0]
+	if b != '"' && b != '\'' {
+		return
+	}
+
+	if token[len(token)-1] == b {
+		return
+	}
+
+	chunk := data[advance-1:]
+	i := bytes.IndexByte(chunk, b)
+	if i == -1 {
+		advance = len(data)
+		token = append(token, chunk...)
+		return
+	}
+
+	advance += i
+	token = append(token, chunk[:i+1]...)
+
+	return
+}
+
 func replaceEnv(cmds []string) {
 	for i, c := range cmds {
 		if !strings.HasPrefix(c, "$$") {

builder_test.go

@@ -33,6 +33,55 @@ func TestNewBuilder(t *testing.T) {
 	assert.Equal(t, c.IgnoredItems, b.ignoredItems)
 }
 
+func TestNewBuilder_CmdWithQuotes(t *testing.T) {
+	tests := []struct {
+		Command string
+		Chunks  []string
+	}{
+		{ // one single quote pair
+			Command: `echo 'hello world' foo`,
+			Chunks:  []string{`echo`, `'hello world'`, `foo`},
+		},
+		{ // one double quote pair
+			Command: `echo "hello world" foo`,
+			Chunks:  []string{`echo`, `"hello world"`, `foo`},
+		},
+		{ // no ending double quote
+			Command: `echo "ga ga oh la la`,
+			Chunks:  []string{`echo`, `"ga ga oh la la`},
+		},
+		{ // no ending single quote
+			Command: `echo 'ga ga oh la la`,
+			Chunks:  []string{`echo`, `'ga ga oh la la`},
+		},
+		{ // multiple double quotes
+			Command: `echo "ga" "foo"`,
+			Chunks:  []string{`echo`, `"ga"`, `"foo"`},
+		},
+		{ // double quotes inside single quotes
+			Command: `echo -c 'foo "bar"'`,
+			Chunks:  []string{`echo`, `-c`, `'foo "bar"'`},
+		},
+		{ // single quotes inside double quotes
+			Command: `echo -c "foo 'bar'"`,
+			Chunks:  []string{`echo`, `-c`, `"foo 'bar'"`},
+		},
+	}
+
+	for _, test := range tests {
+		c := config{
+			Build: []string{test.Command},
+			Run:   []string{test.Command},
+		}
+
+		b, err := NewBuilder(c)
+		require.NoError(t, err)
+
+		assert.Equal(t, test.Chunks, b.buildCmds[0])
+		assert.Equal(t, test.Chunks, b.runCmds[0])
+	}
+}
+
 func TestClose(t *testing.T) {
 	b, err := NewBuilder(config{})
 	require.NoError(t, err)