Added ee stack upgrade command, fixes #458

ee/cli/plugins/stack.py

@@ -27,6 +27,7 @@ import grp
 import codecs
 from ee.cli.plugins.stack_services import EEStackStatusController
 from ee.cli.plugins.stack_migrate import EEStackMigrateController
+from ee.cli.plugins.stack_upgrade import EEStackUpgradeController
 from ee.core.logging import Log
 
 
@@ -590,7 +591,7 @@ class EEStackController(CementBaseController):
             if set(EEVariables.ee_hhvm).issubset(set(apt_packages)):
 
                 EEShellExec.cmd_exec(self, "update-rc.d hhvm defaults")
-                
+
                 EEFileUtils.searchreplace(self, "/etc/hhvm/server.ini",
                                                 "9000", "8000")
                 EEFileUtils.searchreplace(self, "/etc/nginx/hhvm.conf",
@@ -1803,6 +1804,7 @@ def load(app):
     handler.register(EEStackController)
     handler.register(EEStackStatusController)
     handler.register(EEStackMigrateController)
+    handler.register(EEStackUpgradeController)
 
     # register a hook (function) to run after arguments are parsed.
     hook.register('post_argument_parsing', ee_stack_hook)

ee/cli/plugins/stack_upgrade.py

@@ -0,0 +1,48 @@
+from cement.core.controller import CementBaseController, expose
+from cement.core import handler, hook
+from ee.core.logging import Log
+from ee.core.variables import EEVariables
+from ee.core.aptget import EEAptGet
+from ee.core.apt_repo import EERepo
+from ee.core.services import EEService
+import configparser
+import os
+
+
+class EEStackUpgradeController(CementBaseController):
+    class Meta:
+        label = 'upgrade'
+        stacked_on = 'stack'
+        stacked_type = 'nested'
+        description = ('UPgrade stack safely')
+        arguments = [
+            (['--php56'],
+                dict(help="Upgrade to PHP5.6 from PHP5.5",
+                     action='store_true')),
+            (['--no-prompt'],
+                dict(help="Upgrade Packages without any prompt",
+                     action='store_true')),
+
+            ]
+
+    @expose(hide=True)
+    def upgrade_php56(self):
+        pass
+
+    @expose(hide=True)
+    def default(self):
+        if ((not self.app.pargs.php56)):
+            # apt-get update
+            EEAptGet.update(self)
+            # display packges update
+            EEAptGet.check_upgrade(self)
+            Log.info(self, "During package update process non nginx-cached"
+                     " parts of your site may remain down")
+            # Check prompt
+            if (self.app.pargs.no_prompt):
+                start_upgrade = input("Do you want to continue:[y/N]")
+                if start_upgrade != "Y" and start_upgrade != "y":
+                    Log.error(self, "Not starting package update")
+            # Update packages
+            Log.info("Updating packages, please wait...")
+            EEAptGet.dist_upgrade(self)

ee/core/aptget.py

@@ -32,25 +32,46 @@ class EEAptGet():
             Log.error(self, "Error while installing packages, "
                       "apt-get exited with error")
 
-    def dist_upgrade():
+    def check_upgrade(self):
         """
         Similar to `apt-get upgrade`
         """
         try:
-            apt_cache = apt.cache.Cache()
+            check_update = subprocess.Popen(['apt-get upgrade -s | grep '
-            apt_cache.update()
+                                            '\"^Inst\" | wc -l'],
-            apt_cache.open(None)
+                                            stdout=subprocess.PIPE,
-            apt_cache.upgrade(True)
+                                            shell=True).communicate()[0]
-            success = (apt_cache.commit(
+            if check_upadte == b'0\n':
-                       apt.progress.text.AcquireProgress(),
+                Log.error(self, "No package update available")
-                       apt.progress.base.InstallProgress()))
+            Log.info("Following package updates are available:")
-            # apt_cache.close()
+            subprocess.Popen("apt-get -s dist-upgrade", shell=True,
-            return success
+                             executable="/bin/bash",
-        except AttributeError as e:
+                             stdout=sys.stdout).communicate()
-            Log.error(self, 'AttributeError: ' + str(e))
+
-        except FetchFailedException as e:
+        except Exception as e:
-            Log.debug(self, 'SystemError:  ' + str(e))
+            Log.error(self, "Error while installing packages, "
-            Log.error(self, 'Unable to Fetch update')
+                      "apt-get exited with error")
+
+    def dist_upgrade(self):
+        """
+        Similar to `apt-get upgrade`
+        """
+        try:
+            with open('/var/log/ee/ee.log', 'a') as f:
+                proc = subprocess.Popen("apt-get dist-upgrade -o "
+                                        "Dpkg::Options::=--force-confold -y",
+                                        shell=True,
+                                        stdin=None, stdout=f, stderr=f,
+                                        executable="/bin/bash")
+                proc.wait()
+
+            if proc.returncode == 0:
+                return True
+            else:
+                Log.error(self, "Unable to run apt-get dist_upgrade")
+        except Exception as e:
+            Log.error(self, "Error while installing packages, "
+                      "apt-get exited with error")
 
     def install(self, packages):
         all_packages = ' '.join(packages)