travis 1.8.5.travis.784.4 → 1.8.5.travis.791.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e0cd4124b23b23d4f6745f3fbca42cf87b581d9
-  data.tar.gz: 90196f99281e2db71b08f9679db5e3030693c6fd
+  metadata.gz: 6b9c5f9724e3878c47bb8c7a1a9084f3a64292cb
+  data.tar.gz: d3c611ac306c10e4e4ffc2c7f0a179495168f85c
 SHA512:
-  metadata.gz: a0d63c1b8e3666c6144027451e46bb23efc40589e094d060bfa4c5eaa72c8697c9696dbeed558bdd2559cd6835d47708a742d2d7a530f88ba2d04deb804095fc
-  data.tar.gz: 63e75595947637a3edcbda73cc5f38348069e36c3217592d2fbbb4362981f1f26d5e4bc96d7f82b2317bebf2d2087953639678304e4d541a6d9657c0cd9943e0
+  metadata.gz: 25e4775422e0dfba4381e7e480cb81a90cd30f62c45b4bdbbe26fe0901f1ba0f76730d0e45fdaef590e8f2da0d9d5ae0d49eeca900343dad4485326126f8401f
+  data.tar.gz: 3da725f5e470a49f8a13ccb01ea8f7c0dde74631d861b64f07f6e69bb7bf864915eb436031dbbaaeb9eb2f7a5f3f13fc2df2510c30fc2ee9b4dd19489b6e3f87

data/lib/travis/tools/github.rb

@@ -205,26 +205,40 @@ module Travis
       end
 
       def basic_auth(user, password, die = true, otp = nil, &block)
-        opt           = { :username => user, :password => password }
-        opt[:headers] = { "X-GitHub-OTP" => otp } if otp
-        yield GH.with(opt)
+        gh = GH.with(:username => user, :password => password)
+        with_otp(gh, user, otp, &block)
       rescue GH::Error => error
-        if 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)
-          basic_auth(user, password, die, otp, &block)
-        elsif die
-          raise gh_error(error)
-        end
+        raise gh_error(error) if die
       end
 
       def login(user, password, die = true, otp = nil)
         basic_auth(user, password, die, otp) do |gh|
-          reply         = gh.post('/authorizations', :scopes => scopes, :note => note)
-          self.callback = proc { gh.delete reply['_links']['self']['href'] } if drop_token
+          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
           reply['token']
         end
       end
 
+      def create_token(gh)
+        gh.post('/authorizations', :scopes => scopes, :note => note)
+      rescue GH::Error => error
+        # token might already exist due to bug in earlier CLI version, we'll have to delete it first
+        raise error unless error.info[:response_status] == 422 and error.info[:response_body].to_s =~ /already_exists/
+        raise error unless reply = gh['/authorizations'].detect { |a| a['note'] == note }
+        gh.delete(reply['_links']['self']['href'])
+        retry
+      end
+
+      def with_otp(gh, user, otp, &block)
+        gh = GH.with(gh.options.merge(:headers => { "X-GitHub-OTP" => otp })) if otp
+        block.call(gh)
+      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)
+        retry
+      end
+
       def acceptable?(token)
         return true unless check_token
         gh   = GH.with(:token => token)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: travis
 version: !ruby/object:Gem::Version
-  version: 1.8.5.travis.784.4
+  version: 1.8.5.travis.791.4
 platform: ruby
 authors:
 - Konstantin Haase
@@ -58,7 +58,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-18 00:00:00.000000000 Z
+date: 2016-11-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday