gitlab 2.2.0 → 3.0.0

data/lib/gitlab/version.rb

@@ -1,3 +1,3 @@
 module Gitlab
-  VERSION = "2.2.0"
+  VERSION = "3.0.0"
 end

data/spec/fixtures/comment_merge_request.json

@@ -0,0 +1 @@
+{"note":"Cool Merge Request!","author":{"id":1,"username":"jsmith","email":"john@example.com","name":"John Smith","blocked":false,"created_at":"2012-07-11T01:32:18Z"}}

data/spec/fixtures/create_merge_request.json

@@ -0,0 +1 @@
+{"id":2,"target_branch":"master","source_branch":"api","project_id":3,"title":"New feature","closed":false,"merged":false,"author":{"id":1,"email":"john@example.com","name":"John Smith","blocked":false,"created_at":"2012-10-19T05:56:05Z"},"assignee":{"id":2,"email":"jack@example.com","name":"Jack Smith","blocked":false,"created_at":"2012-10-19T05:56:14Z"}}

data/spec/fixtures/error_already_exists.json

@@ -0,0 +1 @@
+{"message": "409 Already exists"}

data/spec/fixtures/group.json

@@ -0,0 +1,60 @@
+{"id": 10, "name": "GitLab-Group", "path": "gitlab-group", "owner_id": 6, "projects": [
+    {
+        "id": 9,
+        "name": "mojito",
+        "description": null,
+        "default_branch": "master",
+        "owner": {
+            "id": 6,
+            "username": "jose",
+            "email": "jose@abc.com",
+            "name": "Jose Jose",
+            "blocked": false,
+            "created_at": "2013-02-06T06:54:06Z"
+        },
+        "path": "mojito",
+        "path_with_namespace": "gitlab-group/mojito",
+        "issues_enabled": true,
+        "merge_requests_enabled": true,
+        "wall_enabled": true,
+        "wiki_enabled": true,
+        "created_at": "2013-02-06T16:59:15Z",
+        "namespace": {
+            "created_at": "2013-02-06T16:58:22Z",
+            "id": 10,
+            "name": "GitLab-Group",
+            "owner_id": 6,
+            "path": "gitlab-group",
+            "updated_at": "2013-02-06T16:58:22Z"
+        }
+    },
+    {
+        "id": 10,
+        "name": "gitlabhq",
+        "description": null,
+        "default_branch": null,
+        "owner": {
+            "id": 6,
+            "username": "randx",
+            "email": "randx@github.com",
+            "name": "Dmitry Z",
+            "blocked": false,
+            "created_at": "2013-02-06T06:54:06Z"
+        },
+        "path": "gitlabhq",
+        "path_with_namespace": "gitlab-group/gitlabhq",
+        "issues_enabled": true,
+        "merge_requests_enabled": true,
+        "wall_enabled": true,
+        "wiki_enabled": true,
+        "created_at": "2013-02-06T17:02:31Z",
+        "namespace": {
+            "created_at": "2013-02-06T16:58:22Z",
+            "id": 10,
+            "name": "GitLab-Group",
+            "owner_id": 6,
+            "path": "gitlab-group",
+            "updated_at": "2013-02-06T16:58:22Z"
+        }
+    }
+]}

data/spec/fixtures/group_create.json

@@ -0,0 +1 @@
+{"id":3,"name":"Gitlab-Group","path":"gitlab-group","owner_id":1}

data/spec/fixtures/group_member.json

@@ -0,0 +1 @@
+{"id":2,"username":"jsmith","email":"jsmith@local.host","name":"John Smith","state":"active","created_at":"2013-09-04T18:15:30Z","access_level":10}

data/spec/fixtures/group_member_delete.json

@@ -0,0 +1 @@
+{"created_at":"2013-09-04T18:18:15Z","group_access":10,"group_id":3,"id":2,"notification_level":3,"updated_at":"2013-09-04T18:18:15Z","user_id":2}

data/spec/fixtures/group_members.json

@@ -0,0 +1 @@
+[{"id":1,"username":"eraymond","email":"eraymond@local.host","name":"Edward Raymond","state":"active","created_at":"2013-08-30T16:16:22Z","access_level":50},{"id":1,"username":"jsmith","email":"jsmith@local.host","name":"John Smith","state":"active","created_at":"2013-08-30T16:16:22Z","access_level":50}]

data/spec/fixtures/groups.json

@@ -0,0 +1,2 @@
+[{"id": 3,"name": "ThreeGroup","path": "threegroup","owner_id": 1},{"id": 5,"name": "Five-Group","path": "five-group","owner_id": 2},{"id": 8,"name": "Eight Group","path": "eight-group","owner_id": 6}
+]

data/spec/fixtures/note.json

@@ -0,0 +1 @@
+{"id":1201,"body":"The solution is rather tricky","author":{"id":1,"email":"john@example.com","name":"John Smith","blocked":false,"created_at":"2012-09-17T09:41:56Z"},"created_at":"2012-11-27T19:16:44Z"}

data/spec/fixtures/notes.json

@@ -0,0 +1 @@
+[{"id":1201,"body":"The solution is rather tricky","author":{"id":1,"email":"john@example.com","name":"John Smith","blocked":false,"created_at":"2012-09-17T09:41:56Z"},"created_at":"2012-11-27T19:16:44Z"},{"id":1207,"body":"I know, right?","author":{"id":1,"email":"jack@example.com","name":"Jack Smith","blocked":false,"created_at":"2012-09-17T09:42:03Z"},"created_at":"2012-11-27T19:58:21Z"}]

data/spec/fixtures/project.json

@@ -1 +1 @@
-{"id":3,"code":"gitlab","name":"Gitlab","description":null,"path":"gitlab","default_branch":null,"owner":{"id":1,"email":"john@example.com","name":"John Smith","blocked":false,"created_at":"2012-09-17T09:41:56Z"},"private":true,"issues_enabled":true,"merge_requests_enabled":true,"wall_enabled":true,"wiki_enabled":true,"created_at":"2012-09-17T09:41:58Z"}
+{"id":3,"code":"gitlab","name":"Gitlab","description":null,"path":"gitlab","default_branch":null,"owner":{"id":1,"email":"john@example.com","name":"John Smith","blocked":false,"created_at":"2012-09-17T09:41:56Z"},"public":false,"issues_enabled":true,"merge_requests_enabled":true,"wall_enabled":true,"wiki_enabled":true,"created_at":"2012-09-17T09:41:58Z"}

data/spec/fixtures/project_delete_key.json

@@ -0,0 +1,8 @@
+{
+  "created_at": "2013-10-05T15:05:26Z",
+  "fingerprint": "5c:b5:e6:b0:f5:31:65:3f:a6:b5:59:86:32:cc:15:e1",
+  "id": 2,
+  "key": "ssh-rsa ...",
+  "updated_at": "2013-10-05T15:05:26Z",
+  "user_id": null
+}

data/spec/fixtures/project_for_user.json

@@ -0,0 +1 @@
+{"id":1,"code":"brute","name":"Brute","description":null,"path":"brute","default_branch":null,"owner":{"id":1,"email":"john@example.com","name":"John Owner","blocked":false,"created_at":"2012-09-17T09:41:56Z"},"private":true,"issues_enabled":true,"merge_requests_enabled":true,"wall_enabled":true,"wiki_enabled":true,"created_at":"2012-09-17T09:41:56Z"}

data/spec/fixtures/project_fork_link.json

@@ -0,0 +1 @@
+{"created_at":"2013-07-03T13:51:48Z","forked_from_project_id":24,"forked_to_project_id":42,"id":1,"updated_at":"2013-07-03T13:51:48Z"}

data/spec/fixtures/project_key.json

@@ -0,0 +1,6 @@
+{
+  "id": 2,
+  "title": "Key Title",
+  "key": "ssh-rsa ...",
+  "created_at": "2013-09-22T18:34:32Z"
+}

data/spec/fixtures/project_keys.json

@@ -0,0 +1,6 @@
+[{
+  "id": 2,
+  "title": "Key Title",
+  "key": "ssh-rsa ...",
+  "created_at": "2013-09-22T18:34:32Z"
+}]

data/spec/fixtures/update_merge_request.json

@@ -0,0 +1 @@
+{"id":1,"target_branch":"master","source_branch":"api","project_id":3,"title":"A different new feature","closed":false,"merged":false,"author":{"id":1,"email":"john@example.com","name":"John Smith","blocked":false,"created_at":"2012-10-19T05:56:05Z"},"assignee":{"id":2,"email":"jack@example.com","name":"Jack Smith","blocked":false,"created_at":"2012-10-19T05:56:14Z"}}

data/spec/gitlab/client/groups_spec.rb

@@ -0,0 +1,111 @@
+require 'spec_helper'
+
+describe Gitlab::Client do
+  describe ".groups" do
+    before do
+      stub_get("/groups", "groups")
+      stub_get("/groups/3", "group")
+      @group = Gitlab.group(3)
+      @groups = Gitlab.groups
+    end
+
+    it "should get the correct resource" do
+      a_get("/groups").should have_been_made
+      a_get("/groups/3").should have_been_made
+    end
+
+    it "should return an array of Groups" do
+      @groups.should be_an Array
+      @groups.first.path.should == "threegroup"
+    end
+  end
+
+  describe ".create_group" do
+    before do
+      stub_post("/groups", "group_create")
+      @group = Gitlab.create_group('GitLab-Group', 'gitlab-path')
+    end
+
+    it "should get the correct resource" do
+      a_post("/groups").
+          with(:body => {:path => 'gitlab-path', :name => 'GitLab-Group'}).should have_been_made
+    end
+
+    it "should return information about a created group" do
+      @group.name.should == "Gitlab-Group"
+      @group.path.should == "gitlab-group"
+    end
+  end
+
+  describe ".transfer_project_to_group" do
+    before do
+      stub_post("/projects", "project")
+      @project = Gitlab.create_project('Gitlab')
+      stub_post("/groups", "group_create")
+      @group = Gitlab.create_group('GitLab-Group', 'gitlab-path')
+
+      stub_post("/groups/#{@group.id}/projects/#{@project.id}", "group_create")
+      @group_transfer = Gitlab.transfer_project_to_group(@group.id,@project.id)
+    end
+
+    it "should post to the correct resource" do
+      a_post("/groups/#{@group.id}/projects/#{@project.id}").with(:body => {:id => @group.id.to_s, :project_id => @project.id.to_s}).should have_been_made
+    end
+
+    it "should return information about the group" do
+      @group_transfer.name.should == @group.name
+      @group_transfer.path.should == @group.path
+      @group_transfer.id.should == @group.id
+    end
+  end
+
+  describe ".group_members" do
+    before do
+      stub_get("/groups/3/members", "group_members")
+      @members = Gitlab.group_members(3)
+    end
+
+    it "should get the correct resource" do
+      a_get("/groups/3/members").should have_been_made
+    end
+
+    it "should return information about a group members" do
+      @members.should be_an Array
+      @members.size.should == 2
+      @members[1].name.should == "John Smith"
+    end
+  end
+
+  describe ".add_group_member" do
+    before do
+      stub_post("/groups/3/members", "group_member")
+      @member = Gitlab.add_group_member(3, 1, 40)
+    end
+
+    it "should get the correct resource" do
+      a_post("/groups/3/members").
+        with(:body => {:user_id => '1', :access_level => '40'}).should have_been_made
+    end
+
+    it "should return information about an added member" do
+      @member.name.should == "John Smith"
+    end
+  end
+
+  describe ".remove_group_member" do
+    before do
+      stub_delete("/groups/3/members/1", "group_member_delete")
+      @group = Gitlab.remove_group_member(3, 1)
+    end
+
+    it "should get the correct resource" do
+      a_delete("/groups/3/members/1").should have_been_made
+    end
+
+    it "should return information about the group the member was removed from" do
+      @group.group_id.should == 3
+    end
+  end
+
+
+end

data/spec/gitlab/client/issues_spec.rb

@@ -94,7 +94,7 @@ describe Gitlab::Client do
 
     it "should get the correct resource" do
       a_put("/projects/3/issues/33").
-        with(:body => {:closed => '1'}).should have_been_made
+        with(:body => {:state_event => 'close'}).should have_been_made
     end
 
     it "should return information about an closed issue" do
@@ -111,7 +111,7 @@ describe Gitlab::Client do
 
     it "should get the correct resource" do
       a_put("/projects/3/issues/33").
-        with(:body => {:closed => '0'}).should have_been_made
+        with(:body => {:state_event => 'reopen'}).should have_been_made
     end
 
     it "should return information about an reopened issue" do

data/spec/gitlab/client/merge_requests_spec.rb

@@ -32,4 +32,61 @@ describe Gitlab::Client do
       @merge_request.assignee.name.should == "Jack Smith"
     end
   end
+
+  describe ".create_merge_request" do
+    before do
+      stub_post("/projects/3/merge_requests", "create_merge_request")
+    end
+
+    it "should fail if it doesn't have a source_branch" do
+      expect {
+        Gitlab.create_merge_request(3, 'New merge request', :target_branch => 'master')
+      }.to raise_error Gitlab::Error::MissingAttributes
+    end
+
+    it "should fail if it doesn't have a target_branch" do
+      expect {
+        Gitlab.create_merge_request(3, 'New merge request', :source_branch => 'dev')
+      }.to raise_error Gitlab::Error::MissingAttributes
+    end
+
+    it "should return information about a merge request" do
+      @merge_request = Gitlab.create_merge_request(3, 'New feature',
+        :source_branch => 'api',
+        :target_branch => 'master'
+      )
+      @merge_request.project_id.should == 3
+      @merge_request.assignee.name.should == "Jack Smith"
+      @merge_request.title.should == 'New feature'
+    end
+  end
+
+  describe ".update_merge_request" do
+    before do
+      stub_put("/projects/3/merge_request/2", "update_merge_request")
+      @merge_request = Gitlab.update_merge_request(3, 2,
+        :assignee_id   => '1',
+        :target_branch => 'master',
+        :title         => 'A different new feature'
+      )
+    end
+
+    it "should return information about a merge request" do
+      @merge_request.project_id.should == 3
+      @merge_request.assignee.name.should == "Jack Smith"
+      @merge_request.title.should == 'A different new feature'
+    end
+  end
+
+  describe ".create_merge_request_comment" do
+    before do
+      stub_post("/projects/3/merge_request/2/comments", "comment_merge_request")
+    end
+
+    it "should return information about a merge request" do
+      @merge_request = Gitlab.create_merge_request_comment(3, 2, 'Cool Merge Request!')
+      @merge_request.note.should == 'Cool Merge Request!'
+      @merge_request.author.id == 1
+    end
+  end
 end

data/spec/gitlab/client/notes_spec.rb

@@ -0,0 +1,156 @@
+require 'spec_helper'
+
+describe Gitlab::Client do
+  describe "notes" do
+    context "when wall notes" do
+      before do
+        stub_get("/projects/3/notes", "notes")
+        @notes = Gitlab.notes(3)
+      end
+
+      it "should get the correct resource" do
+        a_get("/projects/3/notes").should have_been_made
+      end
+
+      it "should return an array of notes" do
+        @notes.should be_an Array
+        @notes.first.author.name.should == "John Smith"
+      end
+    end
+
+    context "when issue notes" do
+      before do
+        stub_get("/projects/3/issues/7/notes", "notes")
+        @notes = Gitlab.issue_notes(3, 7)
+      end
+
+      it "should get the correct resource" do
+        a_get("/projects/3/issues/7/notes").should have_been_made
+      end
+
+      it "should return an array of notes" do
+        @notes.should be_an Array
+        @notes.first.author.name.should == "John Smith"
+      end
+    end
+
+    context "when snippet notes" do
+      before do
+        stub_get("/projects/3/snippets/7/notes", "notes")
+        @notes = Gitlab.snippet_notes(3, 7)
+      end
+
+      it "should get the correct resource" do
+        a_get("/projects/3/snippets/7/notes").should have_been_made
+      end
+
+      it "should return an array of notes" do
+        @notes.should be_an Array
+        @notes.first.author.name.should == "John Smith"
+      end
+    end
+  end
+
+  describe "note" do
+    context "when wall note" do
+      before do
+        stub_get("/projects/3/notes/1201", "note")
+        @note = Gitlab.note(3, 1201)
+      end
+
+      it "should get the correct resource" do
+        a_get("/projects/3/notes/1201").should have_been_made
+      end
+
+      it "should return information about a note" do
+        @note.body.should == "The solution is rather tricky"
+        @note.author.name.should == "John Smith"
+      end
+    end
+
+    context "when issue note" do
+      before do
+        stub_get("/projects/3/issues/7/notes/1201", "note")
+        @note = Gitlab.issue_note(3, 7, 1201)
+      end
+
+      it "should get the correct resource" do
+        a_get("/projects/3/issues/7/notes/1201").should have_been_made
+      end
+
+      it "should return information about a note" do
+        @note.body.should == "The solution is rather tricky"
+        @note.author.name.should == "John Smith"
+      end
+    end
+
+    context "when snippet note" do
+      before do
+        stub_get("/projects/3/snippets/7/notes/1201", "note")
+        @note = Gitlab.snippet_note(3, 7, 1201)
+      end
+
+      it "should get the correct resource" do
+        a_get("/projects/3/snippets/7/notes/1201").should have_been_made
+      end
+
+      it "should return information about a note" do
+        @note.body.should == "The solution is rather tricky"
+        @note.author.name.should == "John Smith"
+      end
+    end
+  end
+
+  describe "create note" do
+    context "when wall note" do
+      before do
+        stub_post("/projects/3/notes", "note")
+        @note = Gitlab.create_note(3, "The solution is rather tricky")
+      end
+
+      it "should get the correct resource" do
+        a_post("/projects/3/notes").
+          with(:body => {:body => 'The solution is rather tricky'}).should have_been_made
+      end
+
+      it "should return information about a created note" do
+        @note.body.should == "The solution is rather tricky"
+        @note.author.name.should == "John Smith"
+      end
+    end
+
+    context "when issue note" do
+      before do
+        stub_post("/projects/3/issues/7/notes", "note")
+        @note = Gitlab.create_issue_note(3, 7, "The solution is rather tricky")
+      end
+
+      it "should get the correct resource" do
+        a_post("/projects/3/issues/7/notes").
+          with(:body => {:body => 'The solution is rather tricky'}).should have_been_made
+      end
+
+      it "should return information about a created note" do
+        @note.body.should == "The solution is rather tricky"
+        @note.author.name.should == "John Smith"
+      end
+    end
+
+    context "when snippet note" do
+      before do
+        stub_post("/projects/3/snippets/7/notes", "note")
+        @note = Gitlab.create_snippet_note(3, 7, "The solution is rather tricky")
+      end
+
+      it "should get the correct resource" do
+        a_post("/projects/3/snippets/7/notes").
+          with(:body => {:body => 'The solution is rather tricky'}).should have_been_made
+      end
+
+      it "should return information about a created note" do
+        @note.body.should == "The solution is rather tricky"
+        @note.author.name.should == "John Smith"
+      end
+    end
+  end
+end