Merge pull request #268 from digitalghost-dev/1.9.3

1.9.3

Author: digitalghost-dev

.github/workflows/ci.yml

@@ -31,7 +31,7 @@ on:
       - main
 
 env:
-  VERSION_NUMBER: 'v1.9.2'
+  VERSION_NUMBER: 'v1.9.3'
   DOCKERHUB_REGISTRY_NAME: 'digitalghostdev/poke-cli'
   AWS_REGION: 'us-west-2'
 

.gitignore

@@ -37,6 +37,7 @@ web/.coverage
 # Python
 card_data/.venv
 __pycache__/
+.ruff_cache/
 
 # Terraform
 .terraformrc

.goreleaser.yml

@@ -14,7 +14,7 @@ builds:
       - windows
       - darwin
     ldflags:
-      - -s -w -X main.version=v1.9.2
+      - -s -w -X main.version=v1.9.3
 
 archives:
   - formats: [ 'zip' ]

Dockerfile

@@ -8,7 +8,7 @@ RUN go mod download
 
 COPY . .
 
-RUN go build -ldflags "-X main.version=v1.9.2" -o poke-cli .
+RUN go build -ldflags "-X main.version=v1.9.3" -o poke-cli .
 
 # build 2
 FROM --platform=$BUILDPLATFORM alpine:3.23

README.md

@@ -2,7 +2,7 @@
     <img width="425" src="poke-cli.png" alt="pokemon-logo"/>
     <h4></h4>
     <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/v1.9.2?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/v1.9.3?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">
@@ -99,11 +99,11 @@ Cloudsmith is a fully cloud-based service that lets you easily create, store, an
 3. Choose how to interact with the container:
    * Run a single command and exit:
     ```bash
-    docker run --rm -it digitalghostdev/poke-cli:v1.9.2 <command> [subcommand] [flag]
+    docker run --rm -it digitalghostdev/poke-cli:v1.9.3 <command> [subcommand] [flag]
     ```
    * Enter the container and use its shell:
     ```bash
-    docker run --rm -it --name poke-cli --entrypoint /bin/sh digitalghostdev/poke-cli:v1.9.2 -c "cd /app && exec sh"
+    docker run --rm -it --name poke-cli --entrypoint /bin/sh digitalghostdev/poke-cli:v1.9.3 -c "cd /app && exec sh"
    # placed into the /app directory, run the program with './poke-cli'
    # example: ./poke-cli ability swift-swim
     ```
@@ -112,13 +112,13 @@ Cloudsmith is a fully cloud-based service that lets you easily create, store, an
 > The `card` command renders TCG card images using your terminal's graphics protocol. When running inside Docker, pass your terminal's environment variables so image rendering works correctly:
 > ```bash
 > # Kitty
-> docker run --rm -it -e TERM -e KITTY_WINDOW_ID digitalghostdev/poke-cli:v1.9.2 card
+> docker run --rm -it -e TERM -e KITTY_WINDOW_ID digitalghostdev/poke-cli:v1.9.3 card
 >
 > # WezTerm, iTerm2, Ghostty, Konsole, Rio, Tabby
-> docker run --rm -it -e TERM -e TERM_PROGRAM digitalghostdev/poke-cli:v1.9.2 card
+> docker run --rm -it -e TERM -e TERM_PROGRAM digitalghostdev/poke-cli:v1.9.3 card
 >
 > # Windows Terminal (Sixel)
-> docker run --rm -it -e WT_SESSION digitalghostdev/poke-cli:v1.9.2 card
+> docker run --rm -it -e WT_SESSION digitalghostdev/poke-cli:v1.9.3 card
 > ```
 > If your terminal is not listed above, image rendering is not supported inside Docker.
 

card_data/pipelines/poke_cli_dbt/dbt_project.yml

@@ -1,5 +1,5 @@
 name: 'poke_cli_dbt'
-version: '1.9.2'
+version: '1.9.3'
 
 profile: 'poke_cli_dbt'
 

cli.go

@@ -159,14 +159,11 @@ func runCLI(args []string) int {
 	case exists:
 		return cmdFunc()
 	default:
-		errMessage := styling.ErrorBorder.Render(
-			styling.ErrorColor.Render("✖ Error!"),
-			fmt.Sprintf("\n\t%-15s", fmt.Sprintf("'%s' is not a valid command.\n", cmdArg)),
-			styling.StyleBold.Render("\nCommands:"),
-			renderCommandList(),
-			fmt.Sprintf("\n\nAlso run %s for more info!", styling.StyleBold.Render("poke-cli -h")),
-		)
-		output.WriteString(errMessage)
+		msg := fmt.Sprintf("\t%-15s", fmt.Sprintf("'%s' is not a valid command.\n", cmdArg)) +
+			styling.StyleBold.Render("\nCommands:") +
+			renderCommandList() +
+			fmt.Sprintf("\n\nAlso run %s for more info!", styling.StyleBold.Render("poke-cli -h"))
+		output.WriteString(utils.FormatError(msg))
 
 		fmt.Println(output.String())
 

cli_test.go

@@ -132,14 +132,14 @@ func TestRunCLI_VariousCommands(t *testing.T) {
 		args     []string
 		expected int
 	}{
-		//{"Invalid command", []string{"foobar"}, 1},
+		{"Invalid command", []string{"foobar"}, 1},
 		{"Latest flag long", []string{"--latest"}, 0},
 		{"Latest flag short", []string{"-l"}, 0},
 		{"Version flag long", []string{"--version"}, 0},
 		{"Version flag short", []string{"-v"}, 0},
 		{"Search command with invalid args", []string{"search", "pokemon", "extra-arg"}, 1},
-		//{"Missing Pokémon name", []string{"pokemon"}, 1},
-		//{"Another invalid command", []string{"invalid"}, 1},
+		{"Missing Pokémon name", []string{"pokemon"}, 1},
+		{"Another invalid command", []string{"invalid"}, 1},
 	}
 
 	for _, tt := range tests {

cmd/ability/ability.go

@@ -1,6 +1,7 @@
 package ability
 
 import (
+	"errors"
 	"flag"
 	"fmt"
 	"os"
@@ -48,9 +49,10 @@ func AbilityCommand() (string, error) {
 	abilityName := strings.ToLower(args[2])
 
 	if err := af.FlagSet.Parse(args[3:]); err != nil {
+		if errors.Is(err, flag.ErrHelp) {
+			return output.String(), nil
+		}
 		fmt.Fprintf(&output, "error parsing flags: %v\n", err)
-		af.FlagSet.Usage()
-
 		return output.String(), err
 	}
 

cmd/ability/ability_test.go

@@ -52,6 +52,12 @@ func TestAbilityCommand(t *testing.T) {
 			args:           []string{"ability", "poison-point"},
 			expectedOutput: utils.LoadGolden(t, "ability_poison_point.golden"),
 		},
+		{
+			name:           "Ability invalid flag",
+			args:           []string{"ability", "clear-body", "--bogus"},
+			expectedOutput: utils.LoadGolden(t, "ability_invalid_flag.golden"),
+			wantError:      true,
+		},
 	}
 
 	for _, tt := range tests {