gitlab 4.0.0 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b76c82ead8e87ca095bc2ad47515701b11c9735f
-  data.tar.gz: 758f96760c958422f9642878247aad32cc5962be
+  metadata.gz: 495b1042cb1c31a952e20736b66c03ff91503e55
+  data.tar.gz: b1d768d0e57f2687e947d10e9401742d15815b18
 SHA512:
-  metadata.gz: 14dcda9a02593219e14e7dd67f4480790022c755a7e2261da430784464a2cfc6c0c0f68f8eb3a599f08a39f27bf69e8c9b271bfc54ad4ae71393b56493e88283
-  data.tar.gz: 2b0c3d034013eaffaf176de7a334c95efc15d4f979dfa9e83e4e70de881571925a6d7ec03571ba55076506580673e5bf9b2584e0e99e285f1b763ba7506008c2
+  metadata.gz: 9478123ca2e7e8bbb1a2ea4cc7a0bcea6675f3dcf54c40033e7d30512eb29b3ed2af07a8e92d940c2f7295b8c319dd70fe2a0e7ef2d344f1e566303704653e42
+  data.tar.gz: 976085a5f7b15f55ea2f2fe6a6ffc67c63d1b0c6d2417320b74e17bdad310f3401e6fe82efb8f3b06f52010d9fc561e92e3e4d3295ce5ee5f004eca836f7fef1

data/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 ### Unreleased
 
+### 4.1.0 (26/05/2017)
+- Add appropriate Content-Type header (@mltsy)
+- Add `Jobs` endpoint methods (@hjanuschka)
+- Update `BuildTriggers` to v4 API and rename to `PipelineTriggers`. (@IgnoredAmbience)
+- Add support for `keys` resource (@dirker)
+- Remove version-lock for terminal-table (@SuperTux88)
+
 ### 4.0.0 (10/04/2017)
 - Adds ability to create commits in a repository - (@logicminds)
 - Remove Ruby 1.x support from the project - (@orta)

data/gitlab.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |gem|
   gem.required_ruby_version = ">= 2.0.0"
 
   gem.add_runtime_dependency 'httparty'
-  gem.add_runtime_dependency 'terminal-table', '1.7.1'
+  gem.add_runtime_dependency 'terminal-table'
 
   gem.add_development_dependency 'pry'
   gem.add_development_dependency 'rake'

data/lib/gitlab/client.rb

@@ -5,17 +5,18 @@ module Gitlab
 
     include Branches
     include Builds
-    include BuildTriggers
     include BuildVariables
     include Commits
     include Groups
     include Issues
+    include Keys
     include Labels
     include MergeRequests
     include Milestones
     include Namespaces
     include Notes
     include Pipelines
+    include PipelineTriggers
     include Projects
     include Repositories
     include RepositoryFiles
@@ -25,6 +26,7 @@ module Gitlab
     include SystemHooks
     include Tags
     include Users
+    include Jobs
 
     # Text representation of the client, masking private token.
     #

data/lib/gitlab/client/jobs.rb

@@ -0,0 +1,162 @@
+class Gitlab::Client
+  # Defines methods related to projects.
+  # @see https://docs.gitlab.com/ee/api/jobs.html
+  module Jobs
+    # Gets a list of Jobs for a Project
+    #
+    # @example
+    #   Gitlab.jobs(1)
+    #   Gitlab.jobs("project")
+    #
+    # @param  [Integer, String] id The ID or name of a project.
+    # @param  [Hash] options A customizable set of options.
+    # @option options [Array] :scope The scope of jobs to show, one or array of: created, pending, running, failed, success, canceled, skipped, manual; showing all jobs if none provided.
+    # @return [Array<Gitlab::ObjectifiedHash>]
+    def jobs(project_id, options = {})
+      get("/projects/#{url_encode project_id}/jobs", query: options)
+    end
+
+    # Gets a list of Jobs from a pipeline
+    #
+    # @example
+    #   Gitlab.pipeline_jobs(1, 2)
+    #   Gitlab.pipeline_jobs("project", 2)
+    #
+    # @param  [Integer, String] The ID or name of a project.
+    # @param  [Integer]  the id of the pipeline
+    # @param  [Hash] options A customizable set of options.
+    # @option options [Array] :scope The scope of jobs to show, one or array of: created, pending, running, failed, success, canceled, skipped, manual; showing all jobs if none provided.
+    # @return [Array<Gitlab::ObjectifiedHash>]
+    def pipeline_jobs(project_id, pipeline_id, options = {})
+      get("/projects/#{url_encode project_id}/pipelines/#{pipeline_id}/jobs", query: options)
+    end
+
+    # Gets a single job
+    #
+    # @example
+    #   Gitlab.job(1, 2)
+    #   Gitlab.job("project", 2)
+    #
+    # @param  [Integer, String] The ID or name of a project.
+    # @param  [Integer]  the id of the job
+    def job(project_id, job_id)
+      get("/projects/#{url_encode project_id}/jobs/#{job_id}")
+    end
+
+    # Gets artifacts from a job
+    #
+    # @example
+    #   Gitlab.job_artifacts(1, 2)
+    #   Gitlab.job_artifacts("project", 2)
+    #
+    # @param  [Integer, String] The ID or name of a project.
+    # @param  [Integer]  the id of the job
+    # @return [Array<Gitlab::ObjectifiedHash>]
+    def job_artifacts(project_id, job_id)
+      get("/projects/#{url_encode project_id}/jobs/#{job_id}/artifacts",
+          format: nil,
+          headers: { Accept: 'text/plain' },
+          parser: ::Gitlab::Request::Parser)
+    end
+
+    # Download Job Artifact
+    #
+    # @example
+    #   Gitlab.job_artifacts_download(1, "master", "release")
+    #   Gitlab.job_artifacts_download("project", "master", "release")
+    #
+    # @param  [Integer, String] id, The ID or name of a project.
+    # @param  [String]  ref, Ref Name
+    # @param  [String]  job, jobname
+    # @return [Array<Gitlab::ObjectifiedHash>]
+    def job_artifacts_download(project_id, ref_name, job_name)
+      get("/projects/#{url_encode project_id}/jobs/artifacts/#{ref_name}/download", query: { job: job_name },
+                                                                                    format: nil,
+                                                                                    headers: { Accept: 'text/plain' },
+                                                                                    parser: ::Gitlab::Request::Parser)
+    end
+
+    # Get Job Trace
+    #
+    # @example
+    #   Gitlab.job_trace(1,1)
+    #   Gitlab.job_trace("project", 1)
+    #
+    # @param  [Integer, String] The ID or name of a project.
+    # @param  [Integer]  the id of the job
+    # @return [Array<Gitlab::ObjectifiedHash>]
+    def job_trace(project_id, job_id)
+      get("/projects/#{url_encode project_id}/jobs/#{job_id}/trace",
+          format: nil,
+          headers: { Accept: 'text/plain' },
+          parser: ::Gitlab::Request::Parser)
+    end
+
+    # Cancel a job
+    #
+    # @example
+    #   Gitlab.job_cancel(1,1)
+    #   Gitlab.job_cancel("project", 1)
+    #
+    # @param  [Integer, String] The ID or name of a project.
+    # @param  [Integer]  the id of the job
+    # @return [Array<Gitlab::ObjectifiedHash>]
+    def job_cancel(project_id, job_id)
+      post("/projects/#{url_encode project_id}/jobs/#{job_id}/cancel")
+    end
+
+    # Retry a job
+    #
+    # @example
+    #   Gitlab.job_retry(1,1)
+    #   Gitlab.job_retry("project", 1)
+    #
+    # @param  [Integer, String] The ID or name of a project.
+    # @param  [Integer]  the id of the job
+    # @return [Array<Gitlab::ObjectifiedHash>]
+    def job_retry(project_id, job_id)
+      post("/projects/#{url_encode project_id}/jobs/#{job_id}/retry")
+    end
+
+    # Erase Job
+    #
+    # @example
+    #   Gitlab.job_erase(1,1)
+    #   Gitlab.job_erase("project", 1)
+    #
+    # @param  [Integer, String] The ID or name of a project.
+    # @param  [Integer]  the id of the job
+    # @return [Array<Gitlab::ObjectifiedHash>]
+    def job_erase(project_id, job_id)
+      post("/projects/#{url_encode project_id}/jobs/#{job_id}/erase")
+    end
+
+    # Play a Job
+    # Triggers a manual action to start a job.
+    #
+    # @example
+    #   Gitlab.job_play(1,1)
+    #   Gitlab.job_play("project", 1)
+    #
+    # @param  [Integer, String] The ID or name of a project.
+    # @param  [Integer]  the id of the job
+    # @return [Array<Gitlab::ObjectifiedHash>]
+    def job_play(project_id, job_id)
+      post("/projects/#{url_encode project_id}/jobs/#{job_id}/play")
+    end
+
+    # Keep Artifacts
+    # Prevents artifacts from being deleted when expiration is set.
+    #
+    # @example
+    #   Gitlab.job_artifacts_keep(1,1)
+    #   Gitlab.job_artifacts_keep("project", 1)
+    #
+    # @param  [Integer, String] The ID or name of a project.
+    # @param  [Integer]  the id of the job
+    # @return [Array<Gitlab::ObjectifiedHash>]
+    def job_artifacts_keep(project_id, job_id)
+      post("/projects/#{url_encode project_id}/jobs/#{job_id}/artifacts/keep")
+    end
+  end
+end

data/lib/gitlab/client/keys.rb

@@ -0,0 +1,16 @@
+class Gitlab::Client
+  # Defines methods related to keys.
+  # @see https://docs.gitlab.com/ce/api/keys.html
+  module Keys
+    # Gets information about a key.
+    #
+    # @example
+    #   Gitlab.key(1)
+    #
+    # @param  [Integer] id The ID of a key.
+    # @return [Gitlab::ObjectifiedHash]
+    def key(id)
+      get("/keys/#{id}")
+    end
+  end
+end

data/lib/gitlab/client/pipeline_triggers.rb

@@ -0,0 +1,101 @@
+class Gitlab::Client
+  # Defines methods related to pipelines.
+  # @see https://docs.gitlab.com/ce/api/pipeline_triggers.html
+  # @see https://docs.gitlab.com/ce/ci/triggers/README.html
+  module PipelineTriggers
+    # Gets a list of the project's pipeline triggers
+    #
+    # @example
+    #   Gitlab.triggers(5)
+    #
+    # @param  [Integer, String] project The ID or name of a project.
+    # @return [Array<Gitlab::ObjectifiedHash>] The list of triggers.
+    def triggers(project)
+      get("/projects/#{url_encode project}/triggers")
+    end
+
+    # Gets details of project's pipeline trigger.
+    #
+    # @example
+    #   Gitlab.trigger(5, 1)
+    #
+    # @param  [Integer, String] project The ID or name of a project.
+    # @param  [Integer] trigger_id The trigger ID.
+    # @return [Gitlab::ObjectifiedHash] The trigger.
+    def trigger(project, trigger_id)
+      get("/projects/#{url_encode project}/triggers/#{trigger_id}")
+    end
+
+    # Create a pipeline trigger for a project.
+    #
+    # @example
+    #   Gitlab.create_trigger(5, description: "my description")
+    #
+    # @param  [Integer, String] project The ID or name of a project.
+    # @param  [String] description The trigger name
+    # @return [Gitlab::ObjectifiedHash] The created trigger.
+    def create_trigger(project, description)
+      post("/projects/#{url_encode project}/triggers", body: {description: description})
+    end
+
+    # Update a project trigger
+    #
+    # @example
+    #   Gitlab.update_trigger(5, 1, description: "my description")
+    #
+    # @param [Integer, String] project The ID or name of a project.
+    # @param [Integer] trigger_id The trigger ID.
+    # @param [Hash] options A customizable set of options.
+    # @option options [String] :description The trigger name.
+    # @return [Gitlab::ObjectifiedHash] The updated trigger.
+    def update_trigger(project, trigger_id, options={})
+      put("/projects/#{url_encode project}/triggers/#{trigger_id}", body: options)
+    end
+
+    # Take ownership of a project trigger
+    #
+    # @example
+    #   Gitlab.trigger_take_ownership(5, 1)
+    #
+    # @param [Integer, String] project The ID or name of a project.
+    # @param [Integer] trigger_id The trigger ID.
+    # @return [Gitlab::ObjectifiedHash] The updated trigger.
+    def trigger_take_ownership(project, trigger_id)
+      post("/projects/#{url_encode project}/triggers/#{trigger_id}/take_ownership")
+    end
+
+    # Remove a project's pipeline trigger.
+    #
+    # @example
+    #   Gitlab.remove_trigger(5, 1)
+    #
+    # @param  [Integer, String] project The ID or name of a project.
+    # @param  [Integer] trigger_id The trigger ID.
+    # @return [void]    This API call returns an empty response body.
+    def remove_trigger(project, trigger_id)
+      delete("/projects/#{url_encode project}/triggers/#{trigger_id}")
+    end
+    alias_method :delete_trigger, :remove_trigger
+
+    # Run the given project pipeline trigger.
+    #
+    # @example
+    #   Gitlab.trigger_build(5, '7b9148c158980bbd9bcea92c17522d', 'master')
+    #   Gitlab.trigger_build(5, '7b9148c158980bbd9bcea92c17522d', 'master', { variable1: "value", variable2: "value2" })
+    #
+    # @see https://docs.gitlab.com/ce/ci/triggers/README.html
+    #
+    # @param  [Integer, String] project The ID or name of the project.
+    # @param  [String] token The token of a trigger.
+    # @param  [String] ref Branch or tag name to build.
+    # @param  [Hash] variables A set of build variables to use for the build. (optional)
+    # @return [Gitlab::ObjectifiedHash] The trigger.
+    def run_trigger(project, token, ref, variables={})
+      post("/projects/#{url_encode project}/trigger/pipeline", unauthenticated: true, body: {
+        token: token,
+        ref: ref,
+        variables: variables
+      })
+    end
+  end
+end

data/lib/gitlab/client/users.rb

@@ -120,7 +120,7 @@ class Gitlab::Client
     # @return [Gitlab::ObjectifiedHash]
     # @note This method doesn't require private_token to be set.
     def session(email, password)
-      post("/session", body: { email: email, password: password })
+      post("/session", body: { email: email, password: password }, unauthenticated: true)
     end
 
     # Gets a list of user's SSH keys.

data/lib/gitlab/request.rb

@@ -6,7 +6,7 @@ module Gitlab
   class Request
     include HTTParty
     format :json
-    headers 'Accept' => 'application/json'
+    headers 'Accept' => 'application/json', 'Content-Type' => 'application/x-www-form-urlencoded'
     parser proc { |body, _| parse(body) }
 
     attr_accessor :private_token, :endpoint
@@ -45,7 +45,7 @@ module Gitlab
 
     def post(path, options={})
       set_httparty_config(options)
-      set_authorization_header(options, path)
+      set_authorization_header(options)
       validate self.class.post(@endpoint + path, options)
     end
 
@@ -96,9 +96,12 @@ module Gitlab
     private
 
     # Sets a PRIVATE-TOKEN or Authorization header for requests.
+    #
+    # @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, path=nil)
-      unless path == '/session'
+    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 }

data/lib/gitlab/version.rb

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

data/spec/fixtures/job.json

@@ -0,0 +1,43 @@
+{
+  "commit": {
+    "author_email": "admin@example.com",
+    "author_name": "Administrator",
+    "created_at": "2015-12-24T16:51:14.000+01:00",
+    "id": "0ff3ae198f8601a285adcf5c0fff204ee6fba5fd",
+    "message": "Test the CI integration.",
+    "short_id": "0ff3ae19",
+    "title": "Test the CI integration."
+  },
+  "coverage": null,
+  "created_at": "2015-12-24T15:51:21.880Z",
+  "artifacts_file": null,
+  "finished_at": "2015-12-24T17:54:31.198Z",
+  "id": 8,
+  "name": "rubocop",
+  "pipeline": {
+    "id": 6,
+    "ref": "master",
+    "sha": "0ff3ae198f8601a285adcf5c0fff204ee6fba5fd",
+    "status": "pending"
+  },
+  "ref": "master",
+  "runner": null,
+  "stage": "test",
+  "started_at": "2015-12-24T17:54:30.733Z",
+  "status": "failed",
+  "tag": false,
+  "user": {
+    "avatar_url": "http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=80&d=identicon",
+    "bio": null,
+    "created_at": "2015-12-21T13:14:24.077Z",
+    "id": 1,
+    "linkedin": "",
+    "name": "Administrator",
+    "skype": "",
+    "state": "active",
+    "twitter": "",
+    "username": "root",
+    "web_url": "http://gitlab.dev/root",
+    "website_url": ""
+  }
+}

data/spec/fixtures/job_trace.json

@@ -0,0 +1 @@
+asdasd

data/spec/fixtures/jobs.json

@@ -0,0 +1,91 @@
+[
+  {
+    "commit": {
+      "author_email": "admin@example.com",
+      "author_name": "Administrator",
+      "created_at": "2015-12-24T16:51:14.000+01:00",
+      "id": "0ff3ae198f8601a285adcf5c0fff204ee6fba5fd",
+      "message": "Test the CI integration.",
+      "short_id": "0ff3ae19",
+      "title": "Test the CI integration."
+    },
+    "coverage": null,
+    "created_at": "2015-12-24T15:51:21.802Z",
+    "artifacts_file": {
+      "filename": "artifacts.zip",
+      "size": 1000
+    },
+    "finished_at": "2015-12-24T17:54:27.895Z",
+    "id": 7,
+    "name": "teaspoon",
+    "pipeline": {
+      "id": 6,
+      "ref": "master",
+      "sha": "0ff3ae198f8601a285adcf5c0fff204ee6fba5fd",
+      "status": "pending"
+    },
+    "ref": "master",
+    "runner": null,
+    "stage": "test",
+    "started_at": "2015-12-24T17:54:27.722Z",
+    "status": "failed",
+    "tag": false,
+    "user": {
+      "avatar_url": "http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=80&d=identicon",
+      "bio": null,
+      "created_at": "2015-12-21T13:14:24.077Z",
+      "id": 1,
+      "linkedin": "",
+      "name": "Administrator",
+      "skype": "",
+      "state": "active",
+      "twitter": "",
+      "username": "root",
+      "web_url": "http://gitlab.dev/root",
+      "website_url": ""
+    }
+  },
+  {
+    "commit": {
+      "author_email": "admin@example.com",
+      "author_name": "Administrator",
+      "created_at": "2015-12-24T16:51:14.000+01:00",
+      "id": "0ff3ae198f8601a285adcf5c0fff204ee6fba5fd",
+      "message": "Test the CI integration.",
+      "short_id": "0ff3ae19",
+      "title": "Test the CI integration."
+    },
+    "coverage": null,
+    "created_at": "2015-12-24T15:51:21.727Z",
+    "artifacts_file": null,
+    "finished_at": "2015-12-24T17:54:24.921Z",
+    "id": 6,
+    "name": "spinach:other",
+    "pipeline": {
+      "id": 6,
+      "ref": "master",
+      "sha": "0ff3ae198f8601a285adcf5c0fff204ee6fba5fd",
+      "status": "pending"
+    },
+    "ref": "master",
+    "runner": null,
+    "stage": "test",
+    "started_at": "2015-12-24T17:54:24.729Z",
+    "status": "failed",
+    "tag": false,
+    "user": {
+      "avatar_url": "http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=80&d=identicon",
+      "bio": null,
+      "created_at": "2015-12-21T13:14:24.077Z",
+      "id": 1,
+      "linkedin": "",
+      "name": "Administrator",
+      "skype": "",
+      "state": "active",
+      "twitter": "",
+      "username": "root",
+      "web_url": "http://gitlab.dev/root",
+      "website_url": ""
+    }
+  }
+]

data/spec/fixtures/pipeline_jobs.json

@@ -0,0 +1,91 @@
+[
+  {
+    "commit": {
+      "author_email": "admin@example.com",
+      "author_name": "Administrator",
+      "created_at": "2015-12-24T16:51:14.000+01:00",
+      "id": "0ff3ae198f8601a285adcf5c0fff204ee6fba5fd",
+      "message": "Test the CI integration.",
+      "short_id": "0ff3ae19",
+      "title": "Test the CI integration."
+    },
+    "coverage": null,
+    "created_at": "2015-12-24T15:51:21.802Z",
+    "artifacts_file": {
+      "filename": "artifacts.zip",
+      "size": 1000
+    },
+    "finished_at": "2015-12-24T17:54:27.895Z",
+    "id": 7,
+    "name": "teaspoon",
+    "pipeline": {
+      "id": 6,
+      "ref": "master",
+      "sha": "0ff3ae198f8601a285adcf5c0fff204ee6fba5fd",
+      "status": "pending"
+    },
+    "ref": "master",
+    "runner": null,
+    "stage": "test",
+    "started_at": "2015-12-24T17:54:27.722Z",
+    "status": "failed",
+    "tag": false,
+    "user": {
+      "avatar_url": "http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=80&d=identicon",
+      "bio": null,
+      "created_at": "2015-12-21T13:14:24.077Z",
+      "id": 1,
+      "linkedin": "",
+      "name": "Administrator",
+      "skype": "",
+      "state": "active",
+      "twitter": "",
+      "username": "root",
+      "web_url": "http://gitlab.dev/root",
+      "website_url": ""
+    }
+  },
+  {
+    "commit": {
+      "author_email": "admin@example.com",
+      "author_name": "Administrator",
+      "created_at": "2015-12-24T16:51:14.000+01:00",
+      "id": "0ff3ae198f8601a285adcf5c0fff204ee6fba5fd",
+      "message": "Test the CI integration.",
+      "short_id": "0ff3ae19",
+      "title": "Test the CI integration."
+    },
+    "coverage": null,
+    "created_at": "2015-12-24T15:51:21.727Z",
+    "artifacts_file": null,
+    "finished_at": "2015-12-24T17:54:24.921Z",
+    "id": 6,
+    "name": "spinach:other",
+    "pipeline": {
+      "id": 6,
+      "ref": "master",
+      "sha": "0ff3ae198f8601a285adcf5c0fff204ee6fba5fd",
+      "status": "pending"
+    },
+    "ref": "master",
+    "runner": null,
+    "stage": "test",
+    "started_at": "2015-12-24T17:54:24.729Z",
+    "status": "failed",
+    "tag": false,
+    "user": {
+      "avatar_url": "http://www.gravatar.com/avatar/e64c7d89f26bd1972efa854d13d7dd61?s=80&d=identicon",
+      "bio": null,
+      "created_at": "2015-12-21T13:14:24.077Z",
+      "id": 1,
+      "linkedin": "",
+      "name": "Administrator",
+      "skype": "",
+      "state": "active",
+      "twitter": "",
+      "username": "root",
+      "web_url": "http://gitlab.dev/root",
+      "website_url": ""
+    }
+  }
+]

data/spec/fixtures/run_trigger.json

@@ -0,0 +1 @@
+{"id":8,"variables":{"a":"10"}}

data/spec/fixtures/trigger.json

@@ -1,7 +1,10 @@
 {
-    "created_at": "2015-12-23T16:25:56.760Z",
+    "id": 10,
+    "description": "my trigger",
+    "created_at": "2016-01-07T09:53:58.235Z",
     "deleted_at": null,
     "last_used": null,
-    "token": "7b9148c158980bbd9bcea92c17522d",
-    "updated_at": "2015-12-23T16:25:56.760Z"
+    "token": "6d056f63e50fe6f8c5f8f4aa10edb7",
+    "updated_at": "2016-01-07T09:53:58.235Z",
+    "owner": null
 }

data/spec/fixtures/triggers.json

@@ -1,16 +1,12 @@
 [
     {
-        "created_at": "2015-12-23T16:24:34.716Z",
-        "deleted_at": null,
-        "last_used": "2016-01-04T15:41:21.986Z",
-        "token": "fbdb730c2fbdb095a0862dbd8ab88b",
-        "updated_at": "2015-12-23T16:24:34.716Z"
-    },
-    {
-        "created_at": "2015-12-23T16:25:56.760Z",
+        "id": 10,
+        "description": "my trigger",
+        "created_at": "2016-01-07T09:53:58.235Z",
         "deleted_at": null,
         "last_used": null,
-        "token": "7b9148c158980bbd9bcea92c17522d",
-        "updated_at": "2015-12-23T16:25:56.760Z"
+        "token": "6d056f63e50fe6f8c5f8f4aa10edb7",
+        "updated_at": "2016-01-07T09:53:58.235Z",
+        "owner": null
     }
 ]

data/spec/gitlab/client/jobs_spec.rb

@@ -0,0 +1,135 @@
+require 'spec_helper'
+
+describe Gitlab::Client do
+  describe '.jobs' do
+    before do
+      stub_get('/projects/1/jobs', 'jobs')
+      @projects = Gitlab.jobs(1)
+    end
+
+    it 'should get the correct resource' do
+      expect(a_get('/projects/1/jobs')).to have_been_made
+    end
+  end
+
+  describe '.jobs - with scopes' do
+    before do
+      stub_get('/projects/1/jobs?scope[]=created&scope[]=running', 'jobs')
+      @projects = Gitlab.jobs(1, scope: %w[created running])
+    end
+
+    it 'should get the correct resource' do
+      expect(a_get('/projects/1/jobs?scope[]=created&scope[]=running')).to have_been_made
+    end
+  end
+
+  describe '.pipeline_jobs' do
+    before do
+      stub_get('/projects/1/pipelines/1/jobs', 'pipeline_jobs')
+      @projects = Gitlab.pipeline_jobs(1, 1)
+    end
+    it 'should get the correct resource' do
+      expect(a_get('/projects/1/pipelines/1/jobs')).to have_been_made
+    end
+  end
+
+  describe '.pipeline_jobs - with scope' do
+    before do
+      stub_get('/projects/1/pipelines/1/jobs?scope[]=running&scope[]=created', 'pipeline_jobs')
+      @projects = Gitlab.pipeline_jobs(1, 1, scope: %w[running created])
+    end
+    it 'should get the correct resource' do
+      expect(a_get('/projects/1/pipelines/1/jobs?scope[]=running&scope[]=created')).to have_been_made
+    end
+  end
+
+  describe '.job' do
+    before do
+      stub_get('/projects/1/jobs/1', 'job')
+      @projects = Gitlab.job(1, 1)
+    end
+    it 'should get the correct resource' do
+      expect(a_get('/projects/1/jobs/1')).to have_been_made
+    end
+  end
+
+  describe '.job_artifacts' do
+    before do
+      stub_get('/projects/1/jobs/1/artifacts', 'job')
+      @projects = Gitlab.job_artifacts(1, 1)
+    end
+    it 'should get the correct resource' do
+      expect(a_get('/projects/1/jobs/1/artifacts')).to have_been_made
+    end
+  end
+
+  describe '.job_artifacts_download' do
+    before do
+      stub_get('/projects/1/jobs/artifacts/master/download?job=Release%20Build', 'job')
+      @projects = Gitlab.job_artifacts_download(1, 'master', 'Release Build')
+    end
+    it 'should get the correct resource' do
+      expect(a_get('/projects/1/jobs/artifacts/master/download?job=Release%20Build')).to have_been_made
+    end
+  end
+
+  describe '.job_trace' do
+    before do
+      stub_get('/projects/1/jobs/1/trace', 'job_trace')
+      @projects = Gitlab.job_trace(1, 1)
+    end
+    it 'should get the correct resource' do
+      expect(a_get('/projects/1/jobs/1/trace')).to have_been_made
+    end
+  end
+
+  describe '.job_cancel' do
+    before do
+      stub_post('/projects/1/jobs/1/cancel', 'job')
+      @projects = Gitlab.job_cancel(1, 1)
+    end
+    it 'should get the correct resource' do
+      expect(a_post('/projects/1/jobs/1/cancel')).to have_been_made
+    end
+  end
+
+  describe '.job_retry' do
+    before do
+      stub_post('/projects/1/jobs/1/retry', 'job')
+      @projects = Gitlab.job_retry(1, 1)
+    end
+    it 'should get the correct resource' do
+      expect(a_post('/projects/1/jobs/1/retry')).to have_been_made
+    end
+  end
+
+  describe '.job_erase' do
+    before do
+      stub_post('/projects/1/jobs/1/erase', 'job')
+      @projects = Gitlab.job_erase(1, 1)
+    end
+    it 'should get the correct resource' do
+      expect(a_post('/projects/1/jobs/1/erase')).to have_been_made
+    end
+  end
+
+  describe '.job_play' do
+    before do
+      stub_post('/projects/1/jobs/1/play', 'job')
+      @projects = Gitlab.job_play(1, 1)
+    end
+    it 'should get the correct resource' do
+      expect(a_post('/projects/1/jobs/1/play')).to have_been_made
+    end
+  end
+
+  describe '.job_artifacts_keep' do
+    before do
+      stub_post('/projects/1/jobs/1/artifacts/keep', 'job')
+      @projects = Gitlab.job_artifacts_keep(1, 1)
+    end
+    it 'should get the correct resource' do
+      expect(a_post('/projects/1/jobs/1/artifacts/keep')).to have_been_made
+    end
+  end
+end

data/spec/gitlab/client/keys_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe Gitlab::Client do
+  describe ".key" do
+    before do
+      stub_get("/keys/1", "key")
+      @key = Gitlab.key(1)
+    end
+
+    it "should get the correct resource" do
+      expect(a_get("/keys/1")).to have_been_made
+    end
+
+    it "should return information about a key" do
+      expect(@key.id).to eq(1)
+      expect(@key.title).to eq("narkoz@helium")
+    end
+  end
+end

data/spec/gitlab/client/pipeline_triggers_spec.rb

@@ -0,0 +1,157 @@
+require 'spec_helper'
+
+describe Gitlab::Client do
+  it { should respond_to :delete_trigger }
+
+  describe ".triggers" do
+    before do
+      stub_get("/projects/3/triggers", "triggers")
+      @triggers = Gitlab.triggers(3)
+    end
+
+    it "should get the correct resource" do
+      expect(a_get("/projects/3/triggers")).to have_been_made
+    end
+
+    it "should return an array of project's triggers" do
+      expect(@triggers).to be_a Gitlab::PaginatedResponse
+      expect(@triggers.first.token).to eq("6d056f63e50fe6f8c5f8f4aa10edb7")
+    end
+  end
+
+  describe ".trigger" do
+    before do
+      stub_get("/projects/3/triggers/10", "trigger")
+      @trigger = Gitlab.trigger(3, 10)
+    end
+
+    it "should get the correct resource" do
+      expect(a_get("/projects/3/triggers/10")).to have_been_made
+    end
+
+    it "should return information about a trigger" do
+      expect(@trigger.created_at).to eq("2016-01-07T09:53:58.235Z")
+      expect(@trigger.token).to eq("6d056f63e50fe6f8c5f8f4aa10edb7")
+    end
+  end
+
+  describe ".create_trigger" do
+    before do
+      stub_post("/projects/3/triggers", "trigger")
+      @trigger = Gitlab.create_trigger(3, "my description")
+    end
+
+    it "should get the correct resource" do
+      expect(a_post("/projects/3/triggers").
+          with(body: { description: "my description" })).to have_been_made
+    end
+
+    it "should return information about a new trigger" do
+      expect(@trigger.created_at).to eq("2016-01-07T09:53:58.235Z")
+      expect(@trigger.token).to eq("6d056f63e50fe6f8c5f8f4aa10edb7")
+    end
+  end
+
+  describe ".update_trigger" do
+    before do
+      stub_put("/projects/3/triggers/1", "trigger")
+      @trigger = Gitlab.update_trigger(3, 1, description: "my description")
+    end
+
+    it "should get the correct resource" do
+      expect(a_put("/projects/3/triggers/1").
+          with(body: { description: "my description" })).to have_been_made
+    end
+
+    it "should return information about the trigger" do
+      expect(@trigger.created_at).to eq("2016-01-07T09:53:58.235Z")
+      expect(@trigger.token).to eq("6d056f63e50fe6f8c5f8f4aa10edb7")
+    end
+  end
+
+  describe ".trigger_take_ownership" do
+    before do
+      stub_post("/projects/3/triggers/1/take_ownership", "trigger")
+      @trigger = Gitlab.trigger_take_ownership(3, 1)
+    end
+
+    it "should get the correct resource" do
+      expect(a_post("/projects/3/triggers/1/take_ownership")).to have_been_made
+    end
+
+    it "should return information about the trigger" do
+      expect(@trigger.created_at).to eq("2016-01-07T09:53:58.235Z")
+      expect(@trigger.token).to eq("6d056f63e50fe6f8c5f8f4aa10edb7")
+    end
+  end
+
+  describe ".remove_trigger" do
+    before do
+      stub_delete("/projects/3/triggers/10", "empty")
+      @trigger = Gitlab.remove_trigger(3, 10)
+    end
+
+    it "should get the correct resource" do
+      expect(a_delete("/projects/3/triggers/10")).to have_been_made
+    end
+  end
+
+  describe ".run_trigger" do
+    before do
+      stub_request(:post, "#{Gitlab.endpoint}/projects/3/trigger/pipeline").
+        to_return(body: load_fixture("run_trigger"), status: 200)
+    end
+
+    context "when private_token is not set" do
+      before do
+        Gitlab.private_token = nil
+      end
+
+      it "should not raise Error::MissingCredentials" do
+        expect { Gitlab.run_trigger(3, "7b9148c158980bbd9bcea92c17522d", "master", {a: 10}) }.to_not raise_error
+      end
+
+      after do
+        Gitlab.private_token = 'secret'
+      end
+    end
+
+    context "without variables" do
+      before do
+        @trigger = Gitlab.run_trigger(3, "7b9148c158980bbd9bcea92c17522d", "master")
+      end
+
+      it "should get the correct resource" do
+        expect(a_request(:post, "#{Gitlab.endpoint}/projects/3/trigger/pipeline").
+          with(body: {
+            token: "7b9148c158980bbd9bcea92c17522d",
+            ref: "master"
+          })).to have_been_made
+      end
+
+      it "should return information about the triggered build" do
+        expect(@trigger.id).to eq(8)
+      end
+    end
+
+    context "with variables" do
+      before do
+        @trigger = Gitlab.run_trigger(3, "7b9148c158980bbd9bcea92c17522d", "master", {a: 10})
+      end
+
+      it "should get the correct resource" do
+        expect(a_request(:post, "#{Gitlab.endpoint}/projects/3/trigger/pipeline").
+          with(body: {
+            token: "7b9148c158980bbd9bcea92c17522d",
+            ref: "master",
+            variables: {a: "10"}
+          })).to have_been_made
+      end
+
+      it "should return information about the triggered build" do
+        expect(@trigger.id).to eq(8)
+        expect(@trigger.variables.a).to eq("10")
+      end
+    end
+  end
+end

data/spec/gitlab/request_spec.rb

@@ -15,7 +15,7 @@ describe Gitlab::Request do
       expect(default_options).to be_a Hash
       expect(default_options[:parser]).to be_a Proc
       expect(default_options[:format]).to eq(:json)
-      expect(default_options[:headers]).to eq('Accept' => 'application/json')
+      expect(default_options[:headers]).to eq('Accept' => 'application/json', 'Content-Type' => 'application/x-www-form-urlencoded')
       expect(default_options[:default_params]).to be_nil
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.1.0
 platform: ruby
 authors:
 - Nihad Abbasov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-10 00:00:00.000000000 Z
+date: 2017-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -28,16 +28,16 @@ dependencies:
   name: terminal-table
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -120,17 +120,19 @@ files:
 - lib/gitlab/cli_helpers.rb
 - lib/gitlab/client.rb
 - lib/gitlab/client/branches.rb
-- lib/gitlab/client/build_triggers.rb
 - lib/gitlab/client/build_variables.rb
 - lib/gitlab/client/builds.rb
 - lib/gitlab/client/commits.rb
 - lib/gitlab/client/groups.rb
 - lib/gitlab/client/issues.rb
+- lib/gitlab/client/jobs.rb
+- lib/gitlab/client/keys.rb
 - lib/gitlab/client/labels.rb
 - lib/gitlab/client/merge_requests.rb
 - lib/gitlab/client/milestones.rb
 - lib/gitlab/client/namespaces.rb
 - lib/gitlab/client/notes.rb
+- lib/gitlab/client/pipeline_triggers.rb
 - lib/gitlab/client/pipelines.rb
 - lib/gitlab/client/projects.rb
 - lib/gitlab/client/repositories.rb
@@ -163,6 +165,7 @@ files:
 - spec/fixtures/builds.json
 - spec/fixtures/builds_commits.json
 - spec/fixtures/compare_merge_request_diff.json
+- spec/fixtures/empty.json
 - spec/fixtures/error_already_exists.json
 - spec/fixtures/error_project_not_found.json
 - spec/fixtures/get_repository_file.json
@@ -179,6 +182,9 @@ files:
 - spec/fixtures/groups.json
 - spec/fixtures/issue.json
 - spec/fixtures/issues.json
+- spec/fixtures/job.json
+- spec/fixtures/job_trace.json
+- spec/fixtures/jobs.json
 - spec/fixtures/key.json
 - spec/fixtures/keys.json
 - spec/fixtures/label.json
@@ -200,6 +206,7 @@ files:
 - spec/fixtures/pipeline.json
 - spec/fixtures/pipeline_cancel.json
 - spec/fixtures/pipeline_create.json
+- spec/fixtures/pipeline_jobs.json
 - spec/fixtures/pipeline_retry.json
 - spec/fixtures/pipelines.json
 - spec/fixtures/project.json
@@ -236,6 +243,7 @@ files:
 - spec/fixtures/release_create.json
 - spec/fixtures/release_update.json
 - spec/fixtures/repository_file.json
+- spec/fixtures/run_trigger.json
 - spec/fixtures/runner.json
 - spec/fixtures/runner_delete.json
 - spec/fixtures/runner_edit.json
@@ -270,18 +278,20 @@ files:
 - spec/gitlab/cli_helpers_spec.rb
 - spec/gitlab/cli_spec.rb
 - spec/gitlab/client/branches_spec.rb
-- spec/gitlab/client/build_triggers_spec.rb
 - spec/gitlab/client/build_variables_spec.rb
 - spec/gitlab/client/builds_spec.rb
 - spec/gitlab/client/client_spec.rb
 - spec/gitlab/client/commits_spec.rb
 - spec/gitlab/client/groups_spec.rb
 - spec/gitlab/client/issues_spec.rb
+- spec/gitlab/client/jobs_spec.rb
+- spec/gitlab/client/keys_spec.rb
 - spec/gitlab/client/labels_spec.rb
 - spec/gitlab/client/merge_requests_spec.rb
 - spec/gitlab/client/milestones_spec.rb
 - spec/gitlab/client/namespaces_spec.rb
 - spec/gitlab/client/notes_spec.rb
+- spec/gitlab/client/pipeline_triggers_spec.rb
 - spec/gitlab/client/pipelines_spec.rb
 - spec/gitlab/client/projects_spec.rb
 - spec/gitlab/client/repositories_spec.rb
@@ -339,6 +349,7 @@ test_files:
 - spec/fixtures/builds.json
 - spec/fixtures/builds_commits.json
 - spec/fixtures/compare_merge_request_diff.json
+- spec/fixtures/empty.json
 - spec/fixtures/error_already_exists.json
 - spec/fixtures/error_project_not_found.json
 - spec/fixtures/get_repository_file.json
@@ -355,6 +366,9 @@ test_files:
 - spec/fixtures/groups.json
 - spec/fixtures/issue.json
 - spec/fixtures/issues.json
+- spec/fixtures/job.json
+- spec/fixtures/job_trace.json
+- spec/fixtures/jobs.json
 - spec/fixtures/key.json
 - spec/fixtures/keys.json
 - spec/fixtures/label.json
@@ -376,6 +390,7 @@ test_files:
 - spec/fixtures/pipeline.json
 - spec/fixtures/pipeline_cancel.json
 - spec/fixtures/pipeline_create.json
+- spec/fixtures/pipeline_jobs.json
 - spec/fixtures/pipeline_retry.json
 - spec/fixtures/pipelines.json
 - spec/fixtures/project.json
@@ -412,6 +427,7 @@ test_files:
 - spec/fixtures/release_create.json
 - spec/fixtures/release_update.json
 - spec/fixtures/repository_file.json
+- spec/fixtures/run_trigger.json
 - spec/fixtures/runner.json
 - spec/fixtures/runner_delete.json
 - spec/fixtures/runner_edit.json
@@ -446,18 +462,20 @@ test_files:
 - spec/gitlab/cli_helpers_spec.rb
 - spec/gitlab/cli_spec.rb
 - spec/gitlab/client/branches_spec.rb
-- spec/gitlab/client/build_triggers_spec.rb
 - spec/gitlab/client/build_variables_spec.rb
 - spec/gitlab/client/builds_spec.rb
 - spec/gitlab/client/client_spec.rb
 - spec/gitlab/client/commits_spec.rb
 - spec/gitlab/client/groups_spec.rb
 - spec/gitlab/client/issues_spec.rb
+- spec/gitlab/client/jobs_spec.rb
+- spec/gitlab/client/keys_spec.rb
 - spec/gitlab/client/labels_spec.rb
 - spec/gitlab/client/merge_requests_spec.rb
 - spec/gitlab/client/milestones_spec.rb
 - spec/gitlab/client/namespaces_spec.rb
 - spec/gitlab/client/notes_spec.rb
+- spec/gitlab/client/pipeline_triggers_spec.rb
 - spec/gitlab/client/pipelines_spec.rb
 - spec/gitlab/client/projects_spec.rb
 - spec/gitlab/client/repositories_spec.rb

data/lib/gitlab/client/build_triggers.rb

@@ -1,51 +0,0 @@
-class Gitlab::Client
-  # Defines methods related to builds.
-  # @see https://docs.gitlab.com/ce/api/build_triggers.html
-  module BuildTriggers
-    # Gets a list of the project's build triggers
-    #
-    # @example
-    #   Gitlab.triggers(5)
-    #
-    # @param  [Integer, String] project The ID or name of a project.
-    # @return [Array<Gitlab::ObjectifiedHash>] The list of triggers.
-    def triggers(project)
-      get("/projects/#{url_encode project}/triggers")
-    end
-
-    # Gets details of project's build trigger.
-    #
-    # @example
-    #   Gitlab.trigger(5, '7b9148c158980bbd9bcea92c17522d')
-    #
-    # @param  [Integer, String] project The ID or name of a project.
-    # @param  [String] token The token of a trigger.
-    # @return [Gitlab::ObjectifiedHash] The trigger.
-    def trigger(project, token)
-      get("/projects/#{url_encode project}/triggers/#{token}")
-    end
-
-    # Create a build trigger for a project.
-    #
-    # @example
-    #   Gitlab.create_trigger(5)
-    #
-    # @param  [Integer, String] project The ID or name of a project.
-    # @return [Gitlab::ObjectifiedHash] The trigger.
-    def create_trigger(project)
-      post("/projects/#{url_encode project}/triggers")
-    end
-
-    # Remove a project's build trigger.
-    #
-    # @example
-    #   Gitlab.remove_trigger(5, '7b9148c158980bbd9bcea92c17522d')
-    #
-    # @param  [Integer, String] project The ID or name of a project.
-    # @param  [String] token The token of a trigger.
-    # @return [Gitlab::ObjectifiedHash] The trigger.
-    def remove_trigger(project, token)
-      delete("/projects/#{url_encode project}/triggers/#{token}")
-    end
-  end
-end

data/spec/gitlab/client/build_triggers_spec.rb

@@ -1,67 +0,0 @@
-require 'spec_helper'
-
-describe Gitlab::Client do
-  describe ".triggers" do
-    before do
-      stub_get("/projects/3/triggers", "triggers")
-      @triggers = Gitlab.triggers(3)
-    end
-
-    it "should get the correct resource" do
-      expect(a_get("/projects/3/triggers")).to have_been_made
-    end
-
-    it "should return an array of project's triggers" do
-      expect(@triggers).to be_a Gitlab::PaginatedResponse
-      expect(@triggers.first.token).to eq("fbdb730c2fbdb095a0862dbd8ab88b")
-    end
-  end
-
-  describe ".trigger" do
-    before do
-      stub_get("/projects/3/triggers/7b9148c158980bbd9bcea92c17522d", "trigger")
-      @trigger = Gitlab.trigger(3, "7b9148c158980bbd9bcea92c17522d")
-    end
-
-    it "should get the correct resource" do
-      expect(a_get("/projects/3/triggers/7b9148c158980bbd9bcea92c17522d")).to have_been_made
-    end
-
-    it "should return information about a trigger" do
-      expect(@trigger.created_at).to eq("2015-12-23T16:25:56.760Z")
-      expect(@trigger.token).to eq("7b9148c158980bbd9bcea92c17522d")
-    end
-  end
-
-  describe ".create_trigger" do
-    before do
-      stub_post("/projects/3/triggers", "trigger")
-      @trigger = Gitlab.create_trigger(3)
-    end
-
-    it "should get the correct resource" do
-      expect(a_post("/projects/3/triggers")).to have_been_made
-    end
-
-    it "should return information about a new trigger" do
-      expect(@trigger.created_at).to eq("2015-12-23T16:25:56.760Z")
-      expect(@trigger.token).to eq("7b9148c158980bbd9bcea92c17522d")
-    end
-  end
-
-  describe ".remove_trigger" do
-    before do
-      stub_delete("/projects/3/triggers/7b9148c158980bbd9bcea92c17522d", "trigger")
-      @trigger = Gitlab.remove_trigger(3, "7b9148c158980bbd9bcea92c17522d")
-    end
-
-    it "should get the correct resource" do
-      expect(a_delete("/projects/3/triggers/7b9148c158980bbd9bcea92c17522d")).to have_been_made
-    end
-
-    it "should return information about a deleted trigger" do
-      expect(@trigger.created_at).to eq("2015-12-23T16:25:56.760Z")
-      expect(@trigger.token).to eq("7b9148c158980bbd9bcea92c17522d")
-    end
-  end
-end