codecov 0.2.1 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8a7910be87b931e578ca118951e56d194e4eacce5bae5c43f00008ee5da7ba6
-  data.tar.gz: 10ebc17802361f6940bbec66dd8bf0407af083b0eaeccad17c480e72a587b79f
+  metadata.gz: 8b2e67c7bb37041adf9adb9dbe2fd8f9c2966131d338961785a29b25090e7206
+  data.tar.gz: 2ada93e046953b7e77397831259a21fcaef09012f4ea0c2c4584668b080d68a6
 SHA512:
-  metadata.gz: bcbb1f88c22749834ca20f87869a8d189fb0ac592a1b2a5507c69d7177376850085caaf0f414cfbb778af8e9c9002fa2e6c4994be59fdc5fb42a3b39149ccf9d
-  data.tar.gz: e02d2cda3d6bcc3e5d26391b49a737b31ea992679444dfbc53633eb999574929e2d7e67d2f180c7200daa00a7c6b9f8e94e5c6c80da2c94440748dd81b734a1b
+  metadata.gz: faf56288e9f75ee77f230da561da1ee87e3305fa7220e4b5962e2011e7f7d8c1f3c1a234a386ac698b00ad8999f500787f6b218c78c9009cb25bc096c056093c
+  data.tar.gz: 233cbebb75102d82b62daf1087a490493ee3cef84de7e91163bc8c5040076f2f1798ebde32aa7971c2234c306adcc13c7a3abcc1929489c1aba124a319f195cb

data/lib/codecov.rb

@@ -8,7 +8,7 @@ require 'colorize'
 require 'zlib'
 
 class SimpleCov::Formatter::Codecov
-  VERSION = '0.2.1'
+  VERSION = '0.2.6'
 
   ### CIs
   RECOGNIZED_CIS = [
@@ -20,6 +20,7 @@ class SimpleCov::Formatter::Codecov
     CIRCLE = 'Circle CI',
     CODESHIP = 'Codeship CI',
     DRONEIO = 'Drone CI',
+    GITHUB = 'GitHub Actions',
     GITLAB = 'GitLab CI',
     HEROKU = 'Heroku CI',
     JENKINS = 'Jenkins CI',
@@ -62,6 +63,8 @@ class SimpleCov::Formatter::Codecov
            CODESHIP
          elsif ((ENV['CI'] == 'true') || (ENV['CI'] == 'drone')) && (ENV['DRONE'] == 'true')
            DRONEIO
+         elsif (ENV['CI'] == 'true') && (ENV['GITHUB_ACTIONS'] == 'true')
+           GITHUB
          elsif !ENV['GITLAB_CI'].nil?
            GITLAB
          elsif ENV['HEROKU_TEST_RUN_ID']
@@ -172,6 +175,15 @@ class SimpleCov::Formatter::Codecov
       params[:build_url] = ENV['DRONE_BUILD_LINK'] || ENV['DRONE_BUILD_URL'] || ENV['CI_BUILD_URL']
       params[:pr] = ENV['DRONE_PULL_REQUEST']
       params[:tag] = ENV['DRONE_TAG']
+    when GITHUB
+      # https://help.github.com/en/actions/configuring-and-managing-workflows/using-environment-variables#default-environment-variables
+      params[:service] = 'github-actions'
+      params[:branch] = ENV['GITHUB_HEAD_REF'] || ENV['GITHUB_REF'].sub('refs/head/', '')
+      # PR refs are in the format: refs/pull/7/merge for pull_request events
+      params[:pr] = ENV['GITHUB_REF'].split('/')[2] unless ENV['GITHUB_HEAD_REF'].nil? || ENV['GITHUB_HEAD_REF'].empty?
+      params[:slug] = ENV['GITHUB_REPOSITORY']
+      params[:build] = ENV['GITHUB_RUN_ID']
+      params[:commit] = ENV['GITHUB_SHA']
     when GITLAB
       # http://doc.gitlab.com/ci/examples/README.html#environmental-variables
       # https://gitlab.com/gitlab-org/gitlab-ci-runner/blob/master/lib/build.rb#L96
@@ -280,20 +292,21 @@ class SimpleCov::Formatter::Codecov
     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
@@ -304,7 +317,7 @@ class SimpleCov::Formatter::Codecov
   def create_report(report)
     result = {
       'meta' => {
-        'version' => 'codecov-ruby/v' + SimpleCov::Formatter::Codecov::VERSION
+        'version' => 'codecov-ruby/v' + VERSION
       }
     }
     result.update(result_to_codecov(report))
@@ -314,10 +327,12 @@ class SimpleCov::Formatter::Codecov
   def gzip_report(report)
     puts ['==>'.green, 'Gzipping contents'].join(' ')
 
-    gzip = Zlib::GzipWriter.new(StringIO.new)
+    io = StringIO.new
+    gzip = Zlib::GzipWriter.new(io)
     gzip << report
+    gzip.close
 
-    gzip.close.string
+    io.string
   end
 
   def upload_to_codecov(ci, report)
@@ -351,7 +366,7 @@ class SimpleCov::Formatter::Codecov
     https.use_ssl = !url.match(/^https/).nil?
 
     puts ['-> '.green, 'Pinging Codecov'].join(' ')
-    puts "#{url}/#{uri.path}?#{query_without_token}"
+    puts "#{url}#{uri.path}?#{query_without_token}"
 
     req = Net::HTTP::Post.new(
       "#{uri.path}?#{query}",
@@ -362,8 +377,8 @@ class SimpleCov::Formatter::Codecov
       }
     )
     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 +444,8 @@ class SimpleCov::Formatter::Codecov
     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 +458,8 @@ class SimpleCov::Formatter::Codecov
 
     report['result'] = JSON.parse(response)
     handle_report_response(report)
-    net_blockers(:on)
+
+    net_blockers(:on) if disable_net_blockers
     report
   end
 

data/test/test_codecov.rb

@@ -3,14 +3,32 @@
 require 'helper'
 
 class TestCodecov < Minitest::Test
-  REALENV = {
-    'TRAVIS_BRANCH' => ENV['TRAVIS_BRANCH'],
-    'TRAVIS_COMMIT' => ENV['TRAVIS_COMMIT'],
-    'TRAVIS_REPO_SLUG' => ENV['TRAVIS_REPO_SLUG'],
-    'TRAVIS_JOB_NUMBER' => ENV['TRAVIS_JOB_NUMBER'],
-    'TRAVIS_PULL_REQUEST' => ENV['TRAVIS_PULL_REQUEST'],
-    'TRAVIS_JOB_ID' => ENV['TRAVIS_JOB_ID']
-  }.freeze
+  CI = SimpleCov::Formatter::Codecov.new.detect_ci
+
+  REALENV =
+    if CI == SimpleCov::Formatter::Codecov::GITHUB
+      {
+        'GITHUB_ACTIONS' => ENV['GITHUB_ACTIONS'],
+        'GITHUB_HEAD_REF' => ENV['GITHUB_HEAD_REF'],
+        'GITHUB_REF' => ENV['GITHUB_REF'],
+        'GITHUB_REPOSITORY' => ENV['GITHUB_REPOSITORY'],
+        'GITHUB_RUN_ID' => ENV['GITHUB_RUN_ID'],
+        'GITHUB_SHA' => ENV['GITHUB_SHA']
+      }
+    elsif CI == SimpleCov::Formatter::Codecov::TRAVIS
+      {
+        'TRAVIS' => ENV['TRAVIS'],
+        'TRAVIS_BRANCH' => ENV['TRAVIS_BRANCH'],
+        'TRAVIS_COMMIT' => ENV['TRAVIS_COMMIT'],
+        'TRAVIS_REPO_SLUG' => ENV['TRAVIS_REPO_SLUG'],
+        'TRAVIS_JOB_NUMBER' => ENV['TRAVIS_JOB_NUMBER'],
+        'TRAVIS_PULL_REQUEST' => ENV['TRAVIS_PULL_REQUEST'],
+        'TRAVIS_JOB_ID' => ENV['TRAVIS_JOB_ID']
+      }
+    else
+      {}
+    end.freeze
+
   def url
     ENV['CODECOV_URL'] || 'https://codecov.io'
   end
@@ -32,22 +50,36 @@ class TestCodecov < Minitest::Test
     stub('SimpleCov::SourceFile', filename: filename, lines: lines)
   end
 
-  def upload(success=true)
+  def upload(success = true)
     formatter = SimpleCov::Formatter::Codecov.new
     result = stub('SimpleCov::Result', files: [
                     stub_file('/path/lib/something.rb', [1, 0, 0, nil, 1, nil]),
                     stub_file('/path/lib/somefile.rb', [1, nil, 1, 1, 1, 0, 0, nil, 1, nil])
                   ])
     SimpleCov.stubs(:root).returns('/path')
-    data = formatter.format(result)
+    success_stubs if success
+    data = formatter.format(result, false)
     puts data
     puts data['params']
-    if success
-      assert_successful_upload(data)
-    end
+    assert_successful_upload(data) if success
+    WebMock.reset!
     data
   end
 
+  def success_stubs
+    stub_request(:post, %r{https:\/\/codecov.io\/upload})
+      .to_return(
+        status: 200,
+        body: "https://codecov.io/gh/fake\n" \
+              'https://storage.googleapis.com/codecov/fake'
+      )
+    stub_request(:put, %r{https:\/\/storage.googleapis.com\/})
+      .to_return(
+        status: 200,
+        body: ''
+      )
+  end
+
   def assert_successful_upload(data)
     assert_equal(data['result']['uploaded'], true)
     assert_equal(data['result']['message'], 'Coverage reports upload successfully')
@@ -60,6 +92,7 @@ class TestCodecov < Minitest::Test
 
   def setup
     ENV['CI'] = nil
+    ENV['GITHUB_ACTIONS'] = nil
     ENV['TRAVIS'] = nil
   end
 
@@ -134,6 +167,12 @@ class TestCodecov < Minitest::Test
     ENV['ghprbSourceBranch'] = nil
     ENV['GIT_BRANCH'] = nil
     ENV['GIT_COMMIT'] = nil
+    ENV['GITHUB_ACTIONS'] = nil
+    ENV['GITHUB_REF'] = nil
+    ENV['GITHUB_HEAD_REF'] = nil
+    ENV['GITHUB_REPOSITORY'] = nil
+    ENV['GITHUB_RUN_ID'] = nil
+    ENV['GITHUB_SHA'] = nil
     ENV['GITLAB_CI'] = nil
     ENV['HEROKU_TEST_RUN_ID'] = nil
     ENV['HEROKU_TEST_RUN_BRANCH'] = nil
@@ -149,13 +188,13 @@ class TestCodecov < Minitest::Test
     ENV['SEMAPHORE_REPO_SLUG'] = nil
     ENV['SHIPPABLE'] = nil
     ENV['TF_BUILD'] = nil
-    ENV['TRAVIS'] = 'true'
-    ENV['TRAVIS_BRANCH'] = REALENV['TRAVIS_BRANCH']
-    ENV['TRAVIS_COMMIT'] = REALENV['TRAVIS_COMMIT']
-    ENV['TRAVIS_JOB_ID'] = REALENV['TRAVIS_JOB_ID']
-    ENV['TRAVIS_JOB_NUMBER'] = REALENV['TRAVIS_JOB_NUMBER']
-    ENV['TRAVIS_PULL_REQUEST'] = REALENV['TRAVIS_PULL_REQUEST']
-    ENV['TRAVIS_REPO_SLUG'] = REALENV['TRAVIS_REPO_SLUG']
+    ENV['TRAVIS'] = nil
+    ENV['TRAVIS_BRANCH'] = nil
+    ENV['TRAVIS_COMMIT'] = nil
+    ENV['TRAVIS_JOB_ID'] = nil
+    ENV['TRAVIS_JOB_NUMBER'] = nil
+    ENV['TRAVIS_PULL_REQUEST'] = nil
+    ENV['TRAVIS_REPO_SLUG'] = nil
     ENV['VCS_COMMIT_ID'] = nil
     ENV['WERCKER_GIT_BRANCH'] = nil
     ENV['WERCKER_GIT_COMMIT'] = nil
@@ -163,6 +202,8 @@ class TestCodecov < Minitest::Test
     ENV['WERCKER_GIT_REPOSITORY'] = nil
     ENV['WERCKER_MAIN_PIPELINE_STARTED'] = nil
     ENV['WORKSPACE'] = nil
+
+    REALENV.each_pair { |k, v| ENV[k] = v }
   end
 
   def test_git
@@ -384,6 +425,44 @@ class TestCodecov < Minitest::Test
     assert_equal('f881216b-b5c0-4eb1-8f21-b51887d1d506', result['params']['token'])
   end
 
+  def test_github_pull_request
+    ENV['CI'] = 'true'
+    ENV['GITHUB_ACTIONS'] = 'true'
+    ENV['GITHUB_HEAD_REF'] = 'patch-2'
+    ENV['GITHUB_REF'] = 'refs/pull/7/merge'
+    ENV['GITHUB_REPOSITORY'] = 'codecov/ci-repo'
+    ENV['GITHUB_RUN_ID'] = '1'
+    ENV['GITHUB_SHA'] = 'c739768fcac68144a3a6d82305b9c4106934d31a'
+    ENV['CODECOV_TOKEN'] = 'f881216b-b5c0-4eb1-8f21-b51887d1d506'
+    result = upload
+    assert_equal('github-actions', result['params'][:service])
+    assert_equal('c739768fcac68144a3a6d82305b9c4106934d31a', result['params'][:commit])
+    assert_equal('codecov/ci-repo', result['params'][:slug])
+    assert_equal('1', result['params'][:build])
+    assert_equal('f881216b-b5c0-4eb1-8f21-b51887d1d506', result['params']['token'])
+    assert_equal('patch-2', result['params'][:branch])
+    assert_equal('7', result['params'][:pr])
+  end
+
+  def test_github_push
+    ENV['CI'] = 'true'
+    ENV['GITHUB_ACTIONS'] = 'true'
+    ENV['GITHUB_HEAD_REF'] = nil
+    ENV['GITHUB_REF'] = 'refs/head/master'
+    ENV['GITHUB_REPOSITORY'] = 'codecov/ci-repo'
+    ENV['GITHUB_RUN_ID'] = '1'
+    ENV['GITHUB_SHA'] = 'c739768fcac68144a3a6d82305b9c4106934d31a'
+    ENV['CODECOV_TOKEN'] = 'f881216b-b5c0-4eb1-8f21-b51887d1d506'
+    result = upload
+    assert_equal('github-actions', result['params'][:service])
+    assert_equal('c739768fcac68144a3a6d82305b9c4106934d31a', result['params'][:commit])
+    assert_equal('codecov/ci-repo', result['params'][:slug])
+    assert_equal('1', result['params'][:build])
+    assert_equal('f881216b-b5c0-4eb1-8f21-b51887d1d506', result['params']['token'])
+    assert_equal('master', result['params'][:branch])
+    assert_equal(false, result['params'].key?(:pr))
+  end
+
   def test_gitlab
     ENV['GITLAB_CI'] = 'true'
     ENV['CI_BUILD_REF_NAME'] = 'master'
@@ -521,6 +600,13 @@ class TestCodecov < Minitest::Test
   end
 
   def test_invalid_token
+    stub_request(:post, %r{https:\/\/codecov.io\/upload})
+      .to_return(
+        status: 400,
+        body: "HTTP 400\n" \
+              'Provided token is not a UUID.'
+      )
+
     ENV['CODECOV_TOKEN'] = 'fake'
     result = upload(false)
     assert_equal(false, result['result']['uploaded'])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: codecov
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.6
 platform: ruby
 authors:
 - codecov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-15 00:00:00.000000000 Z
+date: 2020-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: hosted code coverage
 email:
 - hello@codecov.io
@@ -129,7 +143,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="