octokit 0.6.2 → 0.6.3

data/.travis.yml

@@ -1,6 +1,7 @@
 rvm:
   - 1.8.7
+  - 1.9.1
   - 1.9.2
-  - ree
+  - jruby
   - rbx
-  - jruby
+  - ree

data/CHANGELOG.md

@@ -0,0 +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)

data/Gemfile

@@ -1,3 +1,7 @@
-source "http://rubygems.org"
+source 'http://rubygems.org'
+
+platforms :jruby do
+  gem "jruby-openssl", "~> 0.7"
+end
 
 gemspec

data/README.md

@@ -0,0 +1,67 @@
+Octokit
+=======
+Simple Ruby wrapper for the GitHub v2 API.
+
+Installation
+------------
+    gem install octokit
+
+Continuous Integration
+----------------------
+[![Build Status](http://travis-ci.org/pengwynn/octokit.png)](http://travis-ci.org/pengwynn/octokit)
+
+Documentation
+-------------
+http://rdoc.info/gems/octokit
+
+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">
+
+### Show who a user follows
+
+    Octokit.following("sferik")
+    => ["rails", "puls", "wycats", "dhh", "jm3", "joshsusser", "nkallen", "technoweenie", "blaine", "al3x", "defunkt", "schacon", "bmizerany", "rtomayko", "jpr5", "lholden", "140proof", "ephramzerb", "carlhuda", "carllerche", "jnunemaker", "josh", "hoverbird", "jamiew", "jeremyevans", "brynary", "mojodna", "mojombo", "joshbuddy", "igrigorik", "perplexes", "joearasin", "hassox", "nickmarden", "pengwynn", "mmcgrana", "reddavis", "reinh", "mzsanford", "aanand", "pjhyett", "kneath", "tekkub", "adamstac", "timtrueman", "aaronblohowiak", "josevalim", "kaapa", "hurrycane", "jackdempsey", "drogus", "cameronpriest", "danmelton", "marcel", "r", "atmos", "mbleigh", "isaacs", "maxogden", "codeforamerica", "chadk", "laserlemon", "gruber", "lsegal", "bblimke", "wayneeseguin", "brixen", "dkubb", "bhb", "bcardarella", "elliottcable", "fbjork", "mlightner", "dianakimball", "amerine", "danchoi", "develop", "dmfrancisco", "unruthless", "trotter", "hannestyden", "codahale", "ry"]
+
+### Repositories
+For convenience, methods that require a repoistory argument may be passed in any of the following forms:
+
+* "pengwynn/octokit"
+* {:username => "pengwynn", :name => "octokit"}
+* {:username => "pengwynn", :repo => "octokit"}
+* 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>
+
+Authenticated requests
+----------------------
+Some methods require authentication so you'll need to pass a login and an api_token. You can find your GitHub API token on your [account page](https://github.com/account).
+
+    client = Octokit::Client.new(:login => "pengwynn", :token => "OU812")
+    client.follow!("sferik")
+
+Submitting a Pull Request
+-------------------------
+1. Fork the project.
+2. Create a topic branch.
+3. Implement your feature or bug fix.
+4. Add documentation for your feature or bug fix.
+5. Run <tt>bundle exec rake doc:yard</tt>. If your changes are not 100% documented, go back to step 4.
+6. Add specs for your feature or bug fix.
+7. Run <tt>bundle exec rake spec</tt>. If your changes are not 100% covered, go back to step 6.
+8. Commit and push your changes.
+9. Submit a pull request. Please do not include changes to the version or gemspec. (If you want to create your own version for some reason, please do so in a separate commit.)
+
+Inspiration
+-----------
+Octokit was inspired by [Octopi](http://github.com/fcoury/octopi) and aims to be a lightweight, less-ActiveResourcey alternative.
+
+Copyright
+---------
+Copyright (c) 2011 [Wynn Netherland](http://wynnnetherland.com), [Adam Stacoviak](http://adamstacoviak.com/), [Erik Michaels-Ober](https://github.com/sferik).
+See [LICENSE](https://github.com/pengwynn/octokit/blob/master/LICENSE) for details.

data/lib/faraday/response/raise_error.rb

@@ -27,7 +27,7 @@ module Faraday
     end
 
     def error_message(response)
-      "#{response[:method].to_s.upcase} #{response[:url].to_s}: #{response[:status]}#{(': ' + response[:body]) if response[:body]}"
+      "#{response[:method].to_s.upcase} #{response[:url].to_s}: #{response[:status]}#{(': ' + response[:body][:error]) if response[:body]}"
     end
   end
 end

data/lib/octokit/client/commits.rb

@@ -3,12 +3,12 @@ module Octokit
     module Commits
 
       def commits(repo, branch="master", options={})
-        get("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("commits/show/#{Repository.new(repo)}/#{sha}", options)['commits']
+        get("api/v2/json/commits/show/#{Repository.new(repo)}/#{sha}", options)['commits']
       end
 
     end

data/lib/octokit/client/connection.rb

@@ -7,23 +7,21 @@ module Octokit
     module Connection
       private
 
-      def connection(raw=false, authenticate=true)
+      def connection(url, authenticate=true, raw=false)
         options = {
           :proxy => proxy,
           :ssl => {:verify => false},
-          :url => endpoint,
+          :url => url,
         }
 
         options.merge!(:params => { :access_token => oauth_token }) if oauthed? && !authenticated?
 
         con = Faraday::Connection.new(options) do |connection|
+          connection.use Faraday::Request::UrlEncoded
           connection.use Faraday::Response::RaiseError
           unless raw
-            connection.use Faraday::Response::Mashify
-            case format.to_s.downcase
-            when 'json' then connection.use Faraday::Response::ParseJson
-            when 'xml' then connection.use Faraday::Response::ParseXml
-            end
+            connection.use Faraday::Response::Rashify
+            connection.use Faraday::Response::ParseJson
           end
           connection.adapter(adapter)
         end

data/lib/octokit/client/issues.rb

@@ -3,57 +3,57 @@ module Octokit
     module Issues
 
       def search_issues(repo, search_term, state='open', options={})
-        get("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 issues(repo, state='open', options={})
-        get("issues/list/#{Repository.new(repo)}/#{state}", options)['issues']
+      def list_issues(repo, state='open', options={})
+        get("api/v2/json/issues/list/#{Repository.new(repo)}/#{state}", options)['issues']
       end
-      alias :list_issues :issues
+      alias :issues :list_issues
 
       def issues_labeled(repo, label, options={})
-        get("issues/list/#{Repository.new(repo)}/label/#{label}", options)['issues']
+        get("api/v2/json/issues/list/#{Repository.new(repo)}/label/#{label}", options)['issues']
       end
 
-      def issue(repo, number, options={})
-        get("issues/show/#{Repository.new(repo)}/#{number}", options)['issue']
+      def create_issue(repo, title, body, options={})
+        post("api/v2/json/issues/open/#{Repository.new(repo)}", options.merge({:title => title, :body => body}))['issue']
       end
+      alias :open_issue :create_issue
 
-      def issue_comments(repo, number, options={})
-        get("issues/comments/#{Repository.new(repo)}/#{number}", options)['comments']
+      def issue(repo, number, options={})
+        get("api/v2/json/issues/show/#{Repository.new(repo)}/#{number}", options)['issue']
       end
 
-      def create_issue(repo, title, body, options={})
-        post("issues/open/#{Repository.new(repo)}", options.merge({:title => title, :body => body}))['issue']
+      def issue_comments(repo, number, options={})
+        get("api/v2/json/issues/comments/#{Repository.new(repo)}/#{number}", options)['comments']
       end
-      alias :open_issue :create_issue
 
       def close_issue(repo, number, options={})
-        post("issues/close/#{Repository.new(repo)}/#{number}", options)['issue']
+        post("api/v2/json/issues/close/#{Repository.new(repo)}/#{number}", options)['issue']
       end
 
       def reopen_issue(repo, number, options={})
-        post("issues/reopen/#{Repository.new(repo)}/#{number}", options)['issue']
+        post("api/v2/json/issues/reopen/#{Repository.new(repo)}/#{number}", options)['issue']
       end
 
       def update_issue(repo, number, title, body, options={})
-        post("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
 
       def labels(repo, options={})
-        get("issues/labels/#{Repository.new(repo)}", options)['labels']
+        get("api/v2/json/issues/labels/#{Repository.new(repo)}", options)['labels']
       end
 
       def add_label(repo, label, number=nil, options={})
-        post(["issues/label/add/#{Repository.new(repo)}/#{label}", number].compact.join('/'), options)['labels']
+        post(["api/v2/json/issues/label/add/#{Repository.new(repo)}/#{label}", number].compact.join('/'), options)['labels']
       end
 
       def remove_label(repo, label, number=nil, options={})
-        post(["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
 
       def add_comment(repo, number, comment, options={})
-        post("issues/comment/#{Repository.new(repo)}/#{number}", options.merge({:comment => comment}))['comment']
+        post("api/v2/json/issues/comment/#{Repository.new(repo)}/#{number}", options.merge({:comment => comment}))['comment']
       end
     end
   end

data/lib/octokit/client/network.rb

@@ -3,11 +3,11 @@ module Octokit
     module Network
 
       def network_meta(repo, options={})
-        get("#{Repository.new(repo)}/network_meta", options, false, false)
+        get("#{Repository.new(repo)}/network_meta", options, 2, false)
       end
 
       def network_data(repo, options={})
-        get("#{Repository.new(repo)}/network_data_chunk", options, false, false)['commits']
+        get("#{Repository.new(repo)}/network_data_chunk", options, 2, false)['commits']
       end
 
     end

data/lib/octokit/client/objects.rb

@@ -3,29 +3,29 @@ module Octokit
     module Objects
 
       def tree(repo, tree_sha, options={})
-        get("tree/show/#{Repository.new(repo)}/#{tree_sha}", options)['tree']
+        get("api/v2/json/tree/show/#{Repository.new(repo)}/#{tree_sha}", options)['tree']
       end
 
       def blob(repo, tree_sha, path, options={})
-        get("blob/show/#{Repository.new(repo)}/#{tree_sha}/#{path}", options)['blob']
+        get("api/v2/json/blob/show/#{Repository.new(repo)}/#{tree_sha}/#{path}", options)['blob']
       end
 
       def blobs(repo, tree_sha, options={})
-        get("blob/all/#{Repository.new(repo)}/#{tree_sha}", options)['blobs']
+        get("api/v2/json/blob/all/#{Repository.new(repo)}/#{tree_sha}", options)['blobs']
       end
 
       def blob_metadata(repo, tree_sha, options={})
-        get("blob/full/#{Repository.new(repo)}/#{tree_sha}", options)['blobs']
+        get("api/v2/json/blob/full/#{Repository.new(repo)}/#{tree_sha}", options)['blobs']
       end
       alias :blob_meta :blob_metadata
 
       def tree_metadata(repo, tree_sha, options={})
-        get("tree/full/#{Repository.new(repo)}/#{tree_sha}", options)['tree']
+        get("api/v2/json/tree/full/#{Repository.new(repo)}/#{tree_sha}", options)['tree']
       end
       alias :tree_meta :tree_metadata
 
       def raw(repo, sha, options={})
-        get("blob/show/#{Repository.new(repo)}/#{sha}", options, true).body
+        get("api/v2/json/blob/show/#{Repository.new(repo)}/#{sha}", options, 2, true, true).body
       end
 
     end

data/lib/octokit/client/organizations.rb

@@ -3,20 +3,20 @@ module Octokit
     module Organizations
 
       def organization(org, options={})
-        get("organizations/#{org}", options)['organization']
+        get("api/v2/json/organizations/#{org}", options)['organization']
       end
       alias :org :organization
 
       def update_organization(org, values, options={})
-        put("organizations/#{org}", options.merge({:organization => values}))['organization']
+        put("api/v2/json/organizations/#{org}", options.merge({:organization => values}))['organization']
       end
       alias :update_org :update_organization
 
       def organizations(user=nil, options={})
         if user
-          get("user/show/#{user}/organizations", options)
+          get("api/v2/json/user/show/#{user}/organizations", options)
         else
-          get("organizations", options)
+          get("api/v2/json/organizations", options)
         end['organizations']
       end
       alias :list_organizations :organizations
@@ -25,64 +25,64 @@ module Octokit
 
       def organization_repositories(org=nil, options={})
         if org
-          get("organizations/#{org}/public_repositories", options)
+          get("api/v2/json/organizations/#{org}/public_repositories", options)
         else
-          get("organizations/repositories", options)
+          get("api/v2/json/organizations/repositories", options)
         end['repositories']
       end
       alias :org_repositories :organization_repositories
       alias :org_repos :organization_repositories
 
       def organization_members(org, options={})
-        get("organizations/#{org}/public_members", options)['users']
+        get("api/v2/json/organizations/#{org}/public_members", options)['users']
       end
       alias :org_members :organization_members
 
       def organization_teams(org, options={})
-        get("organizations/#{org}/teams", options)['teams']
+        get("api/v2/json/organizations/#{org}/teams", options)['teams']
       end
       alias :org_teams :organization_teams
 
       def create_team(org, values, options={})
-        post("organizations/#{org}/teams", options.merge({:team => values}))['team']
+        post("api/v2/json/organizations/#{org}/teams", options.merge({:team => values}))['team']
       end
 
       def team(team_id, options={})
-        get("teams/#{team_id}", options)['team']
+        get("api/v2/json/teams/#{team_id}", options)['team']
       end
 
       def update_team(team_id, values, options={})
-        put("teams/#{team_id}", options.merge({:team => values}))['team']
+        put("api/v2/json/teams/#{team_id}", options.merge({:team => values}))['team']
       end
 
       def delete_team(team_id, options={})
-        delete("teams/#{team_id}", options)['team']
+        delete("api/v2/json/teams/#{team_id}", options)['team']
       end
 
       def team_members(team_id, options={})
-        get("teams/#{team_id}/members", options)['users']
+        get("api/v2/json/teams/#{team_id}/members", options)['users']
       end
 
       def add_team_member(team_id, user, options={})
-        post("teams/#{team_id}/members", options.merge({:name => user}))['user']
+        post("api/v2/json/teams/#{team_id}/members", options.merge({:name => user}))['user']
       end
 
       def remove_team_member(team_id, user, options={})
-        delete("teams/#{team_id}/members", options.merge({:name => user}))['user']
+        delete("api/v2/json/teams/#{team_id}/members", options.merge({:name => user}))['user']
       end
 
       def team_repositories(team_id, options={})
-        get("teams/#{team_id}/repositories", options)['repositories']
+        get("api/v2/json/teams/#{team_id}/repositories", options)['repositories']
       end
       alias :team_repos :team_repositories
 
       def add_team_repository(team_id, repo, options={})
-        post("teams/#{team_id}/repositories", options.merge(:name => Repository.new(repo)))['repositories']
+        post("api/v2/json/teams/#{team_id}/repositories", options.merge(:name => Repository.new(repo)))['repositories']
       end
       alias :add_team_repo :add_team_repository
 
       def remove_team_repository(team_id, repo, options={})
-        delete("teams/#{team_id}/repositories", options.merge(:name => Repository.new(repo)))['repositories']
+        delete("api/v2/json/teams/#{team_id}/repositories", options.merge(:name => Repository.new(repo)))['repositories']
       end
       alias :remove_team_repo :remove_team_repository
     end

data/lib/octokit/client/pulls.rb

@@ -8,16 +8,16 @@ module Octokit
           :title => title,
           :body  => body,
         }
-        post("pulls/#{Repository.new(repo)}", options.merge({:pull => pull}))['pulls']
+        post("api/v2/json/pulls/#{Repository.new(repo)}", options.merge({:pull => pull}))['pulls']
       end
 
       def pull_requests(repo, state='open', options={})
-        get("pulls/#{Repository.new(repo)}/#{state}", options)['pulls']
+        get("api/v2/json/pulls/#{Repository.new(repo)}/#{state}", options)['pulls']
       end
       alias :pulls :pull_requests
 
       def pull_request(repo, number, options={})
-        get("pulls/#{Repository.new(repo)}/#{number}", options)['pull']
+        get("api/v2/json/pulls/#{Repository.new(repo)}/#{number}", options)['pull']
       end
       alias :pull :pull_request
     end

data/lib/octokit/client/repositories.rb

@@ -3,134 +3,134 @@ module Octokit
     module Repositories
 
       def search_repositories(q, options={})
-        get("repos/search/#{q}", options)['repositories']
+        get("api/v2/json/repos/search/#{q}", options)['repositories']
       end
       alias :search_repos :search_repositories
 
       def repository(repo, options={})
-        get("repos/show/#{Repository.new(repo)}", options)['repository']
+        get("api/v2/json/repos/show/#{Repository.new(repo)}", options)['repository']
       end
       alias :repo :repository
 
       def update_repository(repo, values, options={})
-        post("repos/show/#{Repository.new(repo)}", options.merge({:values => values}))['repository']
+        post("api/v2/json/repos/show/#{Repository.new(repo)}", options.merge({:values => values}))['repository']
       end
       alias :update_repo :update_repository
 
       def repositories(username=login, options={})
-        get(["repos/show", username].compact.join('/'), options)['repositories']
+        get(["api/v2/json/repos/show", username].compact.join('/'), options)['repositories']
       end
       alias :list_repositories :repositories
       alias :list_repos :repositories
       alias :repos :repositories
 
       def watch(repo, options={})
-        post("repos/watch/#{Repository.new(repo)}", options)['repository']
+        post("api/v2/json/repos/watch/#{Repository.new(repo)}", options)['repository']
       end
 
       def unwatch(repo, options={})
-        post("repos/unwatch/#{Repository.new(repo)}", options)['repository']
+        post("api/v2/json/repos/unwatch/#{Repository.new(repo)}", options)['repository']
       end
 
       def fork(repo, options={})
-        post("repos/fork/#{Repository.new(repo)}", options)['repository']
+        post("api/v2/json/repos/fork/#{Repository.new(repo)}", options)['repository']
       end
 
       def create_repository(name, options={})
-        post("repos/create", options.merge(:name => name))['repository']
+        post("api/v2/json/repos/create", options.merge(:name => name))['repository']
       end
       alias :create_repo :create_repository
       alias :create :create_repository
 
       def delete_repository(repo, options={})
-        response = post("repos/delete/#{Repository.new(repo)}", options)
+        response = post("api/v2/json/repos/delete/#{Repository.new(repo)}", options)
         if response.respond_to?(:delete_token)
           response['delete_token']
         else
-          response['repository']
+          response
         end
       end
       alias :delete_repo :delete_repository
 
       def delete_repository!(repo, options={})
-        response = post("repos/delete/#{Repository.new(repo)}", options)
-        post("repos/delete/#{Repository.new(repo)}", options.merge(:delete_token => response['delete_token']))['repository']
+        delete_token = post("api/v2/json/repos/delete/#{Repository.new(repo)}", options)
+        post("api/v2/json/repos/delete/#{Repository.new(repo)}", options.merge(:delete_token => delete_token))
       end
       alias :delete_repo! :delete_repository!
 
       def set_private(repo, options={})
-        post("repos/set/private/#{Repository.new(repo)}", options)['repository']
+        post("api/v2/json/repos/set/private/#{Repository.new(repo)}", options)['repository']
       end
 
       def set_public(repo, options={})
-        post("repos/set/public/#{Repository.new(repo)}", options)['repository']
+        post("api/v2/json/repos/set/public/#{Repository.new(repo)}", options)['repository']
       end
 
       def deploy_keys(repo, options={})
-        get("repos/keys/#{Repository.new(repo)}", options)['public_keys']
+        get("api/v2/json/repos/keys/#{Repository.new(repo)}", options)['public_keys']
       end
       alias :list_deploy_keys :deploy_keys
 
       def add_deploy_key(repo, title, key, options={})
-        post("repos/key/#{Repository.new(repo)}/add", options)['public_keys']
+        post("api/v2/json/repos/key/#{Repository.new(repo)}/add", options)['public_keys']
       end
 
       def remove_deploy_key(repo, id, options={})
-        post("repos/key/#{Repository.new(repo)}/remove", options.merge(:id => id))['public_keys']
+        post("api/v2/json/repos/key/#{Repository.new(repo)}/remove", options.merge(:id => id))['public_keys']
       end
 
       def collaborators(repo, options={})
-        get("repos/show/#{Repository.new(repo)}/collaborators", options)['collaborators']
+        get("api/v2/json/repos/show/#{Repository.new(repo)}/collaborators", options)['collaborators']
       end
       alias :collabs :collaborators
 
       def add_collaborator(repo, collaborator, options={})
-        post("repos/collaborators/#{Repository.new(repo)}/add/#{collaborator}")['collaborators']
+        post("api/v2/json/repos/collaborators/#{Repository.new(repo)}/add/#{collaborator}")['collaborators']
       end
       alias :add_collab :add_collaborator
 
       def remove_collaborator(repo, collaborator, options={})
-        post("repos/collaborators/#{Repository.new(repo)}/remove/#{collaborator}")['collaborators']
+        post("api/v2/json/repos/collaborators/#{Repository.new(repo)}/remove/#{collaborator}")['collaborators']
       end
       alias :remove_collab :remove_collaborator
 
       def pushable(options={})
-        get("repos/pushable", options)['repositories']
+        get("api/v2/json/repos/pushable", options)['repositories']
       end
 
       def repository_teams(repo, options={})
-        get("repos/show/#{Repository.new(repo)}/teams", options)['teams']
+        get("api/v2/json/repos/show/#{Repository.new(repo)}/teams", options)['teams']
       end
       alias :repo_teams :repository_teams
       alias :teams :repository_teams
 
       def contributors(repo, anon=false, options={})
         if anon
-          get("repos/show/#{Repository.new(repo)}/contributors/anon", options)
+          get("api/v2/json/repos/show/#{Repository.new(repo)}/contributors/anon", options)
         else
-          get("repos/show/#{Repository.new(repo)}/contributors", options)
+          get("api/v2/json/repos/show/#{Repository.new(repo)}/contributors", options)
         end['contributors']
       end
       alias :contribs :contributors
 
       def watchers(repo, options={})
-        get("repos/show/#{Repository.new(repo)}/watchers", options)['watchers']
+        get("api/v2/json/repos/show/#{Repository.new(repo)}/watchers", options)['watchers']
       end
 
       def network(repo, options={})
-        get("repos/show/#{Repository.new(repo)}/network", options)['network']
+        get("api/v2/json/repos/show/#{Repository.new(repo)}/network", options)['network']
       end
 
       def languages(repo, options={})
-        get("repos/show/#{Repository.new(repo)}/languages", options)['languages']
+        get("api/v2/json/repos/show/#{Repository.new(repo)}/languages", options)['languages']
       end
 
       def tags(repo, options={})
-        get("repos/show/#{Repository.new(repo)}/tags", options)['tags']
+        get("api/v2/json/repos/show/#{Repository.new(repo)}/tags", options)['tags']
       end
 
       def branches(repo, options={})
-        get("repos/show/#{Repository.new(repo)}/branches", options)['branches']
+        get("api/v2/json/repos/show/#{Repository.new(repo)}/branches", options)['branches']
       end
 
     end