Merge pull request WindomZ#20 from WindomZ/dev

v1.0.1 fix WindomZ#19

README.md

@@ -8,8 +8,8 @@ The solution for building command shell programs,
 drive by <[docopt](https://github.com/docopt/docopt.go)>, 
 inspired by <[commander.js](https://github.com/tj/commander.js)>
 
-![v0.17.2](https://img.shields.io/badge/version-v0.17.2-yellow.svg)
-![status](https://img.shields.io/badge/status-beta-yellow.svg)
+![v1.0.1](https://img.shields.io/badge/version-v1.0.1-blue.svg)
+![status](https://img.shields.io/badge/status-stable-green.svg)
 
 ## Features
 
@@ -28,10 +28,10 @@ To install commander according to your `$GOPATH`:
 go get github.com/WindomZ/go-commander
 ```
 
-To use commander in your Go code:
+or use stable v1 version:
 
-```go
-import "github.com/WindomZ/go-commander"
+```bash
+go get gopkg.in/WindomZ/go-commander.v1
 ```
 
 ## Examples

command_test.go

@@ -46,9 +46,9 @@ func TestCommand_HelpMessage(t *testing.T) {
 
 	assert.Equal(t, c.UsagesString(),
 		[]string{
-			"cmd <x> [[-c|--config] | [-d|--drop]]",
-			"cmd cmd2 [[-a|--about] | [-t|--test]]",
-			"cmd cmd3 [y] [[-b=<kn>|--bold=<kn>] | [-c|--count]]",
+			"cmd <x> [-c|--config] [-d|--drop]",
+			"cmd cmd2 [-a|--about] [-t|--test]",
+			"cmd cmd3 [y] [-b=<kn>|--bold=<kn>] [-c|--count]",
 		})
 	assert.Equal(t, c.OptionsString(),
 		[]string{
@@ -64,9 +64,9 @@ func TestCommand_HelpMessage(t *testing.T) {
 		`  this is description
 
   Usage:
-    cmd <x> [[-c|--config] | [-d|--drop]]
-    cmd cmd2 [[-a|--about] | [-t|--test]]
-    cmd cmd3 [y] [[-b=<kn>|--bold=<kn>] | [-c|--count]]
+    cmd <x> [-c|--config] [-d|--drop]
+    cmd cmd2 [-a|--about] [-t|--test]
+    cmd cmd3 [y] [-b=<kn>|--bold=<kn>] [-c|--count]
 
   Options:
     -c --config   config description
@@ -87,9 +87,9 @@ func TestCommand_HelpMessage(t *testing.T) {
 		`  this is description
 
   Usage:
-    cmd <x> [[-c|--config] | [-d|--drop]]
-    cmd cmd2 [[-a|--about] | [-t|--test]]
-    cmd cmd3 [y] [[-b=<kn>|--bold=<kn>] | [-c|--count]]
+    cmd <x> [-c|--config] [-d|--drop]
+    cmd cmd2 [-a|--about] [-t|--test]
+    cmd cmd3 [y] [-b=<kn>|--bold=<kn>] [-c|--count]
 
   Options:
     -c --config   config description
@@ -107,15 +107,15 @@ func TestCommand_HelpMessage(t *testing.T) {
 `)
 
 	c.Doc(`  Usage:
-    cmd <x> [[-c|--config] | [-d|--drop]]
-    cmd cmd2 [[-a|--about] | [-t|--test]]
-    cmd cmd3 [y] [[-b=<kn>|--bold=<kn>] | [-c|--count]]
+    cmd <x> [-c|--config] [-d|--drop]
+    cmd cmd2 [-a|--about] [-t|--test]
+    cmd cmd3 [y] [-b=<kn>|--bold=<kn>] [-c|--count]
 `)
 
 	assert.Equal(t, c.HelpMessage(), `  Usage:
-    cmd <x> [[-c|--config] | [-d|--drop]]
-    cmd cmd2 [[-a|--about] | [-t|--test]]
-    cmd cmd3 [y] [[-b=<kn>|--bold=<kn>] | [-c|--count]]
+    cmd <x> [-c|--config] [-d|--drop]
+    cmd cmd2 [-a|--about] [-t|--test]
+    cmd cmd3 [y] [-b=<kn>|--bold=<kn>] [-c|--count]
 `)
 }
 
@@ -126,7 +126,7 @@ func TestCommand_Aliases(t *testing.T) {
 		Option("-a, --about", "cmd about description").
 		Option("-t, --test", "cmd test description")
 	assert.Equal(t, c.HelpMessage(), `  Usage:
-    (cmd|c0|cmd0) [[-a|--about] | [-t|--test]]
+    (cmd|c0|cmd0) [-a|--about] [-t|--test]
 
   Options:
     -a --about    cmd about description

options.go

@@ -29,7 +29,11 @@ func (o _Options) UsagesString(ones ...bool) (r []string) {
 		}
 	}
 	if len(rs) != 0 {
-		r = append(r, fmt.Sprintf("[%s]", strings.Join(rs, " | ")))
+		if len(rs) == 1 {
+			r = append(r, fmt.Sprintf("[%s]", strings.Join(rs, " ")))
+		} else {
+			r = append(r, fmt.Sprintf("%s", strings.Join(rs, " ")))
+		}
 	}
 	return
 }

options_test.go

@@ -18,7 +18,7 @@ func TestOptions_UsagesString(t *testing.T) {
 		newOption("-d, --drop", "drop description"),
 	}
 	assert.Equal(t, o.UsagesString(),
-		[]string{"[[-a|--about] | [-b=<kn>|--bold=<kn>] | [-c|--config] | [-d|--drop]]"})
+		[]string{"[-a|--about] [-b=<kn>|--bold=<kn>] [-c|--config] [-d|--drop]"})
 }
 
 func TestOptions_OptionsString(t *testing.T) {