👔 up(app): update app and cmd run logic, app.RunCmd now will return error

Author: inhere

app.go

@@ -11,6 +11,7 @@ import (
 	"github.com/gookit/gcli/v3/helper"
 	"github.com/gookit/goutil/cflag"
 	"github.com/gookit/goutil/cliutil"
+	"github.com/gookit/goutil/errorx"
 )
 
 /*************************************************************
@@ -483,10 +484,16 @@ func (app *App) Run(args []string) (code int) {
 	app.Fire(events.OnAppPrepared, map[string]any{"name": name})
 
 	// do run input command
-	code = app.doRunCmd(name, app.args)
+	var exCode int
+	err := app.doRunCmd(name, app.args)
+	if err != nil {
+		if ec, ok := err.(errorx.ErrorCoder); ok {
+			exCode = ec.Code()
+		}
+	}
 
-	Debugf("command '%s' run complete, exit with code: %d", name, code)
-	return app.exitOnEnd(code)
+	Debugf("command '%s' run complete, exit with code: %d", name, exCode)
+	return app.exitOnEnd(exCode)
 }
 
 // RunLine manual run a command by command line string.
@@ -505,21 +512,22 @@ func (app *App) RunLine(argsLine string) int {
 //	app.Exec("top", []string{"-a", "val0", "arg0"})
 //	// can add sub command on args
 //	app.Exec("top", []string{"sub", "-o", "abc"})
-func (app *App) RunCmd(name string, args []string) int {
-	if app.HasCommand(name) {
-		return ERR
+func (app *App) RunCmd(name string, args []string) error {
+	if !app.HasCommand(name) {
+		return errorx.Failf(ERR, "command %q not exists", name)
 	}
+
 	return app.doRunCmd(name, args)
 }
 
-func (app *App) doRunCmd(name string, args []string) (code int) {
+func (app *App) doRunCmd(name string, args []string) (err error) {
 	cmd := app.GetCommand(name)
 	app.fireWithCmd(events.OnAppRunBefore, cmd, map[string]any{"args": args})
 	Debugf("will run app command '%s' with args: %v", name, args)
 
 	// do execute command
-	if err := cmd.innerDispatch(args); err != nil {
-		code = ERR
+	if err = cmd.innerDispatch(args); err != nil {
+		err = newRunErr(ERR, err)
 		app.Fire(events.OnAppRunError, map[string]any{"err": err})
 	} else {
 		app.Fire(events.OnAppRunAfter, nil)

cmd.go

@@ -703,7 +703,7 @@ func (c *Command) App() *App {
 	return c.app
 }
 
-// ID get command ID string
+// ID get command ID string. return like: git:branch:create
 func (c *Command) ID() string {
 	return strings.Join(c.pathNames, CommandSep)
 }

ext.go

@@ -6,6 +6,7 @@ import (
 	"strings"
 
 	"github.com/gookit/gcli/v3/events"
+	"github.com/gookit/goutil/errorx"
 	"github.com/gookit/goutil/maputil"
 )
 
@@ -43,6 +44,27 @@ const (
 	EvtGOptionsParsed = events.OnGlobalOptsParsed
 )
 
+// runErr struct
+type runErr struct {
+	code int
+	err  error
+}
+
+// newRunErr instance
+func newRunErr(code int, err error) errorx.ErrorCoder {
+	return &runErr{code: code, err: err}
+}
+
+// Code for error
+func (e *runErr) Code() int {
+	return e.code
+}
+
+// Error string
+func (e *runErr) Error() string {
+	return fmt.Sprintf("%v with code %d", e.err, e.code)
+}
+
 // HookFunc definition.
 //
 // Returns:

gcli.go

@@ -255,6 +255,9 @@ type Booleans = cflag.Booleans
 // EnumString The string flag list, implemented flag.Value interface
 type EnumString = cflag.EnumString
 
+// ConfString The config-string flag, INI format, like nginx-config
+type ConfString = cflag.ConfString
+
 // String type, a special string
 //
 // Usage:

helper/utils.go

@@ -5,11 +5,9 @@ import (
 	"fmt"
 	"regexp"
 	"strings"
-	"syscall"
 	"text/template"
 
 	"github.com/gookit/goutil/strutil"
-	"golang.org/x/term"
 )
 
 const (
@@ -47,38 +45,6 @@ func IsGoodCmdName(name string) bool {
 	return goodCmdName.MatchString(name)
 }
 
-// exec: `stty -a 2>&1`
-// const (
-// mac: speed 9600 baud; 97 rows; 362 columns;
-// macSttyMsgPattern = `(\d+)\s+rows;\s*(\d+)\s+columns;`
-// linux: speed 38400 baud; rows 97; columns 362; line = 0;
-// linuxSttyMsgPattern = `rows\s+(\d+);\s*columns\s+(\d+);`
-// )
-
-var (
-	terminalWidth, terminalHeight int
-
-	// macSttyMsgMatch = regexp.MustCompile(macSttyMsgPattern)
-	// linuxSttyMsgMatch = regexp.MustCompile(linuxSttyMsgPattern)
-)
-
-// GetTerminalSize for current console terminal.
-func GetTerminalSize(refresh ...bool) (w int, h int) {
-	if terminalWidth > 0 && len(refresh) > 0 && !refresh[0] {
-		return terminalWidth, terminalHeight
-	}
-
-	var err error
-	w, h, err = term.GetSize(syscall.Stdin)
-	if err != nil {
-		return
-	}
-
-	// cache result
-	terminalWidth, terminalHeight = w, h
-	return
-}
-
 // Panicf message
 func Panicf(format string, v ...any) {
 	panic(fmt.Sprintf("GCli: "+format, v...))