Merge pull request #2756 from mboersma/fix-cmd-args

fix(deisctl): parse global and command-specific options correctly

Author: mboersma

deisctl/cmd/cmd.go

@@ -583,11 +583,8 @@ Note: "deisctl config platform set sshPrivateKey=" expects a path
 to a private key.
 
 Usage:
-  deisctl config <target> get [<key>...] [options]
-  deisctl config <target> set <key=val>... [options]
-
-Options:
-  --verbose		print out the request bodies [default: false]
+  deisctl config <target> get [<key>...]
+  deisctl config <target> set <key=val>...
 
 Examples:
   deisctl config platform set domain=mydomain.com

deisctl/config/config.go

@@ -9,10 +9,6 @@ import (
 
 // Config runs the config subcommand
 func Config(args map[string]interface{}) error {
-	err := setConfigFlags(args)
-	if err != nil {
-		return err
-	}
 	return doConfig(args)
 }
 
@@ -33,14 +29,6 @@ func CheckConfig(root string, k string) error {
 	return nil
 }
 
-// Flags for config package
-var Flags struct {
-}
-
-func setConfigFlags(args map[string]interface{}) error {
-	return nil
-}
-
 func doConfig(args map[string]interface{}) error {
 	client, err := getEtcdClient()
 	if err != nil {

deisctl/deisctl.go

@@ -30,7 +30,7 @@ func main() {
 func Command(argv []string) int {
 	deisctlMotd := utils.DeisIfy("Deis Control Utility")
 	usage := deisctlMotd + `
-Usage: deisctl <command> [<args>...] [options]
+Usage: deisctl [options] <command> [<args>...]
 
 Commands, use "deisctl help <command>" to learn more:
   install           install components, or the entire platform
@@ -62,7 +62,7 @@ Options:
 	// pre-parse command-line arguments
 	argv, helpFlag := parseArgs(argv)
 	// give docopt an optional final false arg so it doesn't call os.Exit()
-	args, err := docopt.Parse(usage, argv, false, Version, false, false)
+	args, err := docopt.Parse(usage, argv, false, Version, true, false)
 	if err != nil || len(args) == 0 {
 		if helpFlag {
 			fmt.Print(usage)