octokit 1.10.0 → 1.11.0

data/CHANGELOG.md

@@ -1,7 +1,7 @@
 # CHANGELOG
 
-* [1.10.0 - August 8,
-* 2012](https://github.com/pengwynn/octokit/compare/v1.9.4...v1.10.0)
+* [1.11.0 - August 29, 2012](https://github.com/pengwynn/octokit/compare/v1.10.0...v1.11.0)
+* [1.10.0 - August 8, 2012](https://github.com/pengwynn/octokit/compare/v1.9.4...v1.10.0)
 * [1.9.4 - August 6, 2012](https://github.com/pengwynn/octokit/compare/v1.9.3...v1.9.4)
 * [1.9.3 - July 27, 2012](https://github.com/pengwynn/octokit/compare/v1.9.2...v1.9.3)
 * [1.9.2 - July 25, 2012](https://github.com/pengwynn/octokit/compare/v1.9.1...v1.9.2)

data/lib/octokit/client/commits.rb

@@ -47,9 +47,8 @@ module Octokit
       #   commit.message # => "My commit message"
       #   commit.committer # => { "name" => "Wynn Netherland", "email" => "wynn@github.com", ... }
       def create_commit(repo, message, tree, parents=nil, options={})
-        params = { :message => message, :tree => tree }.tap do |params|
-          params[:parents] = [parents].flatten if parents
-        end
+        params = { :message => message, :tree => tree }
+        params[:parents] = [parents].flatten if parents
         post("repos/#{Repository.new(repo)}/git/commits", options.merge(params), 3)
       end
 
@@ -93,6 +92,23 @@ module Octokit
         get("repos/#{Repository.new(repo)}/compare/#{start}...#{endd}", options, 3)
       end
 
+      # Merge a branch or sha
+      #
+      # @param repo [String, Hash, Repository] A GitHub repository
+      # @param base [String] The name of the base branch to merge into
+      # @param head [String] The branch or SHA1 to merge
+      # @option options [String] :commit_message The commit message for the merge
+      # @return [Hashie::Mash] A hash representing the comparison
+      # @see http://developer.github.com/v3/repos/merging/
+      def merge(repo, base, head, options={})
+        params = {
+          :base => base,
+          :head => head
+        }.merge(options)
+        post("repos/#{Repository.new(repo)}/merges", params, 3)
+      end
+
+
     end
   end
 end

data/lib/octokit/version.rb

@@ -1,3 +1,3 @@
 module Octokit
-  VERSION = "1.10.0" unless defined?(Octokit::VERSION)
+  VERSION = "1.11.0" unless defined?(Octokit::VERSION)
 end

data/spec/fixtures/v3/merge.json

@@ -0,0 +1,47 @@
+{
+  "author": {
+    "gravatar_id": "7e19cd5486b5d6dc1ef90e671ba52ae0",
+    "login": "pengwynn",
+    "url": "https://api.github.com/users/pengwynn",
+    "id": 865,
+    "avatar_url": "https://secure.gravatar.com/avatar/7e19cd5486b5d6dc1ef90e671ba52ae0?d=https://a248.e.akamai.net/assets.github.com%2Fimages%2Fgravatars%2Fgravatar-user-420.png"
+  },
+  "commit": {
+    "author": {
+      "date": "2012-08-29T17:59:52-07:00",
+      "name": "Wynn Netherland",
+      "email": "wynn@github.com"
+    },
+    "tree": {
+      "sha": "574baabd931c510792e65dd11a09ed0bc4df740c",
+      "url": "https://api.github.com/repos/pengwynn/api-sandbox/git/trees/574baabd931c510792e65dd11a09ed0bc4df740c"
+    },
+    "message": "Testing the merge API",
+    "comment_count": 0,
+    "url": "https://api.github.com/repos/pengwynn/api-sandbox/git/commits/4298c8499e0a7a160975adefdecdf9d8a5437095",
+    "committer": {
+      "date": "2012-08-29T17:59:52-07:00",
+      "name": "Wynn Netherland",
+      "email": "wynn@github.com"
+    }
+  },
+  "sha": "4298c8499e0a7a160975adefdecdf9d8a5437095",
+  "parents": [
+    {
+      "sha": "abf4b791145f0b44114e5db96bf548bcd2aa9c6b",
+      "url": "https://api.github.com/repos/pengwynn/api-sandbox/commits/abf4b791145f0b44114e5db96bf548bcd2aa9c6b"
+    },
+    {
+      "sha": "ed65f66e1fd65351cf2b63bba905b6571ad98d4b",
+      "url": "https://api.github.com/repos/pengwynn/api-sandbox/commits/ed65f66e1fd65351cf2b63bba905b6571ad98d4b"
+    }
+  ],
+  "url": "https://api.github.com/repos/pengwynn/api-sandbox/commits/4298c8499e0a7a160975adefdecdf9d8a5437095",
+  "committer": {
+    "gravatar_id": "7e19cd5486b5d6dc1ef90e671ba52ae0",
+    "login": "pengwynn",
+    "url": "https://api.github.com/users/pengwynn",
+    "id": 865,
+    "avatar_url": "https://secure.gravatar.com/avatar/7e19cd5486b5d6dc1ef90e671ba52ae0?d=https://a248.e.akamai.net/assets.github.com%2Fimages%2Fgravatars%2Fgravatar-user-420.png"
+  }
+}

data/spec/octokit/client/commits_spec.rb

@@ -30,7 +30,7 @@ describe Octokit::Client::Commits do
   end
 
   describe ".create_commit" do
-    
+
     it "should create a commit" do
       stub_post("/repos/octocat/Hello-World/git/commits").
         with(:body => { :message => "My commit message", :tree => "827efc6d56897b048c772eb4087f854f46256132", :parents => ["7d1b31e74ee336d15cbd21741bc88a537ed063a0"] },
@@ -89,4 +89,18 @@ describe Octokit::Client::Commits do
     end
   end
 
+  describe ".merge" do
+
+    before do
+      stub_post("/repos/pengwynn/api-sandbox/merges").
+        to_return(:body => fixture("v3/merge.json"))
+    end
+
+    it "should merge a branch into another" do
+      merge = @client.merge("pengwynn/api-sandbox", "master", "new-branch", :commit_message => "Testing the merge API")
+      merge.sha.should == '4298c8499e0a7a160975adefdecdf9d8a5437095'
+      merge.commit.message.should == 'Testing the merge API'
+    end
+
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: octokit
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.11.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-09 00:00:00.000000000 Z
+date: 2012-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -297,6 +297,7 @@ files:
 - spec/fixtures/v3/languages.json
 - spec/fixtures/v3/list_commit_comments.json
 - spec/fixtures/v3/markdown_gfm
+- spec/fixtures/v3/merge.json
 - spec/fixtures/v3/milestone.json
 - spec/fixtures/v3/milestones.json
 - spec/fixtures/v3/not_found.json
@@ -427,6 +428,7 @@ test_files:
 - spec/fixtures/v3/languages.json
 - spec/fixtures/v3/list_commit_comments.json
 - spec/fixtures/v3/markdown_gfm
+- spec/fixtures/v3/merge.json
 - spec/fixtures/v3/milestone.json
 - spec/fixtures/v3/milestones.json
 - spec/fixtures/v3/not_found.json