Merge branch 'master' into stable

Author: gau1991

.travis.yml

@@ -25,7 +25,7 @@ script:
   - sudo echo -e "[user]\n\tname = abc\n\temail = [email protected]" > ~/.gitconfig
   - sudo echo "Travis Banch = $TRAVIS_BRANCH"
   - sudo apt-get install -y --force-yes git python3-setuptools python3-dev python3-apt
-  - sudo python3 setup.py install
+  - sudo bash install $TRAVIS_BRANCH
   - sudo ee --help
   - sudo ee stack install
   - sudo ee stack install --web
@@ -64,10 +64,10 @@ script:
   - sudo ee site create site12.in --wpfc --wpsubdomain
   - sudo ee site create site12.net --wpfc --wpsubdomain
 
-  - sudo ee debug
-  - sudo ee debug --stop
+  - sudo ee debug --all
+  - sudo ee debug --all=off
   - sudo ee debug site12.net
-  - sudo ee debug site12.net --stop
+  - sudo ee debug site12.net --all=off
   - sudo ee site create 1.com --html
   - sudo ee site create 2.com --php
   - sudo ee site create 3.com --mysql
@@ -88,6 +88,11 @@ script:
   - sudo ee site update site9.com --wpsubdomain --w3tc
   - sudo ee site update site9.com --wpsubdomain --wpsc
 
+  - sudo ee site create www.site-1.com --wp
+  - sudo ee site create www.subsite.site-1.com --wpfc
+  - sudo ee site update www.subsite.site-1.com --wp
+  - sudo ee site delete www.subsite.site-1.com --all --no-prompt
+
   - sudo ee site delete site12.in --all --no-prompt
   - sudo ee site delete site12.net --no-prompt
   - sudo ee site delete site12.org --no-prompt

CONTRIBUTING.md

@@ -1,26 +1,36 @@
-# Contribute to EasyEngine (ee)
+# Community Guidelines
 
-This guide details how to use issues and pull requests to improve EasyEngine (ee).
+This guide details how to get involve in EasyEngine commmunity. Please read this carefully.
 
-## How to report issue:
 
-Github issue-tracker is used **only** for report bugs and feature request.
 
-Please attach the output of following command when open a new issue/bug
+## How to get help?
+
+Please attach the output of following command when open a new support request.
+
 ```bash
 lsb_release -a
 ee -v
 ee info
 wp --allow-root --info
 ```
 
-### EasyEngine chat:
-Developer & contributor discussion: https://gitter.im/rtCamp/easyengine
+### Where to create issue?
+
+For free support, please use - http://community.rtcamp.com/c/easyengine
+
+For premium support, please check - https://rtcamp.com/products/easyengine-premium-support/
 
+Please do NOT clutter github issue tracker here with support requests. It hampers development speed of this project.
 
-### EasyEngine support request:
-For support-request please use - http://community.rtcamp.com/c/easyengine
 
+### Pull Requests
 
-### Pull Requests:
 When submitting your code please follow this coding standerds - http://docs.rtcamp.com/easyengine/dev/python/
+
+
+### EasyEngine Chat
+
+Developer & contributor discussion: https://gitter.im/rtCamp/easyengine
+
+Please do NOT use chat for technical support. Chat is limited to developer & contributor disucssion related to EasyEngine future.

README.md

@@ -1,16 +1,7 @@
-IMPORTANT
-============================================
-
-#### We are looking for [Python Developers] (https://rtcamp.com/careers/python-developer/) to join our team. We offer work from home, so you can join EasyEngine team anywhere! _[Why Python?] (https://rtcamp.com/blog/easyengine-3-roadmap/#whypython)_
-
----
-
-[![Stories in Ready](https://badge.waffle.io/rtcamp/easyengine.png?label=ready&title=Ready)](https://waffle.io/rtcamp/easyengine)
-[![Stories in Progress](https://badge.waffle.io/rtcamp/easyengine.png?label=in%20progress&title=In%20Progress)](https://waffle.io/rtcamp/easyengine)
-
-<img src="https://d3qt5vpr7p9rgn.cloudfront.net/wp-content/uploads/2013/08/easy-engine-logo-2-RS1.png" alt="EasyEngine Logo" align="right" />
-
 [![Travis Build Status](https://travis-ci.org/rtCamp/easyengine.svg "Travis Build Status")] (https://travis-ci.org/rtCamp/easyengine)
+[![Join the chat at https://gitter.im/rtCamp/easyengine](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/rtCamp/easyengine?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+
+<img src="https://d3qt5vpr7p9rgn.cloudfront.net/wp-content/uploads/2013/08/easy-engine-logo-2-RS1-240x184.png" alt="EasyEngine Logo" align="right" />
 
 EasyEngine (ee) is a python tool, which makes it easy to manage your wordpress sites running on nginx web-server.
 
@@ -92,5 +83,13 @@ ee site create example.com --mysql    # create example.com with php & mysql supp
 
 [![Donate](https://cloud.githubusercontent.com/assets/4115/5297691/c7b50292-7bd7-11e4-987b-2dc21069e756.png)]  (https://rtcamp.com/donate/?project=easyengine)
 
+## Careers
+
+We are looking for [Python Developers] (https://rtcamp.com/careers/python-developer/) to join our team. 
+
+We offer work from home, so you can join EasyEngine team anywhere! _[Why Python?] (https://rtcamp.com/blog/easyengine-3-roadmap/#whypython)_
+
+---
+
 ## License
 [MIT] (http://opensource.org/licenses/MIT)

config/bash_completion.d/ee_auto.rc

@@ -29,13 +29,13 @@ _ee_complete()
             # IF YOU HAD ANOTHER CONTROLLER, YOU'D HANDLE THAT HERE
             "debug")
                 COMPREPLY=( $(compgen \
-                              -W "$(command find /etc/nginx/sites-enabled/ -type l -printf "%P " 2> /dev/null) --start --nginx --php --fpm --mysql -i --interactive --stop " \
+                              -W "$(command find /etc/nginx/sites-enabled/ -type l -printf "%P " 2> /dev/null)  --nginx --php --fpm --mysql -i --interactive --all --nginx=off --php=off --fpm=off --mysql=off --all=off  " \
                               -- $cur) )
                 ;;
 
             "stack")
                 COMPREPLY=( $(compgen \
-                              -W "install purge reload remove restart start status stop" \
+                              -W "install purge reload remove restart start status stop migrate" \
                               -- $cur) )
                 ;;
 
@@ -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) )
                 ;;
 
@@ -74,15 +74,19 @@ _ee_complete()
             # HANDLE EVERYTHING AFTER THE THIRD LEVEL NAMESPACE
             "install" | "purge" | "remove" )
                 COMPREPLY=( $(compgen \
-                              -W "--web --admin --mail --nginx --php --mysql --postfix --wpcli --phpmyadmin --adminer --utils --memcache --dovecot" \
+                              -W "--web --admin --mail --nginx --php --mysql --postfix --wpcli --phpmyadmin --adminer --utils --memcache --dovecot --all" \
                               -- $cur) )
                 ;;
             "start" | "stop" | "reload" | "restart" | "status")
                 COMPREPLY=( $(compgen \
                               -W "--nginx --php --mysql --postfix --memcache --dovecot" \
                               -- $cur) )
                 ;;
-
+            "migrate")
+                COMPREPLY=( $(compgen \
+                              -W "--mariadb" \
+                              -- $cur) )
+                ;;
             "list")
                 COMPREPLY=( $(compgen \
                               -W "--enabled --disabled" \
@@ -106,13 +110,22 @@ _ee_complete()
         esac
 
         if [ ${COMP_WORDS[1]} == "debug" ] && ([ "$prev" != "--start" ] || [ "$prev" != "--nginx" ] || [ "$prev" != "--php" ] || [ "$prev" != "--fpm" ] || [ "$prev" != "--mysql" ] || [ "$prev" != "-i" ] || ["$prev" != "--interactive" ] || ["$prev" != "--stop" ]); then
-                retlist="--start --stop --wp --rewrite -i"
+                retlist="--all --wp --rewrite -i --all=off --wp=off --rewrite=off"
+                ret="${retlist[@]/$prev}"
+                COMPREPLY=( $(compgen \
+                              -W "$(echo $ret)" \
+                              -- $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
@@ -141,9 +154,16 @@ _ee_complete()
 
     case "$prev" in
         "--wp" | "--wpsubdir" | "--wpsubdomain")
-            COMPREPLY=( $(compgen \
-                          -W "--w3tc --wpfc --wpsc" \
-                          -- $cur) )
+            if [ ${COMP_WORDS[1]} != "debug" ]; then
+                retlist="--w3tc --wpfc --wpsc"
+            else
+                retlist="--wp=off --rewrite --rewrite=off -i --interactive"
+            fi
+
+            ret="${retlist[@]/$prev}"
+                COMPREPLY=( $(compgen \
+                              -W "$(echo $ret)" \
+                              -- $cur) )
             ;;
 
         "--web" | "--admin" | "--mail" | "--nginx" | "--php" | "--mysql" | "--postfix" | "--wpcli" | "--phpmyadmin" | "--adminer" | "--utils" | "--memcache" | "--dovecot")

ee/cli/ext/ee_outputhandler.py

@@ -0,0 +1,20 @@
+# Based on https://github.com/datafolklabs/cement/issues/295
+# To avoid encoding releated error,we defined our custom output handler
+# I hope we will remove this when we upgarde to Cement 2.6 (Not released yet)
+import os
+from cement.utils import fs
+from cement.ext.ext_mustache import MustacheOutputHandler
+
+
+class EEOutputHandler(MustacheOutputHandler):
+    class Meta:
+        label = 'ee_output_handler'
+
+    def _load_template_from_file(self, path):
+        for templ_dir in self.app._meta.template_dirs:
+            full_path = fs.abspath(os.path.join(templ_dir, path))
+            if os.path.exists(full_path):
+                self.app.log.debug('loading template file %s' % full_path)
+                return open(full_path, encoding='utf-8', mode='r').read()
+            else:
+                continue

ee/cli/main.py

@@ -13,10 +13,9 @@
 from cement.core import foundation
 from cement.utils.misc import init_defaults
 from cement.core.exc import FrameworkError, CaughtSignal
-from cement.utils import fs
-from cement.ext.ext_mustache import MustacheOutputHandler
+from cement.ext.ext_argparse import ArgParseArgumentHandler
 from ee.core import exc
-
+from ee.cli.ext.ee_outputhandler import EEOutputHandler
 
 # Application default.  Should update config/ee.conf to reflect any
 # changes, or additions here.
@@ -31,22 +30,12 @@
 # External templates (generally, do not ship with application code)
 defaults['ee']['template_dir'] = '/var/lib/ee/templates'
 
-
-# Based on https://github.com/datafolklabs/cement/issues/295
-# To avoid encoding releated error,we defined our custom output handler
-# I hope we will remove this when we upgarde to Cement 2.6 (Not released yet)
-class EEOutputHandler(MustacheOutputHandler):
+class EEArgHandler(ArgParseArgumentHandler):
     class Meta:
-        label = 'ee_output_handler'
+        label = 'ee_args_handler'
 
-    def _load_template_from_file(self, path):
-        for templ_dir in self.app._meta.template_dirs:
-            full_path = fs.abspath(os.path.join(templ_dir, path))
-            if os.path.exists(full_path):
-                self.app.log.debug('loading template file %s' % full_path)
-                return open(full_path, encoding='utf-8', mode='r').read()
-            else:
-                continue
+    def error(self, message):
+        super(EEArgHandler, self).error("unknown args")
 
 
 class EEApp(foundation.CementApp):
@@ -72,6 +61,8 @@ class Meta:
         # default output handler
         output_handler = EEOutputHandler
 
+        arg_handler = EEArgHandler
+
         debug = TOGGLE_DEBUG