chore: use charm.land/fang/v2 for better tables, colors (#58)

- use `charm.land/fang/v2` for better tables, colors
- replace `version` subcommand with `--version` flag

Author: notnmeyer

README.md

@@ -56,14 +56,17 @@ Store a key with `loops auth login --name <name>`. Run this again with a differe
 
 Use `--team <name>` on any command to pick a specific stored key.
 
-### Environment variable
-
-Set `LOOPS_API_KEY` to use a key directly — useful for CI or when keyring storage isn't available.
-
 ### Precedence
 
 When multiple keys are available, the CLI resolves them in this order:
 
 1. `LOOPS_API_KEY` env var
 1. `--team` flag
 1. The current default (set via `loops auth use`)
+
+## Environment variables
+
+| Variable | Description |
+| --- | --- |
+| `LOOPS_API_KEY` | API key to use directly — useful for CI or when keyring storage isn't available. |
+| `NO_COLOR` | Set to `1` to disable color output. `0` or unset leaves color on. |

cmd/auth_list.go

@@ -34,16 +34,15 @@ var authListCmd = &cobra.Command{
 			return nil
 		}
 
-		w := newTableWriter(cmd.OutOrStdout())
-		fmt.Fprintln(w, "NAME\tACTIVE\tAPI KEY\t")
+		t := newStyledTable(cmd.OutOrStdout(), "NAME", "ACTIVE", "API KEY")
 		for _, e := range entries {
 			active := ""
 			if e.Name == activeTeam {
 				active = "*"
 			}
-			fmt.Fprintf(w, "%s\t%s\t%s\n", e.Name, active, maskKey(e.APIKey))
+			t.Row(e.Name, active, maskKey(e.APIKey))
 		}
-		return w.Flush()
+		return t.Render()
 	},
 }
 

cmd/auth_status.go

@@ -34,11 +34,12 @@ var statusCmd = &cobra.Command{
 			activeKey = "(none)"
 		}
 
-		fmt.Fprintf(cmd.OutOrStdout(), "Active Key: %s\n", activeKey)
-		fmt.Fprintf(cmd.OutOrStdout(), "API Key:    %s\n", masked)
-		fmt.Fprintf(cmd.OutOrStdout(), "Team:       %s\n", keyResp.TeamName)
-		fmt.Fprintf(cmd.OutOrStdout(), "Endpoint:   %s\n", cfg.EndpointURL)
-		return nil
+		t := newStyledTable(cmd.OutOrStdout(), "FIELD", "VALUE")
+		t.Row("activeKey", activeKey)
+		t.Row("apiKey", masked)
+		t.Row("teamName", keyResp.TeamName)
+		t.Row("endpointUrl", cfg.EndpointURL)
+		return t.Render()
 	},
 }
 

cmd/build_info.go

@@ -0,0 +1,25 @@
+package cmd
+
+import (
+	"runtime/debug"
+	"strings"
+)
+
+var (
+	version = "dev"
+	commit  = "none"
+)
+
+func init() {
+	if info, ok := debug.ReadBuildInfo(); ok && version == "dev" {
+		if info.Main.Version != "" && info.Main.Version != "(devel)" {
+			version = strings.TrimPrefix(info.Main.Version, "v")
+		}
+		for _, s := range info.Settings {
+			if s.Key == "vcs.revision" && len(s.Value) >= 7 {
+				commit = s.Value[:7]
+				break
+			}
+		}
+	}
+}

cmd/contact_properties.go

@@ -49,14 +49,11 @@ var contactPropertiesListCmd = &cobra.Command{
 			return nil
 		}
 
-		w := newTableWriter(cmd.OutOrStdout())
-		fmt.Fprintln(w, "KEY\tLABEL\tTYPE")
+		t := newStyledTable(cmd.OutOrStdout(), "KEY", "LABEL", "TYPE")
 		for _, p := range props {
-			fmt.Fprintf(w, "%s\t%s\t%s\n", p.Key, p.Label, p.Type)
+			t.Row(p.Key, p.Label, p.Type)
 		}
-		w.Flush()
-
-		return nil
+		return t.Render()
 	},
 }
 

cmd/contacts.go

@@ -131,14 +131,13 @@ var contactsFindCmd = &cobra.Command{
 		}
 
 		c := contacts[0]
-		w := newTableWriter(cmd.OutOrStdout())
-		fmt.Fprintln(w, "FIELD\tVALUE\tCUSTOM")
+		t := newStyledTable(cmd.OutOrStdout(), "FIELD", "VALUE", "CUSTOM")
 		row := func(field, value string, custom bool) {
 			marker := ""
 			if custom {
 				marker = "*"
 			}
-			fmt.Fprintf(w, "%s\t%s\t%s\n", field, value, marker)
+			t.Row(field, value, marker)
 		}
 		row("id", c.ID, false)
 		row("email", c.Email, false)
@@ -153,9 +152,7 @@ var contactsFindCmd = &cobra.Command{
 		for _, k := range sortedKeys(c.Custom) {
 			row(k, formatCustomValue(c.Custom[k]), true)
 		}
-		w.Flush()
-
-		return nil
+		return t.Render()
 	},
 }
 

cmd/contacts_suppression.go

@@ -48,9 +48,10 @@ var contactsSuppressionCheckCmd = &cobra.Command{
 		if result.IsSuppressed {
 			suppressed = "yes"
 		}
-		fmt.Fprintf(cmd.OutOrStdout(), "Suppressed: %s\n", suppressed)
-		fmt.Fprintf(cmd.OutOrStdout(), "Removal quota: %d/%d remaining\n", result.RemovalQuota.Remaining, result.RemovalQuota.Limit)
-		return nil
+		t := newStyledTable(cmd.OutOrStdout(), "FIELD", "VALUE")
+		t.Row("isSuppressed", suppressed)
+		t.Row("removalQuota", fmt.Sprintf("%d/%d remaining", result.RemovalQuota.Remaining, result.RemovalQuota.Limit))
+		return t.Render()
 	},
 }
 

cmd/lists.go

@@ -43,14 +43,11 @@ var listsListCmd = &cobra.Command{
 			return nil
 		}
 
-		w := newTableWriter(cmd.OutOrStdout())
-		fmt.Fprintln(w, "ID\tNAME\tDESCRIPTION\tPUBLIC")
+		t := newStyledTable(cmd.OutOrStdout(), "ID", "NAME", "DESCRIPTION", "PUBLIC")
 		for _, l := range lists {
-			fmt.Fprintf(w, "%s\t%s\t%s\t%v\n", l.ID, l.Name, l.Description, l.IsPublic)
+			t.Row(l.ID, l.Name, l.Description, fmt.Sprintf("%v", l.IsPublic))
 		}
-		w.Flush()
-
-		return nil
+		return t.Render()
 	},
 }
 

cmd/output.go

@@ -4,7 +4,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
-	"text/tabwriter"
 )
 
 type outputFlag string
@@ -31,10 +30,6 @@ func isJSONOutput() bool {
 	return outputFormat == "json"
 }
 
-func newTableWriter(w io.Writer) *tabwriter.Writer {
-	return tabwriter.NewWriter(w, 0, 0, 2, ' ', 0)
-}
-
 func printJSON(w io.Writer, v any) error {
 	enc := json.NewEncoder(w)
 	enc.SetIndent("", "  ")

cmd/root.go

@@ -1,10 +1,12 @@
 package cmd
 
 import (
-	"fmt"
+	"context"
+	"io"
 	"os"
 	"time"
 
+	"charm.land/fang/v2"
 	"github.com/loops-so/cli/internal/api"
 	"github.com/loops-so/cli/internal/config"
 	"github.com/spf13/cobra"
@@ -36,18 +38,12 @@ var rootCmd = &cobra.Command{
 	SilenceUsage:  true,
 }
 
-func fixHelpFlags(cmd *cobra.Command) {
-	cmd.InitDefaultHelpFlag()
-	if f := cmd.Flags().Lookup("help"); f != nil {
-		name := cmd.Name()
-		if name == "" {
-			name = "this command"
-		}
-		f.Usage = "Help for " + name
-	}
-	for _, sub := range cmd.Commands() {
-		fixHelpFlags(sub)
+func jsonAwareErrorHandler(w io.Writer, styles fang.Styles, err error) {
+	if isJSONOutput() {
+		_ = printJSON(w, Result{Success: false, Message: err.Error()})
+		return
 	}
+	fang.DefaultErrorHandler(w, styles, err)
 }
 
 func Execute() {
@@ -63,17 +59,17 @@ func Execute() {
 		}
 	}()
 
-	fixHelpFlags(rootCmd)
-	err := rootCmd.Execute()
+	err := fang.Execute(
+		context.Background(),
+		rootCmd,
+		fang.WithVersion(version),
+		fang.WithCommit(commit),
+		fang.WithErrorHandler(jsonAwareErrorHandler),
+	)
 
 	checkForUpdate(os.Stderr)
 
 	if err != nil {
-		if isJSONOutput() {
-			printJSON(os.Stderr, Result{Success: false, Message: err.Error()})
-		} else {
-			fmt.Fprintln(os.Stderr, "Error:", err)
-		}
 		os.Exit(1)
 	}
 }