Updates bash-completion, zsh-completion

celery/bin/celery.py

@@ -304,19 +304,14 @@ Migrating task {state.count}/{state.strtotal}: \
 {body[task]}[{body[id]}]\
 """
 
-DEBUG = os.environ.get('C_DEBUG', False)
-
 command_classes = [
     ('Main', ['worker', 'events', 'beat', 'shell', 'multi', 'amqp'], 'green'),
     ('Remote Control', ['status', 'inspect', 'control'], 'blue'),
     ('Utils',
-     ['purge', 'list', 'migrate', 'call', 'result', 'report', 'upgrade'],
+     ['purge', 'list', 'call', 'result', 'migrate', 'graph', 'upgrade'],
      None),
+    ('Debugging', ['report', 'logtool'], 'red'),
 ]
-if DEBUG:  # pragma: no cover
-    command_classes.append(
-        ('Debug', ['graph', 'logtool'], 'red'),
-    )
 
 
 def determine_exit_status(ret):

extra/bash-completion/celery.bash

@@ -10,9 +10,11 @@ _celery()
     prevp="${COMP_WORDS[COMP_CWORD-1]}"
     basep="${COMP_WORDS[1]}"
     opts="worker events beat shell multi amqp status
-          inspect control purge list migrate call result report"
+          inspect control purge list migrate call result
+          report upgrade flower graph logtool help"
     fargs="--app= --broker= --loader= --config= --version"
-    dopts="--detach --umask= --gid= --uid= --pidfile= --logfile= --loglevel="
+    dopts="--detach --umask= --gid= --uid= --pidfile=
+           --logfile= --loglevel= --executable="
     controlargs="--timeout --destination"
     pools="prefork eventlet gevent threads solo"
     loglevels="critical error warning info debug"

extra/zsh-completion/celery.zsh

@@ -14,7 +14,8 @@ local -a _1st_arguments ifargs dopts controlargs
 typeset -A opt_args
 
 _1st_arguments=('worker' 'events' 'beat' 'shell' 'multi' 'amqp' 'status' 'inspect' \
-                'control' 'purge' 'list' 'migrate' 'call' 'result' 'report')
+                'control' 'purge' 'list' 'migrate' 'call' 'result' 'report' \
+                'graph', 'logtool', 'help')
 ifargs=('--app=' '--broker=' '--loader=' '--config=' '--version')
 dopts=('--detach' '--umask=' '--gid=' '--uid=' '--pidfile=' '--logfile=' '--loglevel=')
 controlargs=('--timeout' '--destination')