Merge pull request #287 from digitalghost-dev/1.10.2

1.10.2

Author: digitalghost-dev

.github/workflows/ci.yml

@@ -31,7 +31,7 @@ on:
       - main
 
 env:
-  VERSION_NUMBER: 'v1.10.1'
+  VERSION_NUMBER: 'v1.10.2'
   DOCKERHUB_REGISTRY_NAME: 'digitalghostdev/poke-cli'
   AWS_REGION: 'us-west-2'
 
@@ -94,7 +94,7 @@ jobs:
         uses: actions/checkout@v6
 
       - name: Set up Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v6
         with:
           go-version: '1.25.9'
 
@@ -140,7 +140,7 @@ jobs:
             --target dist/poke-cli_${{ env.VERSION_NUMBER }}_linux_${{ matrix.arch }}.apk
 
       - name: Upload packages as artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: linux-packages-${{ matrix.arch }}
           path: dist/*
@@ -156,13 +156,13 @@ jobs:
 
     steps:
       - name: Download package artifact
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v7
         with:
           name: linux-packages-${{ matrix.arch }}
           path: packages/
 
       - name: Install Cloudsmith CLI
-        uses: cloudsmith-io/cloudsmith-cli-action@v1.0.8
+        uses: cloudsmith-io/cloudsmith-cli-action@v2
         with:
           api-key: ${{ secrets.CLOUDSMITH_API_KEY }}
 
@@ -184,13 +184,13 @@ jobs:
 
     steps:
       - name: Download package artifact
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v7
         with:
           name: linux-packages-${{ matrix.arch }}
           path: packages/
 
       - name: Install Cloudsmith CLI
-        uses: cloudsmith-io/cloudsmith-cli-action@v1.0.8
+        uses: cloudsmith-io/cloudsmith-cli-action@v2
         with:
           api-key: ${{ secrets.CLOUDSMITH_API_KEY }}
 
@@ -212,13 +212,13 @@ jobs:
 
     steps:
       - name: Download package artifact
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v7
         with:
           name: linux-packages-${{ matrix.arch }}
           path: packages/
 
       - name: Install Cloudsmith CLI
-        uses: cloudsmith-io/cloudsmith-cli-action@v1.0.8
+        uses: cloudsmith-io/cloudsmith-cli-action@v2
         with:
           api-key: ${{ secrets.CLOUDSMITH_API_KEY }}
 
@@ -267,7 +267,7 @@ jobs:
 
       - name: Upload Report
         if: always()
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: lychee-report
           path: ./lychee-report.md
@@ -285,23 +285,23 @@ jobs:
             docs
 
       - name: Set up Docker Buildx
-        uses: 'docker/setup-buildx-action@v3.0.0'
+        uses: 'docker/setup-buildx-action@v4'
 
       - name: Prepare Docker Build Context
         run: |
           mkdir docker-context
           rsync -av --exclude=docker-context . docker-context/
 
       - name: Build and Export
-        uses: 'docker/build-push-action@v5.0.0'
+        uses: 'docker/build-push-action@v7'
         with:
           context: ./docker-context
           file: ./docker-context/docs/Dockerfile
           tags: docs:latest
           outputs: type=docker,dest=/tmp/docs.tar
 
       - name: Upload Artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: docs
           path: /tmp/docs.tar
@@ -316,7 +316,7 @@ jobs:
         uses: actions/checkout@v6
 
       - name: Configure AWS
-        uses: aws-actions/configure-aws-credentials@v4
+        uses: aws-actions/configure-aws-credentials@v6
         with:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
@@ -327,7 +327,7 @@ jobs:
         uses: aws-actions/amazon-ecr-login@v2
 
       - name: Download Artifact
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v7
         with:
           name: docs
           path: /tmp
@@ -365,22 +365,22 @@ jobs:
         uses: actions/checkout@v6
 
       - name: Set up Docker Buildx
-        uses: 'docker/setup-buildx-action@v3.0.0'
+        uses: 'docker/setup-buildx-action@v4'
 
       - name: Prepare Docker Build Context
         run: |
           mkdir docker-context
           rsync -av --exclude=docker-context . docker-context/
 
       - name: Build and Export
-        uses: 'docker/build-push-action@v5.0.0'
+        uses: 'docker/build-push-action@v7'
         with:
           context: ./docker-context
           tags: poke-cli:${{ env.VERSION_NUMBER }}
           outputs: type=docker,dest=/tmp/poke-cli.tar
 
       - name: Upload Artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: poke-cli
           path: /tmp/poke-cli.tar
@@ -396,7 +396,7 @@ jobs:
         uses: actions/checkout@v6
 
       - name: Configure AWS
-        uses: aws-actions/configure-aws-credentials@v4
+        uses: aws-actions/configure-aws-credentials@v6
         with:
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
@@ -422,10 +422,10 @@ jobs:
         uses: actions/checkout@v6
 
       - name: Set up Docker Buildx
-        uses: 'docker/setup-buildx-action@v3.0.0'
+        uses: 'docker/setup-buildx-action@v4'
 
       - name: Download Artifact
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v7
         with:
           name: poke-cli
           path: /tmp
@@ -451,13 +451,13 @@ jobs:
 
     steps:
       - name: Download SBOM
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v7
         with:
           name: poke-cli-sbom-${{ env.VERSION_NUMBER }}.spdx.json
           path: /tmp
 
       - name: Scan SBOM
-        uses: anchore/scan-action@v5
+        uses: anchore/scan-action@v7
         id: scan
         with:
           sbom: /tmp/poke-cli-sbom-${{ env.VERSION_NUMBER }}.spdx.json
@@ -486,25 +486,25 @@ jobs:
 
       - name: Docker Meta
         id: meta
-        uses: 'docker/metadata-action@v5.0.0'
+        uses: 'docker/metadata-action@v6'
         with:
           images: ${{ env.DOCKERHUB_REGISTRY_NAME }}
 
       - name: Set up QEMU
-        uses: 'docker/setup-qemu-action@v3'
+        uses: 'docker/setup-qemu-action@v4'
 
       - name: Set up Docker Buildx
-        uses: 'docker/setup-buildx-action@v3.0.0'
+        uses: 'docker/setup-buildx-action@v4'
 
       - name: Login to Docker Hub
-        uses: 'docker/login-action@v3'
+        uses: 'docker/login-action@v4'
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Build and Push by Digest
         id: build
-        uses: 'docker/build-push-action@v5.0.0'
+        uses: 'docker/build-push-action@v7'
         with:
           context: .
           platforms: ${{ matrix.platform }}
@@ -519,7 +519,7 @@ jobs:
 
       - name: Upload Digest for AMD64
         if: matrix.platform == 'linux/amd64'
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: digests-amd64
           path: /tmp/digests/*
@@ -528,7 +528,7 @@ jobs:
 
       - name: Upload Digest for ARM64
         if: matrix.platform == 'linux/arm64'
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v6
         with:
           name: digests-arm64
           path: /tmp/digests/*
@@ -541,24 +541,24 @@ jobs:
 
     steps:
       - name: Download Digests
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v7
         with:
           pattern: digests-*
           path: /tmp/digests
           merge-multiple: true
 
       - name: Set up Docker Buildx
-        uses: 'docker/setup-buildx-action@v3.0.0'
+        uses: 'docker/setup-buildx-action@v4'
 
       - name: Docker meta
         id: meta
-        uses: 'docker/metadata-action@v5.0.0'
+        uses: 'docker/metadata-action@v6'
         with:
           images: ${{ env.DOCKERHUB_REGISTRY_NAME }}
           tags: ${{ env.VERSION_NUMBER }}
 
       - name: Login to Docker Hub
-        uses: 'docker/login-action@v3'
+        uses: 'docker/login-action@v4'
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}

.goreleaser.yml

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

Dockerfile

@@ -8,7 +8,7 @@ RUN go mod download
 
 COPY . .
 
-RUN go build -ldflags "-X main.version=v1.10.1" -o poke-cli .
+RUN go build -ldflags "-X main.version=v1.10.2" -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.10.1?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.10.2?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.10.1 <command> [subcommand] [flag]
+    docker run --rm -it digitalghostdev/poke-cli:v1.10.2 <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.10.1 -c "cd /app && exec sh"
+    docker run --rm -it --name poke-cli --entrypoint /bin/sh digitalghostdev/poke-cli:v1.10.2 -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.10.1 card
+> docker run --rm -it -e TERM -e KITTY_WINDOW_ID digitalghostdev/poke-cli:v1.10.2 card
 >
 > # WezTerm, iTerm2, Ghostty, Konsole, Rio, Tabby
-> docker run --rm -it -e TERM -e TERM_PROGRAM digitalghostdev/poke-cli:v1.10.1 card
+> docker run --rm -it -e TERM -e TERM_PROGRAM digitalghostdev/poke-cli:v1.10.2 card
 >
 > # Windows Terminal (Sixel)
-> docker run --rm -it -e WT_SESSION digitalghostdev/poke-cli:v1.10.1 card
+> docker run --rm -it -e WT_SESSION digitalghostdev/poke-cli:v1.10.2 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.10.1'
+version: '1.10.2'
 
 profile: 'poke_cli_dbt'
 

card_data/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "card-data"
-version = "v1.10.1"
+version = "v1.10.2"
 description = "File directory to store all data related processes for the Pokémon TCG."
 readme = "README.md"
 requires-python = ">=3.12"

cli.go

@@ -123,18 +123,19 @@ func runCLI(args []string) int {
 
 	remainingArgs := mainFlagSet.Args()
 
-	commands := map[string]func() int{
-		"ability": utils.HandleCommandOutput(ability.AbilityCommand),
-		"berry":   utils.HandleCommandOutput(berry.BerryCommand),
-		"card":    utils.HandleCommandOutput(card.CardCommand),
-		"item":    utils.HandleCommandOutput(item.ItemCommand),
-		"move":    utils.HandleCommandOutput(move.MoveCommand),
-		"natures": utils.HandleCommandOutput(natures.NaturesCommand),
-		"pokemon": utils.HandleCommandOutput(pokemon.PokemonCommand),
-		"speed":   utils.HandleCommandOutput(speed.SpeedCommand),
-		"tcg":     utils.HandleCommandOutput(tcg.TcgCommand),
-		"types":   utils.HandleCommandOutput(types.TypesCommand),
-		"search":  utils.HandleCommandOutput(search.SearchCommand),
+	type commandFunc func([]string) (string, error)
+	commands := map[string]commandFunc{
+		"ability": ability.AbilityCommand,
+		"berry":   berry.BerryCommand,
+		"card":    card.CardCommand,
+		"item":    item.ItemCommand,
+		"move":    move.MoveCommand,
+		"natures": natures.NaturesCommand,
+		"pokemon": pokemon.PokemonCommand,
+		"speed":   speed.SpeedCommand,
+		"tcg":     tcg.TcgCommand,
+		"types":   types.TypesCommand,
+		"search":  search.SearchCommand,
 	}
 
 	cmdArg := ""
@@ -157,7 +158,7 @@ func runCLI(args []string) int {
 		currentVersion()
 		return 0
 	case exists:
-		return cmdFunc()
+		return utils.HandleCommandOutput(cmdFunc, remainingArgs)()
 	default:
 		msg := fmt.Sprintf("\t%-15s", fmt.Sprintf("'%s' is not a valid command.\n", cmdArg)) +
 			styling.StyleBold.Render("\nCommands:") +

cli_test.go

@@ -108,10 +108,6 @@ func TestRunCLI(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			originalArgs := os.Args
-			os.Args = append([]string{"poke-cli"}, tt.args...)
-			defer func() { os.Args = originalArgs }()
-
 			var exitCode int
 			output := captureOutput(func() {
 				exitCode = runCLI(tt.args)