separate options

This commit is contained in:
2020-10-25 12:40:40 +03:00
parent 365fc32888
commit 1c7e9623ce
43 changed files with 510 additions and 493 deletions

View File

@@ -16,8 +16,8 @@ func Args() *console.Command {
Configure: func(ctx context.Context, def *input.Definition) error {
def.SetOptions(
option.Bool("foo", "foo option", option.Short("f")),
input.NewOption("bar", "required bar option", option.Required, option.Short("b")),
input.NewOption("cat", "cat option", option.Short("c")),
option.New("bar", "required bar option", option.Required, option.Short("b")),
option.New("cat", "cat option", option.Short("c")),
)
return nil

View File

@@ -15,7 +15,7 @@ func CreateUser(required bool) *console.Command {
Description: "Creates a new user.",
Help: "This command allows you to create a user...",
Configure: func(ctx context.Context, cfg *input.Definition) error {
var opts []func(*input.Argument)
var opts []func(*argument.Argument)
if required {
opts = append(opts, argument.Required)
}

View File

@@ -25,7 +25,7 @@ func Hello() *console.Command {
},
Configure: func(_ context.Context, def *input.Definition) error {
def.SetArguments(
input.NewArgument("name", "Same name", argument.Default("World")),
argument.New("name", "Same name", argument.Default("World")),
)
return nil

View File

@@ -6,9 +6,10 @@ import (
"gitoa.ru/go-4devs/console"
"gitoa.ru/go-4devs/console/input"
"gitoa.ru/go-4devs/console/input/flag"
"gitoa.ru/go-4devs/console/input/option"
"gitoa.ru/go-4devs/console/input/validator"
"gitoa.ru/go-4devs/console/output"
"gitoa.ru/go-4devs/console/validator"
)
const defaultTimeout = time.Second * 30
@@ -41,7 +42,7 @@ func Long() *console.Command {
def.SetOptions(option.Duration("timeout", "set duration run command",
option.Default(defaultTimeout),
option.Short("t"),
option.Valid(validator.NotBlank(input.ValueDuration)),
option.Valid(validator.NotBlank(flag.Duration)),
))
return nil