travis 1.6.7.travis.420.4 → 1.6.7.travis.422.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZjA5ODBiYjQ2ZWMyNTc3MzQwMTQxOTFiMDUzODQ5NjY2ZWI0YmJhMQ==
+    OTAzODJjNTFhZDM3M2RiNmRlZmMxODNjZDhiNjE1NWFlZmEzY2JhNQ==
   data.tar.gz: !binary |-
-    YWZkOGZlZTU4M2ZhZDNjYjY1ZGNjNzA5YzkyZDg4Mjc0NDM4ZDdkZg==
+    Y2E4MWMwYzVkMmU0MmEyNWJmNjY4ZDJkYmQ1NTIwZjE0OTExNGJmZg==
 SHA512:
   metadata.gz: !binary |-
-    MWNmMmI1OTVhOTY0MzVkZDU2MDI4NzcwOTBmYWUyNjMzZmNlMzUxZGZkNzU4
-    M2QwOGQzNzUxOTRhMzNmMTU3M2U5NmI1YzMyYmY4NTY3M2NmNTM1ZTY4NmNh
-    YzQyMzZjMmZmYTVlZmY2MjEzYWU4NTA3MTdhNzQ2ZDVhMjcxNmQ=
+    ZmQ3YTlhMDNkMDQ5YWY5YWFhZTMyOTdmMzlmZTliODIyMjUyMjYxMDA1ZTdk
+    NjdiZTI1MmUzNDJjNzY5NWMwYjY2ZTNhYTMyZDI4OThkNWNhZWJkYmZhMGM3
+    MzE3OGFkYWY4ZDM2MWExZjBlYzNhNzg3N2YwZDg0OTBhODA3MzA=
   data.tar.gz: !binary |-
-    NDY1NzllZTJiODY4MzAzZTM1ZTMzOTlhYTg4ZDNmN2Y5ZWQ2MzBhZmFlZDYy
-    NGNkYjFmNzZiNzc3YjY0ZmQ2NzQ2YWUwMThhNGYwYjM0YTEwNDc2Yjg4NDEw
-    ZTI0N2MyZDA3M2U2ZjZlNGY1ZjdlMDUyODZkZTA5ZDI0Y2FkMDE=
+    NDNmMGVjMGQzZjIxZjhhYjM0NzkwNzBhMDQzMWQzY2UxNDI2MzRhOGQwNzk3
+    YjJiODQ5OWVjMzg1YmI3NjM4ZjlmYmVkOTc1MTI2YWE1M2MzNmQ1OTA1YTIw
+    Yzg2MTQ1MmIzZDc0Y2Q1OGZjNmNiOTc5MDkwYmU2ZTZjOGZhMjE=

data/README.md

@@ -1555,6 +1555,10 @@ If you have the old `travis-cli` gem installed, you should `gem uninstall travis
 
 ## Version History
 
+**1.6.7** (not yet released)
+
+* Better error message when using an invalid access token.
+
 **1.6.6** (December 16, 2013)
 
 * Fix `travis login --pro` for new users.

data/lib/travis/cli/command.rb

@@ -167,10 +167,12 @@ module Travis
         run(*arguments)
         clear_error
         store_config
+      rescue Travis::Client::NotLoggedIn => e
+        raise(e) if explode?
+        error "#{e.message} - try running #{command("login#{endpoint_option}")}"
       rescue StandardError => e
         raise(e) if explode?
         message = e.message
-        message += " - try running #{command("login#{endpoint_option}")}" if Travis::Client::Error === e and message == 'access denied'
         message += color("\nfor a full error report, run #{command("report#{endpoint_option}")}", :error) if interactive?
         store_error(e)
         error(message)

data/lib/travis/client/error.rb

@@ -8,7 +8,7 @@ module Travis
     class NotFound < Error
     end
 
-    class NotLoggedIn < NotFound
+    class NotLoggedIn < Error
     end
   end
 end

data/lib/travis/client/session.rb

@@ -206,9 +206,11 @@ module Travis
         when 200..299      then JSON.parse(result.body) rescue result.body
         when 301, 303      then raw(:get, result.headers['Location'])
         when 302, 307, 308 then raw(verb, result.headers['Location'])
-        when 404           then raise Travis::Client::NotFound, result.body
-        when 400..499      then raise Travis::Client::Error,    result.status
-        when 500..599      then raise Travis::Client::Error,    "server error (#{result.status})"
+        when 401           then raise Travis::Client::NotLoggedIn, 'not logged in'
+        when 403           then raise Travis::Client::NotLoggedIn, 'invalid access token'
+        when 404           then raise Travis::Client::NotFound,    result.body
+        when 400..499      then raise Travis::Client::Error,       result.status
+        when 500..599      then raise Travis::Client::Error,       "server error (#{result.status})"
         else raise Travis::Client::Error, "unhandled status code #{result.status}"
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: travis
 version: !ruby/object:Gem::Version
-  version: 1.6.7.travis.420.4
+  version: 1.6.7.travis.422.4
 platform: ruby
 authors:
 - Konstantin Haase