#17 - better support passwords in tests, more cli tests

cmd/utils.go

@@ -1,20 +1,49 @@
 package cmd
 
 import (
+	"bufio"
 	"fmt"
+	"os"
+	"strings"
 
 	"github.com/bgentry/speakeasy"
+	"github.com/mattn/go-isatty"
 	"github.com/pkg/errors"
 	"github.com/spf13/viper"
-	keys "github.com/tendermint/go-crypto/keys"
+
 	data "github.com/tendermint/go-wire/data"
 	"github.com/tendermint/tmlibs/cli"
+
+	keys "github.com/tendermint/go-crypto/keys"
 )
 
 const PassLength = 10
 
-func getPassword(prompt string) (string, error) {
-	pass, err := speakeasy.Ask(prompt)
+// if we read from non-tty, we just need to init the buffer reader once,
+// in case we try to read multiple passwords (eg. update)
+var buf *bufio.Reader
+
+func inputIsTty() bool {
+	return isatty.IsTerminal(os.Stdin.Fd()) || isatty.IsCygwinTerminal(os.Stdin.Fd())
+}
+
+func stdinPassword() (string, error) {
+	if buf == nil {
+		buf = bufio.NewReader(os.Stdin)
+	}
+	pass, err := buf.ReadString('\n')
+	if err != nil {
+		return "", err
+	}
+	return strings.TrimSpace(pass), nil
+}
+
+func getPassword(prompt string) (pass string, err error) {
+	if inputIsTty() {
+		pass, err = speakeasy.Ask(prompt)
+	} else {
+		pass, err = stdinPassword()
+	}
 	if err != nil {
 		return "", err
 	}
@@ -25,6 +54,11 @@ func getPassword(prompt string) (string, error) {
 }
 
 func getCheckPassword(prompt, prompt2 string) (string, error) {
+	// simple read on no-tty
+	if !inputIsTty() {
+		return getPassword(prompt)
+	}
+
 	// TODO: own function???
 	pass, err := getPassword(prompt)
 	if err != nil {