Handle socket errors and better handling of v4 (#75)

Author: thomasrockhu

CHANGELOG.md

@@ -1,3 +1,6 @@
+### `0.2.2`
+- Handle SocketError and better error handling of v4 failures
+
 ### `0.2.1`
 - Properly handle 400 cases when using the v4 endpoint
 

codecov.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name               = 'codecov'
-  s.version            = '0.2.1'
+  s.version            = '0.2.2'
   s.platform           = Gem::Platform::RUBY
   s.authors            = ['codecov']
   s.email              = ['[email protected]']
@@ -22,4 +22,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'mocha'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rubocop'
+  s.add_development_dependency 'webmock'
 end

lib/codecov.rb

@@ -8,7 +8,7 @@
 require 'zlib'
 
 class SimpleCov::Formatter::Codecov
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 
   ### CIs
   RECOGNIZED_CIS = [
@@ -280,20 +280,21 @@ def retry_request(req, https)
     retries = 3
     begin
       response = https.request(req)
-    rescue Timeout::Error => e
+    rescue Timeout::Error, SocketError => e
       retries -= 1
 
       if retries.zero?
-        puts 'Timeout error uploading coverage reports to Codecov. Out of retries.'
+        puts 'Timeout or connection error uploading coverage reports to Codecov. Out of retries.'
         puts e
         return response
       end
 
-      puts 'Timeout error uploading coverage reports to Codecov. Retrying...'
+      puts 'Timeout or connection error uploading coverage reports to Codecov. Retrying...'
       puts e
       retry
     rescue StandardError => e
       puts 'Error uploading coverage reports to Codecov. Sorry'
+      puts e.class.name
       puts e
       return response
     end
@@ -362,8 +363,8 @@ def upload_to_v4(url, report, query, query_without_token)
       }
     )
     response = retry_request(req, https)
-    if response.code == '400'
-      puts response.body.red
+    if !response&.code || response.code == '400'
+      puts response&.body&.red
       return false
     end
 
@@ -429,8 +430,8 @@ def handle_report_response(report)
     end
   end
 
-  def format(result)
-    net_blockers(:off)
+  def format(result, disable_net_blockers = true)
+    net_blockers(:off) if disable_net_blockers
 
     display_header
     ci = detect_ci
@@ -443,7 +444,8 @@ def format(result)
 
     report['result'] = JSON.parse(response)
     handle_report_response(report)
-    net_blockers(:on)
+
+    net_blockers(:on) if disable_net_blockers
     report
   end
 

test/helper.rb

@@ -12,3 +12,5 @@
 
 require 'minitest/autorun'
 require 'mocha/setup'
+
+require 'webmock/minitest'