Merge branch 'development' release v0.5.2

Author: samrocketman

CHANGELOG.md

@@ -1,3 +1,13 @@
+---
+## gitlab-mirrors v0.5.2
+
+* Certified compatibility with GitLab 8.1.4.
+* Documentation updates.
+* Fixes project transfer bug which is a regression introduced somewhere in
+  GitLab 8.x.  This prevented projects being properly created in GitLab under
+  the mirror namespace.
+
+---
 ## gitlab-mirrors v0.5.1
 
 * Certified compatibility with GitLab 7.6.2.

README.md

@@ -78,6 +78,7 @@ Created by Sam Gleske under [MIT License](LICENSE).
 * Docs #26 [Glen Mailer](https://github.com/glenjamin)
 * Docs #54  [Martijn Vermaat](https://github.com/martijnvermaat)
 * Better logging #57 [Loic Dachary](https://github.com/dachary)
+* Fixed project transfer bug #78 [Corey Osman](https://github.com/logicminds)
 
 [gitlab-api]: http://api.gitlab.org/
 [issues]: https://github.com/samrocketman/gitlab-mirrors/issues

docs/installation.md

@@ -123,8 +123,8 @@ user instead of a dedicated administrator.
    group is owned by the user.  This means that if you wish to mirror projects
    in namespaces other than your own username then you will have to first
    manually create the mirror in GitLab and then run the `add_mirror.sh` command
-   (see Managing repositories).
-2. You user will include mirror pushes in your user statistics.
+   (see Managing repositories).  This bug has not been tested in GitLab 7.x/8.x.
+2. Your user will include mirror pushes in your user statistics.
 
 ---
 Next up is [Managing mirrored repositories](management.md)

docs/prerequisites.md

@@ -2,10 +2,10 @@
 
 ### Required software
 
-* [GitLab 6.x/7.x][gitlab]
+* [Tested with GitLab 6.x/7.x/8.x][gitlab]
 * [pyapi-gitlab3 @ v0.5.4][python-gitlab3]
 * [GNU coreutils][coreutils]
-* [git 1.6.5][git] or later (git 1.6.5 introduced transport helpers)
+* [git 1.8.0][git] or later
 
 If you plan on mirroring SVN repositories as well then you'll need the
 following additional options.

lib/VERSION

@@ -1 +1 @@
-VERSION="v0.5.1"
+VERSION="v0.5.2"

lib/manage_gitlab_project.py

@@ -48,30 +48,11 @@
 else:
   git=gitlab.GitLab(gitlab_url=gitlab_url,token=token_secret,ssl_verify=True)
 
-def findgroup(gname):
-  #Locate the group
-  page=1
-  while len(git.groups(page=page)) > 0:
-    for group in git.groups(page=page):
-      if group.name == gname:
-        return group
-    page += 1
-  else:
-    print >> stderr, "Project namespace (user or group) not found or user does not have permission of existing group."
-    print >> stderr, "gitlab-mirrors will not automatically create the project namespace."
-    exit(1)
-
-def findproject(gname,pname,user=False):
-  page=1
-  while len(git.projects(page=page,per_page=20)) > 0:
-    for project in git.projects(page=page,per_page=20):
-      if not user and project.namespace['name'] == gname and project.name == pname:
-        return project
-      elif user and project.namespace['path'] == gname and project.name == pname:
-        return project
-    page += 1
-  else:
-    return False
+# transfer the project from the source namespace to the specified group namespace
+def transfer_project(src_project, group):
+  value = group.transfer_project(src_project.id)
+  dest_project = git.find_project(name=src_project.name)
+  return dest_project
 
 def createproject(pname):
   if len(options.desc) == 0:
@@ -87,40 +68,55 @@ def createproject(pname):
     'merge_requests_enabled': options.merge,
     'wiki_enabled': options.wiki,
     'snippets_enabled': options.snippets,
-    'public': options.public
+    'public': options.public,
+    'namespace_id': git.find_group(name=gitlab_namespace).id,
   }
   #make all project options lowercase boolean strings i.e. true instead of True
   for x in project_options.keys():
     project_options[x] = str(project_options[x]).lower()
-  new_project=git.add_project(pname,description=description,**project_options)
-  if gitlab_user != gitlab_namespace:
-    new_project=findproject(gitlab_user,pname,user=True)
-    new_project=git.group(found_group.id).transfer_project(new_project.id)
-  if findproject(gitlab_namespace,pname):
-    return findproject(gitlab_namespace,pname)
+  print >> stderr, "Creating new project %s" % pname
+  git.add_project(pname,description=description,**project_options)
+  found_project = git.find_project(name=pname)
+  if needs_transfer(gitlab_user, gitlab_namespace, found_project):
+     found_project = transfer_project(found_project, found_group)
+  return found_project
+
+# returns a Bool True if the transfer is required
+def needs_transfer(user, groupname, project):
+  namespace = False
+  if groupname:
+    namespace = groupname
   else:
-    return False
+    namespace = user
+  return project.namespace['name'] != namespace
 
 if options.create:
-  found_group=findgroup(gitlab_namespace)
-  found_project=findproject(gitlab_namespace,project_name)
-
-  if not found_project:
+  found_group=git.find_group(name=gitlab_namespace)
+  found_project = None
+  # search the group namespace first
+  found_project=git.find_project(name=project_name)
+  if found_project:
+    if needs_transfer(gitlab_user, gitlab_namespace, found_project):
+      found_project = transfer_project(found_project, found_group)
+      if not found_project:
+        print >> stderr, "There was a problem transferring {group}/{project}.  Did you give {user} user Admin rights in gitlab?".format(group=gitlab_namespace,project=project_name,user=gitlab_user)
+        exit(1)
+  else:
     found_project=createproject(project_name)
     if not found_project:
       print >> stderr, "There was a problem creating {group}/{project}.  Did you give {user} user Admin rights in gitlab?".format(group=gitlab_namespace,project=project_name,user=gitlab_user)
       exit(1)
-
   if options.http:
     print found_project.http_url_to_repo
   else:
     print found_project.ssh_url_to_repo
 elif options.delete:
   try:
-    deleted_project=git.project(findproject(gitlab_namespace,project_name).id).delete()
+    deleted_project=git.find_project(name=project_name).delete()
   except Exception as e:
     print >> stderr, e
     exit(1)
 else:
   print >> stderr, "No --create or --delete option added."
   exit(1)
+