refactor: use aperturerobotics/cli

paralin · paralin · commit 2dda65c0b943 · 2025-04-14T16:27:07.000-07:00
Signed-off-by: Christian Stewart &lt;christian@aperture.us&gt;
diff --git a/cli/client.go b/cli/client.go
@@ -7,7 +7,7 @@ import (
 
 	bus_api "github.com/aperturerobotics/controllerbus/bus/api"
 	"github.com/aperturerobotics/starpc/srpc"
-	"github.com/urfave/cli/v2"
+	"github.com/aperturerobotics/cli"
 )
 
 // ClientArgs contains the client arguments and functions.
diff --git a/cli/client_exec_configset.go b/cli/client_exec_configset.go
@@ -8,7 +8,7 @@ import (
 	controller_exec "github.com/aperturerobotics/controllerbus/controller/exec"
 	"github.com/ghodss/yaml"
 	"github.com/pkg/errors"
-	"github.com/urfave/cli/v2"
+	"github.com/aperturerobotics/cli"
 )
 
 // RunExecController runs the execute configset command.
diff --git a/cli/client_nodeinfo.go b/cli/client_nodeinfo.go
@@ -5,7 +5,7 @@ import (
 	"os"
 
 	bus_api "github.com/aperturerobotics/controllerbus/bus/api"
-	"github.com/urfave/cli/v2"
+	"github.com/aperturerobotics/cli"
 )
 
 // RunBusInfo runs the bus information command.
diff --git a/cli/daemon.go b/cli/daemon.go
@@ -1,7 +1,7 @@
 package cli
 
 import (
-	"github.com/urfave/cli/v2"
+	"github.com/aperturerobotics/cli"
 )
 
 // DaemonArgs contains common flags for controller-bus daemons.
diff --git a/cmd/controllerbus/cmd_client.go b/cmd/controllerbus/cmd_client.go
@@ -2,7 +2,7 @@ package main
 
 import (
 	ccli "github.com/aperturerobotics/controllerbus/cli"
-	"github.com/urfave/cli/v2"
+	"github.com/aperturerobotics/cli"
 )
 
 // cliArgs are the client arguments
diff --git a/cmd/controllerbus/cmd_daemon.go b/cmd/controllerbus/cmd_daemon.go
@@ -16,7 +16,7 @@ import (
 	boilerplate_controller "github.com/aperturerobotics/controllerbus/example/boilerplate/controller"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
-	"github.com/urfave/cli/v2"
+	"github.com/aperturerobotics/cli"
 )
 
 var daemonFlags cbcli.DaemonArgs
diff --git a/cmd/controllerbus/main.go b/cmd/controllerbus/main.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/urfave/cli/v2"
+	"github.com/aperturerobotics/cli"
 )
 
 // Commands are the CLI commands
diff --git a/example/plugin-demo/go.mod b/example/plugin-demo/go.mod
@@ -45,7 +45,6 @@ require (
 	github.com/multiformats/go-varint v0.0.7 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/spaolacci/murmur3 v1.1.1-0.20190317074736-539464a789e9 // indirect
-	github.com/urfave/cli/v2 v2.27.5 // indirect
 	github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
 	github.com/zeebo/blake3 v0.2.4 // indirect
 	golang.org/x/crypto v0.31.0 // indirect
diff --git a/example/plugin-demo/go.sum b/example/plugin-demo/go.sum
@@ -81,8 +81,6 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 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/v2 v2.27.5 h1:WoHEJLdsXr6dDWoJgMq/CboDmyY/8HMMH1fTECbih+w=
-github.com/urfave/cli/v2 v2.27.5/go.mod h1:3Sevf16NykTbInEnD0yKkjDAeZDS0A6bzhBH5hrMvTQ=
 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=
 github.com/zeebo/assert v1.1.0 h1:hU1L1vLTHsnO8x8c9KAR5GmM5QscxHg5RNU5z5qbUWY=
diff --git a/go.mod b/go.mod
@@ -10,10 +10,11 @@ replace github.com/libp2p/go-libp2p => github.com/aperturerobotics/go-libp2p v0.
 replace github.com/libp2p/go-msgio => github.com/aperturerobotics/go-libp2p-msgio v0.0.0-20240511033615-1b69178aa5c8 // aperture
 
 require (
+	github.com/aperturerobotics/cli v1.0.0 // latest
 	github.com/aperturerobotics/common v0.21.2 // latest
 	github.com/aperturerobotics/json-iterator-lite v1.0.1-0.20241223092408-d525fa878b3e // latest
-	github.com/aperturerobotics/protobuf-go-lite v0.8.1 // latest
-	github.com/aperturerobotics/starpc v0.37.1 // latest
+	github.com/aperturerobotics/protobuf-go-lite v0.9.0 // latest
+	github.com/aperturerobotics/starpc v0.38.0 // latest
 	github.com/aperturerobotics/util v1.29.2 // latest
 )
 
@@ -25,21 +26,19 @@ require (
 	github.com/pkg/errors v0.9.1
 	github.com/sergi/go-diff v1.3.1
 	github.com/sirupsen/logrus v1.9.3
-	github.com/urfave/cli/v2 v2.27.6
 	github.com/zeebo/blake3 v0.2.4
 	golang.org/x/mod v0.24.0
 	golang.org/x/tools v0.31.0
 	mvdan.cc/gofumpt v0.7.0
 )
 
 require (
-	github.com/coder/websocket v1.8.12 // indirect
-	github.com/cpuguy83/go-md2man/v2 v2.0.5 // indirect
+	github.com/coder/websocket v1.8.13 // indirect
 	github.com/google/go-cmp v0.7.0 // indirect
 	github.com/ipfs/go-cid v0.4.1 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.8 // indirect
 	github.com/libp2p/go-buffer-pool v0.1.0 // indirect
-	github.com/libp2p/go-libp2p v0.41.0 // indirect
+	github.com/libp2p/go-libp2p v0.41.1 // indirect
 	github.com/libp2p/go-yamux/v4 v4.0.2-0.20240826150533-e92055b23e0e // indirect
 	github.com/minio/sha256-simd v1.0.1 // indirect
 	github.com/multiformats/go-base32 v0.1.0 // indirect
@@ -49,7 +48,6 @@ require (
 	github.com/multiformats/go-multihash v0.2.3 // indirect
 	github.com/multiformats/go-multistream v0.5.0 // indirect
 	github.com/multiformats/go-varint v0.0.7 // indirect
-	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/spaolacci/murmur3 v1.1.1-0.20190317074736-539464a789e9 // indirect
 	github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
 	golang.org/x/crypto v0.31.0 // indirect
diff --git a/go.sum b/go.sum
@@ -1,21 +1,21 @@
+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/go-libp2p v0.37.1-0.20241111002741-5cfbb50b74e0 h1:tGwbeDoEeQCrUQL+ClUywldqvz9eRmhcVrGwGxz2xJg=
 github.com/aperturerobotics/go-libp2p v0.37.1-0.20241111002741-5cfbb50b74e0/go.mod h1:FJkAtQcP9XxqG1NNLNHKm+wLVIGSCQX2s6CEoD+w97g=
 github.com/aperturerobotics/json-iterator-lite v1.0.1-0.20241223092408-d525fa878b3e h1:9KDK70CSnHCUGShpq3sEg/t8zEEnKePlhJ4775ekpeI=
 github.com/aperturerobotics/json-iterator-lite v1.0.1-0.20241223092408-d525fa878b3e/go.mod h1:SvGGBv3OVxUyqO0ZxA/nvs6z3cg7NIbZ64TnbV2OISo=
-github.com/aperturerobotics/protobuf-go-lite v0.8.1 h1:CcBvqWOSep4VF3pPp+ZLcYQwPQu2kGOvL3bbF71bzKE=
-github.com/aperturerobotics/protobuf-go-lite v0.8.1/go.mod h1:6AD6TgBrC+aWprTirXrUASFvTbuIRAsuDLBNUthzcyA=
-github.com/aperturerobotics/starpc v0.37.1 h1:t3wle/l/005ZQW0Kok8eLnXE+DTzMGrUvL+OoC6zaJU=
-github.com/aperturerobotics/starpc v0.37.1/go.mod h1:KNY2IhQi3u4d48bT045tSLtQfHTiGhLXIThHzGlBTwU=
+github.com/aperturerobotics/protobuf-go-lite v0.9.0 h1:zY3+qG0FPZiqhmEMQbVPW3wFLJ//aitvYy1zdgO8Hwo=
+github.com/aperturerobotics/protobuf-go-lite v0.9.0/go.mod h1:fULrxQxEBWKQm7vvju9AfjTp9yfHoLgwMQWTiZQ2tg0=
+github.com/aperturerobotics/starpc v0.38.0 h1:/1R3TLIoVIk5AA2SdCylykrL9BfoeTsXVvv8cRn0ebU=
+github.com/aperturerobotics/starpc v0.38.0/go.mod h1:hXOnhcvSXOoA6/Tw/qinQKhpi8+7WDkhrFXS5nHQ6us=
 github.com/aperturerobotics/util v1.29.2 h1:4mF7PfltK2g9KuD5gYUx3zvfEQXA/7F/V6EIEwJA35Q=
 github.com/aperturerobotics/util v1.29.2/go.mod h1:wfEm6n6evCQCGu+NjR8qINo0feaPEgeXxDZK6/oSuk8=
 github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM=
 github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ=
-github.com/coder/websocket v1.8.12 h1:5bUXkEPPIbewrnkU8LTCLVaxi4N4J8ahufH2vlo4NAo=
-github.com/coder/websocket v1.8.12/go.mod h1:LNVeNrXQZfe5qhS9ALED3uA+l5pPqvwXg3CKoDBB2gs=
-github.com/cpuguy83/go-md2man/v2 v2.0.5 h1:ZtcqGrnekaHpVLArFSe4HK5DoKx1T0rq2DwVB0alcyc=
-github.com/cpuguy83/go-md2man/v2 v2.0.5/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
+github.com/coder/websocket v1.8.13 h1:f3QZdXy7uGVz+4uCJy2nTZyM0yTBj8yANEHhqlXZ9FE=
+github.com/coder/websocket v1.8.13/go.mod h1:LNVeNrXQZfe5qhS9ALED3uA+l5pPqvwXg3CKoDBB2gs=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -68,8 +68,6 @@ 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/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8=
 github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
-github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
-github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/sergi/go-diff v1.3.1 h1:xkr+Oxo4BOQKmkn/B9eMK0g5Kg/983T9DqqPHwYqD+8=
 github.com/sergi/go-diff v1.3.1/go.mod h1:aMJSSKb2lpPvRNec0+w3fl7LP9IOFzdc9Pa4NFbPK1I=
 github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
@@ -81,8 +79,6 @@ github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81P
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 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/v2 v2.27.6 h1:VdRdS98FNhKZ8/Az8B7MTyGQmpIr36O1EHybx/LaZ4g=
-github.com/urfave/cli/v2 v2.27.6/go.mod h1:3Sevf16NykTbInEnD0yKkjDAeZDS0A6bzhBH5hrMvTQ=
 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=
 github.com/zeebo/assert v1.1.0 h1:hU1L1vLTHsnO8x8c9KAR5GmM5QscxHg5RNU5z5qbUWY=
diff --git a/package.json b/package.json
@@ -52,12 +52,12 @@
     "happy-dom": "^17.4.4",
     "prettier": "^3.5.3",
     "rimraf": "^6.0.1",
-    "typescript": "^5.8.2",
-    "vitest": "^3.0.7"
+    "typescript": "^5.8.3",
+    "vitest": "^3.1.1"
   },
   "dependencies": {
     "@aptre/protobuf-es-lite": "^0.4.4",
-    "starpc": "^0.37.0"
+    "starpc": "^0.38.0"
   },
   "resolutions": {
     "@aptre/protobuf-es-lite": "0.4.8"
diff --git a/plugin/cli/cli.go b/plugin/cli/cli.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 	"strings"
 
-	"github.com/urfave/cli/v2"
+	"github.com/aperturerobotics/cli"
 )
 
 // CompilerArgs contains common flags for the plugin compiler.
diff --git a/plugin/cli/codegen.go b/plugin/cli/codegen.go
@@ -5,7 +5,7 @@ import (
 	"errors"
 
 	"github.com/sirupsen/logrus"
-	"github.com/urfave/cli/v2"
+	"github.com/aperturerobotics/cli"
 )
 
 func (c *CompilerArgs) runCodegenOnce(cctx *cli.Context) error {
diff --git a/plugin/cli/compile.go b/plugin/cli/compile.go
@@ -11,7 +11,7 @@ import (
 	plugin_compiler "github.com/aperturerobotics/controllerbus/plugin/compiler"
 	b58 "github.com/mr-tron/base58/base58"
 	"github.com/sirupsen/logrus"
-	"github.com/urfave/cli/v2"
+	"github.com/aperturerobotics/cli"
 )
 
 // setupCompiler setups and creates the compiler.
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ import (`
`7`	`7`
`8`	`8`	`bus_api "github.com/aperturerobotics/controllerbus/bus/api"`
`9`	`9`	`"github.com/aperturerobotics/starpc/srpc"`
`10`		`- "github.com/urfave/cli/v2"`
	`10`	`+ "github.com/aperturerobotics/cli"`
`11`	`11`	`)`
`12`	`12`
`13`	`13`	`// ClientArgs contains the client arguments and functions.`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import (`
`8`	`8`	`controller_exec "github.com/aperturerobotics/controllerbus/controller/exec"`
`9`	`9`	`"github.com/ghodss/yaml"`
`10`	`10`	`"github.com/pkg/errors"`
`11`		`- "github.com/urfave/cli/v2"`
	`11`	`+ "github.com/aperturerobotics/cli"`
`12`	`12`	`)`
`13`	`13`
`14`	`14`	`// RunExecController runs the execute configset command.`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import (`
`5`	`5`	`"os"`
`6`	`6`
`7`	`7`	`bus_api "github.com/aperturerobotics/controllerbus/bus/api"`
`8`		`- "github.com/urfave/cli/v2"`
	`8`	`+ "github.com/aperturerobotics/cli"`
`9`	`9`	`)`
`10`	`10`
`11`	`11`	`// RunBusInfo runs the bus information command.`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`package cli`
`2`	`2`
`3`	`3`	`import (`
`4`		`- "github.com/urfave/cli/v2"`
	`4`	`+ "github.com/aperturerobotics/cli"`
`5`	`5`	`)`
`6`	`6`
`7`	`7`	`// DaemonArgs contains common flags for controller-bus daemons.`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ package main`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`ccli "github.com/aperturerobotics/controllerbus/cli"`
`5`		`- "github.com/urfave/cli/v2"`
	`5`	`+ "github.com/aperturerobotics/cli"`
`6`	`6`	`)`
`7`	`7`
`8`	`8`	`// cliArgs are the client arguments`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ import (`
`16`	`16`	`boilerplate_controller "github.com/aperturerobotics/controllerbus/example/boilerplate/controller"`
`17`	`17`	`"github.com/pkg/errors"`
`18`	`18`	`"github.com/sirupsen/logrus"`
`19`		`- "github.com/urfave/cli/v2"`
	`19`	`+ "github.com/aperturerobotics/cli"`
`20`	`20`	`)`
`21`	`21`
`22`	`22`	`var daemonFlags cbcli.DaemonArgs`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import (`
`4`	`4`	`"fmt"`
`5`	`5`	`"os"`
`6`	`6`
`7`		`- "github.com/urfave/cli/v2"`
	`7`	`+ "github.com/aperturerobotics/cli"`
`8`	`8`	`)`
`9`	`9`
`10`	`10`	`// Commands are the CLI commands`