gitlab 4.2.0 → 4.3.0

data/lib/gitlab/page_links.rb

@@ -6,7 +6,7 @@ module Gitlab
     HEADER_LINK = 'Link'.freeze
     DELIM_LINKS = ','.freeze
     LINK_REGEX = /<([^>]+)>; rel=\"([^\"]+)\"/
-    METAS = %w(last next first prev)
+    METAS = %w(last next first prev).freeze
 
     attr_accessor(*METAS)
 
@@ -25,7 +25,7 @@ module Gitlab
         LINK_REGEX.match(link.strip) do |match|
           url, meta = match[1], match[2]
           next if !url || !meta || METAS.index(meta).nil?
-          self.send("#{meta}=", url)
+          send("#{meta}=", url)
         end
       end
     end

data/lib/gitlab/request.rb

@@ -26,58 +26,42 @@ module Gitlab
       elsif body.nil?
         false
       else
-        raise Error::Parsing.new "Couldn't parse a response body"
+        raise Error::Parsing, "Couldn't parse a response body"
       end
     end
 
     # Decodes a JSON response into Ruby object.
     def self.decode(response)
-      JSON.load response
+      return response ? JSON.load(response) : {}     
     rescue JSON::ParserError
-      raise Error::Parsing.new "The response is not a valid JSON"
+      raise Error::Parsing, 'The response is not a valid JSON'
     end
 
-    def get(path, options={})
-      set_httparty_config(options)
-      set_authorization_header(options)
-      validate self.class.get(@endpoint + path, options)
-    end
-
-    def post(path, options={})
-      set_httparty_config(options)
-      set_authorization_header(options)
-      validate self.class.post(@endpoint + path, options)
-    end
-
-    def put(path, options={})
-      set_httparty_config(options)
-      set_authorization_header(options)
-      validate self.class.put(@endpoint + path, options)
-    end
-
-    def delete(path, options={})
-      set_httparty_config(options)
-      set_authorization_header(options)
-      validate self.class.delete(@endpoint + path, options)
+    %w(get post put delete).each do |method|
+      define_method method do |path, options={}|
+        httparty_config(options)
+        authorization_header(options)
+        validate self.class.send(method, @endpoint + path, options)
+      end
     end
 
     # Checks the response code for common errors.
     # Returns parsed response for successful requests.
     def validate(response)
       error_klass = case response.code
-      when 400 then Error::BadRequest
-      when 401 then Error::Unauthorized
-      when 403 then Error::Forbidden
-      when 404 then Error::NotFound
-      when 405 then Error::MethodNotAllowed
-      when 409 then Error::Conflict
-      when 422 then Error::Unprocessable
-      when 500 then Error::InternalServerError
-      when 502 then Error::BadGateway
-      when 503 then Error::ServiceUnavailable
-      end
-
-      fail error_klass.new(response) if error_klass
+                    when 400 then Error::BadRequest
+                    when 401 then Error::Unauthorized
+                    when 403 then Error::Forbidden
+                    when 404 then Error::NotFound
+                    when 405 then Error::MethodNotAllowed
+                    when 409 then Error::Conflict
+                    when 422 then Error::Unprocessable
+                    when 500 then Error::InternalServerError
+                    when 502 then Error::BadGateway
+                    when 503 then Error::ServiceUnavailable
+                    end
+
+      raise error_klass, response if error_klass
 
       parsed = response.parsed_response
       parsed.client = self if parsed.respond_to?(:client=)
@@ -87,9 +71,9 @@ module Gitlab
 
     # Sets a base_uri and default_params for requests.
     # @raise [Error::MissingCredentials] if endpoint not set.
-    def set_request_defaults(sudo=nil)
+    def request_defaults(sudo=nil)
       self.class.default_params sudo: sudo
-      raise Error::MissingCredentials.new("Please set an endpoint to API") unless @endpoint
+      raise Error::MissingCredentials, 'Please set an endpoint to API' unless @endpoint
       self.class.default_params.delete(:sudo) if sudo.nil?
     end
 
@@ -100,20 +84,20 @@ module Gitlab
     # @param [Hash] options A customizable set of options.
     # @option options [Boolean] :unauthenticated true if the API call does not require user authentication.
     # @raise [Error::MissingCredentials] if private_token and auth_token are not set.
-    def set_authorization_header(options)
-      unless options[:unauthenticated]
-        raise Error::MissingCredentials.new("Please provide a private_token or auth_token for user") unless @private_token
-        if @private_token.length <= 20
-          options[:headers] = { 'PRIVATE-TOKEN' => @private_token }
-        else
-          options[:headers] = { 'Authorization' => "Bearer #{@private_token}" }
-        end
-      end
+    def authorization_header(options)
+      return if options[:unauthenticated]
+      raise Error::MissingCredentials, 'Please provide a private_token or auth_token for user' unless @private_token
+
+      options[:headers] = if @private_token.size < 21
+                            { 'PRIVATE-TOKEN' => @private_token }
+                          else
+                            { 'Authorization' => "Bearer #{@private_token}" }
+                          end
     end
 
     # Set HTTParty configuration
     # @see https://github.com/jnunemaker/httparty
-    def set_httparty_config(options)
+    def httparty_config(options)
       options.merge!(httparty) if httparty
     end
   end

data/lib/gitlab/shell.rb

@@ -63,13 +63,10 @@ class Gitlab::Shell
 
     # Execute a given command with arguements
     def execute(cmd=command, args=arguments)
-      if actions.include?(cmd.to_sym)
-        confirm_command(cmd)
-        gitlab_helper(cmd, args)
-      else
-        fail "Unknown command: #{cmd}. " \
-             "See the 'help' for a list of valid commands."
-      end
+      raise "Unknown command: #{cmd}. See the 'help' for a list of valid commands." unless actions.include?(cmd.to_sym)
+
+      confirm_command(cmd)
+      gitlab_helper(cmd, args)
     end
 
     def quit_shell
@@ -80,5 +77,5 @@ class Gitlab::Shell
     def history
       @history ||= History.new
     end
-  end # class << self
+  end
 end

data/lib/gitlab/version.rb

@@ -1,3 +1,3 @@
 module Gitlab
-  VERSION = "4.2.0"
+  VERSION = '4.3.0'.freeze
 end

data/spec/fixtures/deployment.json

@@ -0,0 +1,57 @@
+{
+  "id": 42,
+  "iid": 2,
+  "ref": "master",
+  "sha": "a91957a858320c0e17f3a0eca7cfacbff50ea29a",
+  "created_at": "2016-08-11T11:32:35.444Z",
+  "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"
+  },
+  "environment": {
+    "id": 9,
+    "name": "production",
+    "external_url": "https://about.gitlab.com"
+  },
+  "deployable": {
+    "id": 664,
+    "status": "success",
+    "stage": "deploy",
+    "name": "deploy",
+    "ref": "master",
+    "tag": false,
+    "coverage": null,
+    "created_at": "2016-08-11T11:32:24.456Z",
+    "started_at": null,
+    "finished_at": "2016-08-11T11:32:35.145Z",
+    "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-11T07:09:20.351Z",
+      "bio": null,
+      "location": null,
+      "skype": "",
+      "linkedin": "",
+      "twitter": "",
+      "website_url": ""
+    },
+    "commit": {
+      "id": "a91957a858320c0e17f3a0eca7cfacbff50ea29a",
+      "short_id": "a91957a8",
+      "title": "Merge branch 'rename-readme' into 'master'\r",
+      "author_name": "Administrator",
+      "author_email": "admin@example.com",
+      "created_at": "2016-08-11T13:28:26.000+02:00",
+      "message": "Merge branch 'rename-readme' into 'master'\r\n\r\nRename README\r\n\r\n\r\n\r\nSee merge request !2"
+    },
+    "runner": null
+  }
+}

data/spec/fixtures/deployments.json

@@ -0,0 +1,116 @@
+[
+  {
+    "created_at": "2016-08-11T07:36:40.222Z",
+    "deployable": {
+      "commit": {
+        "author_email": "admin@example.com",
+        "author_name": "Administrator",
+        "created_at": "2016-08-11T09:36:01.000+02:00",
+        "id": "99d03678b90d914dbb1b109132516d71a4a03ea8",
+        "message": "Merge branch 'new-title' into 'master'\r\n\r\nUpdate README\r\n\r\n\r\n\r\nSee merge request !1",
+        "short_id": "99d03678",
+        "title": "Merge branch 'new-title' into 'master'\r"
+      },
+      "coverage": null,
+      "created_at": "2016-08-11T07:36:27.357Z",
+      "finished_at": "2016-08-11T07:36:39.851Z",
+      "id": 657,
+      "name": "deploy",
+      "ref": "master",
+      "runner": null,
+      "stage": "deploy",
+      "started_at": null,
+      "status": "success",
+      "tag": false,
+      "user": {
+        "avatar_url": "http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=80&d=identicon",
+        "bio": null,
+        "created_at": "2016-08-11T07:09:20.351Z",
+        "id": 1,
+        "linkedin": "",
+        "location": null,
+        "name": "Administrator",
+        "skype": "",
+        "state": "active",
+        "twitter": "",
+        "username": "root",
+        "web_url": "http://localhost:3000/root",
+        "website_url": ""
+      }
+    },
+    "environment": {
+      "external_url": "https://about.gitlab.com",
+      "id": 9,
+      "name": "production"
+    },
+    "id": 41,
+    "iid": 1,
+    "ref": "master",
+    "sha": "99d03678b90d914dbb1b109132516d71a4a03ea8",
+    "user": {
+      "avatar_url": "http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=80&d=identicon",
+      "id": 1,
+      "name": "Administrator",
+      "state": "active",
+      "username": "root",
+      "web_url": "http://localhost:3000/root"
+    }
+  },
+  {
+    "created_at": "2016-08-11T11:32:35.444Z",
+    "deployable": {
+      "commit": {
+        "author_email": "admin@example.com",
+        "author_name": "Administrator",
+        "created_at": "2016-08-11T13:28:26.000+02:00",
+        "id": "a91957a858320c0e17f3a0eca7cfacbff50ea29a",
+        "message": "Merge branch 'rename-readme' into 'master'\r\n\r\nRename README\r\n\r\n\r\n\r\nSee merge request !2",
+        "short_id": "a91957a8",
+        "title": "Merge branch 'rename-readme' into 'master'\r"
+      },
+      "coverage": null,
+      "created_at": "2016-08-11T11:32:24.456Z",
+      "finished_at": "2016-08-11T11:32:35.145Z",
+      "id": 664,
+      "name": "deploy",
+      "ref": "master",
+      "runner": null,
+      "stage": "deploy",
+      "started_at": null,
+      "status": "success",
+      "tag": false,
+      "user": {
+        "avatar_url": "http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=80&d=identicon",
+        "bio": null,
+        "created_at": "2016-08-11T07:09:20.351Z",
+        "id": 1,
+        "linkedin": "",
+        "location": null,
+        "name": "Administrator",
+        "skype": "",
+        "state": "active",
+        "twitter": "",
+        "username": "root",
+        "web_url": "http://localhost:3000/root",
+        "website_url": ""
+      }
+    },
+    "environment": {
+      "external_url": "https://about.gitlab.com",
+      "id": 9,
+      "name": "production"
+    },
+    "id": 42,
+    "iid": 2,
+    "ref": "master",
+    "sha": "a91957a858320c0e17f3a0eca7cfacbff50ea29a",
+    "user": {
+      "avatar_url": "http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=80&d=identicon",
+      "id": 1,
+      "name": "Administrator",
+      "state": "active",
+      "username": "root",
+      "web_url": "http://localhost:3000/root"
+    }
+  }
+]

data/spec/fixtures/group_edit.json

@@ -0,0 +1,14 @@
+{
+  "id": 1,
+  "name": "Foobar Group",
+  "path": "foo-bar",
+  "description": "An interesting group",
+  "visibility": "public",
+  "lfs_enabled": true,
+  "avatar_url": "http://gitlab.example.com/uploads/group/avatar/1/foo.jpg",
+  "web_url": "http://gitlab.example.com/groups/foo-bar",
+  "request_access_enabled": false,
+  "full_name": "Foobar Group",
+  "full_path": "foo-bar",
+  "parent_id": 123
+}

data/spec/fixtures/group_subgroups.json

@@ -0,0 +1,16 @@
+[
+  {
+    "id": 1,
+    "name": "Foobar Group",
+    "path": "foo-bar",
+    "description": "An interesting group",
+    "visibility": "public",
+    "lfs_enabled": true,
+    "avatar_url": "http://gitlab.example.com/uploads/group/avatar/1/foo.jpg",
+    "web_url": "http://gitlab.example.com/groups/foo-bar",
+    "request_access_enabled": false,
+    "full_name": "Foobar Group",
+    "full_path": "foo-bar",
+    "parent_id": 123
+  }
+]

data/spec/fixtures/pipeline_schedule.json

@@ -0,0 +1,32 @@
+{
+  "id": 13,
+  "description": "Test schedule pipeline",
+  "ref": "master",
+  "cron": "* * * * *",
+  "cron_timezone": "Asia/Tokyo",
+  "next_run_at": "2017-05-19T13:41:00.000Z",
+  "active": true,
+  "created_at": "2017-05-19T13:31:08.849Z",
+  "updated_at": "2017-05-19T13:40:17.727Z",
+  "last_pipeline": {
+    "id": 332,
+    "sha": "0e788619d0b5ec17388dffb973ecd505946156db",
+    "ref": "master",
+    "status": "pending"
+  },
+  "owner": {
+    "name": "Administrator",
+    "username": "root",
+    "id": 1,
+    "state": "active",
+    "avatar_url": "http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=80&d=identicon",
+    "web_url": "https://gitlab.example.com/root"
+  },
+  "variables": [
+    {
+      "key": "TEST_VARIABLE_1",
+      "value": "TEST_1"
+    }
+  ]
+}
+

data/spec/fixtures/pipeline_schedule_create.json

@@ -0,0 +1,21 @@
+{
+  "id": 14,
+  "description": "Build packages",
+  "ref": "master",
+  "cron": "0 1 * * 5",
+  "cron_timezone": "UTC",
+  "next_run_at": "2017-05-26T01:00:00.000Z",
+  "active": true,
+  "created_at": "2017-05-19T13:43:08.169Z",
+  "updated_at": "2017-05-19T13:43:08.169Z",
+  "last_pipeline": null,
+  "owner": {
+    "name": "Administrator",
+    "username": "root",
+    "id": 1,
+    "state": "active",
+    "avatar_url": "http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=80&d=identicon",
+    "web_url": "https://gitlab.example.com/root"
+  }
+}
+

data/spec/fixtures/pipeline_schedule_update.json

@@ -0,0 +1,26 @@
+{
+  "id": 13,
+  "description": "Test schedule pipeline",
+  "ref": "master",
+  "cron": "0 2 * * *",
+  "cron_timezone": "Asia/Tokyo",
+  "next_run_at": "2017-05-19T17:00:00.000Z",
+  "active": true,
+  "created_at": "2017-05-19T13:31:08.849Z",
+  "updated_at": "2017-05-19T13:44:16.135Z",
+  "last_pipeline": {
+    "id": 332,
+    "sha": "0e788619d0b5ec17388dffb973ecd505946156db",
+    "ref": "master",
+    "status": "pending"
+  },
+  "owner": {
+    "name": "Administrator",
+    "username": "root",
+    "id": 1,
+    "state": "active",
+    "avatar_url": "http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=80&d=identicon",
+    "web_url": "https://gitlab.example.com/root"
+  }
+}
+