Merge branch 'python' of github.com:rtcamp/easyengine into python

config/bash_completion.d/ee_auto.rc

@@ -59,7 +59,7 @@ _ee_complete()
 
             "log")
                 COMPREPLY=( $(compgen \
-                              -W "--mysql --php --nginx --all" \
+                              -W "$(command find /etc/nginx/sites-enabled/ -type l -printf "%P " 2> /dev/null) --mysql --php --nginx --all" \
                               -- $cur) )
                 ;;
 
@@ -117,6 +117,15 @@ _ee_complete()
                               -- $cur) )
         fi
 
+        if [ ${COMP_WORDS[1]} == "log" ] && ([ "$prev" != "--access" ] || [ "$prev" != "--nginx" ] || [ "$prev" != "--php" ] || [ "$prev" != "--fpm" ] || [ "$prev" != "--mysql" ] || [ "$prev" != "-i" ] || ["$prev" != "--interactive" ] || ["$prev" != "--stop" ]); then
+                retlist="--all --wp --rewrite -i --all=off --wp=off --rewrite=off"
+                ret="${retlist[@]/$prev}"
+                COMPREPLY=( $(compgen \
+                              -W "$(echo $ret)" \
+                              -- $cur) )
+        fi
+
+
     elif [ $COMP_CWORD -eq 4 ]; then
         case "$mprev" in
             # HANDLE EVERYTHING AFTER THE THIRD LEVEL NAMESPACE

ee/cli/plugins/debug.py

@@ -14,6 +14,27 @@ import glob
 import signal
 import subprocess
 
+usage = """
+Usage: ee debug {<sitename>} {arguments}
+
+arguments usage:
+--all --all=on          start debugging all server parameters.
+--all=off               stop debugging all server parameters
+--nginx --nginx=on      start debugging nginx server configuration for site
+--nginx=off             stop debugging nginx server configuration for site
+--rewrite --rewrite=on  start debugging nginx rewrite rules for site
+--rewrite=off           stop debugging nginx rewrite rules for site
+--php --php=on          start debugging server php configuration
+--php=off               stop debugging server php configuration
+--fpm --fpm=on          start debugging fastcgi configuration
+--fpm=off               stop debugging fastcgi configuration
+--mysql --mysql=on      start debugging mysql server
+--mysql=off             stop debugging mysql server
+--wp --wp=on            start wordpress debugging
+--wp=off                stop wordpress debugging
+
+"""
+
 
 def debug_plugin_hook(app):
     # do something with the ``app`` object here.
@@ -27,10 +48,10 @@ class EEDebugController(CementBaseController):
         stacked_on = 'base'
         stacked_type = 'nested'
         arguments = [
-            # (['--stop'],
+            (['--stop'],
-            #     dict(help='Stop debug', action='store_true')),
+                dict(help='Stop debug', action='store_true')),
-            # (['--start'],
+            (['--start'],
-            #     dict(help='Start debug', action='store_true')),
+                dict(help='Start debug', action='store_true')),
             (['--nginx'],
                 dict(help='start/stop debugging nginx server '
                      'configuration for site',
@@ -466,44 +487,15 @@ class EEDebugController(CementBaseController):
         self.trigger_nginx = False
         self.trigger_php = False
 
-        # if self.app.pargs.stop:
-        #     self.start = False
-
         if ((not self.app.pargs.nginx) and (not self.app.pargs.php)
            and (not self.app.pargs.fpm) and (not self.app.pargs.mysql)
            and (not self.app.pargs.wp) and (not self.app.pargs.rewrite)
            and (not self.app.pargs.all)
            and (not self.app.pargs.site_name)):
-            print("""
+            if self.app.pargs.stop or self.app.pargs.start:
-Usage: ee debug {<sitename>} {arguments}
+                print("--start/stop option is deprecated in ee3.0.5", usage)
-arguments :
+            else:
---all [{on,off}]      start/stop debugging all server parameters.
+                print(usage)
---nginx [{on,off}]    start/stop debugging nginx server configuration for site
---rewrite [{on,off}]  start/stop debugging nginx rewrite rules for site
---php [{on,off}]      start/stop debugging server php configuration
---fpm [{on,off}]      start/stop debugging fastcgi configuration
---mysql [{on,off}]    start/stop debugging mysql server
---wp [{on,off}]       start/stop wordpress debugging
-
-
-Usage example:
-# This is global option will affect all sites
-# start debugging all server parameters
-
-ee debug --all / --all=on
-# stop debugging for all server parameters
-
-ee debug --all=off
-
-#This is site specific option will affect specific site mentioned
-# start debugging all server parameters for example.com
-
-ee debug example.com --all / --all=on
-
-# stop debugging for all server parameters available for example.com
-
-ee debug example.com --all=off
-            """)
 
         if self.app.pargs.all == 'on':
             if self.app.pargs.site_name:
@@ -527,24 +519,7 @@ ee debug example.com --all=off
            and (not self.app.pargs.fpm) and (not self.app.pargs.mysql)
            and (not self.app.pargs.wp) and (not self.app.pargs.rewrite)
            and self.app.pargs.site_name):
-            print("""
+            print(usage)
-usage: ee debug <sitename> {arguments}
-arguments :
---all [{on,off}]       start/stop debugging all server parameters
---nginx [{on,off}]     start/stop debugging nginx server configuration for site
---rewrite [{on,off}]   start/stop debugging nginx rewrite rules for site
---wp [{on,off}]        start/stop wordpress debugging for site
-
-Usage example:
-#This is site specific option will affect specific site mentioned
-# start debugging all server parameters for example.com
-
-ee debug example.com --all / --all=on
-
-# stop debugging for all server parameters available for example.com
-
-ee debug example.com --all=off
-            """)
             # self.app.pargs.nginx = 'on'
             # self.app.pargs.wp = 'on'
             # self.app.pargs.rewrite = 'on'