octokit 0.4.1 → 0.5.0

data/.rspec

@@ -0,0 +1,3 @@
+--color
+--format=nested
+--backtrace

data/Rakefile

@@ -1,14 +1,7 @@
-$LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
 require 'bundler'
 Bundler::GemHelper.install_tasks
 
-require 'shoulda/tasks'
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec)
 
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.ruby_opts = ["-rubygems"] if defined? Gem
-  test.libs << "lib" << "test"
-  test.pattern = "test/**/*_test.rb"
-end
-
-task :default => :test
+task :default => :spec

data/changelog.markdown

@@ -1,4 +1,7 @@
 # Changelog
+## 0.5.0
+	* Rewrote all tests in rspec
+	* A handful of backwards-incompatible API changes
 ## 0.4.1
   * Patch from [karlfreeman](http://github.com/karlfreeman) to fix user search
 ## 0.4.0

data/lib/octokit/client.rb

@@ -1,4 +1,3 @@
-require File.expand_path('../event', __FILE__)
 require File.expand_path('../repository', __FILE__)
 Dir[File.expand_path('../client/*.rb', __FILE__)].each{|file| require file}
 
@@ -27,4 +26,4 @@ module Octokit
     include Octokit::Client::Timelines
     include Octokit::Client::Users
   end
-end
+end

data/lib/octokit/client/authentication.rb

@@ -14,6 +14,10 @@ module Octokit
       def authenticated?
         !authentication.empty?
       end
+
+      def oauthed?
+        !oauth_token.nil?
+      end
     end
   end
 end

data/lib/octokit/client/commits.rb

@@ -8,7 +8,7 @@ module Octokit
       alias :list_commits :commits
 
       def commit(repo, sha, options={})
-        get("commits/show/#{Repository.new(repo)}/#{sha}", options)['commit']
+        get("commits/show/#{Repository.new(repo)}/#{sha}", options)['commits']
       end
 
     end

data/lib/octokit/client/connection.rb

@@ -7,16 +7,18 @@ module Octokit
     module Connection
       private
 
-      def connection(raw=false)
+      def connection(raw=false, authenticate=true)
         options = {
           :proxy => proxy,
           :ssl => {:verify => false},
           :url => endpoint,
         }
 
+        options.merge!(:params => { :access_token => oauth_token }) if oauthed? && !authenticated?
+
         Faraday::Connection.new(options) do |connection|
           connection.adapter(adapter)
-          connection.basic_auth authentication[:login], authentication[:password] if authenticated?
+          connection.basic_auth authentication[:login], authentication[:password] if authenticate and authenticated?
           connection.use Faraday::Response::RaiseError
           unless raw
             case format.to_s.downcase

data/lib/octokit/client/issues.rb

@@ -20,7 +20,7 @@ module Octokit
       end
 
       def issue_comments(repo, number, options={})
-        post("issues/comments/#{Repository.new(repo)}/#{number}", options)['comments']
+        get("issues/comments/#{Repository.new(repo)}/#{number}", options)['comments']
       end
 
       def create_issue(repo, title, body, options={})
@@ -43,15 +43,15 @@ module Octokit
       def labels(repo, options={})
         get("issues/labels/#{Repository.new(repo)}", options)['labels']
       end
-  
-      def add_label(repo, number, label, options={})
-        post("issues/label/add/#{Repository.new(repo)}/#{label}/#{number}", options)['labels']
+
+      def add_label(repo, label, number=nil, options={})
+        post(["issues/label/add/#{Repository.new(repo)}/#{label}", number].compact.join('/'), options)['labels']
       end
-  
-      def remove_label(repo, number, label, options={})
-        post("issues/label/remove/#{Repository.new(repo)}/#{label}/#{number}")['labels']
+
+      def remove_label(repo, label, number=nil, options={})
+        post(["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']
       end

data/lib/octokit/client/network.rb

@@ -5,9 +5,9 @@ module Octokit
       def network_meta(repo, options={})
         get("#{Repository.new(repo)}/network_meta", options, false, false)
       end
-  
-      def network_data(repo, nethash, options={})
-        get("#{Repository.new(repo)}/network_data_chunk", options.merge({:nethash => nethash}), false, false)['commits']
+
+      def network_data(repo, options={})
+        get("#{Repository.new(repo)}/network_data_chunk", options, false, false)['commits']
       end
 
     end

data/lib/octokit/client/objects.rb

@@ -20,7 +20,7 @@ module Octokit
       alias :blob_meta :blob_metadata
 
       def tree_metadata(repo, tree_sha, options={})
-        get("tree/full/#{Repository.new(repo)}/#{tree_sha}", options)['blobs']
+        get("tree/full/#{Repository.new(repo)}/#{tree_sha}", options)['tree']
       end
       alias :tree_meta :tree_metadata
 

data/lib/octokit/client/organizations.rb

@@ -23,7 +23,7 @@ module Octokit
       alias :list_orgs :organizations
       alias :orgs :organizations
 
-      def organization_repositories(org, options={})
+      def organization_repositories(org=nil, options={})
         if org
           get("organizations/#{org}/public_repositories", options)
         else
@@ -38,9 +38,10 @@ module Octokit
       end
       alias :org_members :organization_members
 
-      def teams(org, options={})
+      def organization_teams(org, options={})
         get("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']

data/lib/octokit/client/pulls.rb

@@ -1,8 +1,14 @@
 module Octokit
   class Client
     module Pulls
-      def create_pull_request(repo, options={})
-        post("pulls/#{Repository.new(repo)}", options)['pulls']
+      def create_pull_request(repo, base, head, title, body, options={})
+        pull = {
+          :base  => base,
+          :head  => head,
+          :title => title,
+          :body  => body,
+        }
+        post("pulls/#{Repository.new(repo)}", options.merge({:pull => pull}))['pulls']
       end
 
       def pull_requests(repo, state='open', options={})
@@ -11,7 +17,7 @@ module Octokit
       alias :pulls :pull_requests
 
       def pull_request(repo, number, options={})
-        get("pulls/#{Repository.new(repo)}/#{number}", options)['pulls']
+        get("pulls/#{Repository.new(repo)}/#{number}", options)['pull']
       end
       alias :pull :pull_request
     end

data/lib/octokit/client/repositories.rb

@@ -17,7 +17,7 @@ module Octokit
       end
       alias :update_repo :update_repository
 
-      def repositories(username=nil, options={})
+      def repositories(username=login, options={})
         get(["repos/show", username].compact.join('/'), options)['repositories']
       end
       alias :list_repositories :repositories
@@ -39,17 +39,28 @@ module Octokit
       end
       alias :fork :fork!
 
-      def create_repository(options={})
-        post("repos/create", options)['repository']
+      def create_repository(name, options={})
+        post("repos/create", options.merge(:name => name))['repository']
       end
       alias :create_repo :create_repository
       alias :create :create_repository
 
       def delete_repository(repo, options={})
-        post("repos/delete/#{Repository.new(repo)}", options)['repository']
+        response = post("repos/delete/#{Repository.new(repo)}", options)
+        if response.respond_to?(:delete_token)
+          response['delete_token']
+        else
+          response['repository']
+        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']
+      end
+      alias :delete_repo! :delete_repository!
+
       def set_private!(repo, options={})
         post("repos/set/private/#{Repository.new(repo)}", options)['repository']
       end
@@ -65,7 +76,7 @@ module Octokit
       end
       alias :list_deploy_keys :deploy_keys
 
-      def add_deploy_key(repo, options={})
+      def add_deploy_key(repo, title, key, options={})
         post("repos/key/#{Repository.new(repo)}/add", options)['public_keys']
       end
 
@@ -92,15 +103,17 @@ module Octokit
         get("repos/pushable", options)['repositories']
       end
 
-      def teams(repo, options={})
-        get("repos/show/#{Repository.new(repo)}/teams", options)['repositories']
+      def repository_teams(repo, options={})
+        get("repos/show/#{Repository.new(repo)}/teams", options)['teams']
       end
+      alias :repo_teams :repository_teams
+      alias :teams :repository_teams
 
-      def contributors(repo, anon=true, options={})
+      def contributors(repo, anon=false, options={})
         if anon
-          get("repos/show/#{Repository.new(repo)}/contributors", options)
-        else
           get("repos/show/#{Repository.new(repo)}/contributors/anon", options)
+        else
+          get("repos/show/#{Repository.new(repo)}/contributors", options)
         end['contributors']
       end
       alias :contribs :contributors

data/lib/octokit/client/request.rb

@@ -1,26 +1,26 @@
 module Octokit
   class Client
     module Request
-      def get(path, options={}, raw=false, format_path=true)
-        request(:get, path, options, raw, format_path)
+      def get(path, options={}, raw=false, format_path=true, authenticate=true)
+        request(:get, path, options, raw, format_path, authenticate)
       end
 
-      def post(path, options={}, raw=false, format_path=true)
-        request(:post, path, options, raw, format_path)
+      def post(path, options={}, raw=false, format_path=true, authenticate=true)
+        request(:post, path, options, raw, format_path, authenticate)
       end
 
-      def put(path, options={}, raw=false, format_path=true)
-        request(:put, path, options, raw, format_path)
+      def put(path, options={}, raw=false, format_path=true, authenticate=true)
+        request(:put, path, options, raw, format_path, authenticate)
       end
 
-      def delete(path, options={}, raw=false, format_path=true)
-        request(:delete, path, options, raw, format_path)
+      def delete(path, options={}, raw=false, format_path=true, authenticate=true)
+        request(:delete, path, options, raw, format_path, authenticate)
       end
 
       private
 
-      def request(method, path, options, raw, format_path)
-        response = connection(raw).send(method) do |request|
+      def request(method, path, options, raw, format_path, authenticate)
+        response = connection(raw, authenticate).send(method) do |request|
           path = formatted_path(path) if format_path
           case method
             when :get, :delete

data/lib/octokit/client/timelines.rb

@@ -2,17 +2,19 @@ module Octokit
   class Client
     module Timelines
 
-      def public_timeline(username=login, options={})
-        if username.nil?
-          path = "timeline.json"
-        else
-          path = "#{username}.json"
-        end
-        get(path, options, false, false)
+      def timeline(options={})
+        path = "https://github.com/timeline.json"
+        get(path, options, false, false, false)
       end
 
-      def timeline(options={})
-        get("#{login}.private.json", options, false, false)
+      def user_timeline(username=login, options={})
+        if token
+          path = "https://github.com/#{username}.private.json"
+          options[:token] = token
+        else
+          path = "https://github.com/#{username}.json"
+        end
+        get(path, options, false, false, false)
       end
 
     end

data/lib/octokit/configuration.rb

@@ -3,18 +3,19 @@ require File.expand_path('../version', __FILE__)
 
 module Octokit
   module Configuration
-    VALID_OPTIONS_KEYS = [:adapter, :endpoint, :format, :login, :password, :proxy, :token, :user_agent, :version].freeze
+    VALID_OPTIONS_KEYS = [:adapter, :endpoint, :format, :login, :password, :proxy, :token, :oauth_token, :user_agent, :version].freeze
     VALID_FORMATS      = [:json, :xml, :yaml].freeze
 
-    DEFAULT_ADAPTER    = Faraday.default_adapter.freeze
-    DEFAULT_ENDPOINT   = 'https://github.com/'.freeze
-    DEFAULT_FORMAT     = :json.freeze
-    DEFAULT_LOGIN      = nil.freeze
-    DEFAULT_PASSWORD   = nil.freeze
-    DEFAULT_PROXY      = nil.freeze
-    DEFAULT_TOKEN      = nil.freeze
-    DEFAULT_USER_AGENT = "Octokit Ruby Gem #{Octokit::VERSION}".freeze
-    DEFAULT_VERSION    = 2
+    DEFAULT_ADAPTER     = Faraday.default_adapter.freeze
+    DEFAULT_ENDPOINT    = 'https://github.com/'.freeze
+    DEFAULT_FORMAT      = :json.freeze
+    DEFAULT_LOGIN       = nil.freeze
+    DEFAULT_PASSWORD    = nil.freeze
+    DEFAULT_PROXY       = nil.freeze
+    DEFAULT_TOKEN       = nil.freeze
+    DEFAULT_OAUTH_TOKEN = nil.freeze
+    DEFAULT_USER_AGENT  = "Octokit Ruby Gem #{Octokit::VERSION}".freeze
+    DEFAULT_VERSION     = 2
 
     attr_accessor *VALID_OPTIONS_KEYS
 
@@ -31,15 +32,16 @@ module Octokit
     end
 
     def reset
-      self.adapter    = DEFAULT_ADAPTER
-      self.endpoint   = DEFAULT_ENDPOINT
-      self.format     = DEFAULT_FORMAT
-      self.login      = DEFAULT_LOGIN
-      self.password   = DEFAULT_PASSWORD
-      self.proxy      = DEFAULT_PROXY
-      self.token      = DEFAULT_TOKEN
-      self.user_agent = DEFAULT_USER_AGENT
-      self.version    = DEFAULT_VERSION
+      self.adapter     = DEFAULT_ADAPTER
+      self.endpoint    = DEFAULT_ENDPOINT
+      self.format      = DEFAULT_FORMAT
+      self.login       = DEFAULT_LOGIN
+      self.password    = DEFAULT_PASSWORD
+      self.proxy       = DEFAULT_PROXY
+      self.token       = DEFAULT_TOKEN
+      self.oauth_token = DEFAULT_OAUTH_TOKEN
+      self.user_agent  = DEFAULT_USER_AGENT
+      self.version     = DEFAULT_VERSION
     end
   end
 end

data/lib/octokit/version.rb

@@ -1,3 +1,3 @@
 module Octokit
-  VERSION = "0.4.1".freeze unless defined?(Octokit::VERSION)
+  VERSION = "0.5.0".freeze unless defined?(Octokit::VERSION)
 end

data/octokit.gemspec

@@ -2,18 +2,16 @@
 require File.expand_path('../lib/octokit/version', __FILE__)
 
 Gem::Specification.new do |s|
-  s.add_development_dependency('fakeweb', '~> 1.3')
-  s.add_development_dependency('jnunemaker-matchy', '~> 0.4')
   s.add_development_dependency('json', '~> 1.4')
-  s.add_development_dependency('mocha', '~> 0.9')
   s.add_development_dependency('nokogiri', '~> 1.4')
   s.add_development_dependency('rake', '~> 0.8')
-  s.add_development_dependency('shoulda', '~> 2.11')
+  s.add_development_dependency('rspec', '~> 2.4')
+  s.add_development_dependency('simplecov', '~> 0.3')
   s.add_development_dependency('webmock', '~> 1.6')
   s.add_development_dependency('ZenTest', '~> 4.4')
-  s.add_runtime_dependency('addressable', '~> 2.2.2')
+  s.add_runtime_dependency('addressable', '~> 2.2.3')
   s.add_runtime_dependency('hashie', '~> 0.4.0')
-  s.add_runtime_dependency('faraday', '~> 0.5.3')
+  s.add_runtime_dependency('faraday', '~> 0.5.4')
   s.add_runtime_dependency('faraday_middleware', '~> 0.3.1')
   s.add_runtime_dependency('multi_json', '~> 0.0.5')
   s.add_runtime_dependency('multi_xml', '~> 0.2.0')

data/spec/faraday/response_spec.rb

@@ -0,0 +1,33 @@
+require File.expand_path('../../helper', __FILE__)
+
+describe Faraday::Response do
+  before do
+    @client = Octokit::Client.new
+  end
+
+  {
+    400 => Octokit::BadRequest,
+    401 => Octokit::Unauthorized,
+    403 => Octokit::Forbidden,
+    404 => Octokit::NotFound,
+    406 => Octokit::NotAcceptable,
+    500 => Octokit::InternalServerError,
+    501 => Octokit::NotImplemented,
+    502 => Octokit::BadGateway,
+    503 => Octokit::ServiceUnavailable,
+  }.each do |status, exception|
+    context "when HTTP status is #{status}" do
+
+      before do
+        stub_get('user/show/sferik').
+          to_return(:status => status)
+      end
+
+      it "should raise #{exception.name} error" do
+        lambda do
+          @client.user('sferik')
+        end.should raise_error(exception)
+      end
+    end
+  end
+end