Skip to content

Commit

Permalink
dep: update dep goutil to latest v0.6.1
Browse files Browse the repository at this point in the history
  • Loading branch information
inhere committed Dec 13, 2022
1 parent 2e77f16 commit a90c415
Show file tree
Hide file tree
Showing 3 changed files with 53 additions and 14 deletions.
53 changes: 46 additions & 7 deletions _examples/cmd/interact_demo.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,25 @@ import (
"github.com/gookit/color"
"github.com/gookit/gcli/v3"
"github.com/gookit/gcli/v3/interact"
"github.com/gookit/gcli/v3/interact/cparam"
"github.com/gookit/gcli/v3/show/emoji"
"github.com/gookit/goutil"
"github.com/gookit/goutil/dump"
"github.com/gookit/goutil/errorx"
"github.com/gookit/goutil/strutil"
)

// InteractDemo command
var InteractDemo = &gcli.Command{
Name: "interact",
Func: interactDemo,
Name: "interact",
Func: interactDemo,
Desc: "the command will show some interactive methods",
Subs: []*gcli.Command{InteractCollectCmd},

Aliases: []string{"itt"},
Config: func(c *gcli.Command) {
c.AddArg("name", "want running interact method name", true)
},
Desc: "the command will show some interactive methods",
Examples: `{$fullCmd} confirm
{$fullCmd} select
`,
Expand Down Expand Up @@ -66,7 +74,7 @@ func interactDemo(c *gcli.Command, _ []string) error {
}

func demoSelect(_ *gcli.Command) {
color.Green.Println("This's An Select Demo")
color.Green.Println("Thies's An Select Demo")
fmt.Println("----------------------------------------------------------")

ans := interact.SelectOne(
Expand Down Expand Up @@ -101,7 +109,7 @@ func demoSelect(_ *gcli.Command) {
}

func demoMultiSelect(_ *gcli.Command) {
color.Green.Println("This's An MultiSelect Demo")
color.Green.Println("Thies's An MultiSelect Demo")

ans := interact.MultiSelect(
"Your city name(use array)?",
Expand All @@ -120,7 +128,7 @@ func demoMultiSelect(_ *gcli.Command) {
}

func demoConfirm(_ *gcli.Command) {
color.Green.Println("This's An Confirm Demo")
color.Green.Println("Thies's An Confirm Demo")

if interact.Confirm("Ensure continue") {
fmt.Println(emoji.Render(":smile: Confirmed"))
Expand All @@ -130,7 +138,7 @@ func demoConfirm(_ *gcli.Command) {
}

func demoPassword(_ *gcli.Command) {
color.Green.Println("This's An ReadPassword Demo")
color.Green.Println("Thies's An ReadPassword Demo")
// hiddenInputTest()
// return
// pwd := interact.GetHiddenInput("Enter Password:", true)
Expand Down Expand Up @@ -163,3 +171,34 @@ func demoQuestion(_ *gcli.Command) {
ans := interact.Ask("Your name? ", "", nil, 3)
color.Comment.Println("Your answer is:", ans)
}

// InteractCollectCmd instance.
var InteractCollectCmd = &gcli.Command{
Name: "collect",
Desc: "collect multi input params at once",
Func: func(c *gcli.Command, args []string) error {

vc := interact.NewCollector()
err := vc.AddParams(
cparam.NewStringParam("title", "title name").Config(func(p *cparam.StringParam) {
p.ValidFn = func(val string) error {
return goutil.ErrOnFail(strutil.IsBlank(val), errorx.Raw("title is required"))
}
}),
cparam.NewChoiceParam("projects", "select projects").
WithChoices([]string{"user", "order", "goods"}),
)
if err != nil {
return err
}

if err = vc.Run(); err != nil {
return err
}

c.Println("Result:")
dump.P(vc.Results())

return nil
},
}
6 changes: 3 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ go 1.18

require (
github.com/gookit/color v1.5.2
github.com/gookit/goutil v0.6.0
github.com/gookit/goutil v0.6.1
golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90
golang.org/x/term v0.0.0-20220722155259-a9ba230a4035
)

require (
github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778 // indirect
golang.org/x/sync v0.1.0 // indirect
golang.org/x/sys v0.0.0-20220829200755-d48e67d00261 // indirect
golang.org/x/term v0.0.0-20220722155259-a9ba230a4035 // indirect
golang.org/x/text v0.4.0 // indirect
golang.org/x/text v0.5.0 // indirect
)
8 changes: 4 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ 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=
github.com/gookit/color v1.5.2 h1:uLnfXcaFjlrDnQDT+NCBcfhrXqYTx/rcCa6xn01Y8yI=
github.com/gookit/color v1.5.2/go.mod h1:w8h4bGiHeeBpvQVePTutdbERIUf3oJE5lZ8HM0UgXyg=
github.com/gookit/goutil v0.6.0 h1:uGne/hUNe2xiJZB77QkeIsKsdPRaPyXFv9mUdDqq/Bw=
github.com/gookit/goutil v0.6.0/go.mod h1:DI6e4Waos7Yzjhoz75YFMpGl08m92cxNu0Tep36D/d0=
github.com/gookit/goutil v0.6.1 h1:EsaMR1QWxg61R8oBW7sbSHUxQzMZUKTDUEAKpsHUXJI=
github.com/gookit/goutil v0.6.1/go.mod h1:s2xa6+NP2nxI+h88TUAio7xROJzZaerEfkzJ0+lqvm4=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
Expand All @@ -23,8 +23,8 @@ golang.org/x/sys v0.0.0-20220829200755-d48e67d00261 h1:v6hYoSR9T5oet+pMXwUWkbiVq
golang.org/x/sys v0.0.0-20220829200755-d48e67d00261/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20220722155259-a9ba230a4035 h1:Q5284mrmYTpACcm+eAKjKJH48BBwSyfJqmmGDTtT8Vc=
golang.org/x/term v0.0.0-20220722155259-a9ba230a4035/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/text v0.4.0 h1:BrVqGRd7+k1DiOgtnFvAkoQEWQvBc25ouMJM6429SFg=
golang.org/x/text v0.4.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
golang.org/x/text v0.5.0 h1:OLmvp0KP+FVG99Ct/qFiL/Fhk4zp4QQnZ7b2U+5piUM=
golang.org/x/text v0.5.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
Expand Down

0 comments on commit a90c415

Please sign in to comment.