[FEATURE] Formula creator improvements

cmd/single/main.go

@@ -112,7 +112,7 @@ func buildCommands() *cobra.Command {
 	updateRepoCmd := cmd.NewUpdateRepoCmd(repoManager)
 	autocompleteZsh := cmd.NewAutocompleteZsh(autocompleteGen)
 	autocompleteBash := cmd.NewAutocompleteBash(autocompleteGen)
-	createFormulaCmd := cmd.NewCreateFormulaCmd(formulaCreator, inputText, inputList)
+	createFormulaCmd := cmd.NewCreateFormulaCmd(formulaCreator, inputText, inputList, inputBool)
 
 	autocompleteCmd.AddCommand(autocompleteZsh, autocompleteBash)
 	addCmd.AddCommand(addRepoCmd)

cmd/team/main.go

@@ -139,7 +139,7 @@ func buildCommands() *cobra.Command {
 	updateRepoCmd := cmd.NewUpdateRepoCmd(repoManager)
 	autocompleteZsh := cmd.NewAutocompleteZsh(autocompleteGen)
 	autocompleteBash := cmd.NewAutocompleteBash(autocompleteGen)
-	createFormulaCmd := cmd.NewCreateFormulaCmd(formulaCreator, inputText, inputList)
+	createFormulaCmd := cmd.NewCreateFormulaCmd(formulaCreator, inputText, inputList, inputBool)
 
 	autocompleteCmd.AddCommand(autocompleteZsh, autocompleteBash)
 	addCmd.AddCommand(addRepoCmd)

pkg/cmd/create_formula.go

@@ -1,9 +1,10 @@
 package cmd
 
 import (
+	"errors"
 	"fmt"
-	"log"
 	"os"
+	"strings"
 
 	"github.com/spf13/cobra"
 
@@ -12,32 +13,32 @@ import (
 	"github.com/ZupIT/ritchie-cli/pkg/stdin"
 )
 
+var ErrNotAllowedCharacter = errors.New(`not allowed character on formula name \/,><@`)
+
+const notAllowedChars = `\/><,@`
+
 // createFormulaCmd type for add formula command
 type createFormulaCmd struct {
 	formula.Creator
 	prompt.InputText
 	prompt.InputList
-}
-
-// createFormula type for stdin json decoder
-type createFormula struct {
-	FormulaCmd string `json:"formulaCmd"`
-	Lang string `json:"lang"`
+	prompt.InputBool
 }
 
 // CreateFormulaCmd creates a new cmd instance
-func NewCreateFormulaCmd(cf formula.Creator, it prompt.InputText, il prompt.InputList) *cobra.Command {
+func NewCreateFormulaCmd(cf formula.Creator, it prompt.InputText, il prompt.InputList, ib prompt.InputBool) *cobra.Command {
 	c := createFormulaCmd{
 		cf,
 		it,
 		il,
+		ib,
 	}
 
 	cmd := &cobra.Command{
 		Use:     "formula",
 		Short:   "Create a new formula",
 		Example: "rit create formula",
-		RunE: RunFuncE(c.runStdin(), c.runPrompt()),
+		RunE:    RunFuncE(c.runStdin(), c.runPrompt()),
 	}
 
 	cmd.LocalFlags()
@@ -47,25 +48,48 @@ func NewCreateFormulaCmd(cf formula.Creator, it prompt.InputText, il prompt.Inpu
 
 func (c createFormulaCmd) runPrompt() CommandRunnerFunc {
 	return func(cmd *cobra.Command, args []string) error {
-		fmt.Println("Creating Formula ...")
-
-		fCmd, err := c.Text("New formula's command ? [ex.: rit group verb <noun>]", true)
+		fCmd, err := c.Text("Enter the new formula command [ex.: rit group verb noun]", true)
 		if err != nil {
 			return err
 		}
 
+		if strings.ContainsAny(fCmd, notAllowedChars) {
+			return ErrNotAllowedCharacter
+		}
+
+		fmt.Println("Creating Formula ...")
+
 		lang, err := c.List("Choose the language: ", []string{"Go", "Java", "Node", "Python", "Shell"})
 		if err != nil {
 			return err
 		}
+		homeDir, _ := os.UserHomeDir()
+		ritFormulasPath := fmt.Sprintf("%s/my-ritchie-formulas", homeDir)
+		repoQuestion := fmt.Sprintf("Use default repo (%s)?", ritFormulasPath)
+		var localRepoDir string
+		choice, _ := c.Bool(repoQuestion, []string{"yes", "no"})
+		if !choice {
+			pathQuestion := fmt.Sprintf("Enter your path [ex.:%s]", ritFormulasPath)
+			localRepoDir, err = c.Text(pathQuestion, true)
+			if err != nil {
+				return err
+			}
+
+		}
+
+		cf := formula.Create{
+			FormulaCmd:   fCmd,
+			Lang:         lang,
+			LocalRepoDir: localRepoDir,
+		}
 
-		f, err := c.Create(fCmd, lang)
+		f, err := c.Create(cf)
 		if err != nil {
 			return err
 		}
 
-		log.Printf("Formula in %s successfully created!\n", lang)
-		log.Printf("Your formula is in %s", f.FormPath)
+		fmt.Printf("Formula in %s successfully created!\n", lang)
+		fmt.Printf("Your formula is in %s", f.FormPath)
 
 		return nil
 	}
@@ -75,24 +99,24 @@ func (c createFormulaCmd) runStdin() CommandRunnerFunc {
 	return func(cmd *cobra.Command, args []string) error {
 		fmt.Println("Creating Formula ...")
 
-		cf := createFormula{}
+		var cf formula.Create
 
-		err := stdin.ReadJson(os.Stdin, &cf)
-		if err != nil {
+		if err := stdin.ReadJson(os.Stdin, &cf); err != nil {
 			fmt.Println("The STDIN inputs weren't informed correctly. Check the JSON used to execute the command.")
 			return err
 		}
 
-		f, err := c.Create(
-			cf.FormulaCmd,
-			cf.Lang,
-			)
+		if strings.ContainsAny(cf.FormulaCmd, notAllowedChars) {
+			return ErrNotAllowedCharacter
+		}
+
+		f, err := c.Create(cf)
 		if err != nil {
 			return err
 		}
 
-		log.Printf("Formula in %s successfully created!\n", cf.Lang)
-		log.Printf("Your formula is in %s", f.FormPath)
+		fmt.Printf("Formula in %s successfully created!\n", cf.Lang)
+		fmt.Printf("Your formula is in %s", f.FormPath)
 
 		return nil
 	}

pkg/cmd/create_formula_test.go

@@ -5,7 +5,7 @@ import (
 )
 
 func TestNewCreateFormulaCmd(t *testing.T) {
-	cmd := NewCreateFormulaCmd(formCreator{}, inputTextMock{}, inputListMock{})
+	cmd := NewCreateFormulaCmd(formCreator{}, inputTextMock{}, inputListMock{}, inputTrueMock{})
 	cmd.PersistentFlags().Bool("stdin", false, "input by stdin")
 	if cmd == nil {
 		t.Errorf("NewCreateFormulaCmd got %v", cmd)

pkg/cmd/mocks_test.go

@@ -92,7 +92,7 @@ func (repoCleaner) Clean(name string) error {
 
 type formCreator struct{}
 
-func (formCreator) Create(formulaCmd, lang string) (formula.CreateManager, error) {
+func (formCreator) Create(cf formula.Create) (formula.CreateManager, error) {
 	return formula.CreateManager{}, nil
 }