gitlab 3.7.0 → 4.0.0

data/lib/gitlab/client/users.rb

@@ -1,7 +1,7 @@
 class Gitlab::Client
   # Defines methods related to users.
-  # @see https://github.com/gitlabhq/gitlabhq/blob/master/doc/api/users.md
-  # @see https://github.com/gitlabhq/gitlabhq/blob/master/doc/api/session.md
+  # @see https://docs.gitlab.com/ce/api/users.html
+  # @see https://docs.gitlab.com/ce/api/session.html
   module Users
     # Gets a list of users.
     #
@@ -96,7 +96,7 @@ class Gitlab::Client
     # @param [Integer] user_id The Id of user
     # @return [Boolean] success or not
     def block_user(user_id)
-      put("/users/#{user_id}/block")
+      post("/users/#{user_id}/block")
     end
 
     # Unblocks the specified user. Available only for admin.
@@ -107,7 +107,7 @@ class Gitlab::Client
     # @param [Integer] user_id The Id of user
     # @return [Boolean] success or not
     def unblock_user(user_id)
-      put("/users/#{user_id}/unblock")
+      post("/users/#{user_id}/unblock")
     end
 
     # Creates a new user session.
@@ -127,13 +127,20 @@ class Gitlab::Client
     #
     # @example
     #   Gitlab.ssh_keys
+    #   Gitlab.ssh_keys({ user_id: 2 })
     #
     # @param  [Hash] options A customizable set of options.
     # @option options [Integer] :page The page number.
     # @option options [Integer] :per_page The number of results per page.
+    # @option options [Integer] :user_id The ID of the user to retrieve the keys for.
     # @return [Array<Gitlab::ObjectifiedHash>]
     def ssh_keys(options={})
-      get("/user/keys", query: options)
+      user_id = options.delete :user_id
+      if user_id.to_i.zero?
+        get("/user/keys", query: options)
+      else
+        get("/users/#{user_id}/keys", query: options)
+      end
     end
 
     # Gets information about SSH key.

data/lib/gitlab/file_response.rb

@@ -40,6 +40,7 @@ module Gitlab
     # Parse filename from the 'Content Disposition' header.
     def parse_headers!(headers)
       @filename = headers[HEADER_CONTENT_DISPOSITION].split("filename=")[1]
+      @filename = @filename[1...-1] if @filename[0] == '"' # Unquote filenames
     end
   end
 end

data/lib/gitlab/version.rb

@@ -1,3 +1,3 @@
 module Gitlab
-  VERSION = "3.7.0"
+  VERSION = "4.0.0"
 end

data/spec/fixtures/merge_request_closes_issues.json

@@ -0,0 +1 @@
+[{"id":1,"iid":1,"project_id":5,"title":"Merge request 1 issue 1","description":"","state":"opened","created_at":"2017-04-06T08:03:36.163Z","updated_at":"2017-04-06T08:03:57.087Z","labels":[],"milestone":null,"assignee":null,"author":{"name":"John","username":"jdoe","id":1,"state":"active","avatar_url":"","web_url":"https://gitlab.com/jdoe"},"user_notes_count":0,"upvotes":0,"downvotes":0,"due_date":null,"confidential":false,"weight":null,"web_url":"https://gitlab.com/jdoe/milestone_merge_requests_test/issues/1"},{"id":2,"iid":2,"project_id":5,"title":"Merge request 1 issue 2","description":"","state":"opened","created_at":"2017-04-06T08:03:44.023Z","updated_at":"2017-04-06T08:03:44.023Z","labels":[],"milestone":null,"assignee":null,"author":{"name":"John","username":"jdoe","id":426047,"state":"active","avatar_url":"","web_url":"https://gitlab.com/jdoe"},"user_notes_count":0,"upvotes":0,"downvotes":0,"due_date":null,"confidential":false,"weight":null,"web_url":"https://gitlab.com/jdoe/milestone_merge_requests_test/issues/2"}]

data/spec/fixtures/milestone_merge_requests.json

@@ -0,0 +1 @@
+[{"id":1,"iid":1,"project_id":1,"title":"lorem ipsum","description":"","state":"opened","created_at":"2017-03-24T12:23:53.918Z","updated_at":"2017-03-24T12:23:53.918Z","target_branch":"master","source_branch":"def","upvotes":0,"downvotes":0,"author":{"name":"John Doe","username":"jdoe","id":1,"state":"active","avatar_url":"","web_url":"https://gitlab.com/jdoen"},"assignee":null,"source_project_id":1,"target_project_id":1,"labels":[],"work_in_progress":false,"milestone":{"id":1,"iid":1,"project_id":1,"title":"Test","description":"","state":"active","created_at":"2017-03-24T12:23:00.560Z","updated_at":"2017-03-24T12:23:00.560Z","due_date":null,"start_date":null},"merge_when_pipeline_succeeds":false,"merge_status":"can_be_merged","sha":"aec123d1775790b2347fdd684b5ba613fdeb994b","merge_commit_sha":null,"user_notes_count":0,"approvals_before_merge":null,"should_remove_source_branch":null,"force_remove_source_branch":false,"squash":false,"web_url":"https://gitlab.com/jdoe/milestone_merge_requests_test/merge_requests/2"},{"id":2,"iid":2,"project_id":1,"title":"ipsum lorem","description":"","state":"opened","created_at":"2017-03-24T12:23:24.662Z","updated_at":"2017-03-24T12:23:33.522Z","target_branch":"master","source_branch":"test1","upvotes":0,"downvotes":0,"author":{"name":"Joren","username":"jdoe","id":1,"state":"active","":"","web_url":"https://gitlab.com/jdoe"},"assignee":null,"source_project_id":1,"target_project_id":1,"labels":[],"work_in_progress":false,"milestone":{"id":1,"iid":1,"project_id":1,"title":"Test","description":"","state":"active","created_at":"2017-03-24T12:23:00.560Z","updated_at":"2017-03-24T12:23:00.560Z","due_date":null,"start_date":null},"merge_when_pipeline_succeeds":false,"merge_status":"can_be_merged","sha":"3ee44c9b40deddae596f838b97523c6f010fd80d","merge_commit_sha":null,"user_notes_count":0,"approvals_before_merge":null,"should_remove_source_branch":null,"force_remove_source_branch":true,"squash":false,"web_url":"https://gitlab.com/jdoe/milestone_merge_requests_test/merge_requests/1"}]

data/spec/fixtures/pipeline.json

@@ -0,0 +1,23 @@
+{
+  "id": 46,
+  "status": "success",
+  "ref": "master",
+  "sha": "a91957a858320c0e17f3a0eca7cfacbff50ea29a",
+  "before_sha": "a91957a858320c0e17f3a0eca7cfacbff50ea29a",
+  "tag": false,
+  "yaml_errors": null,
+  "user": {
+    "name": "Administrator",
+    "username": "root",
+    "id": 1,
+    "state": "active",
+    "avatar_url": "http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=80&d=identicon",
+    "web_url": "http://localhost:3000/root"
+  },
+  "created_at": "2016-08-11T11:28:34.085Z",
+  "updated_at": "2016-08-11T11:32:35.169Z",
+  "started_at": null,
+  "finished_at": "2016-08-11T11:32:35.145Z",
+  "committed_at": null,
+  "duration": null
+}

data/spec/fixtures/pipeline_cancel.json

@@ -0,0 +1,23 @@
+{
+  "id": 46,
+  "status": "canceled",
+  "ref": "master",
+  "sha": "a91957a858320c0e17f3a0eca7cfacbff50ea29a",
+  "before_sha": "a91957a858320c0e17f3a0eca7cfacbff50ea29a",
+  "tag": false,
+  "yaml_errors": null,
+  "user": {
+    "name": "Administrator",
+    "username": "root",
+    "id": 1,
+    "state": "active",
+    "avatar_url": "http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=80&d=identicon",
+    "web_url": "http://localhost:3000/root"
+  },
+  "created_at": "2016-08-11T11:28:34.085Z",
+  "updated_at": "2016-08-11T11:32:35.169Z",
+  "started_at": null,
+  "finished_at": "2016-08-11T11:32:35.145Z",
+  "committed_at": null,
+  "duration": null
+}

data/spec/fixtures/pipeline_create.json

@@ -0,0 +1,23 @@
+{
+  "id": 61,
+  "sha": "384c444e840a515b23f21915ee5766b87068a70d",
+  "ref": "master",
+  "status": "pending",
+  "before_sha": "0000000000000000000000000000000000000000",
+  "tag": false,
+  "yaml_errors": null,
+  "user": {
+    "name": "Administrator",
+    "username": "root",
+    "id": 1,
+    "state": "active",
+    "avatar_url": "http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=80&d=identicon",
+    "web_url": "http://localhost:3000/root"
+  },
+  "created_at": "2016-11-04T09:36:13.747Z",
+  "updated_at": "2016-11-04T09:36:13.977Z",
+  "started_at": null,
+  "finished_at": null,
+  "committed_at": null,
+  "duration": null
+}

data/spec/fixtures/pipeline_retry.json

@@ -0,0 +1,23 @@
+{
+  "id": 46,
+  "status": "pending",
+  "ref": "master",
+  "sha": "a91957a858320c0e17f3a0eca7cfacbff50ea29a",
+  "before_sha": "a91957a858320c0e17f3a0eca7cfacbff50ea29a",
+  "tag": false,
+  "yaml_errors": null,
+  "user": {
+    "name": "Administrator",
+    "username": "root",
+    "id": 1,
+    "state": "active",
+    "avatar_url": "http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=80&d=identicon",
+    "web_url": "http://localhost:3000/root"
+  },
+  "created_at": "2016-08-11T11:28:34.085Z",
+  "updated_at": "2016-08-11T11:32:35.169Z",
+  "started_at": null,
+  "finished_at": "2016-08-11T11:32:35.145Z",
+  "committed_at": null,
+  "duration": null
+}

data/spec/fixtures/pipelines.json

@@ -0,0 +1,48 @@
+[
+  {
+    "id": 47,
+    "status": "pending",
+    "ref": "new-pipeline",
+    "sha": "a91957a858320c0e17f3a0eca7cfacbff50ea29a",
+    "before_sha": "a91957a858320c0e17f3a0eca7cfacbff50ea29a",
+    "tag": false,
+    "yaml_errors": null,
+    "user": {
+      "name": "Administrator",
+      "username": "root",
+      "id": 1,
+      "state": "active",
+      "avatar_url": "http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=80&d=identicon",
+      "web_url": "http://localhost:3000/root"
+    },
+    "created_at": "2016-08-16T10:23:19.007Z",
+    "updated_at": "2016-08-16T10:23:19.216Z",
+    "started_at": null,
+    "finished_at": null,
+    "committed_at": null,
+    "duration": null
+  },
+  {
+    "id": 48,
+    "status": "pending",
+    "ref": "new-pipeline",
+    "sha": "eb94b618fb5865b26e80fdd8ae531b7a63ad851a",
+    "before_sha": "eb94b618fb5865b26e80fdd8ae531b7a63ad851a",
+    "tag": false,
+    "yaml_errors": null,
+    "user": {
+      "name": "Administrator",
+      "username": "root",
+      "id": 1,
+      "state": "active",
+      "avatar_url": "http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=80&d=identicon",
+      "web_url": "http://localhost:3000/root"
+    },
+    "created_at": "2016-08-16T10:23:21.184Z",
+    "updated_at": "2016-08-16T10:23:21.314Z",
+    "started_at": null,
+    "finished_at": null,
+    "committed_at": null,
+    "duration": null
+  }
+]

data/spec/fixtures/project_commit_create.json

@@ -0,0 +1,22 @@
+{
+  "id": "ed899a2f4b50b4370feeea94676502b42383c746",
+  "short_id": "ed899a2f4b5",
+  "title": "some commit message",
+  "author_name": "Dmitriy Zaporozhets",
+  "author_email": "dzaporozhets@sphereconsultinginc.com",
+  "committer_name": "Dmitriy Zaporozhets",
+  "committer_email": "dzaporozhets@sphereconsultinginc.com",
+  "created_at": "2016-09-20T09:26:24.000-07:00",
+  "message": "some commit message",
+  "parent_ids": [
+    "ae1d9fb46aa2b07ee9836d49862ec4e2c46fbbba"
+  ],
+  "committed_date": "2016-09-20T09:26:24.000-07:00",
+  "authored_date": "2016-09-20T09:26:24.000-07:00",
+  "stats": {
+    "additions": 2,
+    "deletions": 2,
+    "total": 4
+  },
+  "status": null
+}

data/spec/fixtures/project_star.json

@@ -0,0 +1,44 @@
+{
+  "id": 3,
+  "description": null,
+  "default_branch": "master",
+  "public": false,
+  "visibility_level": 10,
+  "ssh_url_to_repo":"git@git.gitlab.com:root/gitlab.git",
+  "http_url_to_repo":"http://git.gitlab.com/root/gitlab.git",
+  "web_url":"http://git.gitlab.com/root/gitlab",
+  "tag_list": [
+    
+  ],
+  "name": "GitLab Community Edition",
+  "name_with_namespace": "GitLab / GitLab Community Edition",
+  "path": "gitlab-ce",
+  "path_with_namespace": "gitlab/gitlab-ce",
+  "issues_enabled": true,
+  "open_issues_count": 1,
+  "merge_requests_enabled": true,
+  "builds_enabled": true,
+  "wiki_enabled": true,
+  "snippets_enabled": false,
+  "container_registry_enabled": false,
+  "created_at": "2013-09-30T13:46:02Z",
+  "last_activity_at": "2013-09-30T13:46:02Z",
+  "creator_id": 3,
+  "namespace": {
+    "created_at": "2013-09-30T13:46:02Z",
+    "description": "",
+    "id": 3,
+    "name": "GitLab",
+    "owner_id": 1,
+    "path": "gitlab",
+    "updated_at": "2013-09-30T13:46:02Z"
+  },
+  "archived": true,
+  "avatar_url": "http://example.com/uploads/project/avatar/3/uploads/avatar.png",
+  "shared_runners_enabled": true,
+  "forks_count": 0,
+  "star_count": 1,
+  "public_builds": true,
+  "shared_with_groups": [],
+  "only_allow_merge_if_build_succeeds": false
+}

data/spec/fixtures/project_unstar.json

@@ -0,0 +1,44 @@
+{
+  "id": 3,
+  "description": null,
+  "default_branch": "master",
+  "public": false,
+  "visibility_level": 10,
+  "ssh_url_to_repo":"git@git.gitlab.com:root/gitlab.git",
+  "http_url_to_repo":"http://git.gitlab.com/root/gitlab.git",
+  "web_url":"http://git.gitlab.com/root/gitlab",
+  "tag_list": [
+
+  ],
+  "name": "GitLab Community Edition",
+  "name_with_namespace": "GitLab / GitLab Community Edition",
+  "path": "gitlab-ce",
+  "path_with_namespace": "gitlab/gitlab-ce",
+  "issues_enabled": true,
+  "open_issues_count": 1,
+  "merge_requests_enabled": true,
+  "builds_enabled": true,
+  "wiki_enabled": true,
+  "snippets_enabled": false,
+  "container_registry_enabled": false,
+  "created_at": "2013-09-30T13:46:02Z",
+  "last_activity_at": "2013-09-30T13:46:02Z",
+  "creator_id": 3,
+  "namespace": {
+    "created_at": "2013-09-30T13:46:02Z",
+    "description": "",
+    "id": 3,
+    "name": "GitLab",
+    "owner_id": 1,
+    "path": "gitlab",
+    "updated_at": "2013-09-30T13:46:02Z"
+  },
+  "archived": true,
+  "avatar_url": "http://example.com/uploads/project/avatar/3/uploads/avatar.png",
+  "shared_runners_enabled": true,
+  "forks_count": 0,
+  "star_count": 0,
+  "public_builds": true,
+  "shared_with_groups": [],
+  "only_allow_merge_if_build_succeeds": false
+}

data/spec/gitlab/cli_spec.rb

@@ -106,5 +106,14 @@ describe Gitlab::CLI do
         expect(@output).to_not include('created_at')
       end
     end
+
+    context "fetch project with namespace/repo" do
+      it "should encode delimiter" do
+        stub_get("/projects/gitlab-org%2Fgitlab-ce", "project")
+        args = ['project', 'gitlab-org/gitlab-ce']
+        @output = capture_output { Gitlab::CLI.start(args) }
+        expect(@output).to include('id')
+      end
+    end
   end
 end

data/spec/gitlab/client/client_spec.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe Gitlab::Client do
+  describe '#inspect' do
+    it 'masks tokens on inspect' do
+      client = described_class.new(private_token: 'ui3gIYf4MMzTx-Oh5cEBx')
+      inspected = client.inspect
+      expect(inspected).to include('****************cEBx')
+    end
+  end
+end

data/spec/gitlab/client/commits_spec.rb

@@ -134,4 +134,35 @@ describe Gitlab::Client do
       expect(@status.ref).to eq('decreased-spec')
     end
   end
+
+  describe ".create_commit" do
+    let(:actions) do
+      [
+        {
+          action: "create",
+          file_path: "foo/bar",
+          content: "some content"
+        }
+      ]
+    end
+
+    let(:query) do
+      {
+        branch_name: 'dev',
+        commit_message: 'refactors everything',
+        actions: actions,
+        author_email: 'joe@sample.org',
+        author_name: 'Joe Sample'
+      }
+    end
+
+    before do
+      stub_post("/projects/6/repository/commits", 'project_commit_create').with(query: query)
+      @commit = Gitlab.create_commit(6, 'dev', 'refactors everything', actions, {author_email: 'joe@sample.org', author_name: 'Joe Sample'})
+    end
+
+    it "should return id of a created commit" do
+      expect(@commit.id).to eq('ed899a2f4b50b4370feeea94676502b42383c746')
+    end
+  end
 end

data/spec/gitlab/client/issues_spec.rb

@@ -18,6 +18,22 @@ describe Gitlab::Client do
       end
     end
 
+    context 'with literal project ID passed' do
+      before do
+        stub_get("/projects/gitlab-org%2Fgitlab-ce/issues", "project_issues")
+        @issues = Gitlab.issues('gitlab-org/gitlab-ce')
+      end
+
+      it "should get the correct resource" do
+        expect(a_get("/projects/gitlab-org%2Fgitlab-ce/issues")).to have_been_made
+      end
+
+      it "should return a paginated response of project's issues" do
+        expect(@issues).to be_a Gitlab::PaginatedResponse
+        expect(@issues.first.project_id).to eq(3)
+      end
+    end
+
     context "without project ID passed" do
       before do
         stub_get("/issues", "issues")
@@ -120,6 +136,38 @@ describe Gitlab::Client do
     end
   end
 
+  describe ".subscribe_to_issue" do
+    before do
+      stub_post("/projects/3/issues/33/subscribe", "issue")
+      @issue = Gitlab.subscribe_to_issue(3, 33)
+    end
+
+    it "should get the correct resource" do
+      expect(a_post("/projects/3/issues/33/subscribe")).to have_been_made
+    end
+
+    it "should return information about the subscribed issue" do
+      expect(@issue.project_id).to eq(3)
+      expect(@issue.assignee.name).to eq("Jack Smith")
+    end
+  end
+
+  describe ".unsubscribe_from_issue" do
+    before do
+      stub_post("/projects/3/issues/33/unsubscribe", "issue")
+      @issue = Gitlab.unsubscribe_from_issue(3, 33)
+    end
+
+    it "should get the correct resource" do
+      expect(a_post("/projects/3/issues/33/unsubscribe")).to have_been_made
+    end
+
+    it "should return information about the unsubscribed issue" do
+      expect(@issue.project_id).to eq(3)
+      expect(@issue.assignee.name).to eq("Jack Smith")
+    end
+  end
+
   describe ".delete_issue" do
     before do
       stub_delete("/projects/3/issues/33", "issue")