codecov 0.2.3 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b59d7f1fb16986a207023da3b8f2130b4014084cf7d73d688c304e761c683513
-  data.tar.gz: 68ba0cc7cd7cc16d84e88dd2bf20db83f69872eb540de4e9d4128ec0e889888f
+  metadata.gz: e49b9d2e3374ac7e3f5d6514045a0454c767e200db364059887cb0d0a8a3e13f
+  data.tar.gz: 83f5c298eb2be003da0302d329241f5eaa64a9d5d2d747be0b845437607bce88
 SHA512:
-  metadata.gz: c636171303865424027efcfe53b8de75a1b860dc21f70bc43b65d11ea81eb6c1805c4d7a49ab650e7a0dbda992bdfd78e72aa2c6fd881f8d983859bde850ca80
-  data.tar.gz: b9fc5e08981827a1dc873410222e7590baa41d8c8ba7563803edb35e29d9d2fd2b307a1a3ef85f7893bfd93ef27e79541e419c5cb6842b2ca7564663790a928e
+  metadata.gz: 4c8aba631f40e6fddca4d507613de63caf64207fda359518faceb9267e327cf0d4611ba864083e7ef8158fee9b8f4dfab10e8dfdd6e7f1f6e5d30ac4ae8275cb
+  data.tar.gz: b15d9af39b437902e7f59a749bdf54dee8e12a97f4e78f8c4b918d001ca66606731a17986e4f52e0fe1e4a51b9c87ca652768395d60869da6cb5025cee876827

data/lib/codecov.rb

@@ -4,11 +4,10 @@ require 'uri'
 require 'json'
 require 'net/http'
 require 'simplecov'
-require 'colorize'
 require 'zlib'
 
 class SimpleCov::Formatter::Codecov
-  VERSION = '0.2.3'
+  VERSION = '0.2.8'
 
   ### CIs
   RECOGNIZED_CIS = [
@@ -20,6 +19,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 +62,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 +174,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
@@ -305,7 +316,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))
@@ -325,6 +336,7 @@ class SimpleCov::Formatter::Codecov
 
   def upload_to_codecov(ci, report)
     url = ENV['CODECOV_URL'] || 'https://codecov.io'
+    is_enterprise = url != 'https://codecov.io'
 
     params = build_params(ci)
     params_secret_token = params.clone
@@ -342,8 +354,11 @@ class SimpleCov::Formatter::Codecov
     puts "    url:   #{url}"
     puts "    query: #{query_without_token}"
 
-    response = upload_to_v4(url, gzipped_report, query, query_without_token)
-    return false if response == false
+    response = false
+    unless is_enterprise
+      response = upload_to_v4(url, gzipped_report, query, query_without_token)
+      return false if response == false
+    end
 
     response || upload_to_v2(url, gzipped_report, query, query_without_token)
   end
@@ -409,11 +424,12 @@ class SimpleCov::Formatter::Codecov
     https.use_ssl = !url.match(/^https/).nil?
 
     puts ['-> '.green, 'Uploading to Codecov'].join(' ')
-    puts "#{url}/#{uri.path}?#{query_without_token}"
+    puts "#{url}#{uri.path}?#{query_without_token}"
 
     req = Net::HTTP::Post.new(
       "#{uri.path}?#{query}",
       {
+        'Accept' => 'application/json',
         'Content-Encoding' => 'gzip',
         'Content-Type' => 'text/plain',
         'X-Content-Encoding' => 'gzip'
@@ -570,3 +586,23 @@ class SimpleCov::Formatter::Codecov
     true
   end
 end
+
+# https://stackoverflow.com/a/11482430/5769383
+class String
+  # colorization
+  def colorize(color_code)
+    "\e[#{color_code}m#{self}\e[0m"
+  end
+
+  def black
+    colorize(30)
+  end
+
+  def red
+    colorize(31)
+  end
+
+  def green
+    colorize(32)
+  end
+end

data/test/test_codecov.rb

@@ -3,14 +3,44 @@
 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::CIRCLE
+      {
+        'CIRCLECI' => ENV['CIRCLECI'],
+        'CIRCLE_BUILD_NUM' => ENV['CIRCLE_BUILD_NUM'],
+        'CIRCLE_NODE_INDEX' => ENV['CIRCLE_NODE_INDEX'],
+        'CIRCLE_PROJECT_REPONAME' => ENV['CIRCLE_PROJECT_REPONAME'],
+        'CIRCLE_PROJECT_USERNAME' => ENV['CIRCLE_PROJECT_USERNAME'],
+        'CIRCLE_REPOSITORY_URL' => ENV['CIRCLE_REPOSITORY_URL'],
+        'CIRCLE_PR_NUMBER' => ENV['CIRCLE_PR_NUMBER'],
+        'CIRCLE_BRANCH' => ENV['CIRCLE_BRANCH'],
+        'CIRCLE_SHA1' => ENV['CIRCLE_SHA1']
+      }
+    elsif 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,7 +62,8 @@ class TestCodecov < Minitest::Test
     stub('SimpleCov::SourceFile', filename: filename, lines: lines)
   end
 
-  def upload(success=true)
+  def upload(success = true)
+    WebMock.enable!
     formatter = SimpleCov::Formatter::Codecov.new
     result = stub('SimpleCov::Result', files: [
                     stub_file('/path/lib/something.rb', [1, 0, 0, nil, 1, nil]),
@@ -43,15 +74,13 @@ class TestCodecov < Minitest::Test
     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})
+    stub_request(:post, %r{https:\/\/codecov.io\/upload\/v4})
       .to_return(
         status: 200,
         body: "https://codecov.io/gh/fake\n" \
@@ -76,6 +105,8 @@ class TestCodecov < Minitest::Test
 
   def setup
     ENV['CI'] = nil
+    ENV['CIRCLECI'] = nil
+    ENV['GITHUB_ACTIONS'] = nil
     ENV['TRAVIS'] = nil
   end
 
@@ -150,6 +181,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
@@ -165,13 +202,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
@@ -179,6 +216,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
@@ -190,6 +229,23 @@ class TestCodecov < Minitest::Test
     assert_equal(`git rev-parse HEAD`.strip, result['params'][:commit])
   end
 
+  def test_enterprise
+    stub = stub_request(:post, %r{https:\/\/example.com\/upload\/v2})
+      .to_return(
+        status: 200,
+        body: "{\"id\": \"12345678-1234-abcd-ef12-1234567890ab\", \"message\": \"Coverage reports upload successfully\", \"meta\": { \"status\": 200 }, \"queued\": true, \"uploaded\": true, \"url\": \"https://example.com/github/codecov/codecov-bash/commit/2f6b51562b93e72c610671644fe2a303c5c0e8e5\"}"
+      )
+
+    ENV['CODECOV_URL'] = 'https://example.com'
+    ENV['CODECOV_TOKEN'] = 'f881216b-b5c0-4eb1-8f21-b51887d1d506'
+    result = upload
+    assert_equal('f881216b-b5c0-4eb1-8f21-b51887d1d506', result['params']['token'])
+    assert_equal('12345678-1234-abcd-ef12-1234567890ab', result['result']['id'])
+    branch = `git rev-parse --abbrev-ref HEAD`.strip
+    assert_equal(branch != 'HEAD' ? branch : 'master', result['params'][:branch])
+    assert_equal(`git rev-parse HEAD`.strip, result['params'][:commit])
+  end
+
   def test_travis
     ENV['CI'] = 'true'
     ENV['TRAVIS'] = 'true'
@@ -400,6 +456,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'

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: codecov
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.8
 platform: ruby
 authors:
 - codecov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-27 00:00:00.000000000 Z
+date: 2020-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: colorize
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -39,13 +39,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: minitest-ci
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -143,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:
   - - ">="