Merge branch 'master' into fix/select-default-value

README.md

@@ -138,11 +138,9 @@ response:
 q := &survey.Question{
     Prompt: &survey.Input{Message: "Hello world validation"},
     Validate: func (val interface{}) error {
-        // since we are validating an Input, this will always succeed
-        if str, ok := val.(string) ; ok {
-            if len(str) > 10 {
-                return errors.New("This response cannot be longer than 10 characters.")
-            }
+        // since we are validating an Input, the assertion will always succeed
+        if str, ok := val.(string) ; ok && len(str) > 10 {
+            return errors.New("This response cannot be longer than 10 characters.")
         }
     }
 }
@@ -162,7 +160,7 @@ validators include:
 
 This project tries to maintain semantic GitHub releases as closely as possible. As such, services
 like [gopkg.in](http://labix.org/gopkg.in) work very well to ensure non-breaking changes whenever
-you build your application. For example, importing v1 of survey would look something like
+you build your application. For example, importing v1 of survey could look something like
 
 ```golang
 package main

confirm.go

@@ -118,7 +118,7 @@ func (c *Confirm) Cleanup(rl *readline.Instance, val interface{}) error {
 	// go up one line
 	terminal.CursorPreviousLine(1)
 	// clear the line
-	terminal.EraseInLine(0)
+	terminal.EraseLine(terminal.ERASE_LINE_ALL)
 
 	// the string version of the answer
 	ans := ""

input.go

@@ -52,7 +52,7 @@ func (i *Input) Cleanup(rl *readline.Instance, val interface{}) error {
 	// go up one line
 	terminal.CursorPreviousLine(1)
 	// clear the line
-	terminal.EraseInLine(0)
+	terminal.EraseLine(terminal.ERASE_LINE_ALL)
 
 	// render the template
 	out, err := core.RunTemplate(

multiselect.go

@@ -75,7 +75,7 @@ func (m *MultiSelect) render() error {
 	// clean up what we left behind last time
 	for range m.Options {
 		terminal.CursorPreviousLine(1)
-		terminal.EraseInLine(0)
+		terminal.EraseLine(terminal.ERASE_LINE_ALL)
 	}
 
 	// render the template summarizing the current state
@@ -170,10 +170,10 @@ func (m *MultiSelect) Prompt(rl *readline.Instance) (interface{}, error) {
 // Cleanup removes the options section, and renders the ask like a normal question.
 func (m *MultiSelect) Cleanup(rl *readline.Instance, val interface{}) error {
 	terminal.CursorPreviousLine(1)
-	terminal.EraseInLine(0)
+	terminal.EraseLine(terminal.ERASE_LINE_ALL)
 	for range m.Options {
 		terminal.CursorPreviousLine(1)
-		terminal.EraseInLine(0)
+		terminal.EraseLine(terminal.ERASE_LINE_ALL)
 	}
 
 	// execute the output summary template with the answer

select.go

@@ -68,7 +68,7 @@ func (s *Select) OnChange(line []rune, pos int, key rune) (newLine []rune, newPo
 func (s *Select) render() error {
 	for range s.Options {
 		terminal.CursorPreviousLine(1)
-		terminal.EraseInLine(0)
+		terminal.EraseLine(terminal.ERASE_LINE_ALL)
 	}
 
 	// the formatted response
@@ -163,10 +163,10 @@ func (s *Select) Prompt(rl *readline.Instance) (interface{}, error) {
 
 func (s *Select) Cleanup(rl *readline.Instance, val interface{}) error {
 	terminal.CursorPreviousLine(1)
-	terminal.EraseInLine(0)
+	terminal.EraseLine(terminal.ERASE_LINE_ALL)
 	for range s.Options {
 		terminal.CursorPreviousLine(1)
-		terminal.EraseInLine(0)
+		terminal.EraseLine(terminal.ERASE_LINE_ALL)
 	}
 
 	// execute the output summary template with the answer

terminal/display.go

@@ -1,11 +1,9 @@
-// +build !windows
-
 package terminal
 
-import (
-	"fmt"
-)
+type EraseLineMode int
 
-func EraseInLine(mode int) {
-	fmt.Printf("\x1b[%dK", mode)
-}
+const (
+	ERASE_LINE_END EraseLineMode = iota
+	ERASE_LINE_START
+	ERASE_LINE_ALL
+)

terminal/display_posix.go

@@ -0,0 +1,11 @@
+// +build !windows
+
+package terminal
+
+import (
+	"fmt"
+)
+
+func EraseLine(mode EraseLineMode) {
+	fmt.Printf("\x1b[%dK", mode)
+}

terminal/display_windows.go

@@ -6,7 +6,7 @@ import (
 	"unsafe"
 )
 
-func EraseInLine(mode int) {
+func EraseLine(mode EraseLineMode) {
 	handle := syscall.Handle(os.Stdout.Fd())
 
 	var csbi consoleScreenBufferInfo
@@ -16,11 +16,11 @@ func EraseInLine(mode int) {
 	var x short
 	cursor := csbi.cursorPosition
 	switch mode {
-	case 1:
+	case ERASE_LINE_END:
 		x = csbi.size.x
-	case 2:
+	case ERASE_LINE_START:
 		x = 0
-	case 3:
+	case ERASE_LINE_ALL:
 		cursor.x = 0
 		x = csbi.size.x
 	}