diff --git a/cli/atoa/r1.go b/cli/atoa/r1.go index 40f2c29..5b6b574 100644 --- a/cli/atoa/r1.go +++ b/cli/atoa/r1.go @@ -6,9 +6,10 @@ import ( "regexp" "strings" - "github.com/hedzr/cmdr/v2/pkg/exec" "github.com/hedzr/evendeep/ref" logz "github.com/hedzr/logg/slog" + + "github.com/hedzr/cmdr/v2/pkg/exec" ) // diff --git a/cli/baseopt.go b/cli/baseopt.go index d5ba91f..0901f1f 100644 --- a/cli/baseopt.go +++ b/cli/baseopt.go @@ -7,9 +7,10 @@ import ( "gopkg.in/hedzr/errors.v3" - "github.com/hedzr/cmdr/v2/conf" "github.com/hedzr/is/term/color" "github.com/hedzr/store" + + "github.com/hedzr/cmdr/v2/conf" ) func (c *BaseOpt) errIsSignalFallback(err error) bool { diff --git a/cli/for_test.go b/cli/for_test.go index e5abb0e..3911eec 100644 --- a/cli/for_test.go +++ b/cli/for_test.go @@ -6,8 +6,9 @@ import ( "io" "time" - "github.com/hedzr/cmdr/v2/conf" "github.com/hedzr/store" + + "github.com/hedzr/cmdr/v2/conf" ) func rootCmdForTesting() (root *RootCommand) { //nolint:funlen,revive //for test @@ -1061,6 +1062,7 @@ func (s *appS) Name() string { return s.root.AppName } func (s *appS) Version() string { return s.root.Version } func (s *appS) Worker() Runner { return s.Runner } func (s *appS) Root() *RootCommand { return s.root } +func (s *appS) Args() []string { return s.args } func (s *appS) ensureNewApp() App { //nolint:unparam if s.root == nil { diff --git a/cli/worker/builtins.go b/cli/worker/builtins.go index 4df7809..704595c 100644 --- a/cli/worker/builtins.go +++ b/cli/worker/builtins.go @@ -4,9 +4,10 @@ import ( "fmt" "runtime" - "github.com/hedzr/cmdr/v2/cli" "github.com/hedzr/is/states" logz "github.com/hedzr/logg/slog" + + "github.com/hedzr/cmdr/v2/cli" ) func (w *workerS) addBuiltinCommands(root *cli.RootCommand) (err error) { //nolint:unparam //unified form diff --git a/cli/worker/exec.go b/cli/worker/exec.go index 49a767f..a83bb1a 100644 --- a/cli/worker/exec.go +++ b/cli/worker/exec.go @@ -6,8 +6,9 @@ import ( errorsv3 "gopkg.in/hedzr/errors.v3" - "github.com/hedzr/cmdr/v2/cli" logz "github.com/hedzr/logg/slog" + + "github.com/hedzr/cmdr/v2/cli" ) func (w *workerS) exec(ctx *parseCtx) (err error) { diff --git a/cli/worker/parse.go b/cli/worker/parse.go index fefab58..7b29aa4 100644 --- a/cli/worker/parse.go +++ b/cli/worker/parse.go @@ -5,8 +5,9 @@ import ( errorsv3 "gopkg.in/hedzr/errors.v3" - "github.com/hedzr/cmdr/v2/cli" logz "github.com/hedzr/logg/slog" + + "github.com/hedzr/cmdr/v2/cli" ) func (w *workerS) parse(ctx *parseCtx) (err error) { //nolint:revive diff --git a/cli/worker/pre_test.go b/cli/worker/pre_test.go index a4eef89..3ceeddb 100644 --- a/cli/worker/pre_test.go +++ b/cli/worker/pre_test.go @@ -7,9 +7,10 @@ import ( errorsv3 "gopkg.in/hedzr/errors.v3" + "github.com/hedzr/store" + "github.com/hedzr/cmdr/v2/cli" "github.com/hedzr/cmdr/v2/loaders" - "github.com/hedzr/store" ) func TestWorkerS_Pre(t *testing.T) { @@ -27,14 +28,16 @@ func TestWorkerS_Pre(t *testing.T) { ww.setArgs([]string{"--debug"}) ww.Config.Store = store.New() - ww.Loaders = []cli.Loader{loaders.NewConfigFileLoader(), loaders.NewEnvVarLoader()} + // ww.Loaders = []cli.Loader{loaders.NewConfigFileLoader(), loaders.NewEnvVarLoader()} _ = app - err := ww.Run(withTasksBeforeParse(func(root *cli.RootCommand, runner cli.Runner) (err error) { //nolint:revive - root.SelfAssert() - t.Logf("root.SelfAssert() passed.") - return - })) + err := ww.Run( + withTasksBeforeParse(func(root *cli.RootCommand, runner cli.Runner) (err error) { //nolint:revive + root.SelfAssert() + t.Logf("root.SelfAssert() passed.") + return + }), + ) if err != nil { t.Fatal(err) } diff --git a/cli/worker/printer.go b/cli/worker/printer.go index 7e5b2d4..ae6c258 100644 --- a/cli/worker/printer.go +++ b/cli/worker/printer.go @@ -7,12 +7,13 @@ import ( "strconv" "strings" - "github.com/hedzr/cmdr/v2/cli" - "github.com/hedzr/cmdr/v2/pkg/exec" "github.com/hedzr/is/states" "github.com/hedzr/is/term" "github.com/hedzr/is/term/color" logz "github.com/hedzr/logg/slog" + + "github.com/hedzr/cmdr/v2/cli" + "github.com/hedzr/cmdr/v2/pkg/exec" ) type discardP struct{} diff --git a/cli/worker/shows.go b/cli/worker/shows.go index 0deeca9..c20e8bd 100644 --- a/cli/worker/shows.go +++ b/cli/worker/shows.go @@ -3,9 +3,10 @@ package worker import ( "gopkg.in/hedzr/errors.v3" + logz "github.com/hedzr/logg/slog" + "github.com/hedzr/cmdr/v2/cli" "github.com/hedzr/cmdr/v2/internal/hs" - logz "github.com/hedzr/logg/slog" ) func (w *workerS) showVersion(ctx *parseCtx, lastCmd *cli.Command) (err error) { //nolint:revive,unused diff --git a/cli/worker/worker.go b/cli/worker/worker.go index 09041dd..e99741e 100644 --- a/cli/worker/worker.go +++ b/cli/worker/worker.go @@ -9,10 +9,11 @@ import ( "gopkg.in/hedzr/errors.v3" - "github.com/hedzr/cmdr/v2/cli" - "github.com/hedzr/cmdr/v2/conf" logz "github.com/hedzr/logg/slog" "github.com/hedzr/store" + + "github.com/hedzr/cmdr/v2/cli" + "github.com/hedzr/cmdr/v2/conf" ) func New(c *cli.Config, opts ...wOpt) *workerS { diff --git a/examples/demo/main.go b/examples/demo/main.go index 69868aa..0f7c57d 100644 --- a/examples/demo/main.go +++ b/examples/demo/main.go @@ -3,11 +3,12 @@ package main import ( logz "github.com/hedzr/logg/slog" + "github.com/hedzr/store" + "github.com/hedzr/cmdr/v2" "github.com/hedzr/cmdr/v2/cli" "github.com/hedzr/cmdr/v2/loaders" "github.com/hedzr/cmdr/v2/pkg/dir" - "github.com/hedzr/store" ) func main() { diff --git a/examples/large/main.go b/examples/large/main.go index 7e83579..eed4d07 100644 --- a/examples/large/main.go +++ b/examples/large/main.go @@ -1,12 +1,13 @@ package main import ( + logz "github.com/hedzr/logg/slog" + "github.com/hedzr/store" + "github.com/hedzr/cmdr/v2" "github.com/hedzr/cmdr/v2/cli" "github.com/hedzr/cmdr/v2/examples" "github.com/hedzr/cmdr/v2/loaders" - logz "github.com/hedzr/logg/slog" - "github.com/hedzr/store" ) func main() { diff --git a/examples/more.go b/examples/more.go index e58aba9..18912b9 100644 --- a/examples/more.go +++ b/examples/more.go @@ -6,12 +6,13 @@ import ( "os" "os/exec" - "github.com/hedzr/cmdr/v2/cli" - "github.com/hedzr/cmdr/v2/pkg/dir" - "github.com/hedzr/cmdr/v2/pkg/text" "github.com/hedzr/is" "github.com/hedzr/is/term" logz "github.com/hedzr/logg/slog" //nolint:gci + + "github.com/hedzr/cmdr/v2/cli" + "github.com/hedzr/cmdr/v2/pkg/dir" + "github.com/hedzr/cmdr/v2/pkg/text" ) func AttachServerCommand(parent cli.CommandBuilder) { //nolint:revive diff --git a/loaders/env.go b/loaders/env.go index 66860e2..d60e5b8 100644 --- a/loaders/env.go +++ b/loaders/env.go @@ -3,10 +3,11 @@ package loaders import ( "context" - "github.com/hedzr/cmdr/v2/cli" logz "github.com/hedzr/logg/slog" "github.com/hedzr/store" "github.com/hedzr/store/providers/env" + + "github.com/hedzr/cmdr/v2/cli" ) func NewEnvVarLoader() *envvarloader { diff --git a/loaders/file.go b/loaders/file.go index 9a111b7..f4c101d 100644 --- a/loaders/file.go +++ b/loaders/file.go @@ -8,8 +8,6 @@ import ( logz "github.com/hedzr/logg/slog" - "github.com/hedzr/cmdr/v2/cli" - "github.com/hedzr/cmdr/v2/pkg/dir" "github.com/hedzr/store" "github.com/hedzr/store/codecs/hcl" "github.com/hedzr/store/codecs/hjson" @@ -18,6 +16,9 @@ import ( "github.com/hedzr/store/codecs/toml" "github.com/hedzr/store/codecs/yaml" "github.com/hedzr/store/providers/file" + + "github.com/hedzr/cmdr/v2/cli" + "github.com/hedzr/cmdr/v2/pkg/dir" ) const confSubFolderName = "conf.d"