Merge branch 'request/52' into devel

Author: guyzmo

git_repo/services/ext/gitlab.py

@@ -27,11 +27,11 @@ def connect(self):
 
     def create(self, user, repo, add=False):
         try:
-            self.gl.projects.create(data={
-                'name': repo,
-                # 'namespace_id': user, # TODO does not work, cannot create on
-                # another namespace yet
-            })
+            group = self.gl.groups.search(user)
+            data = {'name': repo}
+            if group:
+                data['namespace_id'] = group[0].id
+            self.gl.projects.create(data=data)
         except GitlabCreateError as err:
             if json.loads(err.response_body.decode('utf-8'))['message']['name'][0] == 'has already been taken':
                 raise ResourceExistsError("Project already exists.") from err

tests/integration/cassettes/test_gitlab_test_01_create.json

@@ -1,38 +1,37 @@
 {
   "http_interactions": [
     {
-      "recorded_at": "2016-03-30T14:13:22",
+      "recorded_at": "2016-10-15T20:46:51",
       "request": {
         "body": {
           "encoding": "utf-8",
           "string": ""
         },
         "headers": {
           "Accept": "*/*",
-          "Accept-Encoding": "gzip, deflate",
+          "Accept-Encoding": "identity",
           "Connection": "keep-alive",
           "PRIVATE-TOKEN": "<PRIVATE_KEY_GITLAB>",
-          "User-Agent": "python-requests/2.9.1"
+          "User-Agent": "python-requests/2.10.0"
         },
         "method": "GET",
         "uri": "https://gitlab.com/api/v3/user"
       },
       "response": {
         "body": {
           "encoding": null,
-          "string": "{\"name\":\"<GITLAB_NAMESPACE>\",\"username\":\"<GITLAB_NAMESPACE>\",\"id\":470686,\"state\":\"active\",\"avatar_url\":\"https://secure.gravatar.com/avatar/59014873897ec9bf64471e4ddf61c8d5?s=80\\u0026d=identicon\",\"web_url\":\"https://gitlab.com/u/<GITLAB_NAMESPACE>\",\"created_at\":\"2016-03-30T13:15:50.649Z\",\"is_admin\":false,\"bio\":\"\",\"skype\":\"\",\"linkedin\":\"\",\"twitter\":\"\",\"website_url\":\"\",\"last_sign_in_at\":\"2016-03-30T13:19:50.252Z\",\"confirmed_at\":\"2016-03-30T13:18:12.005Z\",\"email\":\"[email protected]\",\"theme_id\":2,\"color_scheme_id\":1,\"projects_limit\":100000,\"current_sign_in_at\":\"2016-03-30T13:19:50.252Z\",\"identities\":[],\"can_create_group\":true,\"can_create_project\":true,\"two_factor_enabled\":false,\"external\":false,\"private_token\":\"<PRIVATE_KEY_GITLAB>\"}"
+          "string": "{\"name\":\"Guyzmo\",\"username\":\"<GITLAB_NAMESPACE>\",\"id\":459552,\"state\":\"active\",\"avatar_url\":\"https://secure.gravatar.com/avatar/917dc55c63895af9953df7d798cdd5f8?s=80&d=identicon\",\"web_url\":\"https://gitlab.com/<GITLAB_NAMESPACE>\",\"created_at\":\"2016-03-21T12:52:59.859Z\",\"is_admin\":false,\"bio\":\": :(){ :|:& };:\",\"location\":\"Earth, Solar system, Milkyway, Universe\",\"skype\":\"\",\"linkedin\":\"\",\"twitter\":\"\",\"website_url\":\"http://i.got.nothing.to/blog\",\"organization\":null,\"last_sign_in_at\":\"2016-10-13T18:28:52.737Z\",\"confirmed_at\":\"2016-03-21T13:48:05.234Z\",\"email\":\"[email protected]\",\"theme_id\":4,\"color_scheme_id\":4,\"projects_limit\":100000,\"current_sign_in_at\":\"2016-10-13T18:28:55.087Z\",\"identities\":[],\"can_create_group\":true,\"can_create_project\":true,\"two_factor_enabled\":false,\"external\":false}"
         },
         "headers": {
           "Cache-Control": "max-age=0, private, must-revalidate",
-          "Content-Length": "744",
+          "Content-Length": "775",
           "Content-Type": "application/json",
-          "Date": "Wed, 30 Mar 2016 14:13:35 GMT",
-          "Etag": "W/\"76175f0e11cbbd54fc8475d86a9ab425\"",
+          "Date": "Sat, 15 Oct 2016 20:46:51 GMT",
+          "Etag": "W/\"677a046b34e34176cde8e128968cb26c\"",
           "Server": "nginx",
-          "Status": "200 OK",
           "Vary": "Origin",
-          "X-Request-Id": "6d716239-2eee-4ce5-8bed-a5e7281bb394",
-          "X-Runtime": "2.404647"
+          "X-Request-Id": "0d16804f-e0d9-4841-9beb-285fd7c9817a",
+          "X-Runtime": "0.038217"
         },
         "status": {
           "code": 200,
@@ -42,20 +41,67 @@
       }
     },
     {
-      "recorded_at": "2016-03-30T14:13:24",
+      "recorded_at": "2016-10-15T20:46:52",
+      "request": {
+        "body": {
+          "encoding": "utf-8",
+          "string": ""
+        },
+        "headers": {
+          "Accept": "*/*",
+          "Accept-Encoding": "identity",
+          "Connection": "keep-alive",
+          "PRIVATE-TOKEN": "<PRIVATE_KEY_GITLAB>",
+          "User-Agent": "python-requests/2.10.0"
+        },
+        "method": "GET",
+        "uri": "https://gitlab.com/api/v3/groups?search=<GITLAB_NAMESPACE>"
+      },
+      "response": {
+        "body": {
+          "encoding": null,
+          "string": "[]"
+        },
+        "headers": {
+          "Cache-Control": "max-age=0, private, must-revalidate",
+          "Content-Length": "2",
+          "Content-Type": "application/json",
+          "Date": "Sat, 15 Oct 2016 20:46:52 GMT",
+          "Etag": "W/\"d751713988987e9331980363e24189ce\"",
+          "Link": "<https://gitlab.com/api/v3/groups?page=1&per_page=20&search=<GITLAB_NAMESPACE>>; rel=\"first\", <https://gitlab.com/api/v3/groups?page=0&per_page=20&search=<GITLAB_NAMESPACE>>; rel=\"last\"",
+          "Server": "nginx",
+          "Vary": "Origin",
+          "X-Next-Page": "",
+          "X-Page": "1",
+          "X-Per-Page": "20",
+          "X-Prev-Page": "",
+          "X-Request-Id": "b03eada5-dde3-47d7-973a-880905f9965b",
+          "X-Runtime": "0.024603",
+          "X-Total": "0",
+          "X-Total-Pages": "0"
+        },
+        "status": {
+          "code": 200,
+          "message": "OK"
+        },
+        "url": "https://gitlab.com/api/v3/groups?search=<GITLAB_NAMESPACE>"
+      }
+    },
+    {
+      "recorded_at": "2016-10-15T20:46:52",
       "request": {
         "body": {
           "encoding": "utf-8",
           "string": "{\"name\": \"git-repo\"}"
         },
         "headers": {
           "Accept": "*/*",
-          "Accept-Encoding": "gzip, deflate",
+          "Accept-Encoding": "identity",
           "Connection": "keep-alive",
           "Content-Length": "20",
           "Content-type": "application/json",
           "PRIVATE-TOKEN": "<PRIVATE_KEY_GITLAB>",
-          "User-Agent": "python-requests/2.9.1"
+          "User-Agent": "python-requests/2.10.0"
         },
         "method": "POST",
         "uri": "https://gitlab.com/api/v3/projects"
@@ -69,12 +115,11 @@
           "Cache-Control": "no-cache",
           "Content-Length": "100",
           "Content-Type": "application/json",
-          "Date": "Wed, 30 Mar 2016 14:13:37 GMT",
+          "Date": "Sat, 15 Oct 2016 20:46:52 GMT",
           "Server": "nginx",
-          "Status": "400 Bad Request",
           "Vary": "Origin",
-          "X-Request-Id": "1c3fb159-c378-4d59-95bc-2ca245f8a0d8",
-          "X-Runtime": "2.272477"
+          "X-Request-Id": "30d60bc8-de0c-45fa-abc5-b8547bdbe283",
+          "X-Runtime": "0.069274"
         },
         "status": {
           "code": 400,
@@ -85,4 +130,4 @@
     }
   ],
   "recorded_with": "betamax/0.5.1"
-}
+}