feat(cli): app subcommand

cli/cmd/app/app.go

@@ -0,0 +1,27 @@
+package app
+
+import (
+	"os"
+
+	"numerous/cli/cmd/app/deploy"
+
+	"github.com/spf13/cobra"
+)
+
+var AppRootCmd = &cobra.Command{
+	Use: "app",
+	Args: func(cmd *cobra.Command, args []string) error {
+		if len(args) < 1 {
+			if err := cmd.Help(); err != nil {
+				return err
+			}
+			os.Exit(0)
+		}
+
+		return nil
+	},
+}
+
+func init() {
+	AppRootCmd.AddCommand(deploy.DeployCmd)
+}

cli/cmd/deploy/cmd.go → cli/cmd/app/deploy/cmd.go

@@ -32,7 +32,7 @@ If an app has been initialized in the current working directory, and it should
 be pushed to the organization "organization-slug-a3ecfh2b", and the app name
 "my-app", the following command can be used:
 
-	numerous deploy --organization "organization-slug-a3ecfh2b" --name "my-app"
+	numerous app deploy --organization "organization-slug-a3ecfh2b" --name "my-app"
 	`,
 	Args: func(cmd *cobra.Command, args []string) error {
 		if len(args) > 1 {

cli/cmd/deploy/deploy_test.go → cli/cmd/app/deploy/deploy_test.go

@@ -26,7 +26,7 @@ func TestDeploy(t *testing.T) {
 
 	t.Run("give no existing app then happy path can run", func(t *testing.T) {
 		appDir := t.TempDir()
-		copyTo(t, "../../testdata/streamlit_app", appDir)
+		copyTo(t, "../../../testdata/streamlit_app", appDir)
 
 		apps := &mockAppService{}
 		apps.On("ReadApp", mock.Anything, mock.Anything).Return(app.ReadAppOutput{}, app.ErrAppNotFound)
@@ -44,7 +44,7 @@ func TestDeploy(t *testing.T) {
 
 	t.Run("give existing app then it does not create app", func(t *testing.T) {
 		appDir := t.TempDir()
-		copyTo(t, "../../testdata/streamlit_app", appDir)
+		copyTo(t, "../../../testdata/streamlit_app", appDir)
 
 		apps := &mockAppService{}
 		apps.On("ReadApp", mock.Anything, mock.Anything).Return(app.ReadAppOutput{AppID: appID}, nil)
@@ -69,7 +69,7 @@ func TestDeploy(t *testing.T) {
 
 	t.Run("given invalid slug then it returns error", func(t *testing.T) {
 		appDir := t.TempDir()
-		copyTo(t, "../../testdata/streamlit_app", appDir)
+		copyTo(t, "../../../testdata/streamlit_app", appDir)
 
 		err := Deploy(context.TODO(), nil, appDir, "", "Some Invalid Organization Slug", appName, false)
 
@@ -78,7 +78,7 @@ func TestDeploy(t *testing.T) {
 
 	t.Run("given invalid app name then it returns error", func(t *testing.T) {
 		appDir := t.TempDir()
-		copyTo(t, "../../testdata/streamlit_app", appDir)
+		copyTo(t, "../../../testdata/streamlit_app", appDir)
 
 		err := Deploy(context.TODO(), nil, appDir, "", slug, "Some Invalid App Name", false)
 
@@ -87,7 +87,7 @@ func TestDeploy(t *testing.T) {
 
 	t.Run("given no slug or app name arguments and manifest with deployment and then it uses manifest deployment", func(t *testing.T) {
 		appDir := t.TempDir()
-		copyTo(t, "../../testdata/streamlit_app", appDir)
+		copyTo(t, "../../../testdata/streamlit_app", appDir)
 
 		apps := &mockAppService{}
 		apps.On("ReadApp", mock.Anything, mock.Anything).Return(app.ReadAppOutput{}, app.ErrAppNotFound)
@@ -108,7 +108,7 @@ func TestDeploy(t *testing.T) {
 
 	t.Run("given slug or app name arguments and manifest with deployment and then arguments override manifest deployment", func(t *testing.T) {
 		appDir := t.TempDir()
-		copyTo(t, "../../testdata/streamlit_app", appDir)
+		copyTo(t, "../../../testdata/streamlit_app", appDir)
 
 		apps := &mockAppService{}
 		apps.On("ReadApp", mock.Anything, mock.Anything).Return(app.ReadAppOutput{}, app.ErrAppNotFound)

cli/cmd/organization/organization.go

@@ -3,6 +3,9 @@ package organization
 import (
 	"os"
 
+	"numerous/cli/cmd/organization/create"
+	"numerous/cli/cmd/organization/list"
+
 	"github.com/spf13/cobra"
 )
 
@@ -19,3 +22,8 @@ var OrganizationRootCmd = &cobra.Command{
 		return nil
 	},
 }
+
+func init() {
+	OrganizationRootCmd.AddCommand(create.OrganizationCreateCmd)
+	OrganizationRootCmd.AddCommand(list.OrganizationListCmd)
+}

cli/cmd/root.go

@@ -9,17 +9,15 @@ import (
 	"runtime"
 
 	"numerous/cli/auth"
+	"numerous/cli/cmd/app"
 	deleteapp "numerous/cli/cmd/delete"
-	"numerous/cli/cmd/deploy"
 	"numerous/cli/cmd/dev"
 	"numerous/cli/cmd/initialize"
 	"numerous/cli/cmd/list"
 	"numerous/cli/cmd/log"
 	"numerous/cli/cmd/login"
 	"numerous/cli/cmd/logout"
 	"numerous/cli/cmd/organization"
-	createorganization "numerous/cli/cmd/organization/create"
-	listorganization "numerous/cli/cmd/organization/list"
 	"numerous/cli/cmd/publish"
 	"numerous/cli/cmd/push"
 	"numerous/cli/cmd/report"
@@ -93,7 +91,7 @@ func commandRequiresAuthentication(invokedCommandName string) bool {
 		"numerous log",
 		"numerous organization create",
 		"numerous organization list",
-		"numerous deploy",
+		"numerous app deploy",
 	}
 
 	for _, cmd := range commandsWithAuthRequired {
@@ -118,9 +116,7 @@ func bindCommands() {
 	rootCmd.AddCommand(list.ListCmd)
 	rootCmd.AddCommand(report.ReportCmd)
 	rootCmd.AddCommand(organization.OrganizationRootCmd)
-	rootCmd.AddCommand(deploy.DeployCmd)
-	organization.OrganizationRootCmd.AddCommand(createorganization.OrganizationCreateCmd)
-	organization.OrganizationRootCmd.AddCommand(listorganization.OrganizationListCmd)
+	rootCmd.AddCommand(app.AppRootCmd)
 }
 
 func Execute() {