Merge pull request #26 from alexflint/brettlangdon-dev/positional.help.sqwished

Resolve some merge conflicts from #8

1 files changed, 14 insertions, 2 deletions

diff --git a/usage.go b/usage.go
index 23f7aa5..61f0ad6 100644
--- a/usage.go
+++ b/usage.go
@@ -9,6 +9,9 @@ import (
 	"strings"
 )
 
+// the width of the left column
+const colWidth = 25
+
 // Fail prints usage information to stderr and exits with non-zero status
 func (p *Parser) Fail(msg string) {
 	p.WriteUsage(os.Stderr)
@@ -73,7 +76,17 @@ func (p *Parser) WriteHelp(w io.Writer) {
 	if len(positionals) > 0 {
 		fmt.Fprint(w, "\npositional arguments:\n")
 		for _, spec := range positionals {
-			fmt.Fprintf(w, "  %s\n", spec.long)
+			left := "  " + spec.long
+			fmt.Fprint(w, left)
+			if spec.help != "" {
+				if len(left)+2 < colWidth {
+					fmt.Fprint(w, strings.Repeat(" ", colWidth-len(left)))
+				} else {
+					fmt.Fprint(w, "\n"+strings.Repeat(" ", colWidth))
+				}
+				fmt.Fprint(w, spec.help)
+			}
+			fmt.Fprint(w, "\n")
 		}
 	}
 
@@ -88,7 +101,6 @@ func (p *Parser) WriteHelp(w io.Writer) {
 }
 
 func printOption(w io.Writer, spec *spec) {
-	const colWidth = 25
 	left := "  " + synopsis(spec, "--"+spec.long)
 	if spec.short != "" {
 		left += ", " + synopsis(spec, "-"+spec.short)