Merge branch 'master' into stable

Author: harshadyeola

CHANGELOG.txt

@@ -1,3 +1,6 @@
+v 3.0.6 - April 2,2015
+- Added `update` command to update EasyEngine.
+
 v 3.0.5 - March 18,2015
 - Changed Database from Percona MySQL to MariaDB #362
 - Better arguments for ee debug command

config/ee.conf

@@ -67,3 +67,10 @@ password =
 
 ### EMail for WordPress sites
 email =
+
+[update]
+
+### If enabled, load a plugin named `update` either from the Python module
+### `ee.cli.plugins.example` or from the file path
+### `/var/lib/ee/plugins/example.py`
+enable_plugin = true

ee/cli/plugins/update.py

@@ -0,0 +1,45 @@
+from cement.core.controller import CementBaseController, expose
+from cement.core import handler, hook
+from ee.core.download import EEDownload
+from ee.core.logging import Log
+import time
+import os
+
+
+def ee_update_hook(app):
+    # do something with the ``app`` object here.
+    pass
+
+
+class EEUpdateController(CementBaseController):
+    class Meta:
+        label = 'ee_update'
+        stacked_on = 'base'
+        aliases = ['update']
+        aliases_only = True
+        stacked_type = 'nested'
+        description = ('update EasyEngine to latest version')
+        usage = "ee update"
+
+    @expose(hide=True)
+    def default(self):
+        filename = "eeupdate" + time.strftime("%Y%m%d-%H%M%S")
+        EEDownload.download(self, [["http://rt.cx/eeup",
+                                    "/tmp/{0}".format(filename),
+                                    "update script"]])
+        try:
+            Log.info(self, "updating EasyEngine, please wait ...")
+            os.system("bash /tmp/{0}".format(filename))
+        except OSError as e:
+            Log.debug(self, str(e))
+            Log.error(self, "EasyEngine update failed !")
+        except Exception as e:
+            Log.debug(self, str(e))
+            Log.error(self, "EasyEngine update failed !")
+
+
+def load(app):
+    # register the plugin class.. this only happens if the plugin is enabled
+    handler.register(EEUpdateController)
+    # register a hook (function) to run after arguments are parsed.
+    hook.register('post_argument_parsing', ee_update_hook)

ee/core/variables.py

@@ -12,7 +12,7 @@ class EEVariables():
     """Intialization of core variables"""
 
     # EasyEngine version
-    ee_version = "3.0.5"
+    ee_version = "3.0.6"
 
     # EasyEngine packages versions
     ee_wp_cli = "0.18.0"

install

@@ -48,7 +48,7 @@ fi
 # Define variables for later use
 ee_branch=$1
 readonly ee_version_old="2.2.3"
-readonly ee_version_new="3.0.5"
+readonly ee_version_new="3.0.6"
 readonly ee_log_dir=/var/log/ee/
 readonly ee_install_log=/var/log/ee/install.log
 readonly ee_linux_distro=$(lsb_release -i | awk '{print $3}')

setup.py

@@ -54,7 +54,7 @@
     os.system("git config --global user.email {0}".format(ee_email))
 
 setup(name='ee',
-      version='3.0.5',
+      version='3.0.6',
       description=long_description,
       long_description=long_description,
       classifiers=[],