Merge pull request #246 from digitalghost-dev/1.8.10

digitalghost-dev · web-flow · commit 7ed85e6e7b8c · 2026-02-16T12:10:26.000-08:00
1.8.10
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -31,7 +31,7 @@ on:
       - main
 
 env:
-  VERSION_NUMBER: 'v1.8.9'
+  VERSION_NUMBER: 'v1.8.10'
   DOCKERHUB_REGISTRY_NAME: 'digitalghostdev/poke-cli'
   AWS_REGION: 'us-west-2'
 
diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -14,7 +14,7 @@ builds:
       - windows
       - darwin
     ldflags:
-      - -s -w -X main.version=v1.8.9
+      - -s -w -X main.version=v1.8.10
 
 archives:
   - formats: [ 'zip' ]
diff --git a/Dockerfile b/Dockerfile
@@ -8,7 +8,7 @@ RUN go mod download
 
 COPY . .
 
-RUN go build -ldflags "-X main.version=v1.8.9" -o poke-cli .
+RUN go build -ldflags "-X main.version=v1.8.10" -o poke-cli .
 
 # build 2
 FROM --platform=$BUILDPLATFORM alpine:3.23
diff --git a/README.md b/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.8.9?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.8.10?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.8.9 <command> [subcommand] [flag]
+    docker run --rm -it digitalghostdev/poke-cli:v1.8.10 <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.8.9 -c "cd /app && exec sh"
+    docker run --rm -it --name poke-cli --entrypoint /bin/sh digitalghostdev/poke-cli:v1.8.10 -c "cd /app && exec sh"
    # placed into the /app directory, run the program with './poke-cli'
    # example: ./poke-cli ability swift-swim
     ```
@@ -118,7 +118,7 @@ Cloudsmith is a fully cloud-based service that lets you easily create, store, an
 6. Run the tool!
 
 > [!IMPORTANT]
-> For macOS, you may have to allow the executable to run as it is not signed. Head to System Settings > Privacy & Security > scroll down and allow executable to run.
+> For macOS, you may have to allow the executable to run as it is not signed. Head to System Settings > Privacy & Security > scroll down and allow the executable to run.
 
 <details>
 
diff --git a/card_data/pipelines/poke_cli_dbt/dbt_project.yml b/card_data/pipelines/poke_cli_dbt/dbt_project.yml
@@ -1,5 +1,5 @@
 name: 'poke_cli_dbt'
-version: '1.8.9'
+version: '1.8.10'
 
 profile: 'poke_cli_dbt'
 
diff --git a/card_data/pyproject.toml b/card_data/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "card-data"
-version = "1.5.2"
+version = "1.8.10"
 description = "File directory to store all data related processes for the Pokémon TCG."
 readme = "README.md"
 requires-python = ">=3.12"
diff --git a/cmd/ability/ability.go b/cmd/ability/ability.go
@@ -37,9 +37,7 @@ func AbilityCommand() (string, error) {
 		return output.String(), nil
 	}
 
-	flag.Parse()
-
-	if err := utils.ValidateAbilityArgs(args); err != nil {
+	if err := utils.ValidateArgs(args, utils.Validator{MaxArgs: 4, CmdName: "ability", RequireName: true, HasFlags: true}); err != nil {
 		output.WriteString(err.Error())
 		return output.String(), err
 	}
diff --git a/cmd/berry/berry.go b/cmd/berry/berry.go
@@ -37,7 +37,7 @@ func BerryCommand() (string, error) {
 	flag.Parse()
 
 	// Validate arguments
-	if err := utils.ValidateBerryArgs(os.Args); err != nil {
+	if err := utils.ValidateArgs(os.Args, utils.Validator{MaxArgs: 3, CmdName: "berry", RequireName: false, HasFlags: false}); err != nil {
 		output.WriteString(err.Error())
 		return output.String(), err
 	}
diff --git a/cmd/card/card.go b/cmd/card/card.go
@@ -33,7 +33,7 @@ func CardCommand() (string, error) {
 	flag.Parse()
 
 	// Validate arguments
-	if err := utils.ValidateCardArgs(os.Args); err != nil {
+	if err := utils.ValidateArgs(os.Args, utils.Validator{MaxArgs: 3, CmdName: "card", RequireName: false, HasFlags: false}); err != nil {
 		output.WriteString(err.Error())
 		return output.String(), err
 	}
diff --git a/cmd/card/cardlist.go b/cmd/card/cardlist.go
@@ -19,6 +19,7 @@ var getCardData = connections.CallTCGData
 type CardsModel struct {
 	AllRows           []table.Row
 	Choice            string
+	Error             error
 	IllustratorMap    map[string]string
 	ImageMap          map[string]string
 	Loading           bool
@@ -62,7 +63,7 @@ func cardTableStyles(selectedBg lipgloss.Color) table.Styles {
 	return s
 }
 
-func (m *CardsModel) syncTableStylesForFocus() {
+func syncTableStylesForFocus(m *CardsModel) {
 	if m.Search.Focused() {
 		m.TableStyles = cardTableStyles(inactiveTableSelectedBg)
 	} else {
@@ -146,7 +147,7 @@ func (m CardsModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 			if m.Search.Focused() {
 				m.Search.Blur()
 				m.Table.Focus()
-				m.syncTableStylesForFocus()
+				syncTableStylesForFocus(&m)
 				return m, nil
 			}
 			m.Quitting = true
@@ -168,15 +169,16 @@ func (m CardsModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 				m.Table.Blur()
 				m.Search.Focus()
 			}
-			m.syncTableStylesForFocus()
+			syncTableStylesForFocus(&m)
 			return m, nil
 		}
 
 	case cardDataMsg:
 		// Data arrived - stop loading and build the table
 		if msg.err != nil {
-			m.Quitting = true
-			return m, tea.Quit
+			m.Error = msg.err
+			m.Loading = false
+			return m, nil
 		}
 
 		ti := textinput.New()
@@ -219,7 +221,7 @@ func (m CardsModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 			prev := m.Search.Value()
 			m.Search, bubbleCmd = m.Search.Update(msg)
 			if m.Search.Value() != prev {
-				m.applyFilter()
+				applyFilter(&m)
 			}
 		} else {
 			m.Table, bubbleCmd = m.Table.Update(msg)
@@ -237,7 +239,7 @@ func (m CardsModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 	return m, bubbleCmd
 }
 
-func (m *CardsModel) applyFilter() {
+func applyFilter(m *CardsModel) {
 	q := strings.TrimSpace(strings.ToLower(m.Search.Value()))
 	if q == "" {
 		m.Table.SetRows(m.AllRows)
@@ -263,6 +265,13 @@ func (m CardsModel) View() string {
 	if m.Quitting {
 		return "\n  Quitting card search...\n\n"
 	}
+	if m.Error != nil {
+		return styling.ApiErrorStyle.Render(
+			"Error loading cards from Supabase:\n" +
+				m.Error.Error() + "\n\n" +
+				"Press ctrl+c or esc to exit.",
+		)
+	}
 	if m.Loading {
 		return lipgloss.NewStyle().Padding(2).Render(
 			m.Spinner.View() + " Loading cards...",
diff --git a/cmd/card/cardlist_test.go b/cmd/card/cardlist_test.go
@@ -351,7 +351,7 @@ func TestCardDataMsg_PopulatesModel(t *testing.T) {
 	}
 }
 
-func TestCardDataMsg_Error_QuitsModel(t *testing.T) {
+func TestCardDataMsg_Error_StoresError(t *testing.T) {
 	model, _ := CardsList("set123")
 
 	// Simulate receiving an error via cardDataMsg
@@ -362,12 +362,20 @@ func TestCardDataMsg_Error_QuitsModel(t *testing.T) {
 	newModel, cmd := model.Update(msg)
 	resultModel := newModel.(CardsModel)
 
-	if !resultModel.Quitting {
-		t.Error("Quitting should be true when error received")
+	if resultModel.Error == nil {
+		t.Error("Error should be set when error received")
 	}
 
-	if cmd == nil {
-		t.Error("Should return tea.Quit command on error")
+	if resultModel.Error.Error() != "network error" {
+		t.Errorf("Expected error message 'network error', got '%s'", resultModel.Error.Error())
+	}
+
+	if resultModel.Loading {
+		t.Error("Loading should be false after error")
+	}
+
+	if cmd != nil {
+		t.Error("Should not return a command on error (stays in view to show error)")
 	}
 }
 
diff --git a/cmd/card/setslist.go b/cmd/card/setslist.go
@@ -2,7 +2,6 @@ package card
 
 import (
 	"encoding/json"
-	"fmt"
 
 	"github.com/charmbracelet/bubbles/list"
 	"github.com/charmbracelet/bubbles/spinner"
@@ -16,6 +15,7 @@ var getSetsData = connections.CallTCGData
 
 type SetsModel struct {
 	Choice     string
+	Error      error
 	Loading    bool
 	List       list.Model
 	Quitting   bool
@@ -79,6 +79,9 @@ func (m SetsModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 			m.Quitting = true
 			return m, tea.Quit
 		case "enter":
+			if m.Error != nil {
+				return m, nil
+			}
 			i, ok := m.List.SelectedItem().(item)
 			if ok {
 				m.Choice = string(i)
@@ -90,15 +93,16 @@ func (m SetsModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 	case setsDataMsg:
 		// Data arrived - stop loading and build the list
 		if msg.err != nil {
-			m.Quitting = true
-			return m, tea.Quit
+			m.Error = msg.err
+			m.Loading = false
+			return m, nil
 		}
 
 		const listWidth = 20
 		const listHeight = 20
 
 		l := list.New(msg.items, itemDelegate{}, listWidth, listHeight)
-		l.Title = fmt.Sprintf("Pick a set from the %s series", msg.seriesID)
+		l.Title = "Choose a set!"
 		l.SetShowStatusBar(false)
 		l.SetFilteringEnabled(false)
 		l.Styles.Title = titleStyle
@@ -116,14 +120,14 @@ func (m SetsModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 		return m, cmd
 
 	case tea.WindowSizeMsg:
-		if !m.Loading {
+		if !m.Loading && m.Error == nil {
 			m.List.SetWidth(msg.Width)
 		}
 		return m, nil
 	}
 
 	// Only update the list if it's been initialized
-	if !m.Loading {
+	if !m.Loading && m.Error == nil {
 		var cmd tea.Cmd
 		m.List, cmd = m.List.Update(msg)
 		return m, cmd
@@ -132,6 +136,13 @@ func (m SetsModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 }
 
 func (m SetsModel) View() string {
+	if m.Error != nil {
+		return styling.ApiErrorStyle.Render(
+			"Error loading sets from Supabase:\n" +
+				m.Error.Error() + "\n\n" +
+				"Press ctrl+c or esc to exit.",
+		)
+	}
 	if m.Choice != "" {
 		return quitTextStyle.Render("Set selected:", m.Choice)
 	}
diff --git a/cmd/card/setslist_test.go b/cmd/card/setslist_test.go
@@ -238,7 +238,7 @@ func TestSetsDataMsg_PopulatesModel(t *testing.T) {
 	}
 }
 
-func TestSetsDataMsg_Error_QuitsModel(t *testing.T) {
+func TestSetsDataMsg_Error_StoresError(t *testing.T) {
 	model, _ := SetsList("sv")
 
 	// Simulate receiving an error via setsDataMsg
@@ -249,12 +249,20 @@ func TestSetsDataMsg_Error_QuitsModel(t *testing.T) {
 	newModel, cmd := model.Update(msg)
 	resultModel := newModel.(SetsModel)
 
-	if !resultModel.Quitting {
-		t.Error("Quitting should be true when error received")
+	if resultModel.Error == nil {
+		t.Error("Error should be set when error received")
 	}
 
-	if cmd == nil {
-		t.Error("Should return tea.Quit command on error")
+	if resultModel.Error.Error() != "network error" {
+		t.Errorf("Expected error message 'network error', got '%s'", resultModel.Error.Error())
+	}
+
+	if resultModel.Loading {
+		t.Error("Loading should be false after error")
+	}
+
+	if cmd != nil {
+		t.Error("Should not return a command on error (stays in view to show error)")
 	}
 }
 
diff --git a/cmd/item/item.go b/cmd/item/item.go
@@ -37,7 +37,7 @@ func ItemCommand() (string, error) {
 
 	flag.Parse()
 
-	if err := utils.ValidateItemArgs(os.Args); err != nil {
+	if err := utils.ValidateArgs(os.Args, utils.Validator{MaxArgs: 3, CmdName: "item", RequireName: true, HasFlags: false}); err != nil {
 		output.WriteString(err.Error())
 		return output.String(), err
 	}
diff --git a/cmd/move/move.go b/cmd/move/move.go
@@ -38,7 +38,7 @@ func MoveCommand() (string, error) {
 
 	flag.Parse()
 
-	if err := utils.ValidateMoveArgs(os.Args); err != nil {
+	if err := utils.ValidateArgs(os.Args, utils.Validator{MaxArgs: 3, CmdName: "move", RequireName: true, HasFlags: false}); err != nil {
 		output.WriteString(err.Error())
 		return output.String(), err
 	}
diff --git a/cmd/natures/natures.go b/cmd/natures/natures.go
@@ -30,7 +30,7 @@ func NaturesCommand() (string, error) {
 
 	flag.Parse()
 
-	if err := utils.ValidateNaturesArgs(os.Args); err != nil {
+	if err := utils.ValidateArgs(os.Args, utils.Validator{MaxArgs: 3, CmdName: "natures", RequireName: false, HasFlags: false}); err != nil {
 		output.WriteString(err.Error())
 		return output.String(), err
 	}
diff --git a/cmd/pokemon/pokemon.go b/cmd/pokemon/pokemon.go
@@ -53,11 +53,9 @@ func PokemonCommand() (string, error) {
 		return output.String(), nil
 	}
 
-	flag.Parse()
-
 	err := utils.ValidatePokemonArgs(args)
 	if err != nil {
-		output.WriteString(err.Error()) // This is the styled error
+		output.WriteString(err.Error())
 		return output.String(), err
 	}
 
diff --git a/cmd/search/search.go b/cmd/search/search.go
@@ -32,7 +32,7 @@ func SearchCommand() error {
 
 	flag.Parse()
 
-	if err := utils.ValidateSearchArgs(os.Args); err != nil {
+	if err := utils.ValidateArgs(os.Args, utils.Validator{MaxArgs: 3, CmdName: "search", RequireName: false, HasFlags: false}); err != nil {
 		fmt.Println(err.Error())
 		return err
 	}
diff --git a/cmd/speed/speed.go b/cmd/speed/speed.go
@@ -112,7 +112,7 @@ func SpeedCommand() (string, error) {
 	flag.Parse()
 
 	// Validate arguments
-	if err := utils.ValidateSpeedArgs(os.Args); err != nil {
+	if err := utils.ValidateArgs(os.Args, utils.Validator{MaxArgs: 3, CmdName: "speed", RequireName: false, HasFlags: false}); err != nil {
 		output.WriteString(err.Error())
 		return output.String(), err
 	}
diff --git a/cmd/types/types.go b/cmd/types/types.go
@@ -35,7 +35,7 @@ func TypesCommand() (string, error) {
 	flag.Parse()
 
 	// Validate arguments
-	if err := utils.ValidateTypesArgs(os.Args); err != nil {
+	if err := utils.ValidateArgs(os.Args, utils.Validator{MaxArgs: 3, CmdName: "types", RequireName: false, HasFlags: false}); err != nil {
 		output.WriteString(err.Error())
 		return output.String(), err
 	}
diff --git a/cmd/utils/validateargs.go b/cmd/utils/validateargs.go
diff --git a/cmd/utils/validateargs_test.go b/cmd/utils/validateargs_test.go
diff --git a/nfpm.yaml b/nfpm.yaml
diff --git a/styling/styling.go b/styling/styling.go
diff --git a/testdata/main_latest_flag.golden b/testdata/main_latest_flag.golden

Original file line number	Diff line number	Diff line change
`@@ -37,9 +37,7 @@ func AbilityCommand() (string, error) {`
`37`	`37`	`return output.String(), nil`
`38`	`38`	`}`
`39`	`39`
`40`		`- flag.Parse()`
`41`		`-`
`42`		`- if err := utils.ValidateAbilityArgs(args); err != nil {`
	`40`	`+ if err := utils.ValidateArgs(args, utils.Validator{MaxArgs: 4, CmdName: "ability", RequireName: true, HasFlags: true}); err != nil {`
`43`	`41`	`output.WriteString(err.Error())`
`44`	`42`	`return output.String(), err`
`45`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ func BerryCommand() (string, error) {`
`37`	`37`	`flag.Parse()`
`38`	`38`
`39`	`39`	`// Validate arguments`
`40`		`- if err := utils.ValidateBerryArgs(os.Args); err != nil {`
	`40`	`+ if err := utils.ValidateArgs(os.Args, utils.Validator{MaxArgs: 3, CmdName: "berry", RequireName: false, HasFlags: false}); err != nil {`
`41`	`41`	`output.WriteString(err.Error())`
`42`	`42`	`return output.String(), err`
`43`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ func CardCommand() (string, error) {`
`33`	`33`	`flag.Parse()`
`34`	`34`
`35`	`35`	`// Validate arguments`
`36`		`- if err := utils.ValidateCardArgs(os.Args); err != nil {`
	`36`	`+ if err := utils.ValidateArgs(os.Args, utils.Validator{MaxArgs: 3, CmdName: "card", RequireName: false, HasFlags: false}); err != nil {`
`37`	`37`	`output.WriteString(err.Error())`
`38`	`38`	`return output.String(), err`
`39`	`39`	`}`