gitlab 2.1.0 → 2.2.0

data/lib/gitlab/client.rb

@@ -9,5 +9,6 @@ module Gitlab
     include Gitlab::Client::Snippets
     include Gitlab::Client::Projects
     include Gitlab::Client::Repositories
+    include Gitlab::Client::MergeRequests
   end
 end

data/lib/gitlab/client/merge_requests.rb

@@ -0,0 +1,32 @@
+class Gitlab::Client
+  # Defines methods related to merge requests.
+  module MergeRequests
+    # Gets a list of project merge requests.
+    #
+    # @example
+    #   Gitlab.merge_requests(5)
+    #   Gitlab.merge_requests('gitlab', :per_page => 40)
+    #
+    # @param  [Integer, String] project The ID or code name of a project.
+    # @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.
+    # @return [Array<Gitlab::ObjectifiedHash>]
+    def merge_requests(project, options={})
+      get("/projects/#{project}/merge_requests", :query => options)
+    end
+
+    # Gets a single merge request.
+    #
+    # @example
+    #   Gitlab.merge_request(5, 36)
+    #   Gitlab.merge_request('gitlab', 42)
+    #
+    # @param  [Integer, String] project The ID or code name of a project.
+    # @param  [Integer] id The ID of a merge request.
+    # @return [Array<Gitlab::ObjectifiedHash>]
+    def merge_request(project, id)
+      get("/projects/#{project}/merge_request/#{id}")
+    end
+  end
+end

data/lib/gitlab/version.rb

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

data/spec/fixtures/merge_request.json

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

data/spec/fixtures/merge_requests.json

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

data/spec/gitlab/client/merge_requests_spec.rb

@@ -0,0 +1,35 @@
+require 'spec_helper'
+
+describe Gitlab::Client do
+  describe ".merge_requests" do
+    before do
+      stub_get("/projects/3/merge_requests", "merge_requests")
+      @merge_requests = Gitlab.merge_requests(3)
+    end
+
+    it "should get the correct resource" do
+      a_get("/projects/3/merge_requests").should have_been_made
+    end
+
+    it "should return an array of project's merge requests" do
+      @merge_requests.should be_an Array
+      @merge_requests.first.project_id.should == 3
+    end
+  end
+
+  describe ".merge_request" do
+    before do
+      stub_get("/projects/3/merge_request/1", "merge_request")
+      @merge_request = Gitlab.merge_request(3, 1)
+    end
+
+    it "should get the correct resource" do
+      a_get("/projects/3/merge_request/1").should have_been_made
+    end
+
+    it "should return information about a merge request" do
+      @merge_request.project_id.should == 3
+      @merge_request.assignee.name.should == "Jack Smith"
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gitlab
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-22 00:00:00.000000000 Z
+date: 2012-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -93,6 +93,7 @@ files:
 - lib/gitlab/api.rb
 - lib/gitlab/client.rb
 - lib/gitlab/client/issues.rb
+- lib/gitlab/client/merge_requests.rb
 - lib/gitlab/client/milestones.rb
 - lib/gitlab/client/projects.rb
 - lib/gitlab/client/repositories.rb
@@ -107,6 +108,8 @@ files:
 - spec/fixtures/issues.json
 - spec/fixtures/key.json
 - spec/fixtures/keys.json
+- spec/fixtures/merge_request.json
+- spec/fixtures/merge_requests.json
 - spec/fixtures/milestone.json
 - spec/fixtures/milestones.json
 - spec/fixtures/project.json
@@ -126,6 +129,7 @@ files:
 - spec/fixtures/user.json
 - spec/fixtures/users.json
 - spec/gitlab/client/issues_spec.rb
+- spec/gitlab/client/merge_requests_spec.rb
 - spec/gitlab/client/milestones_spec.rb
 - spec/gitlab/client/projects_spec.rb
 - spec/gitlab/client/repositories_spec.rb
@@ -147,7 +151,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2246136145939191408
+      hash: 2963667120197220798
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -156,7 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2246136145939191408
+      hash: 2963667120197220798
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -168,6 +172,8 @@ test_files:
 - spec/fixtures/issues.json
 - spec/fixtures/key.json
 - spec/fixtures/keys.json
+- spec/fixtures/merge_request.json
+- spec/fixtures/merge_requests.json
 - spec/fixtures/milestone.json
 - spec/fixtures/milestones.json
 - spec/fixtures/project.json
@@ -187,6 +193,7 @@ test_files:
 - spec/fixtures/user.json
 - spec/fixtures/users.json
 - spec/gitlab/client/issues_spec.rb
+- spec/gitlab/client/merge_requests_spec.rb
 - spec/gitlab/client/milestones_spec.rb
 - spec/gitlab/client/projects_spec.rb
 - spec/gitlab/client/repositories_spec.rb