Can now generate main

Author: mbartling

tools/bash_completion/generator.py

@@ -3,10 +3,14 @@
 from collections import defaultdict
 import re
 import subprocess
+import pystache
+import pprint
 
-commandRegex = r"^\s+(?P<command>\w+)\s+(?P<helptxt>[a-zA-Z ]*)$"  # This one extracts single commands and the help txt
+commandRegex = r"^\s+(?P<command>(--)?\w+)\s+(?P<helptxt>[a-zA-Z ]*)$"  # This one extracts single commands and the help txt
 # Why the hell do spaces get regexed in command1 ?
-subcommandRegex = r"^\s+(?P<command1>-+[a-zA-Z_\-]+(?P<modifier1>\s+[A-Z_\-]+){0,1})(?P<command2>,\s+-+[a-zA-Z_-]+(?P<modifier2>\s+[A-Z_-]+){0,1}){0,1}\s+(?P<helptxt>.*)$" # Gets just about everything
+subcommandRegex = r"^\s+(?P<command1>-+[a-zA-Z_\-]+(?P<modifier1>\s+[A-Z_\-]+)?)(?P<command2>,\s+-+[a-zA-Z_-]+(?P<modifier2>\s+[A-Z_-]+)?)?\s+(?P<helptxt>.*)$" # Gets just about everything
+
+pp = pprint.PrettyPrinter(indent=2)
 
 def getHelpTxt(command=None):
     if command:
@@ -18,6 +22,7 @@ def getHelpTxt(command=None):
 
 def parseCommands():
     commands = defaultdict(defaultdict)
+    commands["COMMAND"] = []
     helpTxt = getHelpTxt()
     #print helpTxt
     for line in helpTxt.split('\n'):
@@ -27,18 +32,73 @@ def parseCommands():
             commands[g["command"]]["helptxt"] = g["helptxt"]
             commands[g["command"]]["subcommands"] = []
 
+            # Subcommand mustache generation
+            commands[g["command"]]["DDASH_COMMANDS"] = []
+            commands[g["command"]]["DASH_COMMANDS"] = []
+            commands[g["command"]]["COMMAND"] = g["command"]
+
+            # Main function generation
+            commands["COMMAND"].append({"name": g["command"]})
+
     for commandKey in commands:
         command = commands[commandKey]
         helpTxt = getHelpTxt(commandKey)
         for line in helpTxt.split('\n'):
             match = re.search(subcommandRegex, line)
             if match:
-                commands[commandKey]["subcommands"].append(match.groupdict())
+                commandMatch = match.groupdict()
+
+                # Clean up the subcommands
+                command1 = commandMatch["command1"]
+                command2 = commandMatch["command2"]
+
+                if command1:
+                    command1 = re.sub(",", "", command1)
+                    command1.strip()
+                    command1 = command1.split()[0]
+                if command2:
+                    command2 = re.sub(",", "", command2)
+                    command2.strip()
+                    command2 = command2.split()[0]
+
+                # Not sure why the cleaning is even necessary, the regex looks correct
+                commandMatch["command1"] = command1
+                commandMatch["command2"] = command2
+                
+                commands[commandKey]["subcommands"].append(commandMatch)
+                
+                # Push format for mustache
+                if command1 and '--' in command1:
+                    commands[commandKey]["DDASH_COMMANDS"].append({"name": command1})
+                if command2 and '--' in command2:
+                    commands[commandKey]["DDASH_COMMANDS"].append({"name": command2})
 
-    print commands
+                if command1:
+                    m = re.match("^-[a-zA-Z]{1,2}", command1)
+                    if m:
+                        commands[commandKey]["DASH_COMMANDS"].append({"name": command1})
+                
+                if command2:
+                    m = re.match("^-[a-zA-Z]{1,2}", command2)
+                    if m:
+                        commands[commandKey]["DASH_COMMANDS"].append({"name": command2})
+
+                #print command1, command2
+
+    return commands
+
+def generateMain(commands):
+    tmplt = ""
+
+    with open("templates/mbed.tmplt") as fp:
+        tmplt = fp.read()
+
+    print pystache.render(tmplt, commands)
 
 if __name__ == '__main__':
-    parseCommands()
+    commands = parseCommands()
+
+    generateMain(commands)
 
 # At this point we have a list of all the commands and sub commands
 # for each command create a Bash function

tools/bash_completion/templates/.README.md.swp

@@ -0,0 +1,3 @@
+# Templates
+
+Note these templates are inspired by the mustache syntax. 

tools/bash_completion/templates/README.md

@@ -0,0 +1,34 @@
+__mbed_complete_{{COMMAND}}() {
+    
+    local cur="${COMP_WORDS[COMP_CWORD]}"
+    local prev="${COMP_WORDS[COMP_CWORD-1]}"
+    case "$cur" in 
+        --*)
+            __mbedcomp "
+                {{#DDASH_COMMANDS}}
+                {{name}}
+                {{/DDASH_COMMANDS}}
+                "
+
+            return
+            ;;
+        -*)
+            __mbedcomp "
+                {{#DASH_COMMANDS}}
+                {{name}}
+                {{/DASH_COMMANDS}}
+                "
+            return
+            ;;
+    esac
+
+    # Right now prev is not supported
+    #case "$prev" in 
+    #    toolchain|-G|--global|-v|--verbose|-vv|--very_verbose)
+    #        declare TOOLCHAINS=$(mbed target --supported | head -n 2 | tail -n 1 | tr '|' '\n' | sed -n '/^ Target/!p' | sed -n '/^ mbed/!p')
+    #        __mbedcomp "${TOOLCHAINS}"
+    #        return
+    #        ;;
+    #esac
+
+}

tools/bash_completion/templates/command.tmplt

@@ -0,0 +1,51 @@
+
+_mbed () {
+    local i=1 cmd prev
+
+    prev="${COMP_WORDS[COMP_CWORD-1]}"
+
+# find the subcommand
+     while [[ "$i" -lt "$COMP_CWORD" ]]
+     do
+         local s="${COMP_WORDS[i]}"
+         case "$s" in 
+             --*)
+                 cmd="$s"
+                 break
+                 ;;
+             -*)
+                 ;;
+             *)
+                 cmd="$s"
+                 break
+                 ;;
+         esac
+
+         i="$((++i))"
+     done
+
+    # Handle the main command completions
+    if [[ "$i" -eq "$COMP_CWORD" ]]
+    then
+    local cmds="
+        {{#COMMAND}}
+        {{name}}
+        {{/COMMAND}}
+        "
+
+       __mbedcomp "${cmds}"
+    fi
+
+    # Each subcommand has a completion function based on the parent
+    case "$cmd" in 
+        {{#COMMAND}}
+        {{name}}) __mbed_complete_{{name}} ;;
+        {{/COMMAND}}
+         *) ;;
+         esac
+
+}
+
+complete -o bashdefault -o default -F _mbed mbed
+complete -o bashdefault -o default -F _mbed mbed-cli
+