Merge pull request #19 from chemiron/master

Added '--update' option for install.

Author: klen

makesite/install.py

@@ -89,10 +89,14 @@ def clone_source(self):
 
         return site
 
-    def build(self):
+    def build(self, update=False):
         print_header('Build site', sep='-')
         call('sudo mkdir -p %s' % op.dirname(self.target_dir))
-        call('sudo mv %s %s' % (self.deploy_dir, self.target_dir))
+        if not update:
+            call('sudo mv %s %s' % (self.deploy_dir, self.target_dir))
+        else:
+            call('sudo cp -rf %s/* %s' % (self.deploy_dir, self.target_dir))
+            call('sudo rm -r %s' % self.deploy_dir)
         call('sudo chmod 0755 %s' % self.target_dir)
 
     def _get_source(self):

makesite/main.py

@@ -177,6 +177,9 @@ def shell(args):
     )),
     (['-b', '--branch'], dict(help='Name of branch.', default='master')),
     (['-m', '--module'], dict(help="Name of module. Install module.")),
+    (['-u', '--update'], dict(
+        action="store_true", default=False,
+        help="Update already existing installation.")),
     (['-r', '--repeat'], dict(
         action="store_true", default=False, help='Repeat installation.')),
     (['-i', '--info'], dict(action="store_true", default=False,
@@ -207,7 +210,7 @@ def install(args):
     args.deploy_dir = engine.target_dir
 
     # Check dir exists
-    assert args.info or args.repeat or not op.exists(
+    assert args.info or args.repeat or args.update or not op.exists(
         engine.target_dir), "Path %s exists. Stop deploy." % args.deploy_dir
 
     try:
@@ -220,7 +223,7 @@ def install(args):
         if not site:
             return True
 
-        engine.build()
+        engine.build(args.update)
         site.run_install()
         return site