diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 18435b75..7f21c072 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -147,7 +147,7 @@ }, { "ImportPath": "github.com/flynn/go-shlex", - "Rev": "70644ac2a65dbf1691ce00c209d185163a14edc6" + "Rev": "3f9db97f856818214da2e1057f8ad84803971cff" }, { "ImportPath": "github.com/fsouza/go-dockerclient", diff --git a/Godeps/_workspace/src/github.com/flynn/go-shlex/shlex.go b/Godeps/_workspace/src/github.com/flynn/go-shlex/shlex.go index eaa21b37..7aeace80 100644 --- a/Godeps/_workspace/src/github.com/flynn/go-shlex/shlex.go +++ b/Godeps/_workspace/src/github.com/flynn/go-shlex/shlex.go @@ -60,7 +60,7 @@ func (a *Token) Equal(b *Token) bool { } const ( - RUNE_CHAR string = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789._-,/@$*()+=><:;&^%~|!?[]" + RUNE_CHAR string = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789._-,/@$*()+=><:;&^%~|!?[]{}" RUNE_SPACE string = " \t\r\n" RUNE_ESCAPING_QUOTE string = "\"" RUNE_NONESCAPING_QUOTE string = "'" @@ -347,7 +347,7 @@ SCAN: err = errors.New("EOF found when expecting closing quote.") break SCAN } - case RUNETOKEN_CHAR, RUNETOKEN_SPACE, RUNETOKEN_NONESCAPING_QUOTE, RUNETOKEN_COMMENT: + case RUNETOKEN_CHAR, RUNETOKEN_UNKNOWN, RUNETOKEN_SPACE, RUNETOKEN_NONESCAPING_QUOTE, RUNETOKEN_COMMENT: { value = append(value, nextRune) } @@ -373,7 +373,7 @@ SCAN: err = errors.New("EOF found when expecting closing quote.") break SCAN } - case RUNETOKEN_CHAR, RUNETOKEN_SPACE, RUNETOKEN_ESCAPING_QUOTE, RUNETOKEN_ESCAPE, RUNETOKEN_COMMENT: + case RUNETOKEN_CHAR, RUNETOKEN_UNKNOWN, RUNETOKEN_SPACE, RUNETOKEN_ESCAPING_QUOTE, RUNETOKEN_ESCAPE, RUNETOKEN_COMMENT: { value = append(value, nextRune) } @@ -394,7 +394,7 @@ SCAN: { break SCAN } - case RUNETOKEN_CHAR, RUNETOKEN_ESCAPING_QUOTE, RUNETOKEN_ESCAPE, RUNETOKEN_COMMENT, RUNETOKEN_NONESCAPING_QUOTE: + case RUNETOKEN_CHAR, RUNETOKEN_UNKNOWN, RUNETOKEN_ESCAPING_QUOTE, RUNETOKEN_ESCAPE, RUNETOKEN_COMMENT, RUNETOKEN_NONESCAPING_QUOTE: { value = append(value, nextRune) } diff --git a/Godeps/_workspace/src/github.com/flynn/go-shlex/shlex_test.go b/Godeps/_workspace/src/github.com/flynn/go-shlex/shlex_test.go index 6f5fca20..7551f7c5 100644 --- a/Godeps/_workspace/src/github.com/flynn/go-shlex/shlex_test.go +++ b/Godeps/_workspace/src/github.com/flynn/go-shlex/shlex_test.go @@ -110,8 +110,8 @@ func TestSplitSimple(t *testing.T) { } func TestSplitEscapingQuotes(t *testing.T) { - testInput := "one \"two three\" four" - expectedOutput := []string{"one", "two three", "four"} + testInput := "one \"два ${three}\" four" + expectedOutput := []string{"one", "два ${three}", "four"} foundOutput, err := Split(testInput) if err != nil { t.Error("Split returned error:", err) @@ -145,8 +145,8 @@ func TestGlobbingExpressions(t *testing.T) { } func TestSplitNonEscapingQuotes(t *testing.T) { - testInput := "one 'two three' four" - expectedOutput := []string{"one", "two three", "four"} + testInput := "one 'два ${three}' four" + expectedOutput := []string{"one", "два ${three}", "four"} foundOutput, err := Split(testInput) if err != nil { t.Error("Split returned error:", err)