octokit 0.6.3 → 0.6.4

data/.travis.yml

@@ -5,3 +5,4 @@ rvm:
   - jruby
   - rbx
   - ree
+  - ruby-head

data/CHANGELOG.md

@@ -1,20 +1,20 @@
 # CHANGELOG
 
-* [0.6.3 - May 5, 2011](https://github.com/intridea/oauth2/compare/v0.6.2...v0.6.3)
-* [0.6.2 - April 26, 2011](https://github.com/intridea/oauth2/compare/v0.6.1...v0.6.2)
-* [0.6.1 - April 6, 2011](https://github.com/intridea/oauth2/compare/v0.6.0...v0.6.1)
-* [0.6.0 - March 20, 2011](https://github.com/intridea/oauth2/compare/v0.5.2...v0.6.0)
-* [0.5.2 - February 6, 2011](https://github.com/intridea/oauth2/compare/v0.5.1...v0.5.2)
-* [0.5.1 - February 3, 2011](https://github.com/intridea/oauth2/compare/v0.5.0...v0.5.1)
-* [0.5.0 - January 21, 2011](https://github.com/intridea/oauth2/compare/v0.4.1....v0.5.0)
-* [0.4.1 - January 8, 2011](https://github.com/intridea/oauth2/compare/v0.2.3...v0.4.1)
-* [0.2.3 - June 17, 2010](https://github.com/intridea/oauth2/compare/v0.2.2...v0.2.3)
-* [0.2.2 - June 8, 2010](https://github.com/intridea/oauth2/compare/v0.2.1...v0.2.2)
-* [0.2.1 - May 4, 2010](https://github.com/intridea/oauth2/compare/v0.2.0...v0.2.1)
-* [0.2.0 - April 30, 2010](https://github.com/intridea/oauth2/compare/v0.1.4...v0.2.0)
-* [0.1.4 - January 13, 2010](https://github.com/intridea/oauth2/compare/v0.1.3...v0.1.4)
-* [0.1.3 - December 16, 2009](https://github.com/intridea/oauth2/compare/v0.1.2...v0.1.3)
-* [0.1.2 - December 16, 2009](https://github.com/intridea/oauth2/compare/v0.1.1...v0.1.2)
-* [0.1.1 - December 15, 2009](https://github.com/intridea/oauth2/compare/v0.1.0...v0.1.1)
-* [0.1.0 - December 12, 2009](https://github.com/intridea/oauth2/compare/v0.0.1...v0.1.0)
-* [0.0.1 - December 12, 2009](https://github.com/intridea/oauth2/compare/cb7d5480944229e1a5ddfa9d1113903628765584...v0.0.1)
+* [0.6.3 - May 5, 2011](https://github.com/pengwynn/octokit/compare/v0.6.2...v0.6.3)
+* [0.6.2 - April 26, 2011](https://github.com/pengwynn/octokit/compare/v0.6.1...v0.6.2)
+* [0.6.1 - April 6, 2011](https://github.com/pengwynn/octokit/compare/v0.6.0...v0.6.1)
+* [0.6.0 - March 20, 2011](https://github.com/pengwynn/octokit/compare/v0.5.2...v0.6.0)
+* [0.5.2 - February 6, 2011](https://github.com/pengwynn/octokit/compare/v0.5.1...v0.5.2)
+* [0.5.1 - February 3, 2011](https://github.com/pengwynn/octokit/compare/v0.5.0...v0.5.1)
+* [0.5.0 - January 21, 2011](https://github.com/pengwynn/octokit/compare/v0.4.1...v0.5.0)
+* [0.4.1 - January 8, 2011](https://github.com/pengwynn/octokit/compare/v0.2.3...v0.4.1)
+* [0.2.3 - June 17, 2010](https://github.com/pengwynn/octokit/compare/v0.2.2...v0.2.3)
+* [0.2.2 - June 8, 2010](https://github.com/pengwynn/octokit/compare/v0.2.1...v0.2.2)
+* [0.2.1 - May 4, 2010](https://github.com/pengwynn/octokit/compare/v0.2.0...v0.2.1)
+* [0.2.0 - April 30, 2010](https://github.com/pengwynn/octokit/compare/v0.1.4...v0.2.0)
+* [0.1.4 - January 13, 2010](https://github.com/pengwynn/octokit/compare/v0.1.3...v0.1.4)
+* [0.1.3 - December 16, 2009](https://github.com/pengwynn/octokit/compare/v0.1.2...v0.1.3)
+* [0.1.2 - December 16, 2009](https://github.com/pengwynn/octokit/compare/v0.1.1...v0.1.2)
+* [0.1.1 - December 15, 2009](https://github.com/pengwynn/octokit/compare/v0.1.0...v0.1.1)
+* [0.1.0 - December 12, 2009](https://github.com/pengwynn/octokit/compare/v0.0.1...v0.1.0)
+* [0.0.1 - December 12, 2009](https://github.com/pengwynn/octokit/compare/cb7d5480944229e1a5ddfa9d1113903628765584...v0.0.1)

data/README.md

@@ -2,6 +2,8 @@ Octokit
 =======
 Simple Ruby wrapper for the GitHub v2 API.
 
+![The Puppeteer](https://github.com/pengwynn/octokit/raw/master/puppeteer.jpg "The Puppeteer") by [![Cameron McEfee)](https://secure.gravatar.com/avatar/a79ff2bb7da84e275361857d2feb2b1b?s=20 "Cameron McEfee")](https://github.com/cameronmcefee)
+
 Installation
 ------------
     gem install octokit
@@ -20,7 +22,7 @@ Examples
 ### Show a user
 
     Octokit.user("sferik")
-    => <#Hashie::Mash blog="http://twitter.com/sferik" company="Code for America" created_at="2008/05/14 13:36:12 -0700" email="sferik@gmail.com" followers_count=177 following_count=83 gravatar_id="1f74b13f1e5c6c69cb5d7fbaabb1e2cb" id=10308 location="San Francisco" login="sferik" name="Erik Michaels-Ober" permission=nil public_gist_count=16 public_repo_count=30 type="User">
+    => <#Hashie::Rash blog="http://twitter.com/sferik" company="Code for America" created_at="2008/05/14 13:36:12 -0700" email="sferik@gmail.com" followers_count=177 following_count=83 gravatar_id="1f74b13f1e5c6c69cb5d7fbaabb1e2cb" id=10308 location="San Francisco" login="sferik" name="Erik Michaels-Ober" permission=nil public_gist_count=16 public_repo_count=30 type="User">
 
 ### Show who a user follows
 
@@ -36,7 +38,7 @@ For convenience, methods that require a repoistory argument may be passed in any
 * instance of `Repository`
 
     Octokit.repo("pengwynn/octokit")
-    => <#Hashie::Mash created_at="2009/12/10 13:41:49 -0800" description="Simple Ruby wrapper for the GitHub v2 API and feeds" fork=false forks=25 has_downloads=true has_issues=true has_wiki=true homepage="http://wynnnetherland.com/projects/octokit" integrate_branch="master" language="Ruby" name="octokit" open_issues=8 owner="pengwynn" private=false pushed_at="2011/05/05 06:12:21 -0700" size=1660 url="https://github.com/pengwynn/octokit" watchers=92>
+    => <#Hashie::Rash created_at="2009/12/10 13:41:49 -0800" description="Simple Ruby wrapper for the GitHub v2 API and feeds" fork=false forks=25 has_downloads=true has_issues=true has_wiki=true homepage="http://wynnnetherland.com/projects/octokit" integrate_branch="master" language="Ruby" name="octokit" open_issues=8 owner="pengwynn" private=false pushed_at="2011/05/05 10:48:57 -0700" size=1804 url="https://github.com/pengwynn/octokit" watchers=92>
 
 Authenticated requests
 ----------------------
@@ -59,7 +61,7 @@ Submitting a Pull Request
 
 Inspiration
 -----------
-Octokit was inspired by [Octopi](http://github.com/fcoury/octopi) and aims to be a lightweight, less-ActiveResourcey alternative.
+Octokit was inspired by [Octopi](https://github.com/fcoury/octopi) and aims to be a lightweight, less-ActiveResourcey alternative.
 
 Copyright
 ---------

data/Rakefile

@@ -1,3 +1,5 @@
+#!/usr/bin/env rake
+
 require 'bundler'
 Bundler::GemHelper.install_tasks
 

data/lib/faraday/response/{raise_error.rb → raise_octokit_error.rb}

@@ -1,8 +1,9 @@
 require 'faraday'
+require 'multi_json'
 
 # @api private
 module Faraday
-  class Response::RaiseError < Response::Middleware
+  class Response::RaiseOctokitError < Response::Middleware
     def on_complete(response)
       case response[:status].to_i
       when 400
@@ -15,6 +16,8 @@ module Faraday
         raise Octokit::NotFound, error_message(response)
       when 406
         raise Octokit::NotAcceptable, error_message(response)
+      when 422
+        raise Octokit::UnprocessableEntity, error_message(response)
       when 500
         raise Octokit::InternalServerError, error_message(response)
       when 501
@@ -27,7 +30,13 @@ module Faraday
     end
 
     def error_message(response)
-      "#{response[:method].to_s.upcase} #{response[:url].to_s}: #{response[:status]}#{(': ' + response[:body][:error]) if response[:body]}"
+      message = if body = response[:body]
+        body = ::MultiJson.decode(body) if body.is_a? String
+        ": #{body[:error] || body[:message] || ''}"
+      else
+        ''
+      end
+      "#{response[:method].to_s.upcase} #{response[:url].to_s}: #{response[:status]}#{message}"
     end
   end
 end

data/lib/octokit.rb

@@ -1,53 +1,25 @@
 require 'octokit/configuration'
 require 'octokit/client'
+require 'octokit/error'
 
 module Octokit
   extend Configuration
-
-  # Alias for Octokit::Client.new
-  #
-  # @return [Octokit::Client]
-  def self.client(options={})
-    Octokit::Client.new(options)
-  end
-
-  # Delegate to Octokit::Client.new
-  def self.method_missing(method, *args, &block)
-    return super unless client.respond_to?(method)
-    client.send(method, *args, &block)
-  end
-
-  def self.respond_to?(method, include_private=false)
-    client.respond_to?(method, include_private) || super(method, include_private)
+  class << self
+    # Alias for Octokit::Client.new
+    #
+    # @return [Octokit::Client]
+    def new(options={})
+      Octokit::Client.new(options)
+    end
+
+    # Delegate to Octokit::Client.new
+    def method_missing(method, *args, &block)
+      return super unless new.respond_to?(method)
+      new.send(method, *args, &block)
+    end
+
+    def respond_to?(method, include_private=false)
+      new.respond_to?(method, include_private) || super(method, include_private)
+    end
   end
-
-  # Custom error class for rescuing from all GitHub errors
-  class Error < StandardError; end
-
-  # Raised when GitHub returns a 400 HTTP status code
-  class BadRequest < Error; end
-
-  # Raised when GitHub returns a 401 HTTP status code
-  class Unauthorized < Error; end
-
-  # Raised when GitHub returns a 403 HTTP status code
-  class Forbidden < Error; end
-
-  # Raised when GitHub returns a 404 HTTP status code
-  class NotFound < Error; end
-
-  # Raised when GitHub returns a 406 HTTP status code
-  class NotAcceptable < Error; end
-
-  # Raised when GitHub returns a 500 HTTP status code
-  class InternalServerError < Error; end
-
-  # Raised when GitHub returns a 501 HTTP status code
-  class NotImplemented < Error; end
-
-  # Raised when GitHub returns a 502 HTTP status code
-  class BadGateway < Error; end
-
-  # Raised when GitHub returns a 503 HTTP status code
-  class ServiceUnavailable < Error; end
 end

data/lib/octokit/authentication.rb

@@ -0,0 +1,21 @@
+module Octokit
+  module Authentication
+    def authentication
+      if login && token
+        {:login => "#{login}/token", :password => token}
+      elsif login && password
+        {:login => login, :password => password}
+      else
+        {}
+      end
+    end
+
+    def authenticated?
+      !authentication.empty?
+    end
+
+    def oauthed?
+      !oauth_token.nil?
+    end
+  end
+end

data/lib/octokit/client.rb

@@ -1,12 +1,16 @@
+require 'octokit/authentication'
+require 'octokit/connection'
 require 'octokit/repository'
-require 'octokit/client/authentication'
-require 'octokit/client/connection'
-require 'octokit/client/request'
+require 'octokit/request'
+
 require 'octokit/client/commits'
 require 'octokit/client/issues'
 require 'octokit/client/network'
+require 'octokit/client/milestones'
 require 'octokit/client/objects'
 require 'octokit/client/organizations'
+require 'octokit/client/pub_sub_hubbub'
+require 'octokit/client/pub_sub_hubbub/service_hooks'
 require 'octokit/client/pulls'
 require 'octokit/client/repositories'
 require 'octokit/client/timelines'
@@ -23,16 +27,19 @@ module Octokit
       end
     end
 
-    include Octokit::Client::Authentication
-    include Octokit::Client::Connection
-    include Octokit::Client::Request
+    include Octokit::Authentication
+    include Octokit::Connection
+    include Octokit::Request
 
     include Octokit::Client::Commits
     include Octokit::Client::Issues
     include Octokit::Client::Network
+    include Octokit::Client::Milestones
     include Octokit::Client::Objects
     include Octokit::Client::Organizations
     include Octokit::Client::Pulls
+    include Octokit::Client::PubSubHubbub
+    include Octokit::Client::PubSubHubbub::ServiceHooks
     include Octokit::Client::Repositories
     include Octokit::Client::Timelines
     include Octokit::Client::Users

data/lib/octokit/client/commits.rb

@@ -3,12 +3,12 @@ module Octokit
     module Commits
 
       def commits(repo, branch="master", options={})
-        get("api/v2/json/commits/list/#{Repository.new(repo)}/#{branch}", options)['commits']
+        get("/api/v2/json/commits/list/#{Repository.new(repo)}/#{branch}", options)['commits']
       end
       alias :list_commits :commits
 
       def commit(repo, sha, options={})
-        get("api/v2/json/commits/show/#{Repository.new(repo)}/#{sha}", options)['commits']
+        get("/api/v2/json/commits/show/#{Repository.new(repo)}/#{sha}", options)['commit']
       end
 
     end

data/lib/octokit/client/issues.rb

@@ -2,58 +2,221 @@ module Octokit
   class Client
     module Issues
 
+      # Search issues within a repository
+      #
+      # @param repository [String, Repository, Hash] A GitHub repository.
+      # @param search_term [String] The term to search for
+      # @param state [String] :state (open) <tt>open</tt> or <tt>closed</tt>.
+      # @return [Array] A list of issues matching the search term and state
+      # @see http://develop.github.com/p/issues.html
+      # @example Search for 'test' in the open issues for sferik/rails_admin
+      #   Octokit.search_issues("sferik/rails_admin", 'test', 'open')
       def search_issues(repo, search_term, state='open', options={})
-        get("api/v2/json/issues/search/#{Repository.new(repo)}/#{state}/#{search_term}", options)['issues']
+        get("/api/v2/json/issues/search/#{Repository.new(repo)}/#{state}/#{search_term}", options)['issues']
       end
 
-      def list_issues(repo, state='open', options={})
-        get("api/v2/json/issues/list/#{Repository.new(repo)}/#{state}", options)['issues']
+      # List issues for a repository
+      #
+      # @param repository [String, Repository, Hash] A GitHub repository.
+      # @param options [Hash] A customizable set of options.
+      # @option options [Integer] :milestone Milestone number.
+      # @option options [String] :state (open) State: <tt>open</tt> or <tt>closed</tt>.
+      # @option options [String] :assignee User login.
+      # @option options [String] :mentioned User login.
+      # @option options [String] :labels List of comma separated Label names. Example: <tt>bug,ui,@high</tt>.
+      # @option options [String] :sort (created) Sort: <tt>created</tt>, <tt>updated</tt>, or <tt>comments</tt>.
+      # @option options [String] :direction (desc) Direction: <tt>asc</tt> or <tt>desc</tt>.
+      # @option options [Integer] :page (1) Page number.
+      # @return [Array] A list of issues for a repository.
+      # @see http://developer.github.com/v3/issues/#list-issues-for-this-repository
+      # @example List issues for a repository
+      #   Octokit.list_issues("sferik/rails_admin")
+      def list_issues(repository, options={})
+        get("/repos/#{Repository.new(repository)}/issues", options, 3)
       end
       alias :issues :list_issues
 
-      def issues_labeled(repo, label, options={})
-        get("api/v2/json/issues/list/#{Repository.new(repo)}/label/#{label}", options)['issues']
-      end
-
+      # Create an issue for a repository
+      #
+      # @param repository [String, Repository, Hash] A GitHub repository.
+      # @param title [String] A descriptive title
+      # @param body [String] A concise description
+      # @return [Issue] Your newly created issue
+      # @see http://develop.github.com/p/issues.html
+      # @example Create a new Issues for a repository
+      #   Octokit.create_issue("sferik/rails_admin")
       def create_issue(repo, title, body, options={})
-        post("api/v2/json/issues/open/#{Repository.new(repo)}", options.merge({:title => title, :body => body}))['issue']
+        post("/api/v2/json/issues/open/#{Repository.new(repo)}", options.merge({:title => title, :body => body}))['issue']
       end
       alias :open_issue :create_issue
 
+      # Get a single issue from a repository
+      #
+      # @param repository [String, Repository, Hash] A GitHub repository.
+      # @param number [String] Number ID of the issue
+      # @return [Issue] The issue you requested, if it exists
+      # @see http://developer.github.com/v3/issues/#get-a-single-issue
+      # @example Get issue #25 from pengwynn/octokit
+      #   Octokit.issue("pengwynn/octokit", "25")
       def issue(repo, number, options={})
-        get("api/v2/json/issues/show/#{Repository.new(repo)}/#{number}", options)['issue']
-      end
-
-      def issue_comments(repo, number, options={})
-        get("api/v2/json/issues/comments/#{Repository.new(repo)}/#{number}", options)['comments']
+        get("/api/v2/json/issues/show/#{Repository.new(repo)}/#{number}", options)['issue']
       end
 
+      # Close an issue
+      #
+      # @param repository [String, Repository, Hash] A GitHub repository.
+      # @param number [String] Number ID of the issue
+      # @return [Issue] The updated Issue
+      # @see http://develop.github.com/p/issues.html
+      # @note This implementation needs to be adjusted with switch to API v3
+      # @see http://developer.github.com/v3/issues/#edit-an-issue
+      # @example Close Issue #25 from pengwynn/octokit
+      #   Octokit.close_issue("pengwynn/octokit", "25")
       def close_issue(repo, number, options={})
-        post("api/v2/json/issues/close/#{Repository.new(repo)}/#{number}", options)['issue']
+        post("/api/v2/json/issues/close/#{Repository.new(repo)}/#{number}", options)['issue']
       end
 
+      # Reopen an issue
+      #
+      # @param repository [String, Repository, Hash] A GitHub repository.
+      # @param number [String] Number ID of the issue
+      # @return [Issue] The updated Issue
+      # @see http://develop.github.com/p/issues.html
+      # @note This implementation needs to be adjusted with switch to API v3
+      # @see http://developer.github.com/v3/issues/#edit-an-issue
+      # @example Reopen Issue #25 from pengwynn/octokit
+      #   Octokit.reopen_issue("pengwynn/octokit", "25")
       def reopen_issue(repo, number, options={})
-        post("api/v2/json/issues/reopen/#{Repository.new(repo)}/#{number}", options)['issue']
+        post("/api/v2/json/issues/reopen/#{Repository.new(repo)}/#{number}", options)['issue']
       end
 
+      # Update an issue
+      #
+      # @param repository [String, Repository, Hash] A GitHub repository.
+      # @param number [String] Number ID of the issue
+      # @param title [String] Updated title for the issue
+      # @param body [String] Updated body of the issue
+      # @return [Issue] The updated Issue
+      # @see http://develop.github.com/p/issues.html
+      # @note This implementation needs to be adjusted with switch to API v3
+      # @see http://developer.github.com/v3/issues/#edit-an-issue
+      # @example Change the title of Issue #25
+      #   Octokit.update_issue("pengwynn/octokit", "25", "A new title", "the same body"")
       def update_issue(repo, number, title, body, options={})
-        post("api/v2/json/issues/edit/#{Repository.new(repo)}/#{number}", options.merge({:title => title, :body => body}))['issue']
+        post("/api/v2/json/issues/edit/#{Repository.new(repo)}/#{number}", options.merge({:title => title, :body => body}))['issue']
       end
 
+      # List available labels for a repository
+      #
+      # @param repository [String, Repository, Hash] A GitHub repository.
+      # @return [Array] A list of the labels currently on the issue
+      # @see http://develop.github.com/p/issues.html
+      # @see http://developer.github.com/v3/issues/labels/
+      # @example List labels for pengwynn/octokit
+      #   Octokit.labels("pengwynn/octokit")
       def labels(repo, options={})
-        get("api/v2/json/issues/labels/#{Repository.new(repo)}", options)['labels']
+        get("repos/#{Repository.new(repo)}/labels", options, 3)
       end
 
-      def add_label(repo, label, number=nil, options={})
-        post(["api/v2/json/issues/label/add/#{Repository.new(repo)}/#{label}", number].compact.join('/'), options)['labels']
+      # Get single label for a repository
+      #
+      # @param repository [String, Repository, Hash] A GitHub repository.
+      # @param name [String] Name of the label
+      # @return [Label] A single label from the repository
+      # @see http://developer.github.com/v3/issues/labels/#get-a-single-label
+      # @example Get the "V3 Addition" label from pengwynn/octokit
+      #   Octokit.labels("pengwynn/octokit")
+      def label(repo, name, options={})
+        get("repos/#{Repository.new(repo)}/labels/#{URI.encode(name)}", options, 3)
+      end
+      # Add a label to a repository
+      #
+      # @param repository [String, Repository, Hash] A GitHub repository.
+      # @param label [String] A new label
+      # @param color [String] A color, in hex, without the leading #
+      # @return [Array] A list of the labels currently on the issue
+      # @see http://developer.github.com/v3/issues/labels/
+      # @example Add a new label "Version 1.0" with color "#cccccc"
+      #   Octokit.add_label("pengwynn/octokit", "Version 1.0", "cccccc")
+      def add_label(repo, label, color="ffffff", options={})
+        post("repos/#{Repository.new(repo)}/labels", options.merge({:name => label, :color => color}), 3)
       end
 
+      # Remove a label from a repository
+      #
+      # @param repository [String, Repository, Hash] A GitHub repository.
+      # @param label [String] Label you wish to remove
+      # @param number [Integer] Optional Issue number to remove the label from
+      # @note Leaving the number parameter out will remove this label from all issues
+      # @return [Array] A list of the labels currently on the issue
+      # @see http://develop.github.com/p/issues.html
+      # @see http://developer.github.com/v3/issues/labels/
+      # @example Remove the label "Version 1.0" from the repository
+      #   Octokit.remove_label("pengwynn/octokit", "Version 1.0")
       def remove_label(repo, label, number=nil, options={})
-        post(["api/v2/json/issues/label/remove/#{Repository.new(repo)}/#{label}", number].compact.join('/'), options)['labels']
+        post(["/api/v2/json/issues/label/remove/#{Repository.new(repo)}/#{label}", number].compact.join('/'), options)['labels']
       end
 
+      # Get all comments attached to an issue
+      #
+      # @param repository [String, Repository, Hash] A GitHub repository.
+      # @param number [String] Number ID of the issue
+      # @return [Array] Array of comments that belong to an issue
+      # @see http://developer.github.com/v3/issues/comments
+      # @example Get comments for issue #25 from pengwynn/octokit
+      #   Octokit.issue_comments("pengwynn/octokit", "25")
+      def issue_comments(repo, number, options={})
+        get("/repos/#{Repository.new(repo)}/issues/#{number}/comments", options, 3)
+      end
+
+      # Get a single comment attached to an issue
+      #
+      # @param repository [String, Repository, Hash] A GitHub repository.
+      # @param number [String] Number ID of the issue
+      # @return [Array] Array of comments that belong to an issue
+      # @see http://developer.github.com/v3/issues/comments/#get-a-single-comment
+      # @example Get comments for issue #25 from pengwynn/octokit
+      #   Octokit.issue_comments("pengwynn/octokit", "25")
+      def issue_comment(repo, number, options={})
+        get("/repos/#{Repository.new(repo)}/issues/comments/#{number}", options, 3)
+      end
+
+      # Add a comment to an issue
+      #
+      # @param repository [String, Repository, Hash] A GitHub repository.
+      # @param number [Integer] Issue number
+      # @param comment [String] Comment to be added
+      # @return [Comment] A JSON encoded Comment
+      # @see http://developer.github.com/v3/issues/comments/#create-a-comment
+      # @example Add the comment "Almost to v1" to Issue #23 on pengwynn/octokit
+      #   Octokit.add_comment("pengwynn/octokit", 23, "Almost to v1")
       def add_comment(repo, number, comment, options={})
-        post("api/v2/json/issues/comment/#{Repository.new(repo)}/#{number}", options.merge({:comment => comment}))['comment']
+        post("/repos/#{Repository.new(repo)}/issues/#{number}/comments", options.merge({:body => comment}), 3)
+      end
+
+      # Update a single comment on an issue
+      #
+      # @param repository [String, Repository, Hash] A GitHub repository.
+      # @param number [Integer] Comment number
+      # @param comment [String] Body of the comment which will replace the existing body.
+      # @return [Comment] A JSON encoded Comment
+      # @see http://developer.github.com/v3/issues/comments/#edit-a-comment
+      # @example Update the comment "I've started this on my 25-issue-comments-v3 fork" on Issue #25 on pengwynn/octokit
+      #   Octokit.update_comment("pengwynn/octokit", 25, "Almost to v1, added this on my fork")
+      def update_comment(repo, number, comment, options={})
+        post("/repos/#{Repository.new(repo)}/issues/comments/#{number}", options.merge({:body => comment}), 3)
+      end
+
+      # Delete a single comment
+      #
+      # @param repository [String, Repository, Hash] A GitHub repository.
+      # @param number [Integer] Comment number
+      # @return [Response] A response object with status
+      # @see http://developer.github.com/v3/issues/comments/#delete-a-comment
+      # @example Delete the comment "I've started this on my 25-issue-comments-v3 fork" on Issue #25 on pengwynn/octokit
+      #   Octokit.delete_comment("pengwynn/octokit", 1194549)
+      def delete_comment(repo, number, options={})
+        delete("/repos/#{Repository.new(repo)}/issues/comments/#{number}", options, 3, true, true)
       end
     end
   end