[BUGFIX] Handle whitespace during option parsing

Fixes #13

host/host.go

@@ -39,7 +39,7 @@ type Host struct {
 	options []Option
 }
 
-// GetOptionArgument gets a argument for an option keyword for a host
+// GetOptionArgument gets an argument for an option keyword for a host
 func (host Host) GetOptionArgument(keyword string) string {
 	for _, option := range host.options {
 		if option.keyword == keyword {
@@ -53,8 +53,15 @@ func (host Host) GetOptionArgument(keyword string) string {
 func (host *Host) AddOptionFromString(line string) {
 	line = strings.TrimSpace(line)
 	sepIndex := strings.IndexAny(line, " \t")
-	keyword, argument := line[0:sepIndex], line[sepIndex+1:]
-	host.options = append(host.options, Option{keyword: keyword, argument: argument})
+
+	var keyword, argument string
+	if sepIndex != -1 {
+		keyword, argument = line[0:sepIndex], line[sepIndex+1:]
+	} else {
+		keyword, argument = line, ""
+	}
+
+	host.options = append(host.options, Option{keyword: strings.TrimSpace(keyword), argument: strings.TrimSpace(argument)})
 }
 
 // SetName sets name

host/host_test.go

@@ -58,3 +58,29 @@ func TestContainsStrings(t *testing.T) {
 		t.Errorf("Contains strings isn't returning false when it should")
 	}
 }
+
+func TestAddOptionFromString(t *testing.T) {
+	host := h.MakeHost()
+
+	host.AddOptionFromString("junktown ~/.sdklfj/hosrsefj")
+	host.AddOptionFromString("Mule")
+	host.AddOptionFromString(" 	sdlkfj 	 	 	 ")
+	host.AddOptionFromString(" 	sddfsdflkfj 	 sdfsdf	 	sdfsdfsdf ")
+
+
+	if arg := host.GetOptionArgument("junktown"); arg != "~/.sdklfj/hosrsefj" {
+		t.Errorf("Unexpected option argument. Expected \"~/.sdklfj/hosrsefj\" got %s.", arg)
+	}
+
+	if arg := host.GetOptionArgument("Mule"); arg != "" {
+		t.Errorf("Unexpected option argument. Expected empty string got %s.", arg)
+	}
+
+	if arg := host.GetOptionArgument("sdlkfj"); arg != "" {
+		t.Errorf("Unexpected option argument. Expected empty string got \"%s\".", arg)
+	}
+
+	if arg := host.GetOptionArgument("sddfsdflkfj"); arg != "sdfsdf	 	sdfsdfsdf" {
+		t.Errorf("Unexpected option argument. Expected \"sdfsdf	 	sdfsdfsdf\" got \"%s\".", arg)
+	}
+}

host/parser_test.go

@@ -159,29 +159,6 @@ Host ormulex-qa
 	if found && host.Name() != "ormulex-qa" {
 		t.Errorf("hosts.FindHostByName found the wrong host (#4)")
 	}
-
-}
-
-func TestParseInvalidHostOptions(t *testing.T) {
-	hosts := host.HostsCollection{}
-	hosts.ReadFromString(
-`
-
-# Host options should have a value
-Host ormulex-dev
-				Hostname dev.ormulex.com
-				User mule
-				IdentityFile
-
-Host ormulex-qa
-				Hostname cmw3wbq10
-				User
-				ProxyCommand ssh cmw3wbq10 'nc %h %banana %p'
-
-
-# A comment with some empty lines around it
-
-`)
 }
 
 func TestFindHostValue(t *testing.T) {