Handle space

Author: tcnksm

input.go

@@ -16,6 +16,7 @@ Package input reads user input at the console. http://github.com/tcnksm/go-input
 package input
 
 import (
+	"bufio"
 	"errors"
 	"io"
 	"os"
@@ -54,6 +55,8 @@ type UI struct {
 	mask    bool
 	maskVal string
 
+	bReader *bufio.Reader
+
 	once sync.Once
 }
 
@@ -75,6 +78,10 @@ func (i *UI) setDefault() {
 	if i.Reader == nil {
 		i.Reader = defaultReader
 	}
+
+	if i.bReader == nil {
+		i.bReader = bufio.NewReader(i.Reader)
+	}
 }
 
 // ValidateFunc is function to validate the user input.
@@ -163,8 +170,7 @@ func (o *Options) readOpts() *readOptions {
 	}
 }
 
-// maskString is used to mask string which should not be displayed
-// directly like auth token
+// maskString is used to mask string which should not be displayed.
 func maskString(s string) string {
 	if len(s) < 3 {
 		return "*******"

read.go

@@ -5,6 +5,7 @@ import (
 	"io"
 	"os"
 	"os/signal"
+	"strings"
 )
 
 // readOptions is option for read func
@@ -40,10 +41,12 @@ func (i *UI) read(opts *readOptions) (string, error) {
 			i.mask, i.maskVal = opts.mask, opts.maskVal
 			resultStr, resultErr = i.rawRead(f)
 		} else {
-			_, err := fmt.Fscanln(i.Reader, &resultStr)
-			if err != nil && err.Error() != "unexpected newline" {
+			line, err := i.bReader.ReadString('\n')
+			if err != nil && err != io.EOF {
 				resultErr = fmt.Errorf("failed to read the input: %s", err)
 			}
+
+			resultStr = strings.TrimSuffix(line, "\n")
 		}
 	}()
 

read_test.go

@@ -22,6 +22,15 @@ func TestRead(t *testing.T) {
 			expect:    "passw0rd",
 		},
 
+		{
+			opts: &readOptions{
+				mask:    false,
+				maskVal: "",
+			},
+			userInput: bytes.NewBufferString("taichi nakashima"),
+			expect:    "taichi nakashima",
+		},
+
 		// No good way to test masking...
 	}