refactor: fix test and refactor structure

Author: archandatta

cmd/create.go

@@ -1,6 +1,7 @@
 package cmd
 
 import (
+	"context"
 	"fmt"
 	"os"
 	"path/filepath"
@@ -10,77 +11,94 @@ import (
 	"github.com/spf13/cobra"
 )
 
-var createCmd = &cobra.Command{
-	Use:   "create",
-	Short: "Create a new application",
-	Long:  "Commands for creating new Kernel applications",
-	RunE:  runCreateApp,
+type CreateInput struct {
+	Name     string
+	Language string
+	Template string
 }
 
-func init() {
-	createCmd.Flags().StringP("name", "n", "", "Name of the application")
-	createCmd.Flags().StringP("language", "l", "", "Language of the application")
-	createCmd.Flags().StringP("template", "t", "", "Template to use for the application")
-}
-
-func runCreateApp(cmd *cobra.Command, args []string) error {
-	appName, _ := cmd.Flags().GetString("name")
-	language, _ := cmd.Flags().GetString("language")
-	template, _ := cmd.Flags().GetString("template")
+// CreateCmd is a cobra-independent command handler for create operations
+type CreateCmd struct{}
 
-	appName, err := create.PromptForAppName(appName)
-	if err != nil {
-		return fmt.Errorf("failed to get app name: %w", err)
-	}
-
-	language, err = create.PromptForLanguage(language)
-	if err != nil {
-		return fmt.Errorf("failed to get language: %w", err)
-	}
-
-	template, err = create.PromptForTemplate(template)
-	if err != nil {
-		return fmt.Errorf("failed to get template: %w", err)
-	}
-
-	// Get absolute path for the app directory
-	appPath, err := filepath.Abs(appName)
+// Create executes the create logic
+func (c CreateCmd) Create(ctx context.Context, ci CreateInput) error {
+	appPath, err := filepath.Abs(ci.Name)
 	if err != nil {
 		return fmt.Errorf("failed to resolve app path: %w", err)
 	}
 
 	// TODO: handle overwrite gracefully (prompt user)
 	// Check if directory already exists
 	if _, err := os.Stat(appPath); err == nil {
-		return fmt.Errorf("directory %s already exists", appName)
+		return fmt.Errorf("directory %s already exists", ci.Name)
 	}
 
-	// Create the app directory
 	if err := os.MkdirAll(appPath, 0755); err != nil {
 		return fmt.Errorf("failed to create directory: %w", err)
 	}
 
-	pterm.Println(fmt.Sprintf("\nCreating a new %s %s\n", language, template))
+	pterm.Println(fmt.Sprintf("\nCreating a new %s %s\n", ci.Language, ci.Template))
 
 	spinner, _ := pterm.DefaultSpinner.Start("Copying template files...")
 
-	if err := create.CopyTemplateFiles(appPath, language, template); err != nil {
+	if err := create.CopyTemplateFiles(appPath, ci.Language, ci.Template); err != nil {
 		spinner.Fail("Failed to copy template files")
 		return fmt.Errorf("failed to copy template files: %w", err)
 	}
-	spinner.Success(fmt.Sprintf("✔ %s environment set up successfully", language))
+	spinner.Success(fmt.Sprintf("✔ %s environment set up successfully", ci.Language))
 
 	nextSteps := fmt.Sprintf(`Next steps:
   brew install onkernel/tap/kernel
   cd %s
   kernel login  # or: export KERNEL_API_KEY=<YOUR_API_KEY>
   kernel deploy index.ts
   kernel invoke ts-basic get-page-title --payload '{"url": "https://www.google.com"}'
-`, appName)
+`, ci.Name)
 
 	pterm.Success.Println("🎉 Kernel app created successfully!")
 	pterm.Println()
 	pterm.FgYellow.Println(nextSteps)
 
 	return nil
 }
+
+var createCmd = &cobra.Command{
+	Use:   "create",
+	Short: "Create a new application",
+	Long:  "Commands for creating new Kernel applications",
+	RunE:  runCreateApp,
+}
+
+func init() {
+	createCmd.Flags().StringP("name", "n", "", "Name of the application")
+	createCmd.Flags().StringP("language", "l", "", "Language of the application")
+	createCmd.Flags().StringP("template", "t", "", "Template to use for the application")
+}
+
+func runCreateApp(cmd *cobra.Command, args []string) error {
+	appName, _ := cmd.Flags().GetString("name")
+	language, _ := cmd.Flags().GetString("language")
+	template, _ := cmd.Flags().GetString("template")
+
+	appName, err := create.PromptForAppName(appName)
+	if err != nil {
+		return fmt.Errorf("failed to get app name: %w", err)
+	}
+
+	language, err = create.PromptForLanguage(language)
+	if err != nil {
+		return fmt.Errorf("failed to get language: %w", err)
+	}
+
+	template, err = create.PromptForTemplate(template)
+	if err != nil {
+		return fmt.Errorf("failed to get template: %w", err)
+	}
+
+	c := CreateCmd{}
+	return c.Create(cmd.Context(), CreateInput{
+		Name:     appName,
+		Language: language,
+		Template: template,
+	})
+}

cmd/create_test.go

@@ -1,6 +1,7 @@
 package cmd
 
 import (
+	"context"
 	"os"
 	"path/filepath"
 	"testing"
@@ -12,14 +13,18 @@ import (
 func TestCreateCommand(t *testing.T) {
 	tests := []struct {
 		name        string
-		args        []string
+		input       CreateInput
 		wantErr     bool
 		errContains string
 		validate    func(t *testing.T, appPath string)
 	}{
 		{
 			name: "create typescript sample-app",
-			args: []string{"--name", "test-app", "--language", "typescript", "--template", "sample-app"},
+			input: CreateInput{
+				Name:     "test-app",
+				Language: "typescript",
+				Template: "sample-app",
+			},
 			validate: func(t *testing.T, appPath string) {
 				// Verify files were created
 				assert.FileExists(t, filepath.Join(appPath, "index.ts"))
@@ -29,10 +34,14 @@ func TestCreateCommand(t *testing.T) {
 			},
 		},
 		{
-			name:        "fail with python sample-app (template not found)",
-			args:        []string{"--name", "test-app", "--language", "python", "--template", "sample-app"},
+			name: "fail with invalid template",
+			input: CreateInput{
+				Name:     "test-app",
+				Language: "typescript",
+				Template: "nonexistent",
+			},
 			wantErr:     true,
-			errContains: "template not found: python/sample-app",
+			errContains: "template not found: typescript/nonexistent",
 		},
 	}
 
@@ -50,8 +59,8 @@ func TestCreateCommand(t *testing.T) {
 				os.Chdir(orgDir)
 			})
 
-			createCmd.SetArgs(tt.args)
-			err = createCmd.Execute()
+			c := CreateCmd{}
+			err = c.Create(context.Background(), tt.input)
 
 			// Check if error is expected
 			if tt.wantErr {
@@ -65,7 +74,7 @@ func TestCreateCommand(t *testing.T) {
 			require.NoError(t, err, "failed to execute create command")
 
 			// Validate the created app
-			appPath := filepath.Join(tmpDir, "test-app")
+			appPath := filepath.Join(tmpDir, tt.input.Name)
 			assert.DirExists(t, appPath, "app directory should be created")
 
 			if tt.validate != nil {

pkg/create/prompts.go

@@ -33,7 +33,7 @@ func validateAppName(val any) error {
 
 // handleAppNamePrompt prompts the user for an app name interactively.
 func handleAppNamePrompt() (string, error) {
-	promptText := fmt.Sprintf("%s (default: %s)", AppNamePrompt, DefaultAppName)
+	promptText := fmt.Sprintf("%s (%s)", AppNamePrompt, DefaultAppName)
 	appName, err := pterm.DefaultInteractiveTextInput.
 		WithDefaultText(promptText).
 		Show()