Merge branch 'development'

2 files changed, 75 insertions, 16 deletions

diff --git a/gitautodeploy/gitautodeploy.py b/gitautodeploy/gitautodeploy.py
index 21f1f16..8347d6a 100644
--- a/gitautodeploy/gitautodeploy.py
+++ b/gitautodeploy/gitautodeploy.py
@@ -110,18 +110,9 @@ class GitAutoDeploy(object):
                 continue
 
             if os.path.isdir(repo_config['path']) and os.path.isdir(repo_config['path']+'/.git'):
-                logger.debug("Repository %s already present" % repo_config['url'])
-                continue
-
-            logger.info("Repository %s not present and needs to be cloned" % repo_config['url'])
-
-            # Clone repository
-            ret = GitWrapper.clone(url=repo_config['url'], branch=repo_config['branch'], path=repo_config['path'])
-
-            if ret == 0 and os.path.isdir(repo_config['path']):
-                logger.info("Repository %s successfully cloned" % repo_config['url'])
+                GitWrapper.init(repo_config)
             else:
-                logger.error("Unable to clone %s branch of repository %s" % (repo_config['branch'], repo_config['url']))
+                GitWrapper.clone(repo_config)
 
     def ssh_key_scan(self):
         import re
diff --git a/gitautodeploy/wrappers/git.py b/gitautodeploy/wrappers/git.py
index e600d9e..910e9f6 100644
--- a/gitautodeploy/wrappers/git.py
+++ b/gitautodeploy/wrappers/git.py
@@ -6,6 +6,46 @@ class GitWrapper():
         pass
 
     @staticmethod
+    def init(repo_config):
+        """Init remote url of the repo from the git server"""
+        import logging
+        from process import ProcessWrapper
+        import os
+        import platform
+
+        logger = logging.getLogger()
+        logger.info("Initializing repository %s" % repo_config['path'])
+
+        commands = []
+
+        # On Windows, bash command needs to be run using bash.exe. This assumes bash.exe
+        # (typically installed under C:\Program Files\Git\bin) is in the system PATH.
+        if platform.system().lower() == "windows":
+            commands.append('bash -c "cd \\"' + repo_config['path'] + '\\" && unset GIT_DIR"')
+        else:
+            commands.append('unset GIT_DIR')
+
+        commands.append('git remote set-url ' + repo_config['remote'] + " " + repo_config['url'])
+        commands.append('git fetch ' + repo_config['remote'])
+        commands.append('git checkout -f -B ' + repo_config['branch'] + ' -t ' + repo_config['remote'] + '/' + repo_config['branch'])
+        commands.append('git submodule update --init --recursive')
+
+        # All commands need to success
+        for command in commands:
+            res = ProcessWrapper().call(command, cwd=repo_config['path'], shell=True)
+
+            if res != 0:
+                logger.error("Command '%s' failed with exit code %s" % (command, res))
+                break
+
+        if res == 0 and os.path.isdir(repo_config['path']):
+            logger.info("Repository %s successfully initialized" % repo_config['path'])
+        else:
+            logger.error("Unable to init repository %s" % repo_config['path'])
+
+        return int(res)
+
+    @staticmethod
     def pull(repo_config):
         """Pulls the latest version of the repo from the git server"""
         import logging
@@ -31,11 +71,10 @@ class GitWrapper():
             commands.append('unset GIT_DIR')
 
         commands.append('git fetch ' + repo_config['remote'])
-        commands.append('git reset --hard ' + repo_config['remote'] + '/' + repo_config['branch'])
+        commands.append('git reset --hard ' + repo_config['remote'] + "/" + repo_config['branch'])
         commands.append('git submodule update --init --recursive')
-        #commands.append('git update-index --refresh')
 
-        # All commands needs to success
+        # All commands need to success
         for command in commands:
             res = ProcessWrapper().call(command, cwd=repo_config['path'], shell=True)
 
@@ -51,9 +90,38 @@ class GitWrapper():
         return int(res)
 
     @staticmethod
-    def clone(url, branch, path):
+    def clone(repo_config):
+        """Clones the latest version of the repo from the git server"""
+        import logging
         from process import ProcessWrapper
-        res = ProcessWrapper().call(['git clone --recursive ' + url + ' -b ' + branch + ' ' + path], shell=True)
+        import os
+        import platform
+
+        logger = logging.getLogger()
+        logger.info("Cloning repository %s" % repo_config['path'])
+
+        # Only pull if there is actually a local copy of the repository
+        if 'path' not in repo_config:
+            logger.info('No local repository path configured, no clone will occure')
+            return 0
+
+        commands = []
+        commands.append('unset GIT_DIR')
+        commands.append('git clone --recursive ' + repo_config['url'] + ' -b ' + repo_config['branch'] + ' ' + repo_config['path'])
+
+        # All commands need to success
+        for command in commands:
+            res = ProcessWrapper().call(command, shell=True)
+
+            if res != 0:
+                logger.error("Command '%s' failed with exit code %s" % (command, res))
+                break
+
+        if res == 0 and os.path.isdir(repo_config['path']):
+            logger.info("Repository %s successfully cloned" % repo_config['url'])
+        else:
+            logger.error("Unable to clone repository %s" % repo_config['url'])
+
         return int(res)
 
     @staticmethod