Merge pull request #95 from digitalghost-dev/0.11.0

0.11.0

Author: digitalghost-dev

.github/workflows/ci.yml

@@ -21,11 +21,12 @@ on:
       - 'go.mod'
       - 'go.sum'
       - '.goreleaser.yaml'
+      - 'pokemon.svg'
     branches:
       - main
 
 env:
-  VERSION_NUMBER: 'v0.10.0'
+  VERSION_NUMBER: 'v0.11.0'
   DOCKERHUB_REGISTRY_NAME: 'digitalghostdev/poke-cli'
   AWS_REGION: 'us-west-2'
 

.goreleaser.yaml

@@ -14,7 +14,7 @@ builds:
       - windows
       - darwin
     ldflags:
-      - -s -w -X main.version=v0.10.0
+      - -s -w -X main.version=v0.11.0
 
 archives:
   - format: tar.gz

Dockerfile

@@ -8,7 +8,7 @@ RUN go mod download
 
 COPY . .
 
-RUN go build -ldflags "-X main.version=v0.10.0" -o poke-cli .
+RUN go build -ldflags "-X main.version=v0.11.0" -o poke-cli .
 
 # build 2
 FROM gcr.io/distroless/static-debian12:nonroot

README.md

@@ -2,7 +2,7 @@
     <img height="250" width="350" src="pokemon.svg" 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.10.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.11.0?arch=arm64&style=flat-square&logo=docker&logoColor=FFCC00&labelColor=EEE&color=FFCC00" alt="docker-image-size">
     <img src="https://img.shields.io/github/actions/workflow/status/digitalghost-dev/poke-cli/ci.yml?branch=main&style=flat-square&logo=github&logoColor=FFCC00&label=CI&labelColor=EEE&color=FFCC00" alt="ci-status-badge">
 </div>
 <div align="center">
@@ -68,7 +68,7 @@ _Use a Docker Image_
      * Necessary.
 
 ```bash
-docker run --rm -i -t digitalghostdev/poke-cli:v0.10.0 <command> [subcommand] flag]
+docker run --rm -i -t digitalghostdev/poke-cli:v0.11.0 <command> [subcommand] flag]
 ```
 
 ### Go Install

cli_test.go

@@ -170,7 +170,7 @@ func TestRunCLI(t *testing.T) {
 		{
 			name:           "Latest Flag",
 			args:           []string{"-l"},
-			expectedOutput: "Latest Docker image version: v0.9.3\nLatest release tag: v0.9.3\n",
+			expectedOutput: "Latest Docker image version: v0.10.0\nLatest release tag: v0.10.0\n",
 			expectedCode:   0,
 		},
 	}

cmd/pokemon.go

@@ -15,6 +15,8 @@ import (
 // PokemonCommand processes the Pokémon command
 func PokemonCommand() {
 
+	hintMessage := styleItalic.Render("options: [sm, md, lg]")
+
 	flag.Usage = func() {
 		helpMessage := helpBorder.Render(
 			"Get details about a specific Pokémon.\n\n",
@@ -24,6 +26,8 @@ func PokemonCommand() {
 			"\n\n",
 			styleBold.Render("FLAGS:"),
 			fmt.Sprintf("\n\t%-30s %s", "-a, --abilities", "Prints the Pokémon's abilities."),
+			fmt.Sprintf("\n\t%-30s %s", "-i=xx, --image=xx", "Prints out the Pokémon's default sprite."),
+			fmt.Sprintf("\n\t%5s%-15s", "", hintMessage),
 			fmt.Sprintf("\n\t%-30s %s", "-s, --stats", "Prints the Pokémon's base stats."),
 			fmt.Sprintf("\n\t%-30s %s", "-t, --types", "Prints the Pokémon's typing."),
 			fmt.Sprintf("\n\t%-30s %s", "-h, --help", "Prints the help menu."),
@@ -33,7 +37,7 @@ func PokemonCommand() {
 
 	flag.Parse()
 
-	pokeFlags, abilitiesFlag, shortAbilitiesFlag, statsFlag, shortStatsFlag, typesFlag, shortTypesFlag := flags.SetupPokemonFlagSet()
+	pokeFlags, abilitiesFlag, shortAbilitiesFlag, imageFlag, shortImageFlag, statsFlag, shortStatsFlag, typesFlag, shortTypesFlag := flags.SetupPokemonFlagSet()
 
 	args := os.Args
 
@@ -76,6 +80,20 @@ func PokemonCommand() {
 		capitalizedString, pokemonID, weightKilograms, weightPounds, heightFeet, feet, inches,
 	)
 
+	if *imageFlag != "" || *shortImageFlag != "" {
+		// Determine the size based on the provided flags
+		size := *imageFlag
+		if *shortImageFlag != "" {
+			size = *shortImageFlag
+		}
+
+		// Call the ImageFlag function with the specified size
+		if err := flags.ImageFlag(endpoint, pokemonName, size); err != nil {
+			fmt.Println(err)
+			os.Exit(1)
+		}
+	}
+
 	if *abilitiesFlag || *shortAbilitiesFlag {
 		if err := flags.AbilitiesFlag(endpoint, pokemonName); err != nil {
 			fmt.Printf("Error: %s\n", err)

cmd/pokemon_test.go

@@ -14,6 +14,7 @@ func TestValidatePokemonArgs_ValidInput(t *testing.T) {
 		{"poke-cli", "pokemon", "cloyster", "--abilities"},
 		{"poke-cli", "pokemon", "mewtwo", "--types", "--abilities"},
 		{"poke-cli", "pokemon", "BlaZiKen", "-a", "-t"},
+		{"poke-cli", "pokemon", "gengar", "--image=md"},
 	}
 
 	for _, input := range validInputs {

cmd/validateargs.go

@@ -54,7 +54,7 @@ func ValidatePokemonArgs(args []string) error {
 	}
 
 	// Check if there are too many arguments
-	if len(args) > 6 {
+	if len(args) > 7 {
 		errMessage := errorBorder.Render(
 			errorColor.Render("Error!"),
 			"\nToo many arguments",

connections/connection.go

@@ -36,6 +36,9 @@ type PokemonJSONStruct struct {
 			URL  string `json:"url"`
 		} `json:"type"`
 	} `json:"types"`
+	Sprites struct {
+		FrontDefault string `json:"front_default"`
+	} `json:"sprites"`
 	Stats []struct {
 		BaseStat int `json:"base_stat"`
 		Stat     struct {

flags/pokemonflagset.go

@@ -7,16 +7,26 @@ import (
 	"fmt"
 	"github.com/charmbracelet/lipgloss"
 	"github.com/digitalghost-dev/poke-cli/connections"
+	"github.com/disintegration/imaging"
+	"github.com/lucasb-eyer/go-colorful"
 	"golang.org/x/text/cases"
 	"golang.org/x/text/language"
+	"image"
+	"net/http"
+	"os"
 	"strings"
 )
 
 var (
 	helpBorder = lipgloss.NewStyle().
 			BorderStyle(lipgloss.RoundedBorder()).
 			BorderForeground(lipgloss.Color("#FFCC00"))
-	styleBold = lipgloss.NewStyle().Bold(true)
+	styleBold   = lipgloss.NewStyle().Bold(true)
+	errorColor  = lipgloss.NewStyle().Foreground(lipgloss.Color("#F2055C"))
+	errorBorder = lipgloss.NewStyle().
+			BorderStyle(lipgloss.RoundedBorder()).
+			BorderForeground(lipgloss.Color("#F2055C"))
+	styleItalic = lipgloss.NewStyle().Italic(true)
 )
 
 func header(header string) {
@@ -30,28 +40,37 @@ func header(header string) {
 	fmt.Println(HeaderBold)
 }
 
-func SetupPokemonFlagSet() (*flag.FlagSet, *bool, *bool, *bool, *bool, *bool, *bool) {
+func SetupPokemonFlagSet() (*flag.FlagSet, *bool, *bool, *string, *string, *bool, *bool, *bool, *bool) {
 	pokeFlags := flag.NewFlagSet("pokeFlags", flag.ExitOnError)
 
 	abilitiesFlag := pokeFlags.Bool("abilities", false, "Print the Pokémon's abilities")
 	shortAbilitiesFlag := pokeFlags.Bool("a", false, "Print the Pokémon's abilities")
 
+	imageFlag := pokeFlags.String("image", "", "Print the Pokémon's default sprite")
+	shortImageFlag := pokeFlags.String("i", "", "Print the Pokémon's default sprite")
+
 	statsFlag := pokeFlags.Bool("stats", false, "Print the Pokémon's base stats")
 	shortStatsFlag := pokeFlags.Bool("s", false, "Print the Pokémon's base stats")
 
 	typesFlag := pokeFlags.Bool("types", false, "Print the Pokémon's typing")
 	shortTypesFlag := pokeFlags.Bool("t", false, "Prints the Pokémon's typing")
 
+	hintMessage := styleItalic.Render("options: [sm, md, lg]")
+
 	pokeFlags.Usage = func() {
-		fmt.Println(
-			helpBorder.Render("poke-cli pokemon <pokemon-name> [flags]",
-				styleBold.Render("\n\nFLAGS:"), "\n\t", "-a, --abilities", "\t", "Prints out the Pokémon's abilities.",
-				"\n\t", "-t, --types", "\t\t", "Prints out the Pokémon's typing.", "\n\t", "-s, --stats", "\t\t",
-				"Prints out the Pokémon's base stats."),
+		helpMessage := helpBorder.Render("poke-cli pokemon <pokemon-name> [flags]\n\n",
+			styleBold.Render("FLAGS:"),
+			fmt.Sprintf("\n\t%-30s %s", "-a, --abilities", "Prints the Pokémon's abilities."),
+			fmt.Sprintf("\n\t%-30s %s", "-i=xx, --image=xx", "Prints out the Pokémon's default sprite."),
+			fmt.Sprintf("\n\t%5s%-15s", "", hintMessage),
+			fmt.Sprintf("\n\t%-30s %s", "-s, --stats", "Prints the Pokémon's base stats."),
+			fmt.Sprintf("\n\t%-30s %s", "-t, --types", "Prints the Pokémon's typing."),
+			fmt.Sprintf("\n\t%-30s %s", "-h, --help", "Prints the help menu."),
 		)
+		fmt.Println(helpMessage)
 	}
 
-	return pokeFlags, abilitiesFlag, shortAbilitiesFlag, statsFlag, shortStatsFlag, typesFlag, shortTypesFlag
+	return pokeFlags, abilitiesFlag, shortAbilitiesFlag, imageFlag, shortImageFlag, statsFlag, shortStatsFlag, typesFlag, shortTypesFlag
 }
 
 func AbilitiesFlag(endpoint string, pokemonName string) error {
@@ -98,13 +117,85 @@ func AbilitiesFlag(endpoint string, pokemonName string) error {
 	return nil
 }
 
+func ImageFlag(endpoint string, pokemonName string, size string) error {
+	baseURL := "https://pokeapi.co/api/v2/"
+	pokemonStruct, _, _, _, _ := connections.PokemonApiCall(endpoint, pokemonName, baseURL)
+
+	header("Image")
+
+	// Anonymous function to transform the image to a string
+	// ToString generates an ASCII representation of the image with color
+	ToString := func(width int, height int, img image.Image) string {
+		// Resize the image to the specified width, preserving aspect ratio
+		img = imaging.Resize(img, width, height, imaging.NearestNeighbor)
+		b := img.Bounds()
+		imageWidth := b.Max.X - 2 // Adjust width to exclude margins
+		h := b.Max.Y - 4          // Adjust height to exclude margins
+		str := strings.Builder{}
+
+		// Loop through the image pixels, two rows at a time
+		for heightCounter := 2; heightCounter < h; heightCounter += 2 {
+			for x := 1; x < imageWidth; x++ {
+				// Get the color of the current and next row's pixels
+				c1, _ := colorful.MakeColor(img.At(x, heightCounter))
+				color1 := lipgloss.Color(c1.Hex())
+				c2, _ := colorful.MakeColor(img.At(x, heightCounter+1))
+				color2 := lipgloss.Color(c2.Hex())
+
+				// Render the half-block character with the two colors
+				str.WriteString(lipgloss.NewStyle().
+					Foreground(color1).
+					Background(color2).
+					Render("▀"))
+			}
+
+			// Add a newline after each row
+			str.WriteString("\n")
+		}
+
+		return str.String()
+	}
+
+	imageResp, err := http.Get(pokemonStruct.Sprites.FrontDefault)
+	if err != nil {
+		fmt.Println("Error downloading sprite image:", err)
+		os.Exit(1)
+	}
+	defer imageResp.Body.Close()
+
+	img, err := imaging.Decode(imageResp.Body)
+	if err != nil {
+		fmt.Println("Error decoding image:", err)
+		os.Exit(1)
+	}
+
+	// Define size map
+	sizeMap := map[string][2]int{
+		"lg": {120, 120},
+		"md": {90, 90},
+		"sm": {55, 55},
+	}
+
+	// Validate size
+	dimensions, exists := sizeMap[strings.ToLower(size)]
+	if !exists {
+		errMessage := errorBorder.Render(errorColor.Render("Error!"), "\nInvalid image size.\nValid sizes are: lg, md, sm")
+		return fmt.Errorf("%s", errMessage)
+	}
+
+	imgStr := ToString(dimensions[0], dimensions[1], img)
+	fmt.Println(imgStr)
+
+	return nil
+}
+
 func StatsFlag(endpoint string, pokemonName string) error {
 	baseURL := "https://pokeapi.co/api/v2/"
 	pokemonStruct, _, _, _, _ := connections.PokemonApiCall(endpoint, pokemonName, baseURL)
 
 	header("Base Stats")
 
-	// Helper function to map stat values to categories
+	// Anonymous function to map stat values to categories
 	getStatCategory := func(value int) string {
 		switch {
 		case value < 20: