Convert ad hoc shell calls to singleton instance; fix upgrade bug.

[wizard.git] / wizard / command / restore.py

diff --git a/wizard/command/restore.py b/wizard/command/restore.py
index cadc1f878aefb86b370054da0af396aaa71f8132..eae157f3b63beebc9444c8195c7abdd4a39f1594 100644 (file)
--- a/wizard/command/restore.py
+++ b/wizard/command/restore.py
@@ -1,10 +1,8 @@
 import logging
 import os
-import optparse
 import sys
-import distutils.version
 
-from wizard import command, deploy, git, shell, util
+from wizard import command, deploy, shell
 
 def main(argv, baton):
     options, args = parse_args(argv, baton)
@@ -26,20 +24,25 @@ def main(argv, baton):
             logging.warning("Pruned %d empty backups" % count)
         return
     backup = args[0]
+    if backup == "top":
+        try:
+            backup = sorted(os.listdir(backups))[-1]
+            logging.warning("Using backup %s" % backup)
+        except IndexError:
+            raise Exception("No restore points available")
     bits = backup.split('-')
     date = '-'.join(bits[-3:])
     version = '-'.join(bits[0:-3])
-    shell.drop_priviledges(dir, options.log_file)
-    d = deploy.Deployment(".")
+    shell.drop_priviledges(".", options.log_file)
+    d = deploy.ProductionCopy(".")
     d.verify()
     d.verifyConfigured()
     tag = "%s-%s" % (d.application.name, version)
-    sh = shell.Shell()
     try:
-        sh.call("git", "rev-parse", tag)
+        shell.call("git", "rev-parse", tag)
     except shell.CallError:
         raise Exception("Tag %s doesn't exist in repository" % tag)
-    sh.call("git", "reset", "--hard", tag)
+    shell.call("git", "reset", "-q", "--hard", tag)
     d.restore(backup, options)
 
 def parse_args(argv, baton):
@@ -47,7 +50,10 @@ def parse_args(argv, baton):
 
 Takes a backup from the backups/ directory and does
 a full restore back to it.  CURRENT DATA IS DESTROYED,
-so you may want to do a backup before you do a restore."""
+so you may want to do a backup before you do a restore.
+
+You can specify 'top' as the ID in order to restore from
+the latest backup."""
     parser = command.WizardOptionParser(usage)
     options, args = parser.parse_all(argv)
     if len(args) > 1: