Improved support for multiple repos kinds

dukeclient/fabric/tasks.py

@@ -157,7 +157,6 @@ def update_code(reload=True):
     Update code on the servers.
     """
     project_path = get_project_path(env)
-    print env
 
     with cd(project_path):
         if is_svn(env):
@@ -171,10 +170,11 @@ def checkout_code(reload=True):
     Update code on the servers.
     """
     project_path = get_project_path(env)
-    if is_svn(env):
-        sudo('svn co %s %s' % (env.site['repos'], project_path))
-    elif is_git(env):
-        sudo('git clone %s %s' % (env.site['repos'], project_path))
+    kind, repos = get_repos(env)
+    if kind == 'svn':
+        sudo('svn co %s %s' % (repos, project_path))
+    elif kind == 'git':
+        sudo('git clone %s %s' % (repos, project_path))
 
 
 @task

dukeclient/fabric/utils.py

@@ -76,11 +76,17 @@ def require_root_cwd():
         puts("You must be in the root directory of your project to use this command.")
         sys.exit(1)
 
+def get_repos(env):
+    if '+' in env.site['repos']:
+        return env.site['repos'].split('+')
+    else:
+        if env.site['repos'].startswith('svn:'):
+            return ('svn', env.site['repos'])
+        elif env.site['repos'].startswith('svn:'):
+            return ('git', env.site['repos'])
 
 def is_svn(env):
-    # TODO: find a more reliable way
-    return env.site['repos'].startswith('svn:')
+    return get_repos(env)[0] == 'svn'
 
-def is_git(path):
-    # TODO: find a more reliable way
-    return env.site['repos'].startswith('git:')
+def is_git(env):
+    return get_repos(env)[0] == 'git'