deps: swap older dependencies (#54)

Author: shoenig

go.mod

@@ -3,26 +3,26 @@ module github.com/shoenig/envy
 go 1.23
 
 require (
+	cattlecloud.net/go/babycli v0.2.0
 	github.com/gojuno/minimock/v3 v3.3.14
 	github.com/hashicorp/go-set/v3 v3.0.0-alpha.1
 	github.com/hashicorp/go-uuid v1.0.3
 	github.com/pkg/errors v0.9.1
 	github.com/shoenig/go-conceal v0.5.4
 	github.com/shoenig/ignore v0.4.0
 	github.com/shoenig/regexplus v0.3.0
-	github.com/shoenig/test v1.9.1
+	github.com/shoenig/test v1.12.0
 	github.com/zalando/go-keyring v0.2.5
 	go.etcd.io/bbolt v1.3.11
-	noxide.lol/go/babycli v0.1.4
 )
 
 require (
+	cattlecloud.net/go/stacks v1.1.0 // indirect
 	github.com/alessio/shellescape v1.4.2 // indirect
 	github.com/danieljoos/wincred v1.2.2 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/godbus/dbus/v5 v5.1.0 // indirect
 	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	golang.org/x/sys v0.24.0 // indirect
-	noxide.lol/go/stacks v1.0.0 // indirect
 )

go.sum

@@ -1,3 +1,7 @@
+cattlecloud.net/go/babycli v0.2.0 h1:niw4uPiFQT7bekq8OJ3LoiIsz2B7L6EZcO+esMx9AP0=
+cattlecloud.net/go/babycli v0.2.0/go.mod h1:IhC9GNNMMlDr5sx/lMFBDa1d7jvkI1sluTPsKbpvoAU=
+cattlecloud.net/go/stacks v1.1.0 h1:uXnOnluwPT+3IfRDzTmkEP8RCfToBeNremjahViWUhY=
+cattlecloud.net/go/stacks v1.1.0/go.mod h1:BD7LcLq19hHEyA+oQOrInqmjjiCccCcVTIxt8eEmW4M=
 github.com/alessio/shellescape v1.4.2 h1:MHPfaU+ddJ0/bYWpgIeUnQUqKrlJ1S7BfEYPM4uEoM0=
 github.com/alessio/shellescape v1.4.2/go.mod h1:PZAiSCk0LJaZkiCSkPv8qIobYglO3FPpyFjDCtHLS30=
 github.com/danieljoos/wincred v1.2.2 h1:774zMFJrqaeYCK2W57BgAem/MLi6mtSE47MB6BOJ0i0=
@@ -24,8 +28,8 @@ github.com/shoenig/ignore v0.4.0 h1:qPOWs0slbPMtenC0H3cKvu5Kn3hQFTE3yK6YJvyNDlA=
 github.com/shoenig/ignore v0.4.0/go.mod h1:VF91FoiYAwXq4KinOq6zP5xfFw/Ib6MfftaGKYTpmwo=
 github.com/shoenig/regexplus v0.3.0 h1:+eJZ5P4y1IY4+NgkIIvIqqdG/uYRBuSg4vWUjEppLcY=
 github.com/shoenig/regexplus v0.3.0/go.mod h1:AT46KcYMK7iD/drPHdFtmB42TetxBe5S/O3vMGPa5cw=
-github.com/shoenig/test v1.9.1 h1:oO841L4cjcOd+wp+EZTqGGghT8pe6mXW9iHZLlNG9gg=
-github.com/shoenig/test v1.9.1/go.mod h1:UxJ6u/x2v/TNs/LoLxBNJRV9DiwBBKYxXSyczsBHFoI=
+github.com/shoenig/test v1.12.0 h1:5gu0WaxkayLUad6B/VCnBWMi5VR7oVYCw/d34SU1ed0=
+github.com/shoenig/test v1.12.0/go.mod h1:UxJ6u/x2v/TNs/LoLxBNJRV9DiwBBKYxXSyczsBHFoI=
 github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
 github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
 github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
@@ -40,7 +44,3 @@ golang.org/x/sys v0.24.0 h1:Twjiwq9dn6R1fQcyiK+wQyHWfaz/BJB+YIpzU/Cv3Xg=
 golang.org/x/sys v0.24.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-noxide.lol/go/babycli v0.1.4 h1:gdgpLn1ydzy7VK3ZQAIbHnnPk1yHfyd6OYLo9UsWulY=
-noxide.lol/go/babycli v0.1.4/go.mod h1:WatWwUui1Zf1KtSz4EzLtOkGkljrhOFfXfLHVoBRDj4=
-noxide.lol/go/stacks v1.0.0 h1:g4MPkizQF/6B3u1ejGxWDIjL1zM/MSHMzoS1DEZTOWY=
-noxide.lol/go/stacks v1.0.0/go.mod h1:rwC8UA5l8uwwfRNAKuBSI+7hpP8ilJVK3gozAn7vjzM=

internal/commands/common.go

@@ -7,14 +7,14 @@ import (
 	"regexp"
 	"strings"
 
+	"cattlecloud.net/go/babycli"
 	"github.com/hashicorp/go-set/v3"
 	"github.com/pkg/errors"
 	"github.com/shoenig/envy/internal/keyring"
 	"github.com/shoenig/envy/internal/safe"
 	"github.com/shoenig/envy/internal/setup"
 	"github.com/shoenig/go-conceal"
 	"github.com/shoenig/regexplus"
-	"noxide.lol/go/babycli"
 )
 
 var (

internal/commands/exec.go

@@ -10,9 +10,9 @@ import (
 	"os/exec"
 	"strings"
 
+	"cattlecloud.net/go/babycli"
 	"github.com/shoenig/envy/internal/safe"
 	"github.com/shoenig/envy/internal/setup"
-	"noxide.lol/go/babycli"
 )
 
 func newExecCmd(tool *setup.Tool) *babycli.Component {

internal/commands/list.go

@@ -4,8 +4,8 @@
 package commands
 
 import (
+	"cattlecloud.net/go/babycli"
 	"github.com/shoenig/envy/internal/setup"
-	"noxide.lol/go/babycli"
 )
 
 func newListCmd(tool *setup.Tool) *babycli.Component {

internal/commands/purge.go

@@ -4,8 +4,8 @@
 package commands
 
 import (
+	"cattlecloud.net/go/babycli"
 	"github.com/shoenig/envy/internal/setup"
-	"noxide.lol/go/babycli"
 )
 
 func newPurgeCmd(tool *setup.Tool) *babycli.Component {

internal/commands/set.go

@@ -4,8 +4,8 @@
 package commands
 
 import (
+	"cattlecloud.net/go/babycli"
 	"github.com/shoenig/envy/internal/setup"
-	"noxide.lol/go/babycli"
 )
 
 func newSetCmd(tool *setup.Tool) *babycli.Component {

internal/commands/show.go

@@ -6,8 +6,8 @@ package commands
 import (
 	"sort"
 
+	"cattlecloud.net/go/babycli"
 	"github.com/shoenig/envy/internal/setup"
-	"noxide.lol/go/babycli"
 )
 
 func newShowCmd(tool *setup.Tool) *babycli.Component {

main.go

@@ -6,10 +6,10 @@ package main
 import (
 	"os"
 
+	"cattlecloud.net/go/babycli"
 	"github.com/shoenig/envy/internal/commands"
 	"github.com/shoenig/envy/internal/output"
 	"github.com/shoenig/envy/internal/setup"
-	"noxide.lol/go/babycli"
 )
 
 func main() {
@@ -21,24 +21,4 @@ func main() {
 	args := babycli.Arguments()
 	rc := commands.Invoke(args, tool)
 	os.Exit(rc)
-
-	// fs := flag.NewFlagSet(envyGroup, flag.ContinueOnError)
-
-	// subs := subcommands.NewCommander(fs, "envy commands")
-	// subs.Register(subs.HelpCommand(), usageGroup)
-	// subs.Register(subs.FlagsCommand(), usageGroup)
-	// subs.Register(commands.NewListCmd(tool), envyGroup)
-	// subs.Register(commands.NewSetCmd(tool), envyGroup)
-	// subs.Register(commands.NewPurgeCmd(tool), envyGroup)
-	// subs.Register(commands.NewShowCmd(tool), envyGroup)
-	// subs.Register(commands.NewExecCmd(tool), envyGroup)
-
-	// if err := fs.Parse(os.Args[1:]); err != nil {
-	// 	tool.Writer.Errorf("unable to parse args: %v", err)
-	// 	os.Exit(1)
-	// }
-
-	// ctx := context.Background()
-	// rc := subs.Execute(ctx, fs.Args())
-	// os.Exit(int(rc))
 }