gitlab 3.4.0 → 3.5.0

data/lib/gitlab/request.rb

@@ -19,6 +19,10 @@ module Gitlab
         ObjectifiedHash.new body
       elsif body.is_a? Array
         body.collect! { |e| ObjectifiedHash.new(e) }
+      elsif body
+        true
+      elsif !body
+        false
       elsif body.nil?
         false
       else
@@ -69,6 +73,7 @@ module Gitlab
         when 404; raise Error::NotFound.new error_message(response)
         when 405; raise Error::MethodNotAllowed.new error_message(response)
         when 409; raise Error::Conflict.new error_message(response)
+        when 422; raise Error::Unprocessable.new error_message(response)
         when 500; raise Error::InternalServerError.new error_message(response)
         when 502; raise Error::BadGateway.new error_message(response)
         when 503; raise Error::ServiceUnavailable.new error_message(response)
@@ -109,17 +114,23 @@ module Gitlab
     end
 
     def error_message(response)
+      parsed_response = response.parsed_response
+      message = parsed_response.message || parsed_response.error
+
       "Server responded with code #{response.code}, message: " \
-      "#{handle_error(response.parsed_response.message)}. " \
+      "#{handle_error(message)}. " \
       "Request URI: #{response.request.base_uri}#{response.request.path}"
     end
 
     # Handle error response message in case of nested hashes
     def handle_error(message)
-      if message.is_a? Gitlab::ObjectifiedHash
+      case message
+      when Gitlab::ObjectifiedHash
         message.to_h.sort.map do |key, val|
           "'#{key}' #{(val.is_a?(Hash) ? val.sort.map { |k,v| "(#{k}: #{v.join(' ')})"} : val).join(' ')}"
         end.join(', ')
+      when Array
+        message.join(' ')
       else
         message
       end

data/lib/gitlab/shell.rb

@@ -19,8 +19,7 @@ class Gitlab::Shell
         begin
           parse_input buffer
 
-          yaml_load_arguments! @arguments
-          @arguments.map! { |arg| symbolize_keys arg }
+          @arguments.map! { |arg| symbolize_keys(yaml_load(arg)) }
 
           case buffer
           when nil, ''

data/lib/gitlab/version.rb

@@ -1,3 +1,3 @@
 module Gitlab
-  VERSION = "3.4.0"
+  VERSION = "3.5.0"
 end

data/spec/fixtures/get_repository_file.json

@@ -0,0 +1 @@
+{"file_name":"README.md", "file_path":"README.md", "size":"19", "encoding":"base64", "content":"VGhpcyBpcyBhICpSRUFETUUqIQ==\n", "ref":"master", "blob_id":"0eba9dff767611060181e0423a1de2941d27efc8", "commit_id":"eb38397cb6ae669219e6bc18ad19981fff18ea29"}

data/spec/fixtures/group_create_with_description.json

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

data/spec/fixtures/group_search.json

@@ -0,0 +1,2 @@
+[{"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/namespaces.json

@@ -0,0 +1 @@
+[{"id": 1, "path": "john", "kind": "user"}]

data/spec/fixtures/project_commit_status.json

@@ -0,0 +1,42 @@
+[
+  {
+    "id": 496,
+    "sha": "7d938cb8ac15788d71f4b67c035515a160ea76d8",
+    "ref": "decreased-spec",
+    "status": "failed",
+    "name": "test",
+    "target_url": null,
+    "description": null,
+    "created_at": "2015-10-23T23:35:48.693+02:00",
+    "started_at": null,
+    "finished_at": "2015-10-23T23:35:48.716+02:00",
+    "author": {
+      "name": "Dominik Sander",
+      "username": "dsander",
+      "id": 1,
+      "state": "active",
+      "avatar_url": "https://secure.gravatar.com/avatar/xxxxx?s=40&d=identicon",
+      "web_url": "https://github.com/u/dsander"
+    }
+  },
+  {
+    "id": 493,
+    "sha": "7d938cb8ac15788d71f4b67c035515a160ea76d8",
+    "ref": "decreased-spec",
+    "status": "success",
+    "name": "specs",
+    "target_url": "https://github.com/dsander/omniauth/builds/493",
+    "description": null,
+    "created_at": "2015-10-23T21:39:19.384+02:00",
+    "started_at": "2015-10-23T21:39:21.900+02:00",
+    "finished_at": "2015-10-23T21:39:35.215+02:00",
+    "author": {
+      "name": "Dominik Sander",
+      "username": "dsander",
+      "id": 1,
+      "state": "active",
+      "avatar_url": "https://secure.gravatar.com/avatar/xxxxx?s=40&d=identicon",
+      "web_url": "https://github.com/u/dsander"
+    }
+  }
+]

data/spec/fixtures/project_edit.json

@@ -0,0 +1,21 @@
+{
+   "id":3,
+   "code":"gitlab",
+   "name":"Gitlab-edit",
+   "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_fork.json

@@ -0,0 +1,50 @@
+{
+   "id":20,
+   "description":"desc",
+   "default_branch":"master",
+   "tag_list":[
+
+   ],
+   "public":false,
+   "archived":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",
+   "owner":{
+      "name":"Administrator",
+      "username":"root",
+      "id":1,
+      "state":"active",
+      "avatar_url":"http://git.gitlab.com/uploads/user/avatar/1/12586377.jpeg"
+   },
+   "name":"gitlab",
+   "name_with_namespace":"Administrator / gitlab",
+   "path":"gitlab",
+   "path_with_namespace":"root/gitlab",
+   "issues_enabled":true,
+   "merge_requests_enabled":true,
+   "wiki_enabled":true,
+   "snippets_enabled":false,
+   "created_at":"2015-06-08T01:29:17.190Z",
+   "last_activity_at":"2015-06-08T01:29:17.190Z",
+   "creator_id":1,
+   "namespace":{
+      "id":1,
+      "name":"root",
+      "path":"root",
+      "owner_id":1,
+      "created_at":"2015-05-28T19:23:40.445Z",
+      "updated_at":"2015-05-28T19:23:40.445Z",
+      "description":"",
+      "avatar":null
+   },
+   "forked_from_project":{
+      "id":3,
+      "name":"Gitlab",
+      "name_with_namespace":"Root / gitlab",
+      "path":"gitlab",
+      "path_with_namespace":"root/gitlab"
+   },
+   "avatar_url":null
+}

data/spec/fixtures/project_forked_for_user.json

@@ -0,0 +1,50 @@
+{
+   "id":20,
+   "description":"desc",
+   "default_branch":"master",
+   "tag_list":[
+
+   ],
+   "public":false,
+   "archived":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",
+   "owner":{
+      "name":"Jack Smith",
+      "username":"jack.smith",
+      "id":2,
+      "state":"active",
+      "avatar_url":"http://git.gitlab.com/uploads/user/avatar/1/12586377.jpeg"
+   },
+   "name":"gitlab",
+   "name_with_namespace":"Jack Smith / gitlab",
+   "path":"gitlab",
+   "path_with_namespace":"jack.smith/gitlab",
+   "issues_enabled":true,
+   "merge_requests_enabled":true,
+   "wiki_enabled":true,
+   "snippets_enabled":false,
+   "created_at":"2015-06-08T01:29:17.190Z",
+   "last_activity_at":"2015-06-08T01:29:17.190Z",
+   "creator_id":1,
+   "namespace":{
+      "id":1,
+      "name":"jack.smith",
+      "path":"jack.smith",
+      "owner_id":2,
+      "created_at":"2015-05-28T19:23:40.445Z",
+      "updated_at":"2015-05-28T19:23:40.445Z",
+      "description":"",
+      "avatar":null
+   },
+   "forked_from_project":{
+      "id":3,
+      "name":"Gitlab",
+      "name_with_namespace":"Root / gitlab",
+      "path":"gitlab",
+      "path_with_namespace":"root/gitlab"
+   },
+   "avatar_url":null
+}

data/spec/fixtures/project_update_commit_status.json

@@ -0,0 +1,20 @@
+{
+  "id": 498,
+  "sha": "7d938cb8ac15788d71f4b67c035515a160ea76d8",
+  "ref": "decreased-spec",
+  "status": "failed",
+  "name": "test",
+  "target_url": null,
+  "description": null,
+  "created_at": "2015-10-23T23:56:49.499+02:00",
+  "started_at": null,
+  "finished_at": "2015-10-23T23:56:49.534+02:00",
+  "author": {
+    "name": "Dominik Sander",
+    "username": "dsander",
+    "id": 1,
+    "state": "active",
+    "avatar_url": "https://secure.gravatar.com/avatar/xxx?s=40&d=identicon",
+    "web_url": "https://github.com/u/dsander"
+  }
+}

data/spec/fixtures/snippet_content.json

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+
+puts "Cool snippet!"

data/spec/fixtures/user.json

@@ -1 +1 @@
-{"id":1,"email":"john@example.com","name":"John Smith","bio":null,"skype":"","linkedin":"","twitter":"john","dark_scheme":false,"theme_id":1,"blocked":false,"created_at":"2012-09-17T09:41:56Z"}
+{"id":1,"email":"john@example.com","name":"John Smith","username":"john.smith","bio":null,"skype":"","linkedin":"","twitter":"john","dark_scheme":false,"theme_id":1,"blocked":false,"created_at":"2012-09-17T09:41:56Z"}

data/spec/fixtures/user_block_unblock.json

@@ -0,0 +1 @@
+true

data/spec/fixtures/users.json

@@ -1 +1 @@
-[{"id":1,"email":"john@example.com","name":"John Smith","bio":null,"skype":"","linkedin":"","twitter":"john","dark_scheme":false,"theme_id":1,"blocked":false,"created_at":"2012-09-17T09:41:56Z"},{"id":2,"email":"jack@example.com","name":"Jack Smith","bio":null,"skype":"","linkedin":"","twitter":"","dark_scheme":false,"theme_id":1,"blocked":false,"created_at":"2012-09-17T09:42:03Z"},{"id":3,"email":"wilma@mayerblanda.ca","name":"Beatrice Jewess","bio":null,"skype":"","linkedin":"","twitter":"","dark_scheme":false,"theme_id":1,"blocked":false,"created_at":"2012-09-17T09:42:03Z"},{"id":4,"email":"nicole@mertz.com","name":"Felipe Davis","bio":null,"skype":"","linkedin":"","twitter":"","dark_scheme":false,"theme_id":1,"blocked":false,"created_at":"2012-09-17T09:42:03Z"},{"id":5,"email":"aliza_stark@schmeler.info","name":"Michale Von","bio":null,"skype":"","linkedin":"","twitter":"","dark_scheme":false,"theme_id":1,"blocked":false,"created_at":"2012-09-17T09:42:03Z"},{"id":6,"email":"faye.watsica@rohanwalter.com","name":"Ambrose Hansen","bio":null,"skype":"","linkedin":"","twitter":"","dark_scheme":false,"theme_id":1,"blocked":false,"created_at":"2012-09-17T09:42:03Z"},{"id":7,"email":"maida@walshtorp.name","name":"Alana Hahn","bio":null,"skype":"","linkedin":"","twitter":"","dark_scheme":false,"theme_id":1,"blocked":false,"created_at":"2012-09-17T09:42:03Z"}]
+[{"id":1,"email":"john@example.com","name":"John Smith","username":"john.smith","bio":null,"skype":"","linkedin":"","twitter":"john","dark_scheme":false,"theme_id":1,"blocked":false,"created_at":"2012-09-17T09:41:56Z"},{"id":2,"email":"jack@example.com","name":"Jack Smith","username":"jack.smith","bio":null,"skype":"","linkedin":"","twitter":"","dark_scheme":false,"theme_id":1,"blocked":false,"created_at":"2012-09-17T09:42:03Z"},{"id":3,"email":"wilma@mayerblanda.ca","name":"Beatrice Jewess","username":"beatrice.jewess","bio":null,"skype":"","linkedin":"","twitter":"","dark_scheme":false,"theme_id":1,"blocked":false,"created_at":"2012-09-17T09:42:03Z"},{"id":4,"email":"nicole@mertz.com","name":"Felipe Davis","username":"felipe.davis","bio":null,"skype":"","linkedin":"","twitter":"","dark_scheme":false,"theme_id":1,"blocked":false,"created_at":"2012-09-17T09:42:03Z"},{"id":5,"email":"aliza_stark@schmeler.info","name":"Michale Von","username":"michale.von","bio":null,"skype":"","linkedin":"","twitter":"","dark_scheme":false,"theme_id":1,"blocked":false,"created_at":"2012-09-17T09:42:03Z"},{"id":6,"email":"faye.watsica@rohanwalter.com","name":"Ambrose Hansen","username":"ambrose.hansen","bio":null,"skype":"","linkedin":"","twitter":"","dark_scheme":false,"theme_id":1,"blocked":false,"created_at":"2012-09-17T09:42:03Z"},{"id":7,"email":"maida@walshtorp.name","name":"Alana Hahn","username":"alana.hahn","bio":null,"skype":"","linkedin":"","twitter":"","dark_scheme":false,"theme_id":1,"blocked":false,"created_at":"2012-09-17T09:42:03Z"}]

data/spec/gitlab/cli_helpers_spec.rb

@@ -38,19 +38,19 @@ describe Gitlab::CLI::Helpers do
     end
   end
 
-  describe ".yaml_load_arguments!" do
-    context "when arguments are YAML" do
+  describe ".yaml_load" do
+    context "when argument is a YAML string" do
       it "should return Ruby objects" do
-        arguments = ["{foo: bar, sna: fu}"] 
-        Gitlab::CLI::Helpers.yaml_load_arguments! arguments
-        expect(arguments).to eq([{'foo' => 'bar', 'sna' => 'fu'}])
+        argument = "{foo: bar, sna: fu}" 
+        output = Gitlab::CLI::Helpers.yaml_load argument
+        expect(output).to eq({'foo' => 'bar', 'sna' => 'fu'})
       end
     end
 
     context "when input is NOT valid YAML" do
       it "should raise" do
         ruby_array = [1, 2, 3, 4]
-        expect { Gitlab::CLI::Helpers.yaml_load_arguments! ruby_array}.to raise_exception
+        expect { Gitlab::CLI::Helpers.yaml_load ruby_array}.to raise_error TypeError
       end
     end
   end

data/spec/gitlab/cli_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'json'
 
 describe Gitlab::CLI do
   describe ".run" do
@@ -59,6 +60,21 @@ describe Gitlab::CLI do
       end
     end
 
+
+    context "when command with json output" do
+      before do
+        stub_get("/user", "user")
+        args = ['user', '--json']
+        @output = capture_output { Gitlab::CLI.start(args) }
+      end
+
+      it "should render output as json" do
+        expect(JSON.parse(@output)['result']).to eq(JSON.parse(File.read(File.dirname(__FILE__) + '/../fixtures/user.json')))
+        expect(JSON.parse(@output)['cmd']).to eq('Gitlab.user')
+      end
+    end
+
+
     context "when command with required fields" do
       before do
         stub_get("/user", "user")

data/spec/gitlab/client/commits_spec.rb

@@ -0,0 +1,137 @@
+require 'spec_helper'
+
+describe Gitlab::Client do
+  it { should respond_to :repo_commits }
+  it { should respond_to :repo_commit }
+  it { should respond_to :repo_commit_diff }
+  it { should respond_to :repo_commit_comments }
+  it { should respond_to :repo_create_commit_comment }
+  it { should respond_to :repo_commit_status }
+  it { should respond_to :repo_update_commit_status }
+
+  describe ".commits" do
+    before do
+      stub_get("/projects/3/repository/commits", "project_commits").
+        with(:query => {:ref_name => "api"})
+      @commits = Gitlab.commits(3, :ref_name => "api")
+    end
+
+    it "should get the correct resource" do
+      expect(a_get("/projects/3/repository/commits").
+        with(:query => {:ref_name => "api"})).to have_been_made
+    end
+
+    it "should return an array of repository commits" do
+      expect(@commits).to be_an Array
+      expect(@commits.first.id).to eq("f7dd067490fe57505f7226c3b54d3127d2f7fd46")
+    end
+  end
+
+  describe ".commit" do
+    before do
+      stub_get("/projects/3/repository/commits/6104942438c14ec7bd21c6cd5bd995272b3faff6", "project_commit")
+      @commit = Gitlab.commit(3, '6104942438c14ec7bd21c6cd5bd995272b3faff6')
+    end
+
+    it "should get the correct resource" do
+      expect(a_get("/projects/3/repository/commits/6104942438c14ec7bd21c6cd5bd995272b3faff6"))
+        .to have_been_made
+    end
+
+    it "should return a repository commit" do
+      expect(@commit.id).to eq("6104942438c14ec7bd21c6cd5bd995272b3faff6")
+    end
+  end
+
+  describe ".commit_diff" do
+    before do
+      stub_get("/projects/3/repository/commits/6104942438c14ec7bd21c6cd5bd995272b3faff6/diff", "project_commit_diff")
+      @diff = Gitlab.commit_diff(3, '6104942438c14ec7bd21c6cd5bd995272b3faff6')
+    end
+
+    it "should get the correct resource" do
+      expect(a_get("/projects/3/repository/commits/6104942438c14ec7bd21c6cd5bd995272b3faff6/diff"))
+        .to have_been_made
+    end
+
+    it "should return a diff of a commit" do
+      expect(@diff.new_path).to eq("doc/update/5.4-to-6.0.md")
+    end
+  end
+
+  describe ".commit_comments" do
+    before do
+      stub_get("/projects/3/repository/commits/6104942438c14ec7bd21c6cd5bd995272b3faff6/comments", "project_commit_comments")
+      @commit_comments = Gitlab.commit_comments(3, '6104942438c14ec7bd21c6cd5bd995272b3faff6')
+    end
+
+    it "should get the correct resource" do
+      expect(a_get("/projects/3/repository/commits/6104942438c14ec7bd21c6cd5bd995272b3faff6/comments"))
+        .to have_been_made
+    end
+
+    it "should return commit's comments" do
+      expect(@commit_comments).to be_an Array
+      expect(@commit_comments.length).to eq(2)
+      expect(@commit_comments[0].note).to eq("this is the 1st comment on commit 6104942438c14ec7bd21c6cd5bd995272b3faff6")
+      expect(@commit_comments[0].author.id).to eq(11)
+      expect(@commit_comments[1].note).to eq("another discussion point on commit 6104942438c14ec7bd21c6cd5bd995272b3faff6")
+      expect(@commit_comments[1].author.id).to eq(12)
+    end
+  end
+
+  describe ".create_commit_comment" do
+    before do
+      stub_post("/projects/3/repository/commits/6104942438c14ec7bd21c6cd5bd995272b3faff6/comments", "project_commit_comment")
+      @merge_request = Gitlab.create_commit_comment(3, '6104942438c14ec7bd21c6cd5bd995272b3faff6', 'Nice code!')
+    end
+
+    it "should return information about the newly created comment" do
+      expect(@merge_request.note).to eq('Nice code!')
+      expect(@merge_request.author.id).to eq(1)
+    end
+  end
+
+  describe ".commit_status" do
+    before do
+      stub_get("/projects/6/repository/commits/7d938cb8ac15788d71f4b67c035515a160ea76d8/statuses", 'project_commit_status').
+        with(query: { all: 'true' })
+      @statuses = Gitlab.commit_status(6, '7d938cb8ac15788d71f4b67c035515a160ea76d8', all: true)
+    end
+
+    it "should get the correct resource" do
+      expect(a_get("/projects/6/repository/commits/7d938cb8ac15788d71f4b67c035515a160ea76d8/statuses").
+        with(query: {all: true}))
+    end
+
+    it "should get statuses of a commit" do
+      expect(@statuses).to be_kind_of Array
+      expect(@statuses.first.sha).to eq('7d938cb8ac15788d71f4b67c035515a160ea76d8')
+      expect(@statuses.first.ref).to eq('decreased-spec')
+      expect(@statuses.first.status).to eq('failed')
+      expect(@statuses.last.sha).to eq('7d938cb8ac15788d71f4b67c035515a160ea76d8')
+      expect(@statuses.last.status).to eq('success')
+    end
+  end
+
+  describe ".update_commit_status" do
+    before do
+      stub_post("/projects/6/statuses/7d938cb8ac15788d71f4b67c035515a160ea76d8", 'project_update_commit_status').
+        with(query: {name: 'test', ref: 'decreased-spec', state: 'failed'})
+      @status = Gitlab.update_commit_status(6, '7d938cb8ac15788d71f4b67c035515a160ea76d8', 'failed', name: 'test', ref: 'decreased-spec')
+    end
+
+    it "should get the correct resource" do
+      expect(a_post('/projects/6/statuses/7d938cb8ac15788d71f4b67c035515a160ea76d8').
+        with(query: {name: 'test', ref: 'decreased-spec', state: 'failed'}))
+    end
+
+    it "should information about the newly created status" do
+      expect(@status).to be_kind_of Gitlab::ObjectifiedHash
+      expect(@status.id).to eq(498)
+      expect(@status.sha).to eq('7d938cb8ac15788d71f4b67c035515a160ea76d8')
+      expect(@status.status).to eq('failed')
+      expect(@status.ref).to eq('decreased-spec')
+    end
+  end
+end