Skip to content

Commit 2dda65c

Browse files
paralinparalin
committed
refactor: use aperturerobotics/cli
Signed-off-by: Christian Stewart <[email protected]>
1 parent 3ec2c44 commit 2dda65c

16 files changed

+156
-40
lines changed

‎cli/client.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77

88
bus_api "github.com/aperturerobotics/controllerbus/bus/api"
99
"github.com/aperturerobotics/starpc/srpc"
10-
"github.com/urfave/cli/v2"
10+
"github.com/aperturerobotics/cli"
1111
)
1212

1313
// ClientArgs contains the client arguments and functions.

‎cli/client_exec_configset.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
controller_exec "github.com/aperturerobotics/controllerbus/controller/exec"
99
"github.com/ghodss/yaml"
1010
"github.com/pkg/errors"
11-
"github.com/urfave/cli/v2"
11+
"github.com/aperturerobotics/cli"
1212
)
1313

1414
// RunExecController runs the execute configset command.

‎cli/client_nodeinfo.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"os"
66

77
bus_api "github.com/aperturerobotics/controllerbus/bus/api"
8-
"github.com/urfave/cli/v2"
8+
"github.com/aperturerobotics/cli"
99
)
1010

1111
// RunBusInfo runs the bus information command.

‎cli/daemon.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package cli
22

33
import (
4-
"github.com/urfave/cli/v2"
4+
"github.com/aperturerobotics/cli"
55
)
66

77
// DaemonArgs contains common flags for controller-bus daemons.

‎cmd/controllerbus/cmd_client.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package main
22

33
import (
44
ccli "github.com/aperturerobotics/controllerbus/cli"
5-
"github.com/urfave/cli/v2"
5+
"github.com/aperturerobotics/cli"
66
)
77

88
// cliArgs are the client arguments

‎cmd/controllerbus/cmd_daemon.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
boilerplate_controller "github.com/aperturerobotics/controllerbus/example/boilerplate/controller"
1717
"github.com/pkg/errors"
1818
"github.com/sirupsen/logrus"
19-
"github.com/urfave/cli/v2"
19+
"github.com/aperturerobotics/cli"
2020
)
2121

2222
var daemonFlags cbcli.DaemonArgs

‎cmd/controllerbus/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"fmt"
55
"os"
66

7-
"github.com/urfave/cli/v2"
7+
"github.com/aperturerobotics/cli"
88
)
99

1010
// Commands are the CLI commands

‎example/plugin-demo/go.mod

-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ require (
4545
github.com/multiformats/go-varint v0.0.7 // indirect
4646
github.com/russross/blackfriday/v2 v2.1.0 // indirect
4747
github.com/spaolacci/murmur3 v1.1.1-0.20190317074736-539464a789e9 // indirect
48-
github.com/urfave/cli/v2 v2.27.5 // indirect
4948
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
5049
github.com/zeebo/blake3 v0.2.4 // indirect
5150
golang.org/x/crypto v0.31.0 // indirect

‎example/plugin-demo/go.sum

-2
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,6 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
8181
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
8282
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
8383
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
84-
github.com/urfave/cli/v2 v2.27.5 h1:WoHEJLdsXr6dDWoJgMq/CboDmyY/8HMMH1fTECbih+w=
85-
github.com/urfave/cli/v2 v2.27.5/go.mod h1:3Sevf16NykTbInEnD0yKkjDAeZDS0A6bzhBH5hrMvTQ=
8684
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 h1:gEOO8jv9F4OT7lGCjxCBTO/36wtF6j2nSip77qHd4x4=
8785
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1/go.mod h1:Ohn+xnUBiLI6FVj/9LpzZWtj1/D6lUovWYBkxHVV3aM=
8886
github.com/zeebo/assert v1.1.0 h1:hU1L1vLTHsnO8x8c9KAR5GmM5QscxHg5RNU5z5qbUWY=

‎go.mod

+5-7
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,11 @@ replace github.com/libp2p/go-libp2p => github.com/aperturerobotics/go-libp2p v0.
1010
replace github.com/libp2p/go-msgio => github.com/aperturerobotics/go-libp2p-msgio v0.0.0-20240511033615-1b69178aa5c8 // aperture
1111

1212
require (
13+
github.com/aperturerobotics/cli v1.0.0 // latest
1314
github.com/aperturerobotics/common v0.21.2 // latest
1415
github.com/aperturerobotics/json-iterator-lite v1.0.1-0.20241223092408-d525fa878b3e // latest
15-
github.com/aperturerobotics/protobuf-go-lite v0.8.1 // latest
16-
github.com/aperturerobotics/starpc v0.37.1 // latest
16+
github.com/aperturerobotics/protobuf-go-lite v0.9.0 // latest
17+
github.com/aperturerobotics/starpc v0.38.0 // latest
1718
github.com/aperturerobotics/util v1.29.2 // latest
1819
)
1920

@@ -25,21 +26,19 @@ require (
2526
github.com/pkg/errors v0.9.1
2627
github.com/sergi/go-diff v1.3.1
2728
github.com/sirupsen/logrus v1.9.3
28-
github.com/urfave/cli/v2 v2.27.6
2929
github.com/zeebo/blake3 v0.2.4
3030
golang.org/x/mod v0.24.0
3131
golang.org/x/tools v0.31.0
3232
mvdan.cc/gofumpt v0.7.0
3333
)
3434

3535
require (
36-
github.com/coder/websocket v1.8.12 // indirect
37-
github.com/cpuguy83/go-md2man/v2 v2.0.5 // indirect
36+
github.com/coder/websocket v1.8.13 // indirect
3837
github.com/google/go-cmp v0.7.0 // indirect
3938
github.com/ipfs/go-cid v0.4.1 // indirect
4039
github.com/klauspost/cpuid/v2 v2.2.8 // indirect
4140
github.com/libp2p/go-buffer-pool v0.1.0 // indirect
42-
github.com/libp2p/go-libp2p v0.41.0 // indirect
41+
github.com/libp2p/go-libp2p v0.41.1 // indirect
4342
github.com/libp2p/go-yamux/v4 v4.0.2-0.20240826150533-e92055b23e0e // indirect
4443
github.com/minio/sha256-simd v1.0.1 // indirect
4544
github.com/multiformats/go-base32 v0.1.0 // indirect
@@ -49,7 +48,6 @@ require (
4948
github.com/multiformats/go-multihash v0.2.3 // indirect
5049
github.com/multiformats/go-multistream v0.5.0 // indirect
5150
github.com/multiformats/go-varint v0.0.7 // indirect
52-
github.com/russross/blackfriday/v2 v2.1.0 // indirect
5351
github.com/spaolacci/murmur3 v1.1.1-0.20190317074736-539464a789e9 // indirect
5452
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
5553
golang.org/x/crypto v0.31.0 // indirect

‎go.sum

+8-12
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1+
github.com/aperturerobotics/cli v1.0.0 h1:s3xT2h7eBih4/4yZKTn/HQ6P+qpk6ygWZl2416xAI1M=
2+
github.com/aperturerobotics/cli v1.0.0/go.mod h1:wtlINjMcKuwyV1x4ftReuA6hHZcPB8kPMXHyQqGFCSc=
13
github.com/aperturerobotics/common v0.21.2 h1:fqnPL5Oovpd8nDaNBYGiD1UpZhcH/JfpsS8gt5iBDyA=
24
github.com/aperturerobotics/common v0.21.2/go.mod h1:FrecdNcsYvVS8RcWCR8FUkKFh+XmouFOYKHpBdMqqBA=
35
github.com/aperturerobotics/go-libp2p v0.37.1-0.20241111002741-5cfbb50b74e0 h1:tGwbeDoEeQCrUQL+ClUywldqvz9eRmhcVrGwGxz2xJg=
46
github.com/aperturerobotics/go-libp2p v0.37.1-0.20241111002741-5cfbb50b74e0/go.mod h1:FJkAtQcP9XxqG1NNLNHKm+wLVIGSCQX2s6CEoD+w97g=
57
github.com/aperturerobotics/json-iterator-lite v1.0.1-0.20241223092408-d525fa878b3e h1:9KDK70CSnHCUGShpq3sEg/t8zEEnKePlhJ4775ekpeI=
68
github.com/aperturerobotics/json-iterator-lite v1.0.1-0.20241223092408-d525fa878b3e/go.mod h1:SvGGBv3OVxUyqO0ZxA/nvs6z3cg7NIbZ64TnbV2OISo=
7-
github.com/aperturerobotics/protobuf-go-lite v0.8.1 h1:CcBvqWOSep4VF3pPp+ZLcYQwPQu2kGOvL3bbF71bzKE=
8-
github.com/aperturerobotics/protobuf-go-lite v0.8.1/go.mod h1:6AD6TgBrC+aWprTirXrUASFvTbuIRAsuDLBNUthzcyA=
9-
github.com/aperturerobotics/starpc v0.37.1 h1:t3wle/l/005ZQW0Kok8eLnXE+DTzMGrUvL+OoC6zaJU=
10-
github.com/aperturerobotics/starpc v0.37.1/go.mod h1:KNY2IhQi3u4d48bT045tSLtQfHTiGhLXIThHzGlBTwU=
9+
github.com/aperturerobotics/protobuf-go-lite v0.9.0 h1:zY3+qG0FPZiqhmEMQbVPW3wFLJ//aitvYy1zdgO8Hwo=
10+
github.com/aperturerobotics/protobuf-go-lite v0.9.0/go.mod h1:fULrxQxEBWKQm7vvju9AfjTp9yfHoLgwMQWTiZQ2tg0=
11+
github.com/aperturerobotics/starpc v0.38.0 h1:/1R3TLIoVIk5AA2SdCylykrL9BfoeTsXVvv8cRn0ebU=
12+
github.com/aperturerobotics/starpc v0.38.0/go.mod h1:hXOnhcvSXOoA6/Tw/qinQKhpi8+7WDkhrFXS5nHQ6us=
1113
github.com/aperturerobotics/util v1.29.2 h1:4mF7PfltK2g9KuD5gYUx3zvfEQXA/7F/V6EIEwJA35Q=
1214
github.com/aperturerobotics/util v1.29.2/go.mod h1:wfEm6n6evCQCGu+NjR8qINo0feaPEgeXxDZK6/oSuk8=
1315
github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM=
1416
github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ=
15-
github.com/coder/websocket v1.8.12 h1:5bUXkEPPIbewrnkU8LTCLVaxi4N4J8ahufH2vlo4NAo=
16-
github.com/coder/websocket v1.8.12/go.mod h1:LNVeNrXQZfe5qhS9ALED3uA+l5pPqvwXg3CKoDBB2gs=
17-
github.com/cpuguy83/go-md2man/v2 v2.0.5 h1:ZtcqGrnekaHpVLArFSe4HK5DoKx1T0rq2DwVB0alcyc=
18-
github.com/cpuguy83/go-md2man/v2 v2.0.5/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
17+
github.com/coder/websocket v1.8.13 h1:f3QZdXy7uGVz+4uCJy2nTZyM0yTBj8yANEHhqlXZ9FE=
18+
github.com/coder/websocket v1.8.13/go.mod h1:LNVeNrXQZfe5qhS9ALED3uA+l5pPqvwXg3CKoDBB2gs=
1919
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
2020
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
2121
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
6868
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
6969
github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8=
7070
github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
71-
github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
72-
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
7371
github.com/sergi/go-diff v1.3.1 h1:xkr+Oxo4BOQKmkn/B9eMK0g5Kg/983T9DqqPHwYqD+8=
7472
github.com/sergi/go-diff v1.3.1/go.mod h1:aMJSSKb2lpPvRNec0+w3fl7LP9IOFzdc9Pa4NFbPK1I=
7573
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
8179
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
8280
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
8381
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
84-
github.com/urfave/cli/v2 v2.27.6 h1:VdRdS98FNhKZ8/Az8B7MTyGQmpIr36O1EHybx/LaZ4g=
85-
github.com/urfave/cli/v2 v2.27.6/go.mod h1:3Sevf16NykTbInEnD0yKkjDAeZDS0A6bzhBH5hrMvTQ=
8682
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 h1:gEOO8jv9F4OT7lGCjxCBTO/36wtF6j2nSip77qHd4x4=
8783
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1/go.mod h1:Ohn+xnUBiLI6FVj/9LpzZWtj1/D6lUovWYBkxHVV3aM=
8884
github.com/zeebo/assert v1.1.0 h1:hU1L1vLTHsnO8x8c9KAR5GmM5QscxHg5RNU5z5qbUWY=

‎package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -52,12 +52,12 @@
5252
"happy-dom": "^17.4.4",
5353
"prettier": "^3.5.3",
5454
"rimraf": "^6.0.1",
55-
"typescript": "^5.8.2",
56-
"vitest": "^3.0.7"
55+
"typescript": "^5.8.3",
56+
"vitest": "^3.1.1"
5757
},
5858
"dependencies": {
5959
"@aptre/protobuf-es-lite": "^0.4.4",
60-
"starpc": "^0.37.0"
60+
"starpc": "^0.38.0"
6161
},
6262
"resolutions": {
6363
"@aptre/protobuf-es-lite": "0.4.8"

‎plugin/cli/cli.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"errors"
55
"strings"
66

7-
"github.com/urfave/cli/v2"
7+
"github.com/aperturerobotics/cli"
88
)
99

1010
// CompilerArgs contains common flags for the plugin compiler.

‎plugin/cli/codegen.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"errors"
66

77
"github.com/sirupsen/logrus"
8-
"github.com/urfave/cli/v2"
8+
"github.com/aperturerobotics/cli"
99
)
1010

1111
func (c *CompilerArgs) runCodegenOnce(cctx *cli.Context) error {

‎plugin/cli/compile.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
plugin_compiler "github.com/aperturerobotics/controllerbus/plugin/compiler"
1212
b58 "github.com/mr-tron/base58/base58"
1313
"github.com/sirupsen/logrus"
14-
"github.com/urfave/cli/v2"
14+
"github.com/aperturerobotics/cli"
1515
)
1616

1717
// setupCompiler setups and creates the compiler.

0 commit comments

Comments
 (0)