refactor: use aperturerobotics/cli

Signed-off-by: Christian Stewart <christian@aperture.us>

Author: paralin

cmd/kvfile/main.go

@@ -1,7 +1,6 @@
 package main
 
 import (
-	"context"
 	"encoding/json"
 	"fmt"
 	"io"
@@ -12,7 +11,7 @@ import (
 	kvfile_compress "github.com/aperturerobotics/go-kvfile/compress"
 	b58 "github.com/mr-tron/base58/base58"
 	"github.com/pkg/errors"
-	"github.com/urfave/cli/v3"
+	"github.com/aperturerobotics/cli"
 )
 
 var (
@@ -25,11 +24,11 @@ var (
 )
 
 func main() {
-	app := &cli.Command{
+	app := &cli.App{
 		Name:  "kvfile",
 		Usage: "A CLI tool for working with key-value files",
-		Authors: []any{
-			"Christian Stewart <christian@aperture.us>",
+		Authors: []*cli.Author{
+			{Name: "Christian Stewart", Email: "christian@aperture.us"},
 		},
 		Flags: []cli.Flag{
 			&cli.BoolFlag{
@@ -62,7 +61,7 @@ func main() {
 			{
 				Name:  "count",
 				Usage: "Print the number of keys in a k/v file.",
-				Action: func(ctx context.Context, c *cli.Command) error {
+				Action: func(c *cli.Context) error {
 					reader, rel, err := openKVFile(filePath)
 					if rel != nil {
 						defer rel()
@@ -79,7 +78,7 @@ func main() {
 			{
 				Name:  "keys",
 				Usage: "Print all keys in a k/v file in sorted order.",
-				Action: func(ctx context.Context, c *cli.Command) error {
+				Action: func(c *cli.Context) error {
 					reader, rel, err := openKVFile(filePath)
 					if rel != nil {
 						defer rel()
@@ -94,7 +93,7 @@ func main() {
 			{
 				Name:  "values",
 				Usage: "Print all key-value pairs in a k/v file.",
-				Action: func(ctx context.Context, c *cli.Command) error {
+				Action: func(c *cli.Context) error {
 					reader, rel, err := openKVFile(filePath)
 					if rel != nil {
 						defer rel()
@@ -117,7 +116,7 @@ func main() {
 						Destination: &keyStr,
 					},
 				},
-				Action: func(ctx context.Context, c *cli.Command) error {
+				Action: func(c *cli.Context) error {
 					if keyStr == "" {
 						return fmt.Errorf("please provide a key")
 					}
@@ -152,7 +151,7 @@ func main() {
 						Destination: &valueStr,
 					},
 				},
-				Action: func(ctx context.Context, c *cli.Command) error {
+				Action: func(c *cli.Context) error {
 					if filePath == "" {
 						return fmt.Errorf("please provide a file path")
 					}
@@ -191,7 +190,7 @@ func main() {
 		},
 	}
 
-	err := app.Run(context.Background(), os.Args)
+	err := app.Run(os.Args)
 	if err != nil {
 		os.Stderr.WriteString(err.Error() + "\n")
 		os.Exit(1)

go.mod

@@ -12,15 +12,16 @@ require (
 
 require (
 	github.com/SaveTheRbtz/zstd-seekable-format-go v0.6.1
+	github.com/aperturerobotics/cli v1.0.0
 	github.com/klauspost/compress v1.18.0
 	github.com/mr-tron/base58 v1.2.0
 	github.com/pkg/errors v0.9.1
-	github.com/urfave/cli/v3 v3.1.1
 )
 
 require (
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/google/btree v1.1.2 // indirect
+	github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
 	go.uber.org/atomic v1.10.0 // indirect
 	go.uber.org/multierr v1.9.0 // indirect
 	go.uber.org/zap v1.24.0 // indirect

go.sum

@@ -1,5 +1,7 @@
 github.com/SaveTheRbtz/zstd-seekable-format-go v0.6.1 h1:VuaOpU/0Aklkjcq8KBisGC862WTlf8bPbW3hqBrR6gs=
 github.com/SaveTheRbtz/zstd-seekable-format-go v0.6.1/go.mod h1:IfUnG57D5yphwHgIIeIl74Gp5VCu74GsE7h3riM4cxs=
+github.com/aperturerobotics/cli v1.0.0 h1:s3xT2h7eBih4/4yZKTn/HQ6P+qpk6ygWZl2416xAI1M=
+github.com/aperturerobotics/cli v1.0.0/go.mod h1:wtlINjMcKuwyV1x4ftReuA6hHZcPB8kPMXHyQqGFCSc=
 github.com/aperturerobotics/common v0.21.2 h1:fqnPL5Oovpd8nDaNBYGiD1UpZhcH/JfpsS8gt5iBDyA=
 github.com/aperturerobotics/common v0.21.2/go.mod h1:FrecdNcsYvVS8RcWCR8FUkKFh+XmouFOYKHpBdMqqBA=
 github.com/aperturerobotics/json-iterator-lite v1.0.1-0.20240713111131-be6bf89c3008 h1:So9JeziaWKx2Fw8sK4AUN/szqKtJ0jEMhS6bU4sHbxs=
@@ -26,8 +28,8 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
 github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-github.com/urfave/cli/v3 v3.1.1 h1:bNnl8pFI5dxPOjeONvFCDFoECLQsceDG4ejahs4Jtxk=
-github.com/urfave/cli/v3 v3.1.1/go.mod h1:FJSKtM/9AiiTOJL4fJ6TbMUkxBXn7GO9guZqoZtpYpo=
+github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 h1:gEOO8jv9F4OT7lGCjxCBTO/36wtF6j2nSip77qHd4x4=
+github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1/go.mod h1:Ohn+xnUBiLI6FVj/9LpzZWtj1/D6lUovWYBkxHVV3aM=
 go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ=
 go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
 go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI=