octokit 0.6.3 → 0.6.4

data/spec/fixtures/v3/milestones.json

@@ -0,0 +1,28 @@
+[
+  {
+    "url": "https://api.github.com/repos/pengwynn/octokit/milestones/1",
+    "due_on": "2011-05-01T07:00:00Z",
+    "closed_issues": 1,
+    "created_at": "2011-04-29T19:50:34Z",
+    "open_issues": 5,
+    "description": "Add support for API v3",
+    "state": "open",
+    "title": "0.7.0",
+    "number": 1,
+    "creator": {
+      "type": "User",
+      "location": "San Francisco",
+      "url": "https://api.github.com/users/sferik",
+      "login": "sferik",
+      "gravatar_url": "https://secure.gravatar.com/avatar/1f74b13f1e5c6c69cb5d7fbaabb1e2cb?s=30&d=https://d3nwyuy0nl342s.cloudfront.net%2Fimages%2Fgravatars%2Fgravatar-140.png",
+      "email": "sferik@gmail.com",
+      "hireable": false,
+      "company": "Code for America",
+      "blog": "http://twitter.com/sferik",
+      "created_at": "2008-05-14T20:36:12Z",
+      "bio": null,
+      "name": "Erik Michaels-Ober",
+      "html_url": "https://github.com/sferik"
+    }
+  }
+]

data/spec/fixtures/v3/not_found.json

@@ -0,0 +1,3 @@
+{
+  "message": "Not Found"
+}

data/spec/fixtures/v3/user.json

@@ -0,0 +1,20 @@
+{
+  "type": "User",
+  "location": "San Francisco",
+  "url": "https://api.github.com/users/sferik",
+  "avatar_url": "https://secure.gravatar.com/avatar/1f74b13f1e5c6c69cb5d7fbaabb1e2cb?d=https://a248.e.akamai.net/assets.github.com%2Fimages%2Fgravatars%2Fgravatar-140.png",
+  "public_repos": 37,
+  "public_gists": 18,
+  "blog": "http://twitter.com/sferik",
+  "name": "Erik Michaels-Ober",
+  "hireable": false,
+  "login": "sferik",
+  "followers": 205,
+  "following": 91,
+  "created_at": "2008-05-14T20:36:12Z",
+  "email": "sferik@gmail.com",
+  "id": 10308,
+  "html_url": "https://github.com/sferik",
+  "company": "Code for America",
+  "bio": null
+}

data/spec/helper.rb

@@ -1,15 +1,10 @@
+$:.unshift File.expand_path('..', __FILE__)
+$:.unshift File.expand_path('../../lib', __FILE__)
 require 'simplecov'
-SimpleCov.start do
-  add_group 'Octokit', 'lib/octokit'
-  add_group 'Faraday Middleware', 'lib/faraday'
-  add_group 'Specs', 'spec'
-end
+SimpleCov.start
 require 'octokit'
 require 'rspec'
 require 'webmock/rspec'
-RSpec.configure do |config|
-  config.include WebMock::API
-end
 
 def a_delete(url)
   a_request(:delete, github_url(url))
@@ -19,6 +14,10 @@ def a_get(url)
   a_request(:get, github_url(url))
 end
 
+def a_patch(url)
+  a_request(:patch, github_url(url))
+end
+
 def a_post(url)
   a_request(:post, github_url(url))
 end
@@ -35,6 +34,10 @@ def stub_get(url)
   stub_request(:get, github_url(url))
 end
 
+def stub_patch(url)
+  stub_request(:patch, github_url(url))
+end
+
 def stub_post(url)
   stub_request(:post, github_url(url))
 end
@@ -55,10 +58,10 @@ def github_url(url)
   if url =~ /^http/
     url
   elsif @client && @client.authenticated?
-    "https://pengwynn%2Ftoken:OU812@github.com/api/v2/json/#{url}"
+    "https://pengwynn%2Ftoken:OU812@github.com#{url}"
   elsif @client && @client.oauthed?
-    "https://github.com/api/v2/json/#{url}?access_token=#{@client.oauth_token}"
+    "https://github.com#{url}?access_token=#{@client.oauth_token}"
   else
-    "https://github.com/api/v2/json/#{url}"
+    "https://github.com#{url}"
   end
 end

data/spec/octokit/client/commits_spec.rb

@@ -10,7 +10,7 @@ describe Octokit::Client::Pulls do
   describe ".commits" do
 
     it "should return all commits" do
-      stub_get("commits/list/sferik/rails_admin/master").
+      stub_get("/api/v2/json/commits/list/sferik/rails_admin/master").
         to_return(:body => fixture("v2/commits.json"))
       commits = @client.commits("sferik/rails_admin")
       commits.first.author.login.should == "caboteria"
@@ -21,10 +21,10 @@ describe Octokit::Client::Pulls do
   describe ".commit" do
 
     it "should return a commit" do
-      stub_get("commits/show/sferik/rails_admin/3cdfabd973bc3caac209cba903cfdb3bf6636bcd").
+      stub_get("/api/v2/json/commits/show/sferik/rails_admin/3cdfabd973bc3caac209cba903cfdb3bf6636bcd").
         to_return(:body => fixture("v2/commit.json"))
       commit = @client.commit("sferik/rails_admin", "3cdfabd973bc3caac209cba903cfdb3bf6636bcd")
-      commit.first.author.login.should == "caboteria"
+      commit.author.login.should == "caboteria"
     end
 
   end

data/spec/octokit/client/issues_spec.rb

@@ -10,7 +10,7 @@ describe Octokit::Client::Issues do
   describe ".search_issues" do
 
     it "should return matching issues" do
-      stub_get("issues/search/sferik/rails_admin/open/activerecord").
+      stub_get("/api/v2/json/issues/search/sferik/rails_admin/open/activerecord").
       to_return(:body => fixture("v2/issues.json"))
       issues = @client.search_issues("sferik/rails_admin", "activerecord")
       issues.first.number.should == 105
@@ -21,28 +21,18 @@ describe Octokit::Client::Issues do
   describe ".list_issues" do
 
     it "should return issues" do
-
-     stub_get("https://github.com/api/v2/json/issues/list/sferik/rails_admin/open").
-        to_return(:body => fixture("v2/issues.json"))
+      stub_get("https://api.github.com/repos/sferik/rails_admin/issues").
+        to_return(:body => fixture("v3/issues.json"))
       issues = @client.issues("sferik/rails_admin")
-      issues.first.number.should == 105
+      issues.first.number.should == 388
     end
 
   end
 
-  describe ".issues_labeled" do
-    it "should return issues with a particular label" do
-      stub_get("issues/list/sferik/rails_admin/label/bug").
-        to_return(:body => fixture("v2/issues.json"))
-      issues = @client.issues_labeled("sferik/rails_admin", "bug")
-      issues.first.number.should == 105
-    end
-  end
-
   describe ".create_issue" do
 
     it "should create an issue" do
-      stub_post("issues/open/sferik/rails_admin").
+      stub_post("/api/v2/json/issues/open/sferik/rails_admin").
         to_return(:body => fixture("v2/issue.json"))
       issue = @client.create_issue("sferik/rails_admin", "Use OrmAdapter instead of talking directly to ActiveRecord", "Hi,\n\nI just tried to play with this in an app with no ActiveRecord.  I was disappointed.  It seems the only reason the engine relies on AR is to provide History functionality.  I would argue that having the History in a database, and therefore tying the app to AR & SQL, isn't worth it.  How about we change it to just dump to a CSV and remove the AR dep?\n\n$0.02")
       issue.number.should == 105
@@ -53,7 +43,7 @@ describe Octokit::Client::Issues do
   describe ".issue" do
 
     it "should return an issue" do
-      stub_get("issues/show/sferik/rails_admin/105").
+      stub_get("/api/v2/json/issues/show/sferik/rails_admin/105").
         to_return(:body => fixture("v2/issue.json"))
       issue = @client.issue("sferik/rails_admin", 105)
       issue.number.should == 105
@@ -61,21 +51,10 @@ describe Octokit::Client::Issues do
 
   end
 
-  describe ".issue_comments" do
-
-    it "should return comments for an issue" do
-      stub_get("issues/comments/sferik/rails_admin/105").
-        to_return(:body => fixture("v2/comments.json"))
-      comments = @client.issue_comments("sferik/rails_admin", 105)
-      comments.first.user.should == "jackdempsey"
-    end
-
-  end
-
   describe ".close_issue" do
 
     it "should close an issue" do
-      stub_post("issues/close/sferik/rails_admin/105").
+      stub_post("/api/v2/json/issues/close/sferik/rails_admin/105").
         to_return(:body => fixture("v2/issue.json"))
       issue = @client.close_issue("sferik/rails_admin", 105)
       issue.number.should == 105
@@ -86,7 +65,7 @@ describe Octokit::Client::Issues do
   describe ".reopen_issue" do
 
     it "should reopen an issue" do
-      stub_post("issues/reopen/sferik/rails_admin/105").
+      stub_post("/api/v2/json/issues/reopen/sferik/rails_admin/105").
         to_return(:body => fixture("v2/issue.json"))
       issue = @client.reopen_issue("sferik/rails_admin", 105)
       issue.number.should == 105
@@ -97,7 +76,7 @@ describe Octokit::Client::Issues do
   describe ".update_issue" do
 
     it "should update an issue" do
-      stub_post("issues/edit/sferik/rails_admin/105").
+      stub_post("/api/v2/json/issues/edit/sferik/rails_admin/105").
         to_return(:body => fixture("v2/issue.json"))
       issue = @client.update_issue("sferik/rails_admin", 105, "Use OrmAdapter instead of talking directly to ActiveRecord", "Hi,\n\nI just tried to play with this in an app with no ActiveRecord.  I was disappointed.  It seems the only reason the engine relies on AR is to provide History functionality.  I would argue that having the History in a database, and therefore tying the app to AR & SQL, isn't worth it.  How about we change it to just dump to a CSV and remove the AR dep?\n\n$0.02")
       issue.number.should == 105
@@ -108,10 +87,21 @@ describe Octokit::Client::Issues do
   describe ".labels" do
 
     it "should return labels" do
-      stub_get("issues/labels/sferik/rails_admin").
-        to_return(:body => fixture("v2/labels.json"))
-      labels = @client.labels("sferik/rails_admin")
-      labels.first.should == "bug"
+      stub_get("https://api.github.com/repos/pengwynn/octokit/labels").
+        to_return(:body => fixture("v3/labels.json"))
+      labels = @client.labels("pengwynn/octokit")
+      labels.first.name.should == "V3 Transition"
+    end
+
+  end
+
+  describe ".label" do
+
+    it "should return a single labels" do
+      stub_get("https://api.github.com/repos/pengwynn/octokit/labels/V3%20Addition").
+        to_return(:status => 200, :body => fixture('v3/label.json'))
+      label = @client.label("pengwynn/octokit", 'V3 Addition')
+      label.name.should == "V3 Addition"
     end
 
   end
@@ -119,10 +109,11 @@ describe Octokit::Client::Issues do
   describe ".add_label" do
 
     it "should add a label" do
-      stub_post("issues/label/add/sferik/rails_admin/bug").
-        to_return(:body => fixture("v2/labels.json"))
-      labels = @client.add_label("sferik/rails_admin", "bug")
-      labels.first.should == "bug"
+      stub_post("https://api.github.com/repos/pengwynn/octokit/labels").
+        to_return(:status => 201, :body => fixture('v3/label.json'))
+      labels = @client.add_label("pengwynn/octokit", "bug", 'ededed')
+      labels.color.should == "ededed"
+      labels.name.should  == "V3 Addition"
     end
 
   end
@@ -130,7 +121,7 @@ describe Octokit::Client::Issues do
   describe ".remove_label" do
 
     it "should remove a label" do
-      stub_post("issues/label/remove/sferik/rails_admin/bug").
+      stub_post("/api/v2/json/issues/label/remove/sferik/rails_admin/bug").
         to_return(:body => fixture("v2/labels.json"))
       labels = @client.remove_label("sferik/rails_admin", "bug")
       labels.first.should == "bug"
@@ -138,16 +129,63 @@ describe Octokit::Client::Issues do
 
   end
 
+  describe ".issue_comments" do
+
+    it "should return comments for an issue" do
+      stub_get("https://api.github.com/repos/pengwynn/octokit/issues/25/comments").
+        to_return(:status => 200, :body => fixture('v3/comments.json'))
+      comments = @client.issue_comments("pengwynn/octokit", 25)
+      comments.first.user.login.should == "ctshryock"
+    end
+
+  end
+
+  describe ".issue_comment" do
+
+    it "should return a single comment for an issue" do
+      stub_get("https://api.github.com/repos/pengwynn/octokit/issues/comments/25").
+        to_return(:status => 200, :body => fixture('v3/comment.json'))
+      comments = @client.issue_comment("pengwynn/octokit", 25)
+      comments.user.login.should == "ctshryock"
+      comments.url.should == "https://api.github.com/repos/pengwynn/octokit/issues/comments/1194690"
+    end
+
+  end
+
   describe ".add_comment" do
 
     it "should add a comment" do
-      stub_post("issues/comment/sferik/rails_admin/105").
-        with(:comment => "I don't think I'd like it in a CSV for a variety of reasons, but I do agree that it doesn't have to be AR. I would imagine if there was a patch and work done towards allowing a pluggable History model, it'd be at least considered. I don't have the time at the moment to do this, but I'd imagine you could start with abstracting out the calls to read/write History, ultimately allowing for a drop in of any storage structure. \r\n\r\nIn fact, it might be interesting to leverage wycats moneta towards this end: http://github.com/wycats/moneta").
-        to_return(:body => fixture("v2/comment.json"))
-      comment = @client.add_comment("sferik/rails_admin", 105, "I don't think I'd like it in a CSV for a variety of reasons, but I do agree that it doesn't have to be AR. I would imagine if there was a patch and work done towards allowing a pluggable History model, it'd be at least considered. I don't have the time at the moment to do this, but I'd imagine you could start with abstracting out the calls to read/write History, ultimately allowing for a drop in of any storage structure. \r\n\r\nIn fact, it might be interesting to leverage wycats moneta towards this end: http://github.com/wycats/moneta")
-      comment.user.should == "jackdempsey"
+      stub_post("https://api.github.com/repos/pengwynn/octokit/issues/25/comments").
+        with(:body => "{\"body\":\"A test comment\"}",
+        :headers => {'Content-Type'=>'application/json'}).
+        to_return(:status => 201, :body => fixture('v3/comment.json'))
+      comment = @client.add_comment("pengwynn/octokit", 25, "A test comment")
+      comment.user.login.should == "ctshryock"
+    end
+
+  end
+
+  describe ".update_comment" do
+
+    it "should update an existing comment" do
+      stub_post("https://api.github.com/repos/pengwynn/octokit/issues/comments/1194549").
+        with(:body => "{\"body\":\"A test comment update\"}",
+        :headers => {'Content-Type'=>'application/json'}).
+        to_return(:status => 200, :body => fixture('v3/comment.json'))
+      comment = @client.update_comment("pengwynn/octokit", 1194549, "A test comment update")
+      comment.user.login.should == "ctshryock"
     end
 
   end
 
+  describe ".delete_comment" do
+
+    it "should delete an existing comment" do
+      stub_delete("https://api.github.com/repos/pengwynn/octokit/issues/comments/1194549").
+        to_return(:status => 204)
+      comment = @client.delete_comment("pengwynn/octokit", 1194549)
+      comment.status.should == 204
+    end
+
+  end
 end

data/spec/octokit/client/milestones_spec.rb

@@ -0,0 +1,67 @@
+# -*- encoding: utf-8 -*-
+require 'helper'
+
+describe Octokit::Client::Milestones do
+
+  before do
+    @client = Octokit::Client.new(:login => 'sferik')
+  end
+
+  describe ".list_milestones" do
+
+    it "should list milestones belonging to repository" do
+      stub_get("https://api.github.com/repos/pengwynn/octokit/milestones").
+        to_return(:status => 200, :body => fixture('v3/milestones.json'))
+      milestones = @client.list_milestones("pengwynn/octokit")
+      milestones.first.description.should == "Add support for API v3"
+    end
+
+  end
+
+  describe ".milestone" do
+
+    it "should get a single milestone belonging to repository" do
+      stub_get("https://api.github.com/repos/pengwynn/octokit/milestones/1").
+        to_return(:status => 200, :body => fixture('v3/milestone.json'))
+      milestones = @client.milestone("pengwynn/octokit", 1)
+      milestones.description.should == "Add support for API v3"
+    end
+
+  end
+
+  describe ".create_milestone" do
+
+    it "should create a single milestone" do
+      stub_post("https://api.github.com/repos/pengwynn/octokit/milestones").
+        with(:body => '{"title":"0.7.0"}', :headers => {'Content-Type'=>'application/json'}).
+        to_return(:status => 201, :body => fixture('v3/milestone.json'))
+      milestone = @client.create_milestone("pengwynn/octokit", "0.7.0")
+      milestone.title.should == "0.7.0"
+    end
+
+  end
+
+  describe ".update_milestone" do
+
+    it "should update a milestone" do
+      stub_post("https://api.github.com/repos/pengwynn/octokit/milestones/1").
+        with(:body => "{\"description\":\"Add support for API v3\"}", :headers => {'Accept'=>'*/*', 'Content-Type'=>'application/json'}).
+        to_return(:status => 200, :body => fixture('v3/milestone.json'))
+      milestone = @client.update_milestone("pengwynn/octokit", 1, {:description => "Add support for API v3"})
+      milestone.description.should == "Add support for API v3"
+    end
+
+  end
+
+  describe ".delete_milestone" do
+
+    it "should delete a milestone from a repository" do
+      stub_delete("https://api.github.com/repos/pengwynn/octokit/milestones/2").
+        to_return(:status => 204, :body => "", :headers => {})
+      response = @client.delete_milestone("pengwynn/octokit", 2)
+      response.status.should == 204
+    end
+
+  end
+
+end

data/spec/octokit/client/objects_spec.rb

@@ -10,7 +10,7 @@ describe Octokit::Client::Objects do
   describe ".tree" do
 
     it "should return a tree" do
-      stub_get("tree/show/sferik/rails_admin/3cdfabd973bc3caac209cba903cfdb3bf6636bcd").
+      stub_get("/api/v2/json/tree/show/sferik/rails_admin/3cdfabd973bc3caac209cba903cfdb3bf6636bcd").
         to_return(:body => fixture("v2/tree.json"))
       tree = @client.tree("sferik/rails_admin", "3cdfabd973bc3caac209cba903cfdb3bf6636bcd")
       tree.first.name.should == ".gitignore"
@@ -21,7 +21,7 @@ describe Octokit::Client::Objects do
   describe ".blob" do
 
     it "should return a blob" do
-      stub_get("blob/show/sferik/rails_admin/3cdfabd973bc3caac209cba903cfdb3bf6636bcd/README.mkd").
+      stub_get("/api/v2/json/blob/show/sferik/rails_admin/3cdfabd973bc3caac209cba903cfdb3bf6636bcd/README.mkd").
         to_return(:body => fixture("v2/blob.json"))
       blob = @client.blob("sferik/rails_admin", "3cdfabd973bc3caac209cba903cfdb3bf6636bcd", "README.mkd")
       blob.name.should == "README.mkd"
@@ -32,7 +32,7 @@ describe Octokit::Client::Objects do
   describe ".blobs" do
 
     it "should return blobs" do
-      stub_get("blob/all/sferik/rails_admin/3cdfabd973bc3caac209cba903cfdb3bf6636bcd").
+      stub_get("/api/v2/json/blob/all/sferik/rails_admin/3cdfabd973bc3caac209cba903cfdb3bf6636bcd").
         to_return(:body => fixture("v2/blobs.json"))
       blobs = @client.blobs("sferik/rails_admin", "3cdfabd973bc3caac209cba903cfdb3bf6636bcd")
       blobs[".gitignore"].should == "5efe0eb47a773fa6ea84a0bf190ee218b6a31ead"
@@ -43,7 +43,7 @@ describe Octokit::Client::Objects do
   describe ".blob_metadata" do
 
     it "should return blob metadata" do
-      stub_get("blob/full/sferik/rails_admin/3cdfabd973bc3caac209cba903cfdb3bf6636bcd").
+      stub_get("/api/v2/json/blob/full/sferik/rails_admin/3cdfabd973bc3caac209cba903cfdb3bf6636bcd").
         to_return(:body => fixture("v2/blob_metadata.json"))
       blob_metadata = @client.blob_metadata("sferik/rails_admin", "3cdfabd973bc3caac209cba903cfdb3bf6636bcd")
       blob_metadata.first.name.should == ".gitignore"
@@ -54,7 +54,7 @@ describe Octokit::Client::Objects do
   describe ".tree_metadata" do
 
     it "should return tree metadata" do
-      stub_get("tree/full/sferik/rails_admin/3cdfabd973bc3caac209cba903cfdb3bf6636bcd").
+      stub_get("/api/v2/json/tree/full/sferik/rails_admin/3cdfabd973bc3caac209cba903cfdb3bf6636bcd").
         to_return(:body => fixture("v2/tree_metadata.json"))
       tree_metadata = @client.tree_metadata("sferik/rails_admin", "3cdfabd973bc3caac209cba903cfdb3bf6636bcd")
       tree_metadata.first.name.should == ".gitignore"
@@ -65,7 +65,7 @@ describe Octokit::Client::Objects do
   describe ".raw" do
 
     it "should return raw data" do
-      stub_get("blob/show/sferik/rails_admin/3cdfabd973bc3caac209cba903cfdb3bf6636bcd").
+      stub_get("/api/v2/json/blob/show/sferik/rails_admin/3cdfabd973bc3caac209cba903cfdb3bf6636bcd").
         to_return(:body => fixture("v2/raw.txt"))
       raw = @client.raw("sferik/rails_admin", "3cdfabd973bc3caac209cba903cfdb3bf6636bcd")
       lambda {