Merge pull request #76 from smallstep/fix-brew-tests

Fix homebrew tests that fails trying to allocate a terminal.

Author: maraino

ui/ui.go

@@ -87,12 +87,6 @@ func PrintSelected(name, value string, opts ...Option) error {
 
 // Prompt creates a runs a promptui.Prompt with the given label.
 func Prompt(label string, opts ...Option) (string, error) {
-	clean, err := preparePromptTerminal()
-	if err != nil {
-		return "", err
-	}
-	defer clean()
-
 	o := &options{
 		promptTemplates: PromptTemplates(),
 	}
@@ -103,6 +97,13 @@ func Prompt(label string, opts ...Option) (string, error) {
 		return o.getValue()
 	}
 
+	// Prompt using the terminal
+	clean, err := preparePromptTerminal()
+	if err != nil {
+		return "", err
+	}
+	defer clean()
+
 	prompt := &promptui.Prompt{
 		Label:     label,
 		Default:   o.defaultValue,
@@ -120,12 +121,6 @@ func Prompt(label string, opts ...Option) (string, error) {
 // PromptPassword creates a runs a promptui.Prompt with the given label. This
 // prompt will mask the key entries with \r.
 func PromptPassword(label string, opts ...Option) ([]byte, error) {
-	clean, err := preparePromptTerminal()
-	if err != nil {
-		return nil, err
-	}
-	defer clean()
-
 	// Using a not printable character as they work better than \r
 	o := &options{
 		mask:            1,
@@ -138,6 +133,13 @@ func PromptPassword(label string, opts ...Option) ([]byte, error) {
 		return o.getValueBytes()
 	}
 
+	// Prompt using the terminal
+	clean, err := preparePromptTerminal()
+	if err != nil {
+		return nil, err
+	}
+	defer clean()
+
 	prompt := &promptui.Prompt{
 		Label:     label,
 		Mask:      o.mask,
@@ -175,17 +177,17 @@ func PromptPasswordGenerate(label string, opts ...Option) ([]byte, error) {
 
 // Select creates and runs a promptui.Select with the given label and items.
 func Select(label string, items interface{}, opts ...Option) (int, string, error) {
+	o := &options{
+		selectTemplates: SelectTemplates(label),
+	}
+	o.apply(opts)
+
 	clean, err := prepareSelectTerminal()
 	if err != nil {
 		return 0, "", err
 	}
 	defer clean()
 
-	o := &options{
-		selectTemplates: SelectTemplates(label),
-	}
-	o.apply(opts)
-
 	prompt := &promptui.Select{
 		Label:     label,
 		Items:     items,