From 66e6da3ddd09832575017271bda8164e813bc171 Mon Sep 17 00:00:00 2001
From: Matt Bell <mappum@gmail.com>
Date: Tue, 14 Oct 2014 15:15:42 -0700
Subject: [PATCH] commands/cli: Added value parsing for single-dash options

---
 commands/cli/parse.go | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/commands/cli/parse.go b/commands/cli/parse.go
index 13391e1f1..f766af436 100644
--- a/commands/cli/parse.go
+++ b/commands/cli/parse.go
@@ -46,7 +46,7 @@ func parsePath(input []string, root *commands.Command) ([]string, []string, erro
 // options parses the raw string values of the given options
 // returns the parsed options as strings, along with the CLI args
 func parseOptions(input, path []string, root *commands.Command) (map[string]string, []string, error) {
-  _, err := root.GetOptions(path)
+  options, err := root.GetOptions(path)
   if err != nil {
     return nil, nil, err
   }
@@ -109,11 +109,21 @@ func parseOptions(input, path []string, root *commands.Command) (map[string]stri
         return nil, nil, fmt.Errorf("Invalid option blob: '%s'", input[i])
       }
 
+      nameS := ""
       for _, name := range blob {
-        opts[string(name)] = ""
+        nameS = string(name)
+        opts[nameS] = ""
       }
 
-      // TODO: interpret next blob as value if the last option isn't a bool
+      if nameS != "" {
+        opt, ok := options[nameS]
+        if ok && opt.Type != commands.Bool {
+          i++
+          if i <= len(input) {
+            opts[nameS] = input[i]
+          }
+        }
+      }
 
     } else {
       args = append(args, blob)