Fix windows support

ask.go

@@ -62,7 +62,7 @@ func (i *UI) Ask(query string, opts *Options) (string, error) {
 				break
 			}
 
-			fmt.Fprintf(i.Writer, "Input must not be empty.\n\n")
+			fmt.Fprintf(i.Writer, "Input must not be empty.")
 			continue
 		}
 
@@ -74,7 +74,7 @@ func (i *UI) Ask(query string, opts *Options) (string, error) {
 				break
 			}
 
-			fmt.Fprintf(i.Writer, "Failed to validate input string: %s\n\n", err)
+			fmt.Fprintf(i.Writer, "Failed to validate input string: %s", err)
 			continue
 		}
 

read.go

@@ -46,9 +46,9 @@ func (i *UI) read(opts *readOptions) (string, error) {
 				resultErr = fmt.Errorf("failed to read the input: %s", err)
 			}
 
-			resultStr = strings.TrimSuffix(line, LineSep)
+			resultStr = strings.Trim(line, LineSep)
 			// brute force for the moment
-			resultStr = strings.TrimSuffix(line, "\n")
+			resultStr = strings.TrimSuffix(resultStr, "\n")
 		}
 	}()
 

read_test.go

@@ -2,12 +2,18 @@ package input
 
 import (
 	"bytes"
+	"fmt"
 	"io"
 	"io/ioutil"
 	"testing"
 )
 
 func TestRead(t *testing.T) {
+	var stringWithSpace = fmt.Sprintf("taichi nakashima%s", LineSep)
+	var expectedWithSpace = "taichi nakashima"
+	var stringNoSpace = fmt.Sprintf("passw0rd%s", LineSep)
+	var expectedNoSpace = "passw0rd"
+
 	cases := []struct {
 		opts      *readOptions
 		userInput io.Reader
@@ -18,17 +24,17 @@ func TestRead(t *testing.T) {
 				mask:    false,
 				maskVal: "",
 			},
-			userInput: bytes.NewBufferString("passw0rd"),
-			expect:    "passw0rd",
+			userInput: bytes.NewBufferString(stringNoSpace),
+			expect:    expectedNoSpace,
 		},
 
 		{
 			opts: &readOptions{
 				mask:    false,
 				maskVal: "",
 			},
-			userInput: bytes.NewBufferString("taichi nakashima"),
-			expect:    "taichi nakashima",
+			userInput: bytes.NewBufferString(stringWithSpace),
+			expect:    expectedWithSpace,
 		},
 
 		// No good way to test masking...

select.go

@@ -43,7 +43,7 @@ func (i *UI) Select(query string, list []string, opts *Options) (string, error)
 
 	// Construct the query & display it to user
 	var buf bytes.Buffer
-	buf.WriteString(fmt.Sprintf("%s\n\n", query))
+	buf.WriteString(fmt.Sprintf("%s", query))
 	for i, item := range list {
 		buf.WriteString(fmt.Sprintf("%d. %s\n", i+1, item))
 	}
@@ -87,7 +87,7 @@ func (i *UI) Select(query string, list []string, opts *Options) (string, error)
 				break
 			}
 
-			fmt.Fprintf(i.Writer, "Input must not be empty. Answer by a number.\n\n")
+			fmt.Fprintf(i.Writer, "Input must not be empty. Answer by a number.")
 			continue
 		}
 
@@ -100,7 +100,7 @@ func (i *UI) Select(query string, list []string, opts *Options) (string, error)
 			}
 
 			fmt.Fprintf(i.Writer,
-				"%q is not a valid input. Answer by a number.\n\n", line)
+				"%q is not a valid input. Answer by a number.", line)
 			continue
 		}
 
@@ -112,7 +112,7 @@ func (i *UI) Select(query string, list []string, opts *Options) (string, error)
 			}
 
 			fmt.Fprintf(i.Writer,
-				"%q is not a valid choice. Choose a number from 1 to %d.\n\n",
+				"%q is not a valid choice. Choose a number from 1 to %d.",
 				line, len(list))
 			continue
 		}
@@ -125,7 +125,7 @@ func (i *UI) Select(query string, list []string, opts *Options) (string, error)
 				break
 			}
 
-			fmt.Fprintf(i.Writer, "Failed to validate input string: %s\n\n", err)
+			fmt.Fprintf(i.Writer, "Failed to validate input string: %s", err)
 			continue
 		}