octokit 2.0.0 → 2.1.0

data/README.md

@@ -43,8 +43,8 @@ configuration) or as client instance methods.
 ```ruby
 # Provide authentication credentials
 Octokit.configure do |c|
-  c.login 'defunkt'
-  c.password 'c0d3b4ssssss!'
+  c.login = 'defunkt'
+  c.password = 'c0d3b4ssssss!'
 end
 
 # Fetch the current user
@@ -297,6 +297,7 @@ client instances based on unique configuration options. Breaking changes also
 include:
 
 * `:oauth_token` is now `:access_token`
+* `:auto_traversal` is now `:auto_paginate`
 * `Hashie::Mash` has been removed. Responses now return a `Sawyer::Resource`
   object. This new type behaves mostly like a Ruby `Hash`, but does not fully
   support the `Hashie::Mash` API.

data/lib/octokit/client/authorizations.rb

@@ -45,6 +45,9 @@ module Octokit
       # @option options [Array] :scopes A list of scopes that this authorization is in.
       # @option options [String] :note A note to remind you what the OAuth token is for.
       # @option options [String] :note_url A URL to remind you what app the OAuth token is for.
+      # @option options [Boolean] :idempotent If true, will return an existing authorization if one has already been created.
+      # @option options [String] :client_id  Client Id we received when our application was registered with GitHub.
+      # @option options [String] :client_id  Client Secret we received when our application was registered with GitHub.
       #
       # @return [Sawyer::Resource] A single authorization for the authenticated user
       # @see http://developer.github.com/v3/oauth/#scopes Available scopes
@@ -52,10 +55,21 @@ module Octokit
       # @example Create a new authorization for user ctshryock's project Zoidberg
       #  client = Octokit::Client.new(:login => 'ctshryock', :password => 'secret')
       #  client.create_authorization({:scopes => ["public_repo","gist"], :note => "Why not Zoidberg?", :note_url=> "https://en.wikipedia.org/wiki/Zoidberg"})
+      # @example Create a new OR return an existing authorization to be used by a specific client for user ctshryock's project Zoidberg
+      #  client = Octokit::Client.new(:login => 'ctshryock', :password => 'secret')
+      #  client.create_authorization({:idempotent => true, :client_id => 'xxxx', :client_secret => 'yyyy', :scopes => ["user"]})
       def create_authorization(options = {})
         # Techincally we can omit scopes as GitHub has a default, however the
         # API will reject us if we send a POST request with an empty body.
-        post 'authorizations', options
+
+        if options.delete :idempotent
+          client_id, client_secret = fetch_client_id_and_secret(options)
+          raise ArgumentError.new("Client ID and Secret required for idempotent authorizations") unless client_id && client_secret
+
+          put "authorizations/clients/#{client_id}", options.merge(:client_secret => client_secret)
+        else
+          post 'authorizations', options
+        end
       end
 
       # Update an authorization for the authenticated user.

data/lib/octokit/client/users.rb

@@ -50,7 +50,11 @@ module Octokit
         options.merge!({
           :code => code,
           :client_id => app_id,
-          :client_secret => app_secret
+          :client_secret => app_secret,
+          :headers => {
+            :content_type => 'application/json',
+            :accept       => 'application/json'
+          }
         })
         post "#{web_endpoint}login/oauth/access_token", options
       end

data/lib/octokit/configurable.rb

@@ -115,5 +115,10 @@ module Octokit
     def options
       Hash[Octokit::Configurable.keys.map{|key| [key, instance_variable_get(:"@#{key}")]}]
     end
+
+    def fetch_client_id_and_secret(overrides = {})
+      opts = options.merge(overrides)
+      opts.values_at :client_id, :client_secret
+    end
   end
 end

data/lib/octokit/error.rb

@@ -8,12 +8,18 @@ module Octokit
     # @param [Hash] response HTTP response
     # @return [Octokit::Error]
     def self.from_response(response)
-      status = response[:status].to_i
-      body  = response[:body].to_s
+      status  = response[:status].to_i
+      body    = response[:body].to_s
+      headers = response[:response_headers]
 
       if klass =  case status
                   when 400 then Octokit::BadRequest
-                  when 401 then Octokit::Unauthorized
+                  when 401
+                    if Octokit::OneTimePasswordRequired.required_header(headers)
+                      Octokit::OneTimePasswordRequired
+                    else
+                      Octokit::Unauthorized
+                    end
                   when 403
                     if body =~ /rate limit exceeded/i
                       Octokit::TooManyRequests
@@ -100,6 +106,20 @@ module Octokit
   # Raised when GitHub returns a 401 HTTP status code
   class Unauthorized < Error; end
 
+  # Raised when GitHub returns a 401 HTTP status code
+  # and headers include "X-GitHub-OTP"
+  class OneTimePasswordRequired < Error
+    HEADER = /required; (?<delivery>\w+)/i
+
+    def self.required_header(headers)
+      HEADER.match headers['X-GitHub-OTP'].to_s
+    end
+
+    def password_delivery
+      @password_delivery ||= self.class.required_header(@response[:response_headers])[:delivery]
+    end
+  end
+
   # Raised when GitHub returns a 403 HTTP status code
   class Forbidden < Error; end
 

data/lib/octokit/version.rb

@@ -2,6 +2,6 @@ module Octokit
 
   # Current version
   # @return [String]
-  VERSION = "2.0.0".freeze
+  VERSION = "2.1.0".freeze
 
 end

data/spec/cassettes/Octokit_Client_Authorizations/_create_authorization/with_idempotent_true/creates_a_new_authorization_with_options.json

@@ -0,0 +1 @@
+{"http_interactions":[{"request":{"method":"put","uri":"https://<GITHUB_LOGIN>:<GITHUB_PASSWORD>@api.github.com/authorizations/clients/<GITHUB_CLIENT_ID>","body":{"encoding":"UTF-8","base64_string":"eyJjbGllbnRfaWQiOiI8R0lUSFVCX0NMSUVOVF9JRD4iLCJjbGllbnRfc2Vj\ncmV0IjoiPEdJVEhVQl9DTElFTlRfU0VDUkVUPiIsInNjb3BlcyI6WyJnaXN0\nIl19\n"},"headers":{"Accept":["application/vnd.github.beta+json"],"User-Agent":["Octokit Ruby Gem 2.0.0"]}},"response":{"status":{"code":201,"message":"Created"},"headers":{"Server":["GitHub.com"],"Date":["Thu, 29 Aug 2013 19:36:24 GMT"],"Content-Type":["application/json; charset=utf-8"],"Status":["201 Created"],"X-Ratelimit-Limit":["5000"],"X-Ratelimit-Remaining":["4991"],"X-Ratelimit-Reset":["1377808149"],"Location":["https://api.github.com/authorizations/3459491"],"X-Github-Media-Type":["github.beta; format=json"],"X-Content-Type-Options":["nosniff"],"Content-Length":["336"],"Access-Control-Allow-Credentials":["true"],"Access-Control-Expose-Headers":["ETag, Link, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes"],"Access-Control-Allow-Origin":["*"],"Etag":["\"123a8d275487ebdcf01ff056e6a7e178\""],"Cache-Control":["max-age=0, private, must-revalidate"],"X-Github-Request-Id":["0eac2c58-1f44-4ee3-b754-12409a31bad8"]},"body":{"encoding":"US-ASCII","base64_string":"eyJpZCI6MzQ1OTQ5MSwidXJsIjoiaHR0cHM6Ly9hcGkuZ2l0aHViLmNvbS9h\ndXRob3JpemF0aW9ucy8zNDU5NDkxIiwiYXBwIjp7Im5hbWUiOiJPY3Rva2l0\nIERldmVsb3BtZW50IiwidXJsIjoiaHR0cDovL29jdG9raXQuZGV2IiwiY2xp\nZW50X2lkIjoiPEdJVEhVQl9DTElFTlRfSUQ+In0sInRva2VuIjoiNjFhZmNi\nZDM0YmY2NTIyOWU5MDJiMTBiNGYwNGE0NWRkMGJhODI1NSIsIm5vdGUiOm51\nbGwsIm5vdGVfdXJsIjpudWxsLCJjcmVhdGVkX2F0IjoiMjAxMy0wOC0yOVQx\nOTozNjoyNFoiLCJ1cGRhdGVkX2F0IjoiMjAxMy0wOC0yOVQxOTozNjoyNFoi\nLCJzY29wZXMiOlsiZ2lzdCJdfQ==\n"},"http_version":null},"recorded_at":"Thu, 29 Aug 2013 19:36:24 GMT"}],"recorded_with":"VCR 2.4.0"}

data/spec/cassettes/Octokit_Client_Authorizations/_create_authorization/with_idempotent_true/returns_an_existing_API_authorization_if_one_already_exists.json

@@ -0,0 +1 @@
+{"http_interactions":[{"request":{"method":"put","uri":"https://<GITHUB_LOGIN>:<GITHUB_PASSWORD>@api.github.com/authorizations/clients/<GITHUB_CLIENT_ID>","body":{"encoding":"UTF-8","base64_string":"eyJjbGllbnRfaWQiOiI8R0lUSFVCX0NMSUVOVF9JRD4iLCJjbGllbnRfc2Vj\ncmV0IjoiPEdJVEhVQl9DTElFTlRfU0VDUkVUPiJ9\n"},"headers":{"Accept":["application/vnd.github.beta+json"],"User-Agent":["Octokit Ruby Gem 2.0.0"]}},"response":{"status":{"code":200,"message":"OK"},"headers":{"Server":["GitHub.com"],"Date":["Thu, 29 Aug 2013 19:36:24 GMT"],"Content-Type":["application/json; charset=utf-8"],"Status":["200 OK"],"X-Ratelimit-Limit":["5000"],"X-Ratelimit-Remaining":["4990"],"X-Ratelimit-Reset":["1377808149"],"X-Github-Media-Type":["github.beta; format=json"],"X-Content-Type-Options":["nosniff"],"Content-Length":["336"],"Access-Control-Allow-Credentials":["true"],"Access-Control-Expose-Headers":["ETag, Link, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes"],"Access-Control-Allow-Origin":["*"],"Etag":["\"123a8d275487ebdcf01ff056e6a7e178\""],"Cache-Control":["max-age=0, private, must-revalidate"],"X-Github-Request-Id":["9e4afd9a-8f33-47a8-a0cd-8601d1779724"],"Vary":["Accept-Encoding"]},"body":{"encoding":"US-ASCII","base64_string":"eyJpZCI6MzQ1OTQ5MSwidXJsIjoiaHR0cHM6Ly9hcGkuZ2l0aHViLmNvbS9h\ndXRob3JpemF0aW9ucy8zNDU5NDkxIiwiYXBwIjp7Im5hbWUiOiJPY3Rva2l0\nIERldmVsb3BtZW50IiwidXJsIjoiaHR0cDovL29jdG9raXQuZGV2IiwiY2xp\nZW50X2lkIjoiPEdJVEhVQl9DTElFTlRfSUQ+In0sInRva2VuIjoiNjFhZmNi\nZDM0YmY2NTIyOWU5MDJiMTBiNGYwNGE0NWRkMGJhODI1NSIsIm5vdGUiOm51\nbGwsIm5vdGVfdXJsIjpudWxsLCJjcmVhdGVkX2F0IjoiMjAxMy0wOC0yOVQx\nOTozNjoyNFoiLCJ1cGRhdGVkX2F0IjoiMjAxMy0wOC0yOVQxOTozNjoyNFoi\nLCJzY29wZXMiOlsiZ2lzdCJdfQ==\n"},"http_version":null},"recorded_at":"Thu, 29 Aug 2013 19:36:24 GMT"},{"request":{"method":"put","uri":"https://<GITHUB_LOGIN>:<GITHUB_PASSWORD>@api.github.com/authorizations/clients/<GITHUB_CLIENT_ID>","body":{"encoding":"UTF-8","base64_string":"eyJjbGllbnRfaWQiOiI8R0lUSFVCX0NMSUVOVF9JRD4iLCJjbGllbnRfc2Vj\ncmV0IjoiPEdJVEhVQl9DTElFTlRfU0VDUkVUPiJ9\n"},"headers":{"Accept":["application/vnd.github.beta+json"],"User-Agent":["Octokit Ruby Gem 2.0.0"]}},"response":{"status":{"code":200,"message":"OK"},"headers":{"Server":["GitHub.com"],"Date":["Thu, 29 Aug 2013 19:36:24 GMT"],"Content-Type":["application/json; charset=utf-8"],"Status":["200 OK"],"X-Ratelimit-Limit":["5000"],"X-Ratelimit-Remaining":["4989"],"X-Ratelimit-Reset":["1377808149"],"X-Github-Media-Type":["github.beta; format=json"],"X-Content-Type-Options":["nosniff"],"Content-Length":["336"],"Access-Control-Allow-Credentials":["true"],"Access-Control-Expose-Headers":["ETag, Link, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes"],"Access-Control-Allow-Origin":["*"],"Etag":["\"123a8d275487ebdcf01ff056e6a7e178\""],"Cache-Control":["max-age=0, private, must-revalidate"],"X-Github-Request-Id":["0132512e-b1c7-41f0-b662-e3cdb67abd92"],"Vary":["Accept-Encoding"]},"body":{"encoding":"US-ASCII","base64_string":"eyJpZCI6MzQ1OTQ5MSwidXJsIjoiaHR0cHM6Ly9hcGkuZ2l0aHViLmNvbS9h\ndXRob3JpemF0aW9ucy8zNDU5NDkxIiwiYXBwIjp7Im5hbWUiOiJPY3Rva2l0\nIERldmVsb3BtZW50IiwidXJsIjoiaHR0cDovL29jdG9raXQuZGV2IiwiY2xp\nZW50X2lkIjoiPEdJVEhVQl9DTElFTlRfSUQ+In0sInRva2VuIjoiNjFhZmNi\nZDM0YmY2NTIyOWU5MDJiMTBiNGYwNGE0NWRkMGJhODI1NSIsIm5vdGUiOm51\nbGwsIm5vdGVfdXJsIjpudWxsLCJjcmVhdGVkX2F0IjoiMjAxMy0wOC0yOVQx\nOTozNjoyNFoiLCJ1cGRhdGVkX2F0IjoiMjAxMy0wOC0yOVQxOTozNjoyNFoi\nLCJzY29wZXMiOlsiZ2lzdCJdfQ==\n"},"http_version":null},"recorded_at":"Thu, 29 Aug 2013 19:36:24 GMT"}],"recorded_with":"VCR 2.4.0"}

data/spec/cassettes/Octokit_Client_Authorizations/_create_authorization/without_idempotent_true/creates_a_new_API_authorization_each_time.json

@@ -0,0 +1 @@
+{"http_interactions":[{"request":{"method":"post","uri":"https://<GITHUB_LOGIN>:<GITHUB_PASSWORD>@api.github.com/authorizations","body":{"encoding":"UTF-8","base64_string":"e30=\n"},"headers":{"Accept":["application/vnd.github.beta+json"],"User-Agent":["Octokit Ruby Gem 2.0.0"]}},"response":{"status":{"code":201,"message":"Created"},"headers":{"Server":["GitHub.com"],"Date":["Thu, 29 Aug 2013 19:36:23 GMT"],"Content-Type":["application/json; charset=utf-8"],"Status":["201 Created"],"X-Ratelimit-Limit":["5000"],"X-Ratelimit-Remaining":["4993"],"X-Ratelimit-Reset":["1377808149"],"Location":["https://api.github.com/authorizations/3459488"],"X-Github-Media-Type":["github.beta; format=json"],"X-Content-Type-Options":["nosniff"],"Content-Length":["365"],"Access-Control-Allow-Credentials":["true"],"Access-Control-Expose-Headers":["ETag, Link, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes"],"Access-Control-Allow-Origin":["*"],"Etag":["\"1444ccd8d64cae453cd92448ff936d37\""],"Cache-Control":["max-age=0, private, must-revalidate"],"X-Github-Request-Id":["a27f469a-1e1c-49ab-9080-829e48d3430f"]},"body":{"encoding":"US-ASCII","base64_string":"eyJpZCI6MzQ1OTQ4OCwidXJsIjoiaHR0cHM6Ly9hcGkuZ2l0aHViLmNvbS9h\ndXRob3JpemF0aW9ucy8zNDU5NDg4IiwiYXBwIjp7Im5hbWUiOiJHaXRIdWIg\nQVBJIiwidXJsIjoiaHR0cDovL2RldmVsb3Blci5naXRodWIuY29tL3YzL29h\ndXRoLyNvYXV0aC1hdXRob3JpemF0aW9ucy1hcGkiLCJjbGllbnRfaWQiOiIw\nMDAwMDAwMDAwMDAwMDAwMDAwMCJ9LCJ0b2tlbiI6IjdlMTY5NmNlM2JlOGRl\nMGQ1ZTA4ODE1MzgzNTNmMTYzYTZhNjZhMmMiLCJub3RlIjpudWxsLCJub3Rl\nX3VybCI6bnVsbCwiY3JlYXRlZF9hdCI6IjIwMTMtMDgtMjlUMTk6MzY6MjNa\nIiwidXBkYXRlZF9hdCI6IjIwMTMtMDgtMjlUMTk6MzY6MjNaIiwic2NvcGVz\nIjpbXX0=\n"},"http_version":null},"recorded_at":"Thu, 29 Aug 2013 19:36:23 GMT"},{"request":{"method":"post","uri":"https://<GITHUB_LOGIN>:<GITHUB_PASSWORD>@api.github.com/authorizations","body":{"encoding":"UTF-8","base64_string":"e30=\n"},"headers":{"Accept":["application/vnd.github.beta+json"],"User-Agent":["Octokit Ruby Gem 2.0.0"]}},"response":{"status":{"code":201,"message":"Created"},"headers":{"Server":["GitHub.com"],"Date":["Thu, 29 Aug 2013 19:36:23 GMT"],"Content-Type":["application/json; charset=utf-8"],"Status":["201 Created"],"X-Ratelimit-Limit":["5000"],"X-Ratelimit-Remaining":["4992"],"X-Ratelimit-Reset":["1377808149"],"Location":["https://api.github.com/authorizations/3459490"],"X-Github-Media-Type":["github.beta; format=json"],"X-Content-Type-Options":["nosniff"],"Content-Length":["365"],"Access-Control-Allow-Credentials":["true"],"Access-Control-Expose-Headers":["ETag, Link, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset, X-OAuth-Scopes, X-Accepted-OAuth-Scopes"],"Access-Control-Allow-Origin":["*"],"Etag":["\"39f0b27375ce598f0cf13230ea91b0d9\""],"Cache-Control":["max-age=0, private, must-revalidate"],"X-Github-Request-Id":["2574b4a5-0b8a-46eb-8571-8858eb8a1b0c"]},"body":{"encoding":"US-ASCII","base64_string":"eyJpZCI6MzQ1OTQ5MCwidXJsIjoiaHR0cHM6Ly9hcGkuZ2l0aHViLmNvbS9h\ndXRob3JpemF0aW9ucy8zNDU5NDkwIiwiYXBwIjp7Im5hbWUiOiJHaXRIdWIg\nQVBJIiwidXJsIjoiaHR0cDovL2RldmVsb3Blci5naXRodWIuY29tL3YzL29h\ndXRoLyNvYXV0aC1hdXRob3JpemF0aW9ucy1hcGkiLCJjbGllbnRfaWQiOiIw\nMDAwMDAwMDAwMDAwMDAwMDAwMCJ9LCJ0b2tlbiI6IjM0ZjRlM2M3N2VjZTZm\nMzFmOTY5MTNhMzRlNDMyYTE2NWI4Yjg1OWUiLCJub3RlIjpudWxsLCJub3Rl\nX3VybCI6bnVsbCwiY3JlYXRlZF9hdCI6IjIwMTMtMDgtMjlUMTk6MzY6MjNa\nIiwidXBkYXRlZF9hdCI6IjIwMTMtMDgtMjlUMTk6MzY6MjNaIiwic2NvcGVz\nIjpbXX0=\n"},"http_version":null},"recorded_at":"Thu, 29 Aug 2013 19:36:23 GMT"}],"recorded_with":"VCR 2.4.0"}

data/spec/helper.rb

@@ -30,6 +30,12 @@ VCR.configure do |c|
   c.filter_sensitive_data("<<ACCESS_TOKEN>>") do
       ENV['OCTOKIT_TEST_GITHUB_TOKEN']
   end
+  c.filter_sensitive_data("<GITHUB_CLIENT_ID>") do
+      ENV['OCTOKIT_TEST_GITHUB_CLIENT_ID']
+  end
+  c.filter_sensitive_data("<GITHUB_CLIENT_SECRET>") do
+      ENV['OCTOKIT_TEST_GITHUB_CLIENT_SECRET']
+  end
   c.default_cassette_options = {
     :serialize_with             => :json,
     # TODO: Track down UTF-8 issue and remove
@@ -53,6 +59,14 @@ def test_github_token
   ENV.fetch 'OCTOKIT_TEST_GITHUB_TOKEN'
 end
 
+def test_github_client_id
+  ENV.fetch 'OCTOKIT_TEST_GITHUB_CLIENT_ID'
+end
+
+def test_github_client_secret
+  ENV.fetch 'OCTOKIT_TEST_GITHUB_CLIENT_SECRET'
+end
+
 def stub_delete(url)
   stub_request(:delete, github_url(url))
 end

data/spec/octokit/client/authorizations_spec.rb

@@ -8,18 +8,54 @@ describe Octokit::Client::Authorizations do
   end
 
   describe ".create_authorization", :vcr do
-    it "creates an API authorization" do
-      authorization = @client.create_authorization
-      expect(authorization.app.name).to_not be_nil
-      assert_requested :post, basic_github_url("/authorizations")
+    context 'without :idempotent => true' do
+      it "creates an API authorization" do
+        authorization = @client.create_authorization
+        expect(authorization.app.name).to_not be_nil
+        assert_requested :post, basic_github_url("/authorizations")
+      end
+
+      it "creates a new API authorization each time" do
+        first_authorization = @client.create_authorization
+        second_authorization = @client.create_authorization
+        expect(first_authorization.id).to_not eq second_authorization.id
+      end
+
+      it "creates a new authorization with options" do
+        info = {
+          :scopes => ["gist"],
+        }
+        authorization = @client.create_authorization info
+        expect(authorization.scopes).to be_kind_of Array
+        assert_requested :post, basic_github_url("/authorizations")
+      end
     end
-    it "creates a new authorization with options" do
-      info = {
-        :scopes => ["gist"],
-      }
-      authorization = @client.create_authorization info
-      expect(authorization.scopes).to be_kind_of Array
-      assert_requested :post, basic_github_url("/authorizations")
+
+    context 'with :idempotent => true' do
+      subject do
+        lambda do |info = {}|
+          @client.create_authorization({
+            :idempotent    => true,
+            :client_id     => test_github_client_id,
+            :client_secret => test_github_client_secret
+          }.merge(info))
+        end
+      end
+
+      it "creates a new authorization with options" do
+        info = {
+          :scopes => ["gist"],
+        }
+        authorization = subject.call info
+        expect(authorization.scopes).to be_kind_of Array
+        assert_requested :put, basic_github_url("/authorizations/clients/#{test_github_client_id}")
+      end
+
+      it 'returns an existing API authorization if one already exists' do
+        first_authorization = subject.call
+        second_authorization = subject.call
+        expect(first_authorization.id).to eql second_authorization.id
+      end
     end
   end # .create_authorization
 

data/spec/octokit/client/users_spec.rb

@@ -198,14 +198,17 @@ describe Octokit::Client::Users do
     end
   end # .subscriptions
 
-  describe '.access_token' do
+  describe '.exchange_code_for_token' do
     it 'returns the access_token' do
       VCR.turn_off!
-      stub_post("https://github.com/login/oauth/access_token").
-        to_return(json_response("web_flow_token.json"))
+      post = stub_post("https://github.com/login/oauth/access_token").
+        with(:headers => {
+          :accept       => "application/json",
+          :content_type => "application/json"
+      }).to_return(json_response("web_flow_token.json"))
       response = Octokit.exchange_code_for_token('code', 'id_here', 'secret_here')
       expect(response.access_token).to eq 'this_be_ye_token/use_it_wisely'
-      assert_requested :post, "https://github.com/login/oauth/access_token"
+      assert_requested post
       VCR.turn_on!
     end
   end # .access_token

data/spec/octokit/client_spec.rb

@@ -480,4 +480,34 @@ describe Octokit::Client do
     end
   end
 
+  it "knows the difference between unauthorized and needs OTP" do
+      stub_get('/authorizations').to_return(:status => 401)
+      expect { Octokit.get('/authorizations') }.to raise_error Octokit::Unauthorized
+
+      stub_get('/authorizations/1').to_return \
+        :status => 401,
+        :headers => {
+          :content_type => "application/json",
+          "X-GitHub-OTP" => "required; sms"
+        },
+        :body => {:message => "Must specify two-factor authentication OTP code."}.to_json
+      expect { Octokit.get('/authorizations/1') }.to raise_error Octokit::OneTimePasswordRequired
+  end
+
+  it "knows the password delivery mechanism when needs OTP" do
+    stub_get('/authorizations/1').to_return \
+      :status => 401,
+      :headers => {
+        :content_type => "application/json",
+        "X-GitHub-OTP" => "required; app"
+      },
+      :body => {:message => "Must specify two-factor authentication OTP code."}.to_json
+
+    begin
+      Octokit.get('/authorizations/1')
+    rescue Octokit::OneTimePasswordRequired => otp_error
+      expect(otp_error.password_delivery).to eql 'app'
+    end
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: octokit
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-23 00:00:00.000000000 Z
+date: 2013-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -111,8 +111,11 @@ files:
 - spec/cassettes/Octokit_Client/error_handling/raises_on_404.json
 - spec/cassettes/Octokit_Client_Authorizations/_authorization/returns_a_single_authorization.json
 - spec/cassettes/Octokit_Client_Authorizations/_authorizations/lists_existing_authorizations.json
-- spec/cassettes/Octokit_Client_Authorizations/_create_authorization/creates_a_new_authorization_with_options.json
-- spec/cassettes/Octokit_Client_Authorizations/_create_authorization/creates_an_API_authorization.json
+- spec/cassettes/Octokit_Client_Authorizations/_create_authorization/with_idempotent_true/creates_a_new_authorization_with_options.json
+- spec/cassettes/Octokit_Client_Authorizations/_create_authorization/with_idempotent_true/returns_an_existing_API_authorization_if_one_already_exists.json
+- spec/cassettes/Octokit_Client_Authorizations/_create_authorization/without_idempotent_true/creates_a_new_API_authorization_each_time.json
+- spec/cassettes/Octokit_Client_Authorizations/_create_authorization/without_idempotent_true/creates_a_new_authorization_with_options.json
+- spec/cassettes/Octokit_Client_Authorizations/_create_authorization/without_idempotent_true/creates_an_API_authorization.json
 - spec/cassettes/Octokit_Client_Authorizations/_scopes/checks_the_scopes_on_a_one-off_token.json
 - spec/cassettes/Octokit_Client_Authorizations/_scopes/checks_the_scopes_on_the_current_token.json
 - spec/cassettes/Octokit_Client_Authorizations/_update_authorization/updates_and_existing_authorization.json
@@ -455,8 +458,11 @@ test_files:
 - spec/cassettes/Octokit_Client/error_handling/raises_on_404.json
 - spec/cassettes/Octokit_Client_Authorizations/_authorization/returns_a_single_authorization.json
 - spec/cassettes/Octokit_Client_Authorizations/_authorizations/lists_existing_authorizations.json
-- spec/cassettes/Octokit_Client_Authorizations/_create_authorization/creates_a_new_authorization_with_options.json
-- spec/cassettes/Octokit_Client_Authorizations/_create_authorization/creates_an_API_authorization.json
+- spec/cassettes/Octokit_Client_Authorizations/_create_authorization/with_idempotent_true/creates_a_new_authorization_with_options.json
+- spec/cassettes/Octokit_Client_Authorizations/_create_authorization/with_idempotent_true/returns_an_existing_API_authorization_if_one_already_exists.json
+- spec/cassettes/Octokit_Client_Authorizations/_create_authorization/without_idempotent_true/creates_a_new_API_authorization_each_time.json
+- spec/cassettes/Octokit_Client_Authorizations/_create_authorization/without_idempotent_true/creates_a_new_authorization_with_options.json
+- spec/cassettes/Octokit_Client_Authorizations/_create_authorization/without_idempotent_true/creates_an_API_authorization.json
 - spec/cassettes/Octokit_Client_Authorizations/_scopes/checks_the_scopes_on_a_one-off_token.json
 - spec/cassettes/Octokit_Client_Authorizations/_scopes/checks_the_scopes_on_the_current_token.json
 - spec/cassettes/Octokit_Client_Authorizations/_update_authorization/updates_and_existing_authorization.json