Register completion for multiple commands

argcomplete/shellintegration.py

@@ -1,5 +1,10 @@
 #!/usr/bin/env python
 
+try:
+    from shlex import quote
+except ImportError:
+    from pipes import quote
+
 bashcode = r'''
 # Run something, muting output or redirecting it to the debug stream
 # depending on the value of _ARC_DEBUG.
@@ -31,18 +36,18 @@
         compopt -o nospace
     fi
 }
-complete %(complete_opts)s -F _python_argcomplete "%(executable)s"
+complete %(complete_opts)s -F _python_argcomplete %(executables)s
 '''
 
 tcshcode = '''\
-complete "%(executable)s" 'p@*@`python-argcomplete-tcsh "%(executable)s"`@'
+complete "%(executable)s" 'p@*@`python-argcomplete-tcsh "%(executable)s"`@' ;
 '''
 
-def shellcode(executable, use_defaults=True, shell='bash', complete_arguments=None):
+def shellcode(executables, use_defaults=True, shell='bash', complete_arguments=None):
     '''
     Provide the shell code required to register a python executable for use with the argcomplete module.
 
-    :param str executable: Executable to be completed (when invoked exactly with this name
+    :param str executables: Executables to be completed (when invoked exactly with this name
     :param bool use_defaults: Whether to fallback to readline's default completion when no matches are generated.
     :param str shell: Name of the shell to output code for (bash or tcsh)
     :param complete_arguments: Arguments to call complete with
@@ -55,8 +60,12 @@ def shellcode(executable, use_defaults=True, shell='bash', complete_arguments=No
         complete_options = " ".join(complete_arguments)
 
     if shell == 'bash':
-        code = bashcode
+        quoted_executables = [quote(i) for i in executables]
+        executables_list = " ".join(quoted_executables)
+        code = bashcode % dict(complete_opts=complete_options, executables=executables_list)
     else:
-        code = tcshcode
+        code = ""
+        for executable in executables:
+            code += tcshcode % dict(executable=executable)
 
-    return code % dict(complete_opts=complete_options, executable=executable)
+    return code

scripts/register-python-argcomplete

@@ -41,6 +41,7 @@ parser.add_argument(
 
 parser.add_argument(
     'executable',
+    nargs='+',
     help='executable to completed (when invoked by exactly this name)')
 
 if len(sys.argv) == 1:

test/test.py

@@ -740,17 +740,17 @@ def make_parser():
 
     def test_shellcode_utility(self):
         with NamedTemporaryFile() as fh:
-            sc = shellcode("prog", use_defaults=True, shell="bash", complete_arguments=None)
+            sc = shellcode(["prog"], use_defaults=True, shell="bash", complete_arguments=None)
             fh.write(sc.encode())
             fh.flush()
             subprocess.check_call(['bash', '-n', fh.name])
         with NamedTemporaryFile() as fh:
-            sc = shellcode("prog", use_defaults=False, shell="bash", complete_arguments=["-o", "nospace"])
+            sc = shellcode(["prog", "prog2"], use_defaults=False, shell="bash", complete_arguments=["-o", "nospace"])
             fh.write(sc.encode())
             fh.flush()
             subprocess.check_call(['bash', '-n', fh.name])
-        sc = shellcode("prog", use_defaults=False, shell="tcsh", complete_arguments=["-o", "nospace"])
-        sc = shellcode("prog", use_defaults=False, shell="woosh", complete_arguments=["-o", "nospace"])
+        sc = shellcode(["prog"], use_defaults=False, shell="tcsh", complete_arguments=["-o", "nospace"])
+        sc = shellcode(["prog"], use_defaults=False, shell="woosh", complete_arguments=["-o", "nospace"])
 
 class TestArgcompleteREPL(unittest.TestCase):
     def setUp(self):