octoauth 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3918e6a2c1d30b4f4fa12d2f4fb6a7a64f7ab608
-  data.tar.gz: 246fbe321144407f610f712e9fdfacd824ef0b3c
+  metadata.gz: b80d12c3505ddbe37c6237f2df7d01b56bdb75e7
+  data.tar.gz: 82234ad8872138f5630f5c7b52ea273d16f6c685
 SHA512:
-  metadata.gz: 77aa2d21dd8b6c079888704e5102faecc3a2d3de4c757908b07f73045f96d54f8c5a98b28ea9b42d3fc72809b21172735353344c3ba2f0302d88eea7a8109888
-  data.tar.gz: d2070fe16197bea8bcd5bba83cae237e49e02baed5a504735d1679807fa72f4f9056a5e9dac66d996ded32b0aef88c3488499c3c6941d98524b4fb4bebbb8c0c
+  metadata.gz: 77de129784d3b6656dc153bec66542c246d96314d8ea9f5028d7fdaf610a9969b83330a2b063bec1ec7887257dc7de79c558f1cda7d73e9a979a5bb39ceab202
+  data.tar.gz: bfc7c32f131c8049614783f9b73c4e1b1d5c0d9b86e4e65f5347bda3c38a1ec81768d219905d2578c69625482237fb4443b8240a9504f4fcd4167c2166782ef2

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 1.3.0 / 2015-08-22
+
+* [ENHANCEMENT] Updated octokit to ~> 4.1.0
+
 # 1.2.0 / 2015-06-27
 
 * [ENHANCEMENT] Update octokit to ~> 4.0.0

data/lib/octoauth/auth.rb

@@ -61,10 +61,21 @@ module Octoauth
       "#{@options[:note]}--#{@options[:api_endpoint]}"
     end
 
+    def fingerprint
+      @fingerprint ||= "#{config_note}/#{hostname}"
+    end
+
+    def hostname
+      return @hostname if @hostname
+      res = `hostname`.split.first
+      @hostname = $?.exitstatus == 0 ? res : 'NULL'
+    end
+
     def prompt!(needs2fa = false)
       @options[:login] ||= PROMPTS[:login].ask
       @options[:password] ||= PROMPTS[:password].ask
       @options[:scopes] ||= DEFAULT_SCOPES
+      @options[:fingerprint] = fingerprint
       return unless needs2fa
       @options[:twofactor] ||= PROMPTS[:twofactor].ask
       @options[:headers] = { 'X-GitHub-OTP' => @options[:twofactor] }
@@ -81,7 +92,7 @@ module Octoauth
         @options.subset(:login, :password, :api_endpoint)
       )
       client.create_authorization(
-        @options.subset(:note, :scopes, :headers)
+        @options.subset(:note, :scopes, :headers, :fingerprint)
       ).token
     rescue Octokit::OneTimePasswordRequired
       load_token(true)

data/octoauth.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'octoauth'
-  s.version     = '1.2.0'
+  s.version     = '1.3.0'
   s.date        = Time.now.strftime("%Y-%m-%d")
 
   s.summary     = 'Auth token helper for GitHub API'
@@ -13,13 +13,14 @@ Gem::Specification.new do |s|
   s.files       = `git ls-files`.split
   s.test_files  = `git ls-files spec/*`.split
 
-  s.add_dependency 'octokit', '~> 4.0.0'
+  s.add_dependency 'octokit', '~> 4.1.0'
   s.add_dependency 'userinput', '~> 1.0.0'
 
-  s.add_development_dependency 'rubocop', '~> 0.32.0'
+  s.add_development_dependency 'rubocop', '~> 0.33.0'
   s.add_development_dependency 'rake', '~> 10.4.0'
   s.add_development_dependency 'coveralls', '~> 0.8.0'
   s.add_development_dependency 'rspec', '~> 3.3.0'
   s.add_development_dependency 'fuubar', '~> 2.0.0'
   s.add_development_dependency 'webmock', '~> 1.21.0'
+  s.add_development_dependency 'vcr', '~> 2.9.2'
 end

data/spec/fixtures/cassettes/Write_to_first_file.yml

@@ -0,0 +1,63 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://user:pw@api.github.com/authorizations
+    body:
+      encoding: UTF-8
+      string: '{"note":"foo","scopes":[],"fingerprint":"foo/bean"}'
+    headers:
+      Accept:
+      - application/vnd.github.v3+json
+      User-Agent:
+      - Octokit Ruby Gem 4.0.1
+      Content-Type:
+      - application/json
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+  response:
+    status:
+      code: 401
+      message: Unauthorized
+    headers:
+      Server:
+      - GitHub.com
+      Date:
+      - Sat, 25 Jul 2015 01:56:58 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Content-Length:
+      - '83'
+      Status:
+      - 401 Unauthorized
+      X-Github-Media-Type:
+      - github.v3; format=json
+      X-Ratelimit-Limit:
+      - '60'
+      X-Ratelimit-Remaining:
+      - '54'
+      X-Ratelimit-Reset:
+      - '1437793018'
+      X-Xss-Protection:
+      - 1; mode=block
+      X-Frame-Options:
+      - deny
+      Content-Security-Policy:
+      - default-src 'none'
+      Access-Control-Allow-Credentials:
+      - 'true'
+      Access-Control-Expose-Headers:
+      - ETag, Link, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset,
+        X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval
+      Access-Control-Allow-Origin:
+      - "*"
+      Strict-Transport-Security:
+      - max-age=31536000; includeSubdomains; preload
+      X-Content-Type-Options:
+      - nosniff
+    body:
+      encoding: UTF-8
+      string: '{"message":"Bad credentials","documentation_url":"https://developer.github.com/v3"}'
+    http_version: 
+  recorded_at: Sat, 25 Jul 2015 01:56:58 GMT
+recorded_with: VCR 2.9.3

data/spec/fixtures/cassettes/autosaving_config_file.yml

@@ -0,0 +1,63 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://user:pw@api.github.com/authorizations
+    body:
+      encoding: UTF-8
+      string: '{"note":"autosave_test","scopes":[],"fingerprint":"autosave_test/bean"}'
+    headers:
+      Accept:
+      - application/vnd.github.v3+json
+      User-Agent:
+      - Octokit Ruby Gem 4.0.1
+      Content-Type:
+      - application/json
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+  response:
+    status:
+      code: 401
+      message: Unauthorized
+    headers:
+      Server:
+      - GitHub.com
+      Date:
+      - Sat, 25 Jul 2015 01:56:58 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Content-Length:
+      - '83'
+      Status:
+      - 401 Unauthorized
+      X-Github-Media-Type:
+      - github.v3; format=json
+      X-Ratelimit-Limit:
+      - '60'
+      X-Ratelimit-Remaining:
+      - '58'
+      X-Ratelimit-Reset:
+      - '1437793018'
+      X-Xss-Protection:
+      - 1; mode=block
+      X-Frame-Options:
+      - deny
+      Content-Security-Policy:
+      - default-src 'none'
+      Access-Control-Allow-Credentials:
+      - 'true'
+      Access-Control-Expose-Headers:
+      - ETag, Link, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset,
+        X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval
+      Access-Control-Allow-Origin:
+      - "*"
+      Strict-Transport-Security:
+      - max-age=31536000; includeSubdomains; preload
+      X-Content-Type-Options:
+      - nosniff
+    body:
+      encoding: UTF-8
+      string: '{"message":"Bad credentials","documentation_url":"https://developer.github.com/v3"}'
+    http_version: 
+  recorded_at: Sat, 25 Jul 2015 01:56:58 GMT
+recorded_with: VCR 2.9.3

data/spec/fixtures/cassettes/creates_new_token.yml

@@ -0,0 +1,63 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://user:pw@api.github.com/authorizations
+    body:
+      encoding: UTF-8
+      string: '{"note":"existing","scopes":[],"fingerprint":"existing/bean"}'
+    headers:
+      Accept:
+      - application/vnd.github.v3+json
+      User-Agent:
+      - Octokit Ruby Gem 4.0.1
+      Content-Type:
+      - application/json
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+  response:
+    status:
+      code: 401
+      message: Unauthorized
+    headers:
+      Server:
+      - GitHub.com
+      Date:
+      - Sat, 25 Jul 2015 01:56:58 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Content-Length:
+      - '83'
+      Status:
+      - 401 Unauthorized
+      X-Github-Media-Type:
+      - github.v3; format=json
+      X-Ratelimit-Limit:
+      - '60'
+      X-Ratelimit-Remaining:
+      - '57'
+      X-Ratelimit-Reset:
+      - '1437793018'
+      X-Xss-Protection:
+      - 1; mode=block
+      X-Frame-Options:
+      - deny
+      Content-Security-Policy:
+      - default-src 'none'
+      Access-Control-Allow-Credentials:
+      - 'true'
+      Access-Control-Expose-Headers:
+      - ETag, Link, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset,
+        X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval
+      Access-Control-Allow-Origin:
+      - "*"
+      Strict-Transport-Security:
+      - max-age=31536000; includeSubdomains; preload
+      X-Content-Type-Options:
+      - nosniff
+    body:
+      encoding: UTF-8
+      string: '{"message":"Bad credentials","documentation_url":"https://developer.github.com/v3"}'
+    http_version: 
+  recorded_at: Sat, 25 Jul 2015 01:56:58 GMT
+recorded_with: VCR 2.9.3

data/spec/fixtures/cassettes/handle_two_factor.yml

@@ -0,0 +1,63 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://user:pw@api.github.com/authorizations
+    body:
+      encoding: UTF-8
+      string: '{"note":"foo","scopes":[],"fingerprint":"foo/bean"}'
+    headers:
+      Accept:
+      - application/vnd.github.v3+json
+      User-Agent:
+      - Octokit Ruby Gem 4.0.1
+      Content-Type:
+      - application/json
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+  response:
+    status:
+      code: 401
+      message: Unauthorized
+    headers:
+      Server:
+      - GitHub.com
+      Date:
+      - Sat, 25 Jul 2015 01:56:58 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Content-Length:
+      - '83'
+      Status:
+      - 401 Unauthorized
+      X-Github-Media-Type:
+      - github.v3; format=json
+      X-Ratelimit-Limit:
+      - '60'
+      X-Ratelimit-Remaining:
+      - '55'
+      X-Ratelimit-Reset:
+      - '1437793018'
+      X-Xss-Protection:
+      - 1; mode=block
+      X-Frame-Options:
+      - deny
+      Content-Security-Policy:
+      - default-src 'none'
+      Access-Control-Allow-Credentials:
+      - 'true'
+      Access-Control-Expose-Headers:
+      - ETag, Link, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset,
+        X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval
+      Access-Control-Allow-Origin:
+      - "*"
+      Strict-Transport-Security:
+      - max-age=31536000; includeSubdomains; preload
+      X-Content-Type-Options:
+      - nosniff
+    body:
+      encoding: UTF-8
+      string: '{"message":"Bad credentials","documentation_url":"https://developer.github.com/v3"}'
+    http_version: 
+  recorded_at: Sat, 25 Jul 2015 01:56:58 GMT
+recorded_with: VCR 2.9.3

data/spec/fixtures/cassettes/request_user_input.yml

@@ -0,0 +1,63 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://user:pw@api.github.com/authorizations
+    body:
+      encoding: UTF-8
+      string: '{"note":"foo","scopes":[],"fingerprint":"foo/bean"}'
+    headers:
+      Accept:
+      - application/vnd.github.v3+json
+      User-Agent:
+      - Octokit Ruby Gem 4.0.1
+      Content-Type:
+      - application/json
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+  response:
+    status:
+      code: 401
+      message: Unauthorized
+    headers:
+      Server:
+      - GitHub.com
+      Date:
+      - Sat, 25 Jul 2015 01:56:58 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Content-Length:
+      - '83'
+      Status:
+      - 401 Unauthorized
+      X-Github-Media-Type:
+      - github.v3; format=json
+      X-Ratelimit-Limit:
+      - '60'
+      X-Ratelimit-Remaining:
+      - '56'
+      X-Ratelimit-Reset:
+      - '1437793018'
+      X-Xss-Protection:
+      - 1; mode=block
+      X-Frame-Options:
+      - deny
+      Content-Security-Policy:
+      - default-src 'none'
+      Access-Control-Allow-Credentials:
+      - 'true'
+      Access-Control-Expose-Headers:
+      - ETag, Link, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset,
+        X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval
+      Access-Control-Allow-Origin:
+      - "*"
+      Strict-Transport-Security:
+      - max-age=31536000; includeSubdomains; preload
+      X-Content-Type-Options:
+      - nosniff
+    body:
+      encoding: UTF-8
+      string: '{"message":"Bad credentials","documentation_url":"https://developer.github.com/v3"}'
+    http_version: 
+  recorded_at: Sat, 25 Jul 2015 01:56:58 GMT
+recorded_with: VCR 2.9.3

data/spec/fixtures/cassettes/requesting_scopes.yml

@@ -0,0 +1,63 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://user:pw@api.github.com/authorizations
+    body:
+      encoding: UTF-8
+      string: '{"note":"foo","scopes":["gist","delete_repo"],"fingerprint":"foo/bean"}'
+    headers:
+      Accept:
+      - application/vnd.github.v3+json
+      User-Agent:
+      - Octokit Ruby Gem 4.0.1
+      Content-Type:
+      - application/json
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+  response:
+    status:
+      code: 401
+      message: Unauthorized
+    headers:
+      Server:
+      - GitHub.com
+      Date:
+      - Sat, 25 Jul 2015 01:56:58 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Content-Length:
+      - '83'
+      Status:
+      - 401 Unauthorized
+      X-Github-Media-Type:
+      - github.v3; format=json
+      X-Ratelimit-Limit:
+      - '60'
+      X-Ratelimit-Remaining:
+      - '59'
+      X-Ratelimit-Reset:
+      - '1437793018'
+      X-Xss-Protection:
+      - 1; mode=block
+      X-Frame-Options:
+      - deny
+      Content-Security-Policy:
+      - default-src 'none'
+      Access-Control-Allow-Credentials:
+      - 'true'
+      Access-Control-Expose-Headers:
+      - ETag, Link, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset,
+        X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval
+      Access-Control-Allow-Origin:
+      - "*"
+      Strict-Transport-Security:
+      - max-age=31536000; includeSubdomains; preload
+      X-Content-Type-Options:
+      - nosniff
+    body:
+      encoding: UTF-8
+      string: '{"message":"Bad credentials","documentation_url":"https://developer.github.com/v3"}'
+    http_version: 
+  recorded_at: Sat, 25 Jul 2015 01:56:58 GMT
+recorded_with: VCR 2.9.3

data/spec/fixtures/cassettes/save_to_disk.yml

@@ -0,0 +1,63 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://user:pw@api.github.com/authorizations
+    body:
+      encoding: UTF-8
+      string: '{"note":"write_test","scopes":[],"fingerprint":"write_test/bean"}'
+    headers:
+      Accept:
+      - application/vnd.github.v3+json
+      User-Agent:
+      - Octokit Ruby Gem 4.0.1
+      Content-Type:
+      - application/json
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+  response:
+    status:
+      code: 401
+      message: Unauthorized
+    headers:
+      Server:
+      - GitHub.com
+      Date:
+      - Sat, 25 Jul 2015 01:56:59 GMT
+      Content-Type:
+      - application/json; charset=utf-8
+      Content-Length:
+      - '83'
+      Status:
+      - 401 Unauthorized
+      X-Github-Media-Type:
+      - github.v3; format=json
+      X-Ratelimit-Limit:
+      - '60'
+      X-Ratelimit-Remaining:
+      - '53'
+      X-Ratelimit-Reset:
+      - '1437793018'
+      X-Xss-Protection:
+      - 1; mode=block
+      X-Frame-Options:
+      - deny
+      Content-Security-Policy:
+      - default-src 'none'
+      Access-Control-Allow-Credentials:
+      - 'true'
+      Access-Control-Expose-Headers:
+      - ETag, Link, X-GitHub-OTP, X-RateLimit-Limit, X-RateLimit-Remaining, X-RateLimit-Reset,
+        X-OAuth-Scopes, X-Accepted-OAuth-Scopes, X-Poll-Interval
+      Access-Control-Allow-Origin:
+      - "*"
+      Strict-Transport-Security:
+      - max-age=31536000; includeSubdomains; preload
+      X-Content-Type-Options:
+      - nosniff
+    body:
+      encoding: UTF-8
+      string: '{"message":"Bad credentials","documentation_url":"https://developer.github.com/v3"}'
+    http_version: 
+  recorded_at: Sat, 25 Jul 2015 01:56:59 GMT
+recorded_with: VCR 2.9.3

data/spec/octoauth/auth_spec.rb

@@ -22,121 +22,85 @@ describe Octoauth do
     describe '#initialize' do
       context 'if the file and note already exist' do
         it 'loads the existing token' do
-          auth = Octoauth::Auth.new(
-            note: 'foo',
-            file: 'spec/examples/conf_a.yml'
-          )
-          expect(auth.token).to eql 'bcdebcdebcdebcdebcdebcdebcde'
+          VCR.use_cassette('load_existing_token') do
+            auth = Octoauth::Auth.new(
+              note: 'foo',
+              file: 'spec/examples/conf_a.yml'
+            )
+            expect(auth.token).to eql 'bcdebcdebcdebcdebcdebcdebcde'
+          end
         end
       end
       context 'if there is a note conflict' do
-        it 'returns the existing token' do
-          stub_request(:post, 'https://user:pw@api.github.com/authorizations')
-            .with(body: "{\"note\":\"existing\",\"scopes\":[]}")
-            .to_return(status: 422)
-          stub_request(:get, 'https://user:pw@api.github.com/authorizations')
-            .to_return(
-              status: 200,
-              body: [
-                AuthShim.new('not_match', 'bad'),
-                AuthShim.new('existing', 'existing_token')
-              ]
+        it 'creates_a_new_token' do
+          VCR.use_cassette('creates_new_token') do
+            auth = Octoauth::Auth.new(
+              note: 'existing',
+              login: 'user',
+              password: 'pw'
             )
-          auth = Octoauth::Auth.new(
-            note: 'existing',
-            login: 'user',
-            password: 'pw'
-          )
-          expect(auth.token).to eql 'existing_token'
+            expect(auth.token).to eql 'existing_token'
+          end
         end
       end
       context 'if the file does not exist' do
         it 'requests user input to create token' do
-          stub_request(:post, 'https://user:pw@api.github.com/authorizations')
-            .with(body: "{\"note\":\"foo\",\"scopes\":[]}")
-            .to_return(
-              status: 200,
-              body: AuthShim.new('foo', 'qwertyqwertyqwertyqwerty')
+          VCR.use_cassette('request_user_input') do
+            auth = Octoauth::Auth.new(
+              note: 'foo',
+              login: 'user',
+              password: 'pw'
             )
-          auth = Octoauth::Auth.new(
-            note: 'foo',
-            login: 'user',
-            password: 'pw'
-          )
-          expect(auth.token).to eql 'qwertyqwertyqwertyqwerty'
+            expect(auth.token).to eql 'qwertyqwertyqwertyqwerty'
+          end
         end
         it 'handles users with 2 factor auth enabled' do
-          stub_request(:post, 'https://user:pw@api.github.com/authorizations')
-            .with(body: "{\"note\":\"foo\",\"scopes\":[]}")
-            .to_return(
-              status: 401,
-              headers: { 'X-GitHub-OTP' => 'required; app' }
-            )
-          stub_request(:post, 'https://user:pw@api.github.com/authorizations')
-            .with(
-              body: "{\"note\":\"foo\",\"scopes\":[]}",
-              headers: { 'X-GitHub-OTP' => '1234' }
-            )
-            .to_return(
-              status: 200,
-              body: AuthShim.new('foo', 'qwertyqwertyqwertyqwerty')
-            )
-          allow(STDIN).to receive(:gets).and_return("user\n", "pw\n", "1234\n")
-          auth = Octoauth::Auth.new(note: 'foo')
-          expect(auth.token).to eql 'qwertyqwertyqwertyqwerty'
+          VCR.use_cassette('handle_two_factor') do
+            allow(STDIN).to receive(:gets).and_return("user\n", "pw\n", "1234\n")
+            auth = Octoauth::Auth.new(note: 'foo')
+            expect(auth.token).to eql 'qwertyqwertyqwertyqwerty'
+          end
         end
       end
       it 'supports alternate endpoints' do
-        stub_request(:post, 'https://user:pw@sekrit.com/api/v3/authorizations')
-          .with(body: "{\"note\":\"foo\",\"scopes\":[]}")
-          .to_return(
-            status: 200,
-            body: AuthShim.new('foo', 'qwertyqwertyqwertyqwerty')
+        VCR.use_cassette('alternate_endpoints') do
+          auth = Octoauth::Auth.new(
+            note: 'foo',
+            login: 'user',
+            password: 'pw',
+            api_endpoint: 'https://sekrit.com/api/v3/'
           )
-        auth = Octoauth::Auth.new(
-          note: 'foo',
-          login: 'user',
-          password: 'pw',
-          api_endpoint: 'https://sekrit.com/api/v3/'
-        )
-        expect(auth.token).to eql 'qwertyqwertyqwertyqwerty'
+          expect(auth.token).to eql 'qwertyqwertyqwertyqwerty'
+        end
       end
       it 'supports requesting scopes' do
-        stub_request(:post, 'https://user:pw@api.github.com/authorizations')
-          .with(body: '{"note":"foo","scopes":["gist","delete_repo"]}')
-          .to_return(
-            status: 200,
-            body: AuthShim.new('foo', 'qwertyqwertyqwertyqwerty')
+        VCR.use_cassette('requesting_scopes') do
+          auth = Octoauth::Auth.new(
+            note: 'foo',
+            login: 'user',
+            password: 'pw',
+            scopes: %w(gist delete_repo)
           )
-        auth = Octoauth::Auth.new(
-          note: 'foo',
-          login: 'user',
-          password: 'pw',
-          scopes: %w(gist delete_repo)
-        )
-        expect(auth.token).to eql 'qwertyqwertyqwertyqwerty'
+          expect(auth.token).to eql 'qwertyqwertyqwertyqwerty'
+        end
       end
       it 'supports autosaving the config file' do
-        random = rand(36**30).to_s(30)
-        stub_request(:post, 'https://user:pw@api.github.com/authorizations')
-          .with(body: "{\"note\":\"autosave_test\",\"scopes\":[]}")
-          .to_return(
-            status: 200,
-            body: AuthShim.new('foo', random)
+        VCR.use_cassette('autosaving_config_file') do
+          random = rand(36**30).to_s(30)
+          FileUtils.rm_f 'spec/examples/autosave.yml'
+          Octoauth::Auth.new(
+            note: 'autosave_test',
+            file: 'spec/examples/autosave.yml',
+            login: 'user',
+            password: 'pw',
+            autosave: true
+          )
+          new_auth = Octoauth::Auth.new(
+            note: 'autosave_test',
+            file: 'spec/examples/autosave.yml'
           )
-        FileUtils.rm_f 'spec/examples/autosave.yml'
-        Octoauth::Auth.new(
-          note: 'autosave_test',
-          file: 'spec/examples/autosave.yml',
-          login: 'user',
-          password: 'pw',
-          autosave: true
-        )
-        new_auth = Octoauth::Auth.new(
-          note: 'autosave_test',
-          file: 'spec/examples/autosave.yml'
-        )
-        expect(new_auth.token).to eql random
+          expect(new_auth.token).to eql random
+        end
       end
     end
     context 'when given multiple file paths' do
@@ -170,26 +134,22 @@ describe Octoauth do
             expect(auth.send(:config).token).to be_nil
           end
           it 'writes to the first file' do
-            random = rand(36**30).to_s(30)
-            stub_request(:post, 'https://user:pw@api.github.com/authorizations')
-              .with(body: "{\"note\":\"foo\",\"scopes\":[]}")
-              .to_return(
-                status: 200,
-                body: AuthShim.new('foo', random)
+            VCR.use_cassette('Write_to_first_file') do
+              random = rand(36**30).to_s(30)
+              FileUtils.rm_f ['spec/examples/nil.yml', 'spec/examples/nil2.yml']
+              auth = Octoauth::Auth.new(
+                note: 'foo',
+                files: ['spec/examples/nil.yml', 'spec/examples/nil2.yml'],
+                login: 'user',
+                password: 'pw'
               )
-            FileUtils.rm_f ['spec/examples/nil.yml', 'spec/examples/nil2.yml']
-            auth = Octoauth::Auth.new(
-              note: 'foo',
-              files: ['spec/examples/nil.yml', 'spec/examples/nil2.yml'],
-              login: 'user',
-              password: 'pw'
-            )
-            auth.save
-            new_auth = Octoauth::Auth.new(
-              note: 'foo',
-              file: 'spec/examples/nil.yml'
-            )
-            expect(new_auth.token).to eql random
+              auth.save
+              new_auth = Octoauth::Auth.new(
+                note: 'foo',
+                file: 'spec/examples/nil.yml'
+              )
+              expect(new_auth.token).to eql random
+            end
           end
         end
       end
@@ -197,26 +157,22 @@ describe Octoauth do
 
     describe '#save' do
       it 'saves the config to disk' do
-        random = rand(36**30).to_s(30)
-        FileUtils.rm_f 'spec/examples/tmp.yml'
-        stub_request(:post, 'https://user:pw@api.github.com/authorizations')
-          .with(body: "{\"note\":\"write_test\",\"scopes\":[]}")
-          .to_return(
-            status: 200,
-            body: AuthShim.new('foo', random)
+        VCR.use_cassette('save_to_disk') do
+          random = rand(36**30).to_s(30)
+          FileUtils.rm_f 'spec/examples/tmp.yml'
+          auth = Octoauth::Auth.new(
+            note: 'write_test',
+            file: 'spec/examples/tmp.yml',
+            login: 'user',
+            password: 'pw'
+          )
+          auth.save
+          new_auth = Octoauth::Auth.new(
+            note: 'write_test',
+            file: 'spec/examples/tmp.yml'
           )
-        auth = Octoauth::Auth.new(
-          note: 'write_test',
-          file: 'spec/examples/tmp.yml',
-          login: 'user',
-          password: 'pw'
-        )
-        auth.save
-        new_auth = Octoauth::Auth.new(
-          note: 'write_test',
-          file: 'spec/examples/tmp.yml'
-        )
-        expect(new_auth.token).to eql random
+          expect(new_auth.token).to eql random
+        end
       end
     end
   end

data/spec/octoauth_spec.rb

@@ -3,13 +3,10 @@ require 'spec_helper'
 describe Octoauth do
   describe '#new' do
     it 'creates auth objects' do
-      stub_request(:post, 'https://good:sekrit@api.github.com/authorizations')
-        .to_return(
-          status: 200,
-          body: Struct.new(:token).new('abcdabcdabcdabcdabcdabcdabcdabcdabcd')
-        )
-      auth = Octoauth.new note: 'testing', login: 'good', password: 'sekrit'
-      expect(auth).to be_an_instance_of Octoauth::Auth
+      VCR.use_cassette('creates_auth_objects') do
+        auth = Octoauth.new note: 'testing', login: 'good', password: 'sekrit'
+        expect(auth).to be_an_instance_of Octoauth::Auth
+      end
     end
   end
 end

data/spec/spec_helper.rb

@@ -9,15 +9,15 @@ end
 require 'rspec'
 require 'octoauth'
 
-require 'webmock/rspec'
-WebMock.disable_net_connect!(allow_localhost: true)
-
-module WebMock
-  ##
-  # Patch WebMock to allow Structs as response bodies
-  class Response
-    def assert_valid_body!
-      true
+require 'vcr'
+VCR.configure do |c|
+  c.cassette_library_dir = 'spec/fixtures/cassettes'
+  c.hook_into :webmock
+  c.before_record do |i|
+    i.request.headers.delete 'Authorization'
+    %w(Etag X-Github-Request-Id X-Served-By).each do |header|
+      i.response.headers.delete header
     end
   end
 end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octoauth
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Les Aker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-27 00:00:00.000000000 Z
+date: 2015-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: octokit
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 4.1.0
 - !ruby/object:Gem::Dependency
   name: userinput
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.32.0
+        version: 0.33.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.32.0
+        version: 0.33.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +122,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.21.0
+- !ruby/object:Gem::Dependency
+  name: vcr
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.9.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.9.2
 description: Lightweight wrapper to sanely handle OAuth tokens with Octokit
 email: me@lesaker.org
 executables: []
@@ -142,6 +156,13 @@ files:
 - lib/octoauth/configfile.rb
 - octoauth.gemspec
 - spec/examples/conf_a.yml
+- spec/fixtures/cassettes/Write_to_first_file.yml
+- spec/fixtures/cassettes/autosaving_config_file.yml
+- spec/fixtures/cassettes/creates_new_token.yml
+- spec/fixtures/cassettes/handle_two_factor.yml
+- spec/fixtures/cassettes/request_user_input.yml
+- spec/fixtures/cassettes/requesting_scopes.yml
+- spec/fixtures/cassettes/save_to_disk.yml
 - spec/octoauth/auth_spec.rb
 - spec/octoauth/configfile_spec.rb
 - spec/octoauth_spec.rb
@@ -172,6 +193,13 @@ specification_version: 4
 summary: Auth token helper for GitHub API
 test_files:
 - spec/examples/conf_a.yml
+- spec/fixtures/cassettes/Write_to_first_file.yml
+- spec/fixtures/cassettes/autosaving_config_file.yml
+- spec/fixtures/cassettes/creates_new_token.yml
+- spec/fixtures/cassettes/handle_two_factor.yml
+- spec/fixtures/cassettes/request_user_input.yml
+- spec/fixtures/cassettes/requesting_scopes.yml
+- spec/fixtures/cassettes/save_to_disk.yml
 - spec/octoauth/auth_spec.rb
 - spec/octoauth/configfile_spec.rb
 - spec/octoauth_spec.rb