0.6.1

.github/workflows/ci.yml

@@ -11,7 +11,7 @@ on:
     branches:
       - main
 env:
-  VERSION_NUMBER: 'v0.6.0'
+  VERSION_NUMBER: 'v0.6.1'
   REGISTRY_NAME: digitalghostdev/poke-cli
 
 jobs:

README.md

@@ -2,7 +2,7 @@
     <img height="250" width="350" src="https://cdn.simpleicons.org/pokemon/FFCC00" alt="pokemon-logo"/>
     <h1>Pokémon CLI</h1>
     <img src="https://img.shields.io/github/v/release/digitalghost-dev/poke-cli?style=flat-square&logo=git&logoColor=FFCC00&label=Release%20Version&labelColor=EEE&color=FFCC00" alt="version-label">
-    <img src="https://img.shields.io/docker/image-size/digitalghostdev/poke-cli/v0.6.0?arch=arm64&style=flat-square&logo=docker&logoColor=FFCC00&labelColor=EEE&color=FFCC00" alt="docker-image-size">
+    <img src="https://img.shields.io/docker/image-size/digitalghostdev/poke-cli/v0.6.1?arch=arm64&style=flat-square&logo=docker&logoColor=FFCC00&labelColor=EEE&color=FFCC00" alt="docker-image-size">
 </div>
 
 <div align="center">

cmd/types.go

@@ -50,6 +50,19 @@ func (m model) View() string {
 	return "Select a type! Hit 'Q' or 'CTRL-C' to quit.\n" + baseStyle.Render(m.table.View()) + "\n"
 }
 
+func selectionResult(endpoint, typesName string) error {
+	baseURL := "https://pokeapi.co/api/v2/"
+
+	typeResponse, typeName, _ := connections.TypesApiCall(endpoint, typesName, baseURL)
+
+	capitalizedString := cases.Title(language.English).String(typeName)
+
+	pokemonCount := len(typeResponse.Pokemon)
+
+	fmt.Printf("You selected Type: %s\nNumber of Pokémon with type: %d\n", capitalizedString, pokemonCount)
+	return nil
+}
+
 func TypesCommand() {
 	flag.Usage = func() {
 		helpMessage := helpBorder.Render(
@@ -123,8 +136,6 @@ func TypesCommand() {
 	t.SetStyles(s)
 
 	m := model{table: t}
-
-	// Run the program and capture the final state
 	programModel, err := tea.NewProgram(m).Run()
 	if err != nil {
 		fmt.Println("Error running program:", err)
@@ -133,14 +144,14 @@ func TypesCommand() {
 
 	// Type assert to model and access the selected option
 	finalModel := programModel.(model)
-
-	endpoint := strings.ToLower(args[1])[0:4]
 	typesName := strings.ToLower(finalModel.selectedOption)
 
-	typeResponse, typeName, _ := connections.TypesApiCall(endpoint, typesName, "https://pokeapi.co/api/v2/")
-	capitalizedString := cases.Title(language.English).String(typeName)
-
-	pokemonCount := len(typeResponse.Pokemon)
+	// Extract the first 4 characters of the endpoint from the argument
+	endpoint := strings.ToLower(args[1])[0:4]
 
-	fmt.Printf("You selected Type: %s\nNumber of Pokémon with type: %d\n", capitalizedString, pokemonCount)
+	// Call the selectionTable function with the selected type and endpoint
+	if err := selectionResult(endpoint, typesName); err != nil {
+		fmt.Println(err.Error())
+		os.Exit(1)
+	}
 }

cmd/types_test.go

@@ -16,3 +16,16 @@ func TestValidateTypesArgs_ValidInput(t *testing.T) {
 		assert.NoError(t, err, "Expected no error for valid input")
 	}
 }
+
+func TestValidateTypesArgs_TooManyArgs(t *testing.T) {
+	invalidInputs := [][]string{
+		{"poke-cli", "types", "ground"},
+	}
+	expectedError := "error, too many arguemnts\n"
+
+	for _, input := range invalidInputs {
+		err := ValidateTypesArgs(input)
+		assert.Error(t, err, "Expected error for too many arguments")
+		assert.NotEqual(t, expectedError, err.Error())
+	}
+}

cmd/validateargs.go

@@ -9,11 +9,13 @@ import (
 func ValidatePokemonArgs(args []string) error {
 
 	if len(args) > 5 {
-		return fmt.Errorf(errorBorder.Render(errorColor.Render("Error!"), "\nToo many arguments"))
+		errMessage := errorBorder.Render(errorColor.Render("Error!"), "\nToo many arguments")
+		return fmt.Errorf("%s", errMessage)
 	}
 
 	if len(args) < 3 {
-		return fmt.Errorf(errorBorder.Render(errorColor.Render("Error!"), "\nPlease declare a Pokémon's name after the [pokemon] command", "\nRun 'poke-cli pokemon -h' for more details", "\nerror: insufficient arguments"))
+		errMessage := errorBorder.Render(errorColor.Render("Error!"), "\nPlease declare a Pokémon's name after the [pokemon] command", "\nRun 'poke-cli pokemon -h' for more details", "\nerror: insufficient arguments")
+		return fmt.Errorf("%s", errMessage)
 	}
 
 	if len(args) > 3 {
@@ -22,7 +24,8 @@ func ValidatePokemonArgs(args []string) error {
 				errorTitle := errorColor.Render("Error!")
 				errorString := fmt.Sprintf("\nInvalid argument '%s'. Only flags are allowed after declaring a Pokémon's name", arg)
 				formattedString := errorTitle + errorString
-				return fmt.Errorf(errorBorder.Render(formattedString))
+				renderedError := errorBorder.Render(formattedString)
+				return fmt.Errorf("%s", renderedError)
 			}
 		}
 	}
@@ -38,12 +41,13 @@ func ValidatePokemonArgs(args []string) error {
 // ValidateTypesArgs validates the command line arguments
 func ValidateTypesArgs(args []string) error {
 	if len(args) > 3 {
-		return fmt.Errorf(errorBorder.Render(errorColor.Render("Error!"), "\nToo many arguments"))
+		errMessage := errorBorder.Render(errorColor.Render("Error!"), "\nToo many arguments")
+		return fmt.Errorf("%s", errMessage)
 	}
 
 	if len(args) == 3 && (args[2] != "-h" && args[2] != "--help") {
-		fmt.Println(errorBorder.Render("Error! The only currently available options\nafter [types] command is '-h' or '--help'"))
-		return nil
+		errMessage := errorBorder.Render("Error! The only currently available options\nafter [types] command is '-h' or '--help'")
+		return fmt.Errorf("%s", errMessage)
 	}
 
 	return nil