Commit 3255bb02 authored by Matt Bell's avatar Matt Bell Committed by Juan Batiz-Benet

commands/cli: Output command path in Parse

parent c827573e
...@@ -11,7 +11,7 @@ import ( ...@@ -11,7 +11,7 @@ import (
// Parse parses the input commandline string (cmd, flags, and args). // Parse parses the input commandline string (cmd, flags, and args).
// returns the corresponding command Request object. // returns the corresponding command Request object.
func Parse(input []string, roots ...*cmds.Command) (cmds.Request, *cmds.Command, *cmds.Command, error) { func Parse(input []string, roots ...*cmds.Command) (cmds.Request, *cmds.Command, *cmds.Command, []string, error) {
var root, cmd *cmds.Command var root, cmd *cmds.Command
var path, stringArgs []string var path, stringArgs []string
var opts map[string]interface{} var opts map[string]interface{}
...@@ -22,7 +22,7 @@ func Parse(input []string, roots ...*cmds.Command) (cmds.Request, *cmds.Command, ...@@ -22,7 +22,7 @@ func Parse(input []string, roots ...*cmds.Command) (cmds.Request, *cmds.Command,
p, i, c := parsePath(input, r) p, i, c := parsePath(input, r)
o, s, err := parseOptions(i) o, s, err := parseOptions(i)
if err != nil { if err != nil {
return nil, root, c, err return nil, root, c, p, err
} }
length := len(p) length := len(p)
...@@ -37,22 +37,22 @@ func Parse(input []string, roots ...*cmds.Command) (cmds.Request, *cmds.Command, ...@@ -37,22 +37,22 @@ func Parse(input []string, roots ...*cmds.Command) (cmds.Request, *cmds.Command,
} }
if maxLength == 0 { if maxLength == 0 {
return nil, root, nil, errors.New("Not a valid subcommand") return nil, root, nil, path, errors.New("Not a valid subcommand")
} }
args, err := parseArgs(stringArgs, cmd) args, err := parseArgs(stringArgs, cmd)
if err != nil { if err != nil {
return nil, root, cmd, err return nil, root, cmd, path, err
} }
req := cmds.NewRequest(path, opts, args, cmd) req := cmds.NewRequest(path, opts, args, cmd)
err = cmd.CheckArguments(req) err = cmd.CheckArguments(req)
if err != nil { if err != nil {
return nil, root, cmd, err return req, root, cmd, path, err
} }
return req, root, cmd, nil return req, root, cmd, path, nil
} }
// parsePath separates the command path and the opts and args from a command string // parsePath separates the command path and the opts and args from a command string
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment