Refactor

Author: MickMake

.idea/workspace.xml

@@ -0,0 +1,42 @@
+package helperSystem
+
+import (
+	"strings"
+)
+
+
+// Usage:
+//		{{ $str := UserPrompt "Enter something %s:" "here" }}
+func HelperUserPrompt(prompt string, args ...interface{}) string {
+	return UserPrompt(prompt, args...)
+}
+
+
+// Usage:
+//		{{ $str := UserPromptHidden "Enter something %s:" "here" }}
+func HelperUserPromptHidden(prompt string, args ...interface{}) string {
+	return UserPromptHidden(prompt, args...)
+}
+
+
+// Usage:
+//		{{ $str := UserPrompt "Enter something %s:" "here" }}
+func HelperUserPromptBool(prompt string, args ...interface{}) bool {
+	var ret bool
+
+	for range OnlyOnce {
+		str := UserPrompt(prompt, args...)
+		str = strings.TrimSpace(str)
+		str = strings.ToUpper(str)
+		switch str {
+			case "TRUE":
+				fallthrough
+			case "YES":
+				fallthrough
+			case "Y":
+				ret = true
+		}
+	}
+
+	return ret
+}

jtc/helpers/helperExec/helpers_test.go renamed to jtc/helpers/helperExec/helpers_test.go.txt

@@ -1,86 +1,26 @@
 package helperSystem
 
 import (
-	"bufio"
 	"fmt"
-	"golang.org/x/crypto/ssh/terminal"
-	"os"
-	"strings"
-	"syscall"
 )
 
+// @TODO - This is a workaround for the duplicates that appear with pkgreflect.
 
-// Usage:
-//		{{ $str := UserPrompt "Enter something %s:" "here" }}
-func HelperUserPrompt(prompt string, args ...interface{}) string {
-	var ret string
+type Prompt string
 
-	for range OnlyOnce {
-		fmt.Printf(prompt, args...)
 
-		r := bufio.NewReader(os.Stdin)
-
-		var err error
-		ret, err = r.ReadString('\n')
-		fmt.Printf("\n")
-		if err != nil {
-			break
-		}
-
-		ret = strings.TrimSuffix(ret, "\n")
-	}
-
-	return ret
+func UserPrompt(prompt string, args ...interface{}) string {
+	var p Prompt
+	p.Set(prompt, args)
+	return p.UserPrompt()
 }
-
-
-// Usage:
-//		{{ $str := UserPromptHidden "Enter something %s:" "here" }}
-func HelperUserPromptHidden(prompt string, args ...interface{}) string {
-	var ret string
-
-	for range OnlyOnce {
-		fmt.Printf(prompt, args...)
-
-		hidden, err := terminal.ReadPassword(syscall.Stdin)
-		fmt.Printf("\n")
-		if err != nil {
-			break
-		}
-
-		ret = strings.TrimSuffix(string(hidden), "\n")
-	}
-
-	return ret
+func (me *Prompt) Set(prompt string, args ...interface{}) {
+	*me = Prompt(fmt.Sprintf(prompt, args...))
 }
 
 
-// Usage:
-//		{{ $str := UserPrompt "Enter something %s:" "here" }}
-func HelperUserPromptBool(prompt string, args ...interface{}) bool {
-	var ret bool
-
-	for range OnlyOnce {
-		fmt.Printf(prompt, args...)
-
-		r := bufio.NewReader(os.Stdin)
-
-		str, err := r.ReadString('\n')
-		fmt.Printf("\n")
-		if err != nil {
-			break
-		}
-		str = strings.TrimSpace(str)
-
-		switch strings.ToUpper(str) {
-			case "TRUE":
-				fallthrough
-			case "YES":
-				fallthrough
-			case "Y":
-				ret = true
-		}
-	}
-
-	return ret
+func UserPromptHidden(prompt string, args ...interface{}) string {
+	var p Prompt
+	p.Set(prompt, args)
+	return p.UserPromptHidden()
 }

jtc/helpers/helperSystem/helpers_prompt.go

@@ -0,0 +1,53 @@
+// +build darwin
+
+package helperSystem
+
+import (
+	"bufio"
+	"fmt"
+	"golang.org/x/crypto/ssh/terminal"
+	"os"
+	"strings"
+	"syscall"
+)
+
+
+func (me *Prompt) UserPrompt() string {
+	var ret string
+
+	for range OnlyOnce {
+		fmt.Printf("%s", *me)
+
+		r := bufio.NewReader(os.Stdin)
+
+		var err error
+		ret, err = r.ReadString('\n')
+		fmt.Printf("\n")
+		if err != nil {
+			break
+		}
+
+		ret = strings.TrimSuffix(ret, "\n")
+	}
+
+	return ret
+}
+
+
+func (me *Prompt) UserPromptHidden() string {
+	var ret string
+
+	for range OnlyOnce {
+		fmt.Printf("%s", *me)
+
+		hidden, err := terminal.ReadPassword(syscall.Stdin)
+		fmt.Printf("\n")
+		if err != nil {
+			break
+		}
+
+		ret = strings.TrimSuffix(string(hidden), "\n")
+	}
+
+	return ret
+}

jtc/helpers/helperSystem/pkgreflect.go

@@ -0,0 +1,53 @@
+// +build linux
+
+package helperSystem
+
+import (
+	"bufio"
+	"fmt"
+	"golang.org/x/crypto/ssh/terminal"
+	"os"
+	"strings"
+	"syscall"
+)
+
+
+func (me *Prompt) UserPrompt() string {
+	var ret string
+
+	for range OnlyOnce {
+		fmt.Printf("%s", *me)
+
+		r := bufio.NewReader(os.Stdin)
+
+		var err error
+		ret, err = r.ReadString('\n')
+		fmt.Printf("\n")
+		if err != nil {
+			break
+		}
+
+		ret = strings.TrimSuffix(ret, "\n")
+	}
+
+	return ret
+}
+
+
+func (me *Prompt) UserPromptHidden() string {
+	var ret string
+
+	for range OnlyOnce {
+		fmt.Printf("%s", *me)
+
+		hidden, err := terminal.ReadPassword(syscall.Stdin)
+		fmt.Printf("\n")
+		if err != nil {
+			break
+		}
+
+		ret = strings.TrimSuffix(string(hidden), "\n")
+	}
+
+	return ret
+}

jtc/helpers/helperSystem/prompt.go

@@ -0,0 +1,54 @@
+// +build windows
+
+package helperSystem
+
+import (
+	"bufio"
+	"fmt"
+	"os"
+	"strings"
+)
+
+
+func (me *Prompt) UserPrompt() string {
+	var ret string
+
+	for range OnlyOnce {
+		fmt.Printf("%s", *me)
+
+		r := bufio.NewReader(os.Stdin)
+
+		var err error
+		ret, err = r.ReadString('\n')
+		fmt.Printf("\n")
+		if err != nil {
+			break
+		}
+
+		ret = strings.TrimSuffix(ret, "\n")
+	}
+
+	return ret
+}
+
+
+func (me *Prompt) UserPromptHidden() string {
+	var ret string
+
+	for range OnlyOnce {
+		fmt.Printf("%s", *me)
+
+		r := bufio.NewReader(os.Stdin)
+
+		var err error
+		ret, err = r.ReadString('\n')
+		fmt.Printf("\n")
+		if err != nil {
+			break
+		}
+
+		ret = strings.TrimSuffix(ret, "\n")
+	}
+
+	return ret
+}