Cleanup projects cli command

cmd/project/create.go → cmd/projects/create.go

@@ -1,7 +1,6 @@
-package project
+package projects
 
 import (
-	"errors"
 	"fmt"
 	"os"
 
@@ -15,52 +14,41 @@ func CreateProjectCmd() *cobra.Command {
 	)
 
 	exampleCMD := `
-		resonate project create --name my-app --template py
-		resonate project create -n my-app -t py
-	`
+resonate projects create --template py
+resonate projects create --template py --name my-app`
 
 	cmd := &cobra.Command{
 		Use:     "create",
-		Short:   "Create a new resonate application node project",
+		Short:   "Create a new resonate project",
 		Example: exampleCMD,
 		RunE: func(cmd *cobra.Command, args []string) error {
-			if err := validate(template, name); err != nil {
+			if name == "" {
+				name = template
+			}
+
+			if err := validate(name); err != nil {
 				return err
 			}
 
 			if err := scaffold(template, name); err != nil {
 				return err
 			}
 
-			fmt.Printf("\nproject successfully created in folder %s\n", name)
+			cmd.Printf("Template '%s' successfully copied to folder '%s'\n", template, name)
 			return nil
 		},
 	}
 
-	cmd.Flags().StringVarP(&name, "name", "n", "", "name of the project")
 	cmd.Flags().StringVarP(&template, "template", "t", "", "name of the template, run 'resonate project list' to view available templates")
+	cmd.Flags().StringVarP(&name, "name", "n", "", "name of the project")
 
-	_ = cmd.MarkFlagRequired("name")
 	_ = cmd.MarkFlagRequired("template")
 
 	return cmd
 }
 
-func validate(project, name string) error {
-	if name == "" {
-		return errors.New("a folder name is required")
-	}
-
-	if project == "" {
-		return errors.New("project name is required")
-	}
-
-	err := checkFolderExists(name)
-	if err != nil {
-		return err
-	}
-
-	return nil
+func validate(name string) error {
+	return checkFolderExists(name)
 }
 
 func checkFolderExists(name string) error {

cmd/project/list.go → cmd/projects/list.go

@@ -1,4 +1,4 @@
-package project
+package projects
 
 import (
 	"fmt"
@@ -9,7 +9,7 @@ import (
 func ListProjectCmd() *cobra.Command {
 	cmd := &cobra.Command{
 		Use:     "list",
-		Short:   "List the available application node projects",
+		Short:   "List resonate projects",
 		Example: "resonate project list",
 		RunE: func(cmd *cobra.Command, args []string) error {
 			templates, err := GetProjects()
@@ -27,6 +27,6 @@ func ListProjectCmd() *cobra.Command {
 
 func display(templates Projects) {
 	for name, t := range templates {
-		fmt.Printf("\n%s\n\t%s\n", name, t.Desc)
+		fmt.Printf("%s:\n\t%s\n", name, t.Desc)
 	}
 }

cmd/project/project.go → cmd/projects/projects.go

@@ -1,4 +1,4 @@
-package project
+package projects
 
 import (
 	"encoding/json"
@@ -19,16 +19,16 @@ type (
 
 func NewCmd() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:     "project",
+		Use:     "projects",
 		Aliases: []string{"project"},
-		Short:   "Resonate application node projects",
+		Short:   "Resonate projects",
 		Run: func(cmd *cobra.Command, args []string) {
 			_ = cmd.Help()
 		},
 	}
 
 	// Add subcommands
-	cmd.AddCommand(ListProjectCmd())   // list available projects
+	cmd.AddCommand(ListProjectCmd())   // list projects
 	cmd.AddCommand(CreateProjectCmd()) // create a project
 
 	return cmd

cmd/project/scaffold.go → cmd/projects/scaffold.go

@@ -1,4 +1,4 @@
-package project
+package projects
 
 import (
 	"archive/zip"

cmd/root.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/resonatehq/resonate/cmd/callbacks"
 	"github.com/resonatehq/resonate/cmd/dst"
-	"github.com/resonatehq/resonate/cmd/project"
+	"github.com/resonatehq/resonate/cmd/projects"
 	"github.com/resonatehq/resonate/cmd/promises"
 	"github.com/resonatehq/resonate/cmd/quickstart"
 	"github.com/resonatehq/resonate/cmd/schedules"
@@ -36,15 +36,15 @@ func init() {
 	rootCmd.PersistentFlags().StringP("log-level", "", "info", "can be one of: debug, info, warn, error")
 
 	// Add Subcommands
+	rootCmd.AddCommand(callbacks.NewCmd())
+	rootCmd.AddCommand(dst.NewCmd())
+	rootCmd.AddCommand(projects.NewCmd())
 	rootCmd.AddCommand(promises.NewCmd())
+	rootCmd.AddCommand(quickstart.NewCmd())
 	rootCmd.AddCommand(schedules.NewCmd())
-	rootCmd.AddCommand(dst.NewCmd())
 	rootCmd.AddCommand(serve.ServeCmd())
-	rootCmd.AddCommand(quickstart.NewCmd())
-	rootCmd.AddCommand(tasks.NewCmd())
-	rootCmd.AddCommand(callbacks.NewCmd())
-	rootCmd.AddCommand(project.NewCmd())
 	rootCmd.AddCommand(subscriptions.NewCmd())
+	rootCmd.AddCommand(tasks.NewCmd())
 
 	// Set default output
 	rootCmd.SetOut(os.Stdout)