travis 1.6.3.travis.388.4 → 1.6.3.travis.389.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDc5NjczYzZhZWNiMzNmY2NhMDE3MzBhYjg3MDlhNzRlMjNlMWVkYw==
+    NDQyYTc2Yzg0M2M5YTQ4NmY5ZWQwY2JmMTdlZmYyY2VjOTU4NWFmYg==
   data.tar.gz: !binary |-
-    YTQ2ZDBmNmQ1OWFjYTE3NGVkNGJkNDBlYjA4NGQ4NmI3MjRkOWU0Mg==
+    M2ZkM2I4ZTRjMzA4ZTdjNzA0ZGM1NTJlYzA0MTQxZmMxYzZiM2QzZg==
 SHA512:
   metadata.gz: !binary |-
-    Y2RlMjE5YWMwM2U2MTNkZjVjZmFlMTVjYWZmMGI4ZmQ1NWU3YTY2ZjJkNzRi
-    Y2NkOGNhYzVhMDg4ZjA5NDYwNDVhMzk4NjkzZmU0NWI3ODc1ZmZmNDQ4NjVj
-    ZmZmOGZkNDU4ZTFhY2E3MzcxZDIwYjNmNTdhMDI2OTRlYTI3ZjM=
+    YzY0YzRiNTk2YzY0N2Q2ZTY4N2NjYWJmZjcxMTgyZGU1NjljZTI2ZTA5ZmQ1
+    YzI1ZmVjMTlmNmZhMDQ5ZGIxZTc0OTUwNTIwMzhjNWQ4YzliNzc1N2IxNWJk
+    NTkyNDQ4OTI5ZGYxZWY4MGI0YTMxOTUyNWE0N2FhODdjZDEyNzA=
   data.tar.gz: !binary |-
-    MmE5OTVlYmVlYTQ1YTg2MTM0M2ZmYTA4MjY5NWY3Y2QxMDNlMDlmM2NlNmE5
-    YzgyMjU4MDg0OTM1ZTgzZDE3MjdiZDlkNDFlZjgzOWYzNjIwMmY3MWE1OGMz
-    NGI2NThmNWI1MTUyZmVkOWRmNjdmZWI3ZDU3NzBhYzY4ODllNDg=
+    ZDU1MTM4YjZjZGQ0NDI3NDViNDhmMDdlNWNiOTliYzk2MjM0MTk4NWQ4MWY4
+    OGVlYmUxMzViODg5Mjk0Zjg0YmJkZDRkOTI3OGNlYzJmNmI4YzYzNjNkM2Vi
+    NDU0ZjllMTExZGFkZGY2NDU2MzhlYWE4MjJkZjA4OWYzNzljMTM=

data/lib/travis/client/artifact.rb

@@ -25,9 +25,16 @@ module Travis
         attributes['clean_body'] ||= Tools::SafeString.clean(body)
       end
 
+      def current_body
+        attributes['current_body'] ||= begin
+          body = load_attribute('body')
+          body.to_s.empty? ? session.get_raw("jobs/#{job_id}/log") : body
+        end
+      end
+
       def body(stream = block_given?)
-        return load_attribute('body') unless block_given? or stream
-        return yield(load_attribute('body')) unless stream and job.pending?
+        return current_body unless block_given? or stream
+        return yield(current_body) unless stream and job.pending?
         number = 0
 
         session.listen(self) do |listener|

data/lib/travis/client/session.rb

@@ -56,9 +56,6 @@ module Travis
         clear_cache!
         self.connection = Faraday.new(:url => uri, :ssl => ssl) do |faraday|
           faraday.request  :url_encoded
-          faraday.response :json
-          faraday.response :follow_redirects
-          faraday.response :raise_error
           faraday.adapter(*faraday_adapter)
         end
       end
@@ -173,11 +170,23 @@ module Travis
 
       def raw(verb, url, *args)
         url    = url.sub(/^\//, '')
-        result = instrumented(verb.to_s.upcase, url, *args) { connection.public_send(verb, url, *args) }
-        raise Travis::Client::Error, 'SSL error: could not verify peer' if result.status == 0
-        result.body
-      rescue Faraday::Error::ClientError => e
-        handle_error(e)
+        result = instrumented(verb.to_s.upcase, url, *args) do
+          connection.public_send(verb, url, *args) do |request|
+            next if request.path !~ /^https?:/ or request.path.start_with? api_endpoint
+            request.headers.delete("Authorization")
+          end
+        end
+
+        case result.status
+        when 0             then raise Travis::Client::Error, 'SSL error: could not verify peer'
+        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})"
+        else raise Travis::Client::Error, "unhandled status code #{result.status}"
+        end
       end
 
       def inspect
@@ -240,12 +249,6 @@ module Travis
           entity
         end
 
-        def handle_error(e)
-          klass   = Travis::Client::NotFound if e.is_a? Faraday::Error::ResourceNotFound
-          klass ||= Travis::Client::Error
-          raise klass, error_message(e), e.backtrace
-        end
-
         def error_message(e)
           message = e.response[:body].to_str rescue e.message
           JSON.parse(message).fetch('error').fetch('message') rescue message

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: travis
 version: !ruby/object:Gem::Version
-  version: 1.6.3.travis.388.4
+  version: 1.6.3.travis.389.4
 platform: ruby
 authors:
 - Konstantin Haase
@@ -29,7 +29,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-23 00:00:00.000000000 Z
+date: 2013-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday