Skip to content

Publish Stderr to allow testing help #130

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
dnagir wants to merge 1 commit into from
Closed

Publish Stderr to allow testing help #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions cli.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ In most cases the library users won't need to call this method, unless
a more complex validation is needed.
*/
func (cli *Cli) PrintVersion() {
fmt.Fprintln(stdErr, cli.version.version)
fmt.Fprintln(Stderr, cli.version.version)
}

/*
Expand Down Expand Up @@ -130,5 +130,6 @@ var exiter = func(code int) {

var (
stdOut io.Writer = os.Stdout
stdErr io.Writer = os.Stderr
// Stderr is the writer used for printing help information.
Stderr io.Writer = os.Stderr
)
8 changes: 4 additions & 4 deletions cli_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2329,22 +2329,22 @@ func setAndRestoreEnv(env map[string]string) func() {

func captureAndRestoreOutput(out, err *string) func() {
oldStdOut := stdOut
oldStdErr := stdErr
oldStdErr := Stderr

if out == nil {
stdOut = ioutil.Discard
} else {
stdOut = trapWriter(out)
}
if err == nil {
stdErr = ioutil.Discard
Stderr = ioutil.Discard
} else {
stdErr = trapWriter(err)
Stderr = trapWriter(err)
}

return func() {
stdOut = oldStdOut
stdErr = oldStdErr
Stderr = oldStdErr
}
}

Expand Down
18 changes: 9 additions & 9 deletions commands.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -517,27 +517,27 @@ func (c *Cmd) PrintLongHelp() {
func (c *Cmd) printHelp(longDesc bool) {
full := append(c.parents, c.name)
path := strings.Join(full, " ")
fmt.Fprintf(stdErr, "\nUsage: %s", path)
fmt.Fprintf(Stderr, "\nUsage: %s", path)

spec := strings.TrimSpace(c.Spec)
if len(spec) > 0 {
fmt.Fprintf(stdErr, " %s", spec)
fmt.Fprintf(Stderr, " %s", spec)
}

if len(c.commands) > 0 {
fmt.Fprint(stdErr, " COMMAND [arg...]")
fmt.Fprint(Stderr, " COMMAND [arg...]")
}
fmt.Fprint(stdErr, "\n\n")
fmt.Fprint(Stderr, "\n\n")

desc := c.desc
if longDesc && len(c.LongDesc) > 0 {
desc = c.LongDesc
}
if len(desc) > 0 {
fmt.Fprintf(stdErr, "%s\n", desc)
fmt.Fprintf(Stderr, "%s\n", desc)
}

w := tabwriter.NewWriter(stdErr, 15, 1, 3, ' ', 0)
w := tabwriter.NewWriter(Stderr, 15, 1, 3, ' ', 0)

if len(c.args) > 0 {
fmt.Fprint(w, "\t\nArguments:\t\n")
Expand Down Expand Up @@ -676,7 +676,7 @@ func (c *Cmd) parse(args []string, entry, inFlow, outFlow *flow.Step) error {
}

if err := c.fsm.Parse(args[:nargsLen]); err != nil {
fmt.Fprintf(stdErr, "Error: %s\n", err.Error())
fmt.Fprintf(Stderr, "Error: %s\n", err.Error())
c.PrintHelp()
c.onError(err)
return err
Expand Down Expand Up @@ -731,10 +731,10 @@ func (c *Cmd) parse(args []string, entry, inFlow, outFlow *flow.Step) error {
switch {
case strings.HasPrefix(arg, "-"):
err = fmt.Errorf("Error: illegal option %s", arg)
fmt.Fprintln(stdErr, err.Error())
fmt.Fprintln(Stderr, err.Error())
default:
err = fmt.Errorf("Error: illegal input %s", arg)
fmt.Fprintln(stdErr, err.Error())
fmt.Fprintln(Stderr, err.Error())
}
c.PrintHelp()
c.onError(err)
Expand Down