travis 1.8.5.travis.791.4 → 1.8.5.travis.793.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b9c5f9724e3878c47bb8c7a1a9084f3a64292cb
-  data.tar.gz: d3c611ac306c10e4e4ffc2c7f0a179495168f85c
+  metadata.gz: 6dcbe6853f772d517c4bbeafdea807282dbd6ae9
+  data.tar.gz: 770a0b2eafb71771b8d265984bb271a91187d585
 SHA512:
-  metadata.gz: 25e4775422e0dfba4381e7e480cb81a90cd30f62c45b4bdbbe26fe0901f1ba0f76730d0e45fdaef590e8f2da0d9d5ae0d49eeca900343dad4485326126f8401f
-  data.tar.gz: 3da725f5e470a49f8a13ccb01ea8f7c0dde74631d861b64f07f6e69bb7bf864915eb436031dbbaaeb9eb2f7a5f3f13fc2df2510c30fc2ee9b4dd19489b6e3f87
+  metadata.gz: d5485df7392197b479026138827d0f175d8d1f2362e25258502804586ad0acf4593bdca44c29ab60f5c926a795e223dc6a0b9cb986fe0ce7fb56463456f5818d
+  data.tar.gz: 063724a0e9c1bfbcbdff83cb2b12e5050fd44173e9fb2feb0dfe811ddfaf23c49a047b64c52ea500f3701f008e6e4d4d7a6069c9893b0e54cc219dae6abeec9c

data/lib/travis/tools/github.rb

@@ -38,7 +38,7 @@ module Travis
 
       def with_basic_auth(&block)
         user, password = ask_credentials
-        basic_auth(user, password, true) do |gh|
+        basic_auth(user, password, true) do |gh, _|
           gh['user'] # so otp kicks in
           yield gh
         end
@@ -212,10 +212,10 @@ module Travis
       end
 
       def login(user, password, die = true, otp = nil)
-        basic_auth(user, password, die, otp) do |gh|
+        basic_auth(user, password, die, otp) do |gh, new_otp|
           reply         = create_token(gh)
           auth_href     = reply['_links']['self']['href']
-          self.callback = proc { with_otp(gh, user, otp) { |g| g.delete(auth_href) } } if drop_token
+          self.callback = proc { with_otp(gh, user, new_otp) { |g| g.delete(auth_href) } } if drop_token
           reply['token']
         end
       end
@@ -232,7 +232,7 @@ module Travis
 
       def with_otp(gh, user, otp, &block)
         gh = GH.with(gh.options.merge(:headers => { "X-GitHub-OTP" => otp })) if otp
-        block.call(gh)
+        block.call(gh, otp)
       rescue GH::Error => error
         raise error unless error.info[:response_status] == 401 and error.info[:response_headers]['x-github-otp'].to_s =~ /required/
         otp = ask_otp.arity == 0 ? ask_otp.call : ask_otp.call(user)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: travis
 version: !ruby/object:Gem::Version
-  version: 1.8.5.travis.791.4
+  version: 1.8.5.travis.793.4
 platform: ruby
 authors:
 - Konstantin Haase