Merge pull request #19 from roots/improve-new-prompts

Improve new project prompts

Author: swalkinshaw

cmd/new.go

@@ -12,6 +12,7 @@ import (
 	"path/filepath"
 	"strings"
 
+	"github.com/fatih/color"
 	"github.com/mholt/archiver"
 	"github.com/mitchellh/cli"
 	"trellis-cli/trellis"
@@ -42,7 +43,6 @@ func (c *NewCommand) init() {
 }
 
 func (c *NewCommand) Run(args []string) int {
-	var name string
 	var path string
 
 	if err := c.flags.Parse(args); err != nil {
@@ -53,24 +53,21 @@ func (c *NewCommand) Run(args []string) int {
 
 	switch len(args) {
 	case 0:
-		c.UI.Error("Missing NAME argument\n")
+		c.UI.Error("Missing PATH argument\n")
 		c.UI.Output(c.Help())
 		return 1
 	case 1:
-		name = args[0]
-	case 2:
-		name = args[0]
-		path = args[1]
+		path = args[0]
 	default:
-		c.UI.Error(fmt.Sprintf("Error: too many arguments (expected 2, got %d)\n", len(args)))
+		c.UI.Error(fmt.Sprintf("Error: too many arguments (expected 1, got %d)\n", len(args)))
 		c.UI.Output(c.Help())
 		return 1
 	}
 
 	path, _ = filepath.Abs(path)
 	_, err := os.Stat(path)
 
-	fmt.Println("Creating new Trellis project in", path)
+	c.UI.Info(fmt.Sprintf("Creating new Trellis project in %s\n", path))
 
 	if err != nil {
 		if os.IsNotExist(err) {
@@ -91,16 +88,17 @@ func (c *NewCommand) Run(args []string) int {
 		}
 	}
 
-	var host string
-	host, err = c.UI.Ask(fmt.Sprintf("Enter main site host [default: %s]", name))
+	name, err := askProjectName(c.UI)
+	if err != nil {
+		return 1
+	}
 
-	if err == nil {
-		if len(host) == 0 {
-			host = name
-		}
+	host, err := askDomain(c.UI, name)
+	if err != nil {
+		return 1
 	}
 
-	fmt.Println("Fetching latest versions of Trellis and Bedrock...")
+	fmt.Println("\nFetching latest versions of Trellis and Bedrock...")
 
 	trellisPath := filepath.Join(path, "trellis")
 	trellisVersion := downloadLatestRelease("roots/trellis", path, trellisPath)
@@ -127,7 +125,7 @@ func (c *NewCommand) Run(args []string) int {
 		c.trellis.WriteVaultYaml(vault, filepath.Join("group_vars", env, "vault.yml"))
 	}
 
-	fmt.Printf("\n%s project created with versions:\n", name)
+	fmt.Printf("\n%s project created with versions:\n", color.GreenString(name))
 	fmt.Printf("  Trellis v%s\n", trellisVersion)
 	fmt.Printf("  Bedrock v%s\n", bedrockVersion)
 
@@ -140,30 +138,27 @@ func (c *NewCommand) Synopsis() string {
 
 func (c *NewCommand) Help() string {
 	helpText := `
-Usage: trellis new NAME [PATH]
+Usage: trellis new [PATH]
 
-Creates a new Trellis project in the path specified (defaults to current directory)
-using the latest versions of Trellis and Bedrock.
+Creates a new Trellis project in the path specified using the latest versions of Trellis and Bedrock.
 
 This uses our recommended project structure detailed at
 https://roots.io/trellis/docs/installing-trellis/#create-a-project
 
 Create a new project in the current directory:
 
-  $ trellis new example.com
+  $ trellis new .
 
 Create a new project in the target path:
 
-  $ trellis new example.com ~/dev/example.com
+  $ trellis new ~/dev/example.com
 
 Force create a new project in a non-empty target path:
 
-  $ trellis new --force example.com ~/dev/example.com
+  $ trellis new --force ~/dev/example.com
 
 Arguments:
-  NAME  Name of new Trellis project (ie: example.com)
   PATH  Path to create new project in
-        (default: .)
 
 Options:
   --force     (default: false) Forces the creation of the project even if the target path is not empty
@@ -178,6 +173,34 @@ func addTrellisFile(path string) error {
 	return ioutil.WriteFile(path, []byte{}, 0666)
 }
 
+func askProjectName(ui cli.Ui) (name string, err error) {
+	name, err = ui.Ask(fmt.Sprintf("%s:", color.MagentaString("Project name")))
+
+	if err != nil {
+		return "", err
+	}
+
+	if len(name) == 0 {
+		return askProjectName(ui)
+	}
+
+	return name, nil
+}
+
+func askDomain(ui cli.Ui, name string) (host string, err error) {
+	host, err = ui.Ask(fmt.Sprintf("%s [%s]:", color.MagentaString("Site domain"), color.GreenString(name)))
+
+	if err != nil {
+		return "", err
+	}
+
+	if len(host) == 0 {
+		return name, nil
+	}
+
+	return host, nil
+}
+
 func downloadLatestRelease(repo string, path string, dest string) string {
 	release := fetchLatestRelease(repo)
 

go.mod

@@ -2,6 +2,7 @@ module trellis-cli
 
 require (
 	github.com/dsnet/compress v0.0.0-20171208185109-cc9eb1d7ad76 // indirect
+	github.com/fatih/color v1.7.0
 	github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db // indirect
 	github.com/google/pprof v0.0.0-20190109223431-e84dfd68c163 // indirect
 	github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6 // indirect

main.go

@@ -13,6 +13,7 @@ func main() {
 	c.Args = os.Args[1:]
 
 	ui := &cli.ColoredUi{
+		ErrorColor: cli.UiColorRed,
 		Ui: &cli.BasicUi{
 			Reader:      os.Stdin,
 			Writer:      os.Stdout,