👔 up: cflag - update some for Cmd direct run

Author: inhere

cflag/app.go

@@ -102,19 +102,7 @@ func (a *App) addCmd(c *Cmd) {
 	a.NameWidth = mathutil.MaxInt(a.NameWidth, ln)
 
 	// attach handle func
-	if c.Func != nil {
-		// fix: init c.CFlags on not exist
-		if c.CFlags == nil {
-			c.CFlags = NewEmpty(func(cf *CFlags) {
-				cf.Desc = c.Desc
-				cf.FlagSet = flag.NewFlagSet(c.Name, flag.ContinueOnError)
-			})
-		}
-
-		c.CFlags.Func = func(_ *CFlags) error {
-			return c.Func(c)
-		}
-	}
+	c.init()
 
 	if c.OnAdd != nil {
 		c.OnAdd(c)
@@ -244,14 +232,19 @@ func (a *App) showHelp() error {
 	return nil
 }
 
-// Cmd struct
+//
+// region Command in app
+// -----------------------------------
+
+// Cmd struct. see CFlags
 type Cmd struct {
 	*CFlags
 	Name string
 	Desc string // desc for command, will sync set to CFlags.Desc
-	// OnAdd hook func. you can add some cli options or arguments.
+	// OnAdd hook func. fire on add to App
+	//  - you can add some cli options or arguments.
 	OnAdd func(c *Cmd)
-	// Func for run command, will call after options parsed.
+	// Func for run command, will call after options parsed. will sync set to CFlags.Func
 	Func func(c *Cmd) error
 }
 
@@ -281,6 +274,45 @@ func (c *Cmd) Config(fn func(c *Cmd)) *Cmd {
 	return c
 }
 
+// QuickRun parse OS flags and run command, will auto handle error
+func (c *Cmd) QuickRun() { c.MustParse(nil) }
+
+// MustRun parse flags and run command. alias of MustParse()
+func (c *Cmd) MustRun(args []string) { c.MustParse(args) }
+
+// MustParse parse flags and run command, will auto handle error
+func (c *Cmd) MustParse(args []string) {
+	if err := c.Parse(args); err != nil {
+		ccolor.Redln("ERROR:", err)
+	}
+}
+
+// Parse flags and run command func
+//
+// If args is nil, will parse os.Args
+func (c *Cmd) Parse(args []string) error {
+	// fix: cmd.xxRun not exec Cmd.Func
+	c.init()
+	return c.CFlags.Parse(args)
+}
+
+func (c *Cmd) init() {
+	// attach handle func
+	if c.Func != nil {
+		// fix: init c.CFlags on not exist
+		if c.CFlags == nil {
+			c.CFlags = NewEmpty(func(cf *CFlags) {
+				cf.Desc = c.Desc
+				cf.FlagSet = flag.NewFlagSet(c.Name, flag.ContinueOnError)
+			})
+		}
+
+		c.CFlags.Func = func(_ *CFlags) error {
+			return c.Func(c)
+		}
+	}
+}
+
 func (c *Cmd) getDesc() string {
 	if c.CFlags.Desc != "" {
 		return c.CFlags.Desc

cflag/app_test.go

@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"errors"
 	"os"
+	"strconv"
 	"testing"
 
 	"github.com/gookit/goutil/cflag"
@@ -158,3 +159,33 @@ func TestApp_Run_error(t *testing.T) {
 
 	assert.ErrMsg(t, app.RunWithArgs([]string{"demo"}), "command run error")
 }
+
+func TestCmd_Run(t *testing.T) {
+	var c1Opts = struct {
+		age  int
+		name string
+	}{}
+
+	var buf bytes.Buffer
+
+	cmd := cflag.NewCmd("demo", "this is a demo command", func(c *cflag.Cmd) error {
+		buf.WriteString("name=" + c1Opts.name)
+		buf.WriteString("age=" + strconv.Itoa(c1Opts.age))
+		buf.WriteString("arg1=")
+		buf.WriteString(c.Arg("arg1").String())
+		return nil
+	})
+
+	cmd.IntVar(&c1Opts.age, "age", 0, "this is a int option;;a")
+	cmd.StringVar(&c1Opts.name, "name", "", "this is a string option and required;true")
+	cmd.AddArg("arg1", "this is arg1", true, nil)
+	// show help
+	cmd.MustParse([]string{"--help"})
+
+	// run
+	cmd.MustRun([]string{"--name", "inhere", "arg1-value"})
+	ret := buf.String()
+	assert.StrContains(t, ret, "name=inhere")
+	assert.StrContains(t, ret, "age=0")
+	assert.StrContains(t, ret, "arg1=arg1-value")
+}

cflag/cflag.go

@@ -20,7 +20,6 @@ import (
 	"strings"
 
 	"github.com/gookit/goutil"
-	"github.com/gookit/goutil/cliutil"
 	"github.com/gookit/goutil/envutil"
 	"github.com/gookit/goutil/errorx"
 	"github.com/gookit/goutil/mathutil"
@@ -213,20 +212,16 @@ func (c *CFlags) BindArg(arg *FlagArg) {
  *************************************************************/
 
 // QuickRun parse OS flags and run command, will auto handle error
-func (c *CFlags) QuickRun() {
-	c.MustParse(nil)
-}
+func (c *CFlags) QuickRun() { c.MustParse(nil) }
 
 // MustRun parse flags and run command. alias of MustParse()
-func (c *CFlags) MustRun(args []string) {
-	c.MustParse(args)
-}
+func (c *CFlags) MustRun(args []string) { c.MustParse(args) }
 
 // MustParse parse flags and run command, will auto handle error
 func (c *CFlags) MustParse(args []string) {
 	err := c.Parse(args)
 	if err != nil {
-		cliutil.Redln("ERROR:", err)
+		ccolor.Redln("ERROR:", err)
 	}
 }
 
@@ -240,7 +235,7 @@ func (c *CFlags) Parse(args []string) error {
 
 	defer func() {
 		if err := recover(); err != nil {
-			cliutil.Errorln("ERROR:", err)
+			ccolor.Errorln("ERROR:", err)
 			if Debug {
 				fmt.Println(errorx.Newf("(debug mode)RECOVERD PARSE ERROR: %v", err))
 			}
@@ -448,14 +443,15 @@ func (c *CFlags) showHelp(err error) {
 		buf.Printf("<cyan>%s</>\n\n", c.helpDesc())
 	}
 
-	buf.Printf("<comment>Usage:</> %s [--Options...] [...CliArgs]\n", binName)
+	buf.Printf("<comment>Usage:</> %s [--Options...] [...Arguments]\n", binName)
 	buf.WriteStr("<comment>Options:</>\n")
 
 	// render options help
 	c.renderOptionsHelp(buf)
+	buf.WriteStr1Nl("  <green>-h, --help</>" + strings.Repeat("    ", 4) + "Display command help")
 
 	if len(c.bindArgs) > 0 {
-		buf.WriteStr1("\n<comment>CliArgs:</>\n")
+		buf.WriteStr1("\n<comment>Arguments:</>\n")
 		for _, arg := range c.bindArgs {
 			buf.Printf(
 				"  <green>%s</>   %s\n",