codecov 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b59d7f1fb16986a207023da3b8f2130b4014084cf7d73d688c304e761c683513
-  data.tar.gz: 68ba0cc7cd7cc16d84e88dd2bf20db83f69872eb540de4e9d4128ec0e889888f
+  metadata.gz: bc1716ae9ed1cf09a8e880633b225b27e9d4df5706dc7fb12137bcb4297b3a56
+  data.tar.gz: deead52d64bb597c8c96de120f0b45156d564a43b7429a48b30f45a66370cb49
 SHA512:
-  metadata.gz: c636171303865424027efcfe53b8de75a1b860dc21f70bc43b65d11ea81eb6c1805c4d7a49ab650e7a0dbda992bdfd78e72aa2c6fd881f8d983859bde850ca80
-  data.tar.gz: b9fc5e08981827a1dc873410222e7590baa41d8c8ba7563803edb35e29d9d2fd2b307a1a3ef85f7893bfd93ef27e79541e419c5cb6842b2ca7564663790a928e
+  metadata.gz: 26b3a8a151fabb896829b3cc6c0baf60582ab0bb351f2a2ce51156a5302d0b4cbfcd551172d002d114d369e677e14998dd27f3343d92ef16723332162a5eecf0
+  data.tar.gz: e96ce1b8daa6883a6671b544f5cadff5446ea2572c982b2f913e25f104205fefa353e41ec08a49d0e1e9337b736e23f400358b56724c686b614dd07abf7f6f7e

data/lib/codecov.rb

@@ -7,9 +7,9 @@ require 'simplecov'
 require 'colorize'
 require 'zlib'
 
-class SimpleCov::Formatter::Codecov
-  VERSION = '0.2.3'
+require 'version'
 
+class SimpleCov::Formatter::Codecov
   ### CIs
   RECOGNIZED_CIS = [
     APPVEYOR = 'Appveyor CI',
@@ -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',
@@ -40,7 +41,7 @@ class SimpleCov::Formatter::Codecov
       '| |    / _ \ / _\`|/ _ \/ __/ _ \ \ / /',
       '| |___| (_) | (_| |  __/ (_| (_) \ V /',
       ' \_____\___/ \__,_|\___|\___\___/ \_/',
-      "                               Ruby-#{VERSION}",
+      "                               Ruby-#{Version::LATEST}",
       ''
     ].join("\n")
   end
@@ -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']
@@ -95,7 +98,7 @@ class SimpleCov::Formatter::Codecov
     params = {
       'token' => ENV['CODECOV_TOKEN'],
       'flags' => ENV['CODECOV_FLAG'] || ENV['CODECOV_FLAGS'],
-      'package' => "ruby-#{VERSION}"
+      'package' => "ruby-#{Version::LATEST}"
     }
 
     case ci
@@ -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/heads/', '')
+      # PR refs are in the format: refs/pull/7/merge
+      params[:pr] = ENV['GITHUB_REF'].split('/')[2] if ENV['GITHUB_HEAD_REF']
+      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 +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::LATEST 
       }
     }
     result.update(result_to_codecov(report))

data/test/test_codecov.rb

@@ -3,21 +3,39 @@
 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
 
   def test_defined
     assert defined?(SimpleCov::Formatter::Codecov)
-    assert defined?(SimpleCov::Formatter::Codecov::VERSION)
+    assert defined?(Version::LATEST)
   end
 
   def stub_file(filename, coverage)
@@ -32,7 +50,7 @@ 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]),
@@ -43,9 +61,7 @@ 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
@@ -67,7 +83,7 @@ class TestCodecov < Minitest::Test
   def assert_successful_upload(data)
     assert_equal(data['result']['uploaded'], true)
     assert_equal(data['result']['message'], 'Coverage reports upload successfully')
-    assert_equal(data['meta']['version'], 'codecov-ruby/v' + SimpleCov::Formatter::Codecov::VERSION)
+    assert_equal(data['meta']['version'], 'codecov-ruby/v' + Version::LATEST)
     assert_equal(data['coverage'].to_json, {
       'lib/something.rb' => [nil, 1, 0, 0, nil, 1, nil],
       'lib/somefile.rb' => [nil, 1, nil, 1, 1, 1, 0, 0, nil, 1, nil]
@@ -76,6 +92,7 @@ class TestCodecov < Minitest::Test
 
   def setup
     ENV['CI'] = nil
+    ENV['GITHUB_ACTIONS'] = nil
     ENV['TRAVIS'] = nil
   end
 
@@ -150,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
@@ -165,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
@@ -179,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
@@ -400,6 +425,22 @@ class TestCodecov < Minitest::Test
     assert_equal('f881216b-b5c0-4eb1-8f21-b51887d1d506', result['params']['token'])
   end
 
+  def test_github
+    ENV['CI'] = 'true'
+    ENV['GITHUB_ACTIONS'] = 'true'
+    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'])
+  end
+
   def test_gitlab
     ENV['GITLAB_CI'] = 'true'
     ENV['CI_BUILD_REF_NAME'] = 'master'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: codecov
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - codecov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-27 00:00:00.000000000 Z
+date: 2020-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize