Merge pull request #299 from uzzz/master

Fix ui.Ask to return strings with spaces from stdin

cf/terminal/ui.go

@@ -1,6 +1,7 @@
 package terminal
 
 import (
+	"bufio"
 	"fmt"
 	"io"
 	"os"
@@ -124,8 +125,13 @@ func (c *terminalUI) Confirm(message string, args ...interface{}) bool {
 func (c *terminalUI) Ask(prompt string, args ...interface{}) (answer string) {
 	c.printer.Println("")
 	c.printer.Printf(prompt+PromptColor(">")+" ", args...)
-	fmt.Fscanln(c.stdin, &answer)
-	return
+
+	rd := bufio.NewReader(c.stdin)
+	line, err := rd.ReadString('\n')
+	if err == nil {
+		return strings.TrimSpace(line)
+	}
+	return ""
 }
 
 func (c *terminalUI) Ok() {

cf/terminal/ui_test.go

@@ -68,6 +68,22 @@ var _ = Describe("UI", func() {
 		})
 	})
 
+	Describe("Asking user for input", func() {
+		It("allows string with whitespaces", func() {
+			io_helpers.SimulateStdin("foo bar\n", func(reader io.Reader) {
+				ui := NewUI(reader, NewTeePrinter())
+				Expect(ui.Ask("?")).To(Equal("foo bar"))
+			})
+		})
+
+		It("returns empty string if an error occured while reading string", func() {
+			io_helpers.SimulateStdin("string without expected delimiter", func(reader io.Reader) {
+				ui := NewUI(reader, NewTeePrinter())
+				Expect(ui.Ask("?")).To(Equal(""))
+			})
+		})
+	})
+
 	Describe("Confirming user input", func() {
 		It("treats 'y' as an affirmative confirmation", func() {
 			io_helpers.SimulateStdin("y\n", func(reader io.Reader) {