Merge branch 'master' into stable

Author: gau1991

.travis.yml

@@ -3,6 +3,7 @@ notifications:
   webhooks:
     urls:
       - https://webhooks.gitter.im/e/bd77a26eab56de803949
+      - https://webhooks.gitter.im/e/e3e2feb8384c77bf1a8a
     on_success: always  # options: [always|never|change] default: always
     on_failure: always  # options: [always|never|change] default: always
     on_start: false     # default: false
@@ -20,6 +21,7 @@ before_script:
   - sudo apt-get update
 
 script:
+  - unset LANG
   - 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

CHANGELOG.txt

@@ -1,3 +1,17 @@
+v 3.0.3 - Feb 23,2015
+- Fixed remote MySQL supports, #428, #427, thanks to @joshlyford #432
+- Fixed ascii encoding issue #414
+- Fixed bug in debug pool #426
+- Added admin tools to default stack
+- Added more MIME types,thanks to @cborgia #423
+- Small bugs fixes and improvements
+
+v 3.0.2 - Feb 14,2015
+- Fixed #413
+- Improved installation script
+- Fixed Percona key not importing
+- Small bug fixes and improvements
+
 v 3.0.1 - Feb 12,2015
 - Fixed #411, #40, #409
 - Improved installation script

README.md

@@ -23,7 +23,7 @@ EasyEngine (ee) is a python tool, which makes it easy to manage your wordpress s
 ## Quick Start
 
 ```bash
-wget -q http://rt.cx/ee && sudo bash ee     # Install easyengine 3
+wget -qO ee rt.cx/ee && sudo bash ee     # Install easyengine 3
 sudo ee site create example.com --wp        # Install required packages & setup WordPress on example.com
 ```
 
@@ -33,7 +33,7 @@ sudo ee site create example.com --wp        # Install required packages & setup
 Update Procedure For EasyEngine to version 3.0.1
 
 ```bash
-wget -q http://rt.cx/ee && sudo bash ee
+wget -qO ee rt.cx/ee && sudo bash ee
 ```
 
 ## More Site Creation Commands

config/bash_completion.d/ee_auto.rc

@@ -11,7 +11,7 @@ _ee_complete()
     # SETUP THE BASE LEVEL (everything after "ee")
     if [ $COMP_CWORD -eq 1 ]; then
         COMPREPLY=( $(compgen \
-                      -W "stack site debug clean secure" \
+                      -W "stack site debug clean secure import-slow-log" \
                       -- $cur) )
 
 

ee/cli/main.py

@@ -13,8 +13,11 @@
 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 ee.core import exc
 
+
 # Application default.  Should update config/ee.conf to reflect any
 # changes, or additions here.
 defaults = init_defaults('ee')
@@ -29,6 +32,23 @@
 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 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
+
+
 class EEApp(foundation.CementApp):
     class Meta:
         label = 'ee'
@@ -50,7 +70,7 @@ class Meta:
         extensions = ['mustache']
 
         # default output handler
-        output_handler = 'mustache'
+        output_handler = EEOutputHandler
 
         debug = TOGGLE_DEBUG
 

ee/cli/plugins/debug.py

@@ -103,7 +103,7 @@ def debug_nginx(self):
                     self.trigger_nginx = True
 
                 else:
-                    Log.info(self, "Debug for site allready enabled")
+                    Log.info(self, "Nginx debug for site already enabled")
 
                 self.msg = self.msg + ['{0}{1}/logs/error.log'
                                        .format(EEVariables.ee_webroot,
@@ -129,7 +129,7 @@ def debug_nginx(self):
 
                 else:
 
-                    Log.info(self, "Debug for site allready disabled")
+                    Log.info(self, "Nginx debug for site already disabled")
             else:
                 Log.info(self, "{0} domain not valid"
                          .format(self.app.pargs.site_name))
@@ -154,7 +154,7 @@ def debug_php(self):
                 self.trigger_php = True
                 self.trigger_nginx = True
             else:
-                Log.info(self, "PHP debug is allready enabled")
+                Log.info(self, "PHP debug is already enabled")
 
             self.msg = self.msg + ['/var/log/php5/slow.log']
 
@@ -174,7 +174,7 @@ def debug_php(self):
                 self.trigger_php = True
                 self.trigger_nginx = True
             else:
-                Log.info(self, "PHP debug is allready disabled")
+                Log.info(self, "PHP debug is already disabled")
 
     @expose(hide=True)
     def debug_fpm(self):
@@ -249,7 +249,7 @@ def debug_mysql(self):
                                          "n#EasyEngine end MySQL slow log\\\";"
                                          " }} | crontab -\"".format(cron_time))
             else:
-                Log.info(self, "MySQL slow log is allready enabled")
+                Log.info(self, "MySQL slow log is already enabled")
 
             self.msg = self.msg + ['/var/log/mysql/mysql-slow.log']
 
@@ -273,7 +273,7 @@ def debug_mysql(self):
     def debug_wp(self):
         """Start/Stop WordPress debug"""
         if self.start and self.app.pargs.site_name:
-            wp_config = ("{0}{1}/wp-config.php"
+            wp_config = ("{0}/{1}/wp-config.php"
                          .format(EEVariables.ee_webroot,
                                  self.app.pargs.site_name))
             webroot = "{0}{1}".format(EEVariables.ee_webroot,
@@ -301,8 +301,6 @@ def debug_wp(self):
                                          "wp-content/plugins"
                                          .format(webroot,
                                                  EEVariables.ee_php_user))
-                else:
-                    Log.info(self, "WordPress debug log already enabled")
 
                 self.msg = self.msg + ['{0}{1}/htdocs/wp-content'
                                        '/debug.log'
@@ -337,9 +335,6 @@ def debug_wp(self):
                                          "true);/d\" {0}".format(wp_config))
                 else:
                     Log.info(self, "WordPress debug all already disabled")
-            else:
-                Log.error(self, "{0} domain not valid"
-                          .format(self.app.pargs.site_name))
         else:
             Log.error(self, "Missing argument site name")
 
@@ -383,7 +378,7 @@ def debug_rewrite(self):
                                      .format(config_path))
                 self.trigger_nginx = True
             else:
-                Log.info(self, "Nginx rewrite logs for {0} allready setup"
+                Log.info(self, "Nginx rewrite logs for {0} already setup"
                          .format(self.app.pargs.site_name))
 
             if ('{0}{1}/logs/error.log'.format(EEVariables.ee_webroot,
@@ -405,7 +400,7 @@ def debug_rewrite(self):
                                      .format(config_path))
                 self.trigger_nginx = True
             else:
-                Log.info(self, "Nginx rewrite logs for {0} allready "
+                Log.info(self, "Nginx rewrite logs for {0} already "
                          " disabled".format(self.app.pargs.site_name))
 
     @expose(hide=True)
@@ -419,7 +414,12 @@ def signal_handler(self, signal, frame):
         if self.app.pargs.fpm:
             self.debug_fpm()
         if self.app.pargs.mysql:
-            self.debug_mysql()
+            # MySQL debug will not work for remote MySQL
+            if EEVariables.ee_mysql_host is "localhost":
+                self.debug_mysql()
+            else:
+                Log.warn(self, "Remote MySQL found, EasyEngine will not "
+                         "enable remote debug")
         if self.app.pargs.wp:
             self.debug_wp()
         if self.app.pargs.rewrite:
@@ -450,19 +450,19 @@ def default(self):
            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.site_name)):
-            self.debug_nginx()
-            self.debug_php()
-            self.debug_fpm()
-            self.debug_mysql()
-            self.debug_rewrite()
+            self.app.pargs.nginx = True
+            self.app.pargs.php = True
+            self.app.pargs.fpm = True
+            self.app.pargs.mysql = True
+            self.app.pargs.rewrite = True
 
         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 self.app.pargs.site_name):
-            self.debug_nginx()
-            self.debug_wp()
-            self.debug_rewrite()
+            self.app.pargs.nginx = True
+            self.app.pargs.wp = True
+            self.app.pargs.rewrite = True
 
         if self.app.pargs.nginx:
             self.debug_nginx()
@@ -471,7 +471,12 @@ def default(self):
         if self.app.pargs.fpm:
             self.debug_fpm()
         if self.app.pargs.mysql:
-            self.debug_mysql()
+            # MySQL debug will not work for remote MySQL
+            if EEVariables.ee_mysql_host is "localhost":
+                self.debug_mysql()
+            else:
+                Log.warn(self, "Remote MySQL found, EasyEngine will not "
+                         "enable remote debug")
         if self.app.pargs.wp:
             self.debug_wp()
         if self.app.pargs.rewrite: