codecov 0.2.4 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc1716ae9ed1cf09a8e880633b225b27e9d4df5706dc7fb12137bcb4297b3a56
-  data.tar.gz: deead52d64bb597c8c96de120f0b45156d564a43b7429a48b30f45a66370cb49
+  metadata.gz: cdd8c92464da131becf5bae150b12f4ae3513d84c7f77ba059ee771ee662eca4
+  data.tar.gz: 592ed8f011c9e618aa2b71cf2c0ba7a9fb7a7ff1aa9ad80db72743f7f658cf24
 SHA512:
-  metadata.gz: 26b3a8a151fabb896829b3cc6c0baf60582ab0bb351f2a2ce51156a5302d0b4cbfcd551172d002d114d369e677e14998dd27f3343d92ef16723332162a5eecf0
-  data.tar.gz: e96ce1b8daa6883a6671b544f5cadff5446ea2572c982b2f913e25f104205fefa353e41ec08a49d0e1e9337b736e23f400358b56724c686b614dd07abf7f6f7e
+  metadata.gz: ec4048e6ecb6c5780bfa1e4320a1edc177a5b96b6b2a3a7ba3a41416e5e1b40ea69e64d9cbeb58b920a566e9d3379244a4a21496500210adc9b51116325e5f0e
+  data.tar.gz: 4564c29b679ea650270560c719a1a178c8ab2d65fa9157e7892f06d02855b01ef5dcfe6be35e7cd47a836bec72abb74c1dc36002d9c030344549f987df9d930f

data/lib/codecov.rb

@@ -4,12 +4,11 @@ require 'uri'
 require 'json'
 require 'net/http'
 require 'simplecov'
-require 'colorize'
 require 'zlib'
 
-require 'version'
-
 class SimpleCov::Formatter::Codecov
+  VERSION = '0.2.9'
+
   ### CIs
   RECOGNIZED_CIS = [
     APPVEYOR = 'Appveyor CI',
@@ -18,6 +17,7 @@ class SimpleCov::Formatter::Codecov
     BITRISE = 'Bitrise CI',
     BUILDKITE = 'Buildkite CI',
     CIRCLE = 'Circle CI',
+    CODEBUILD = 'Codebuild CI',
     CODESHIP = 'Codeship CI',
     DRONEIO = 'Drone CI',
     GITHUB = 'GitHub Actions',
@@ -41,7 +41,7 @@ class SimpleCov::Formatter::Codecov
       '| |    / _ \ / _\`|/ _ \/ __/ _ \ \ / /',
       '| |___| (_) | (_| |  __/ (_| (_) \ V /',
       ' \_____\___/ \__,_|\___|\___\___/ \_/',
-      "                               Ruby-#{Version::LATEST}",
+      "                               Ruby-#{VERSION}",
       ''
     ].join("\n")
   end
@@ -59,6 +59,8 @@ class SimpleCov::Formatter::Codecov
            BUILDKITE
          elsif (ENV['CI'] == 'true') && (ENV['CIRCLECI'] == 'true')
            CIRCLE
+         elsif ENV['CODEBUILD_CI'] == 'true'
+           CODEBUILD
          elsif (ENV['CI'] == 'true') && (ENV['CI_NAME'] == 'codeship')
            CODESHIP
          elsif ((ENV['CI'] == 'true') || (ENV['CI'] == 'drone')) && (ENV['DRONE'] == 'true')
@@ -86,7 +88,7 @@ class SimpleCov::Formatter::Codecov
          end
 
     if !RECOGNIZED_CIS.include?(ci)
-      puts ['x>'.red, 'No CI provider detected.'].join(' ')
+      puts [red('x>'), 'No CI provider detected.'].join(' ')
     else
       puts "==> #{ci} detected"
     end
@@ -98,7 +100,7 @@ class SimpleCov::Formatter::Codecov
     params = {
       'token' => ENV['CODECOV_TOKEN'],
       'flags' => ENV['CODECOV_FLAG'] || ENV['CODECOV_FLAGS'],
-      'package' => "ruby-#{Version::LATEST}"
+      'package' => "ruby-#{VERSION}"
     }
 
     case ci
@@ -158,6 +160,15 @@ class SimpleCov::Formatter::Codecov
       params[:pr] = ENV['CIRCLE_PR_NUMBER']
       params[:branch] = ENV['CIRCLE_BRANCH']
       params[:commit] = ENV['CIRCLE_SHA1']
+    when CODEBUILD
+      # https://docs.aws.amazon.com/codebuild/latest/userguide/build-env-ref-env-vars.html
+      params[:service] = 'codebuild'
+      params[:branch] = ENV['CODEBUILD_WEBHOOK_HEAD_REF'].split('/')[2]
+      params[:build] = ENV['CODEBUILD_BUILD_ID']
+      params[:commit] = ENV['CODEBUILD_RESOLVED_SOURCE_VERSION']
+      params[:job] = ENV['CODEBUILD_BUILD_ID']
+      params[:slug] = ENV['CODEBUILD_SOURCE_REPO_URL'].match(/.*github.com\/(?<slug>.*).git/)['slug']
+      params[:pr] = ENV['CODEBUILD_SOURCE_VERSION'].match(/pr\/(?<pr>.*)/)['pr'] if ENV['CODEBUILD_SOURCE_VERSION']
     when CODESHIP
       # https://www.codeship.io/documentation/continuous-integration/set-environment-variables/
       params[:service] = 'codeship'
@@ -178,9 +189,9 @@ class SimpleCov::Formatter::Codecov
     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[: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']
@@ -317,7 +328,7 @@ class SimpleCov::Formatter::Codecov
   def create_report(report)
     result = {
       'meta' => {
-        'version' => 'codecov-ruby/v' + Version::LATEST 
+        'version' => 'codecov-ruby/v' + VERSION
       }
     }
     result.update(result_to_codecov(report))
@@ -325,7 +336,7 @@ class SimpleCov::Formatter::Codecov
   end
 
   def gzip_report(report)
-    puts ['==>'.green, 'Gzipping contents'].join(' ')
+    puts [green('==>'), 'Gzipping contents'].join(' ')
 
     io = StringIO.new
     gzip = Zlib::GzipWriter.new(io)
@@ -337,6 +348,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
@@ -350,12 +362,15 @@ class SimpleCov::Formatter::Codecov
     report['params'] = params
     report['query'] = query
 
-    puts ['==>'.green, 'Uploading reports'].join(' ')
+    puts [green('==>'), 'Uploading reports'].join(' ')
     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
@@ -365,7 +380,7 @@ class SimpleCov::Formatter::Codecov
     https = Net::HTTP.new(uri.host, uri.port)
     https.use_ssl = !url.match(/^https/).nil?
 
-    puts ['-> '.green, 'Pinging Codecov'].join(' ')
+    puts [green('-> '), 'Pinging Codecov'].join(' ')
     puts "#{url}#{uri.path}?#{query_without_token}"
 
     req = Net::HTTP::Post.new(
@@ -378,13 +393,13 @@ class SimpleCov::Formatter::Codecov
     )
     response = retry_request(req, https)
     if !response&.code || response.code == '400'
-      puts response&.body&.red
+      puts red(response&.body)
       return false
     end
 
     reports_url = response.body.lines[0]
     s3target = response.body.lines[1]
-    puts ['-> '.green, 'Uploading to'].join(' ')
+    puts [green('-> '), 'Uploading to'].join(' ')
     puts s3target
 
     uri = URI(s3target)
@@ -409,8 +424,8 @@ class SimpleCov::Formatter::Codecov
         'message' => 'Coverage reports upload successfully'
       }.to_json
     else
-      puts ['-> '.black, 'Could not upload reports via v4 API, defaulting to v2'].join(' ')
-      puts res.body.red
+      puts [black('-> '), 'Could not upload reports via v4 API, defaulting to v2'].join(' ')
+      puts red(res.body)
       nil
     end
   end
@@ -420,12 +435,13 @@ class SimpleCov::Formatter::Codecov
     https = Net::HTTP.new(uri.host, uri.port)
     https.use_ssl = !url.match(/^https/).nil?
 
-    puts ['-> '.green, 'Uploading to Codecov'].join(' ')
-    puts "#{url}/#{uri.path}?#{query_without_token}"
+    puts [green('-> '), 'Uploading to Codecov'].join(' ')
+    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'
@@ -440,7 +456,7 @@ class SimpleCov::Formatter::Codecov
     if report['result']['uploaded']
       puts "    View reports at #{report['result']['url']}"
     else
-      puts '    X> Failed to upload coverage reports'.red
+      puts red('    X> Failed to upload coverage reports')
     end
   end
 
@@ -495,7 +511,7 @@ class SimpleCov::Formatter::Codecov
       'node_modules/'
     ]
 
-    puts ['==>'.green, 'Appending file network'].join(' ')
+    puts [green('==>'), 'Appending file network'].join(' ')
     network = []
     Dir['**/*'].keep_if do |file|
       if File.file?(file) && !file.end_with?(*invalid_file_types) && !file.include?(*invalid_directories)
@@ -581,4 +597,17 @@ class SimpleCov::Formatter::Codecov
 
     true
   end
+
+  # Convenience color methods
+  def black(str)
+    str.nil? ? '' : "\e[30m#{str}\e[0m"
+  end
+
+  def red(str)
+    str.nil? ? '' : "\e[31m#{str}\e[0m"
+  end
+
+  def green(str)
+    str.nil? ? '' : "\e[32m#{str}\e[0m"
+  end
 end

data/test/test_codecov.rb

@@ -6,7 +6,19 @@ class TestCodecov < Minitest::Test
   CI = SimpleCov::Formatter::Codecov.new.detect_ci
 
   REALENV =
-    if CI == SimpleCov::Formatter::Codecov::GITHUB
+    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'],
@@ -35,7 +47,7 @@ class TestCodecov < Minitest::Test
 
   def test_defined
     assert defined?(SimpleCov::Formatter::Codecov)
-    assert defined?(Version::LATEST)
+    assert defined?(SimpleCov::Formatter::Codecov::VERSION)
   end
 
   def stub_file(filename, coverage)
@@ -51,6 +63,7 @@ class TestCodecov < Minitest::Test
   end
 
   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]),
@@ -67,7 +80,7 @@ class TestCodecov < Minitest::Test
   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" \
@@ -83,7 +96,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' + Version::LATEST)
+    assert_equal(data['meta']['version'], 'codecov-ruby/v' + SimpleCov::Formatter::Codecov::VERSION)
     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]
@@ -92,6 +105,7 @@ class TestCodecov < Minitest::Test
 
   def setup
     ENV['CI'] = nil
+    ENV['CIRCLECI'] = nil
     ENV['GITHUB_ACTIONS'] = nil
     ENV['TRAVIS'] = nil
   end
@@ -153,6 +167,12 @@ class TestCodecov < Minitest::Test
     ENV['CIRCLE_PROJECT_USERNAME'] = nil
     ENV['CIRCLE_SHA1'] = nil
     ENV['CIRCLECI'] = nil
+    ENV['CODEBUILD_CI'] = nil
+    ENV['CODEBUILD_BUILD_ID'] = nil
+    ENV['CODEBUILD_RESOLVED_SOURCE_VERSION'] = nil
+    ENV['CODEBUILD_WEBHOOK_HEAD_REF'] = nil
+    ENV['CODEBUILD_SOURCE_VERSION'] = nil
+    ENV['CODEBUILD_SOURCE_REPO_URL'] = nil
     ENV['CODECOV_ENV'] = nil
     ENV['CODECOV_SLUG'] = nil
     ENV['CODECOV_TOKEN'] = nil
@@ -215,6 +235,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'
@@ -425,9 +462,29 @@ class TestCodecov < Minitest::Test
     assert_equal('f881216b-b5c0-4eb1-8f21-b51887d1d506', result['params']['token'])
   end
 
-  def test_github
+  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'
@@ -439,6 +496,8 @@ class TestCodecov < Minitest::Test
     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
@@ -559,6 +618,27 @@ class TestCodecov < Minitest::Test
     assert_equal('f881216b-b5c0-4eb1-8f21-b51887d1d506', result['params']['token'])
   end
 
+  def test_codebuild
+    ENV['CODEBUILD_CI'] = "true"
+    ENV['CODEBUILD_BUILD_ID'] = "codebuild-project:458dq3q8-7354-4513-8702-ea7b9c81efb3"
+    ENV['CODEBUILD_RESOLVED_SOURCE_VERSION'] = 'd653b934ed59c1a785cc1cc79d08c9aaa4eba73b'
+    ENV['CODEBUILD_WEBHOOK_HEAD_REF'] = 'refs/heads/master'
+    ENV['CODEBUILD_SOURCE_VERSION'] = 'pr/123'
+    ENV['CODEBUILD_SOURCE_REPO_URL'] = 'https://github.com/owner/repo.git'
+    ENV['CODECOV_TOKEN'] = 'f881216b-b5c0-4eb1-8f21-b51887d1d506'
+
+    result = upload
+
+    assert_equal("codebuild", result['params'][:service])
+    assert_equal("d653b934ed59c1a785cc1cc79d08c9aaa4eba73b", result['params'][:commit])
+    assert_equal("codebuild-project:458dq3q8-7354-4513-8702-ea7b9c81efb3", result['params'][:build])
+    assert_equal("codebuild-project:458dq3q8-7354-4513-8702-ea7b9c81efb3", result['params'][:job])
+    assert_equal("owner/repo", result['params'][:slug])
+    assert_equal("master", result['params'][:branch])
+    assert_equal("123", result['params'][:pr])
+    assert_equal('f881216b-b5c0-4eb1-8f21-b51887d1d506', result['params']['token'])
+  end
+
   def test_filenames_are_shortened_correctly
     ENV['CODECOV_TOKEN'] = 'f881216b-b5c0-4eb1-8f21-b51887d1d506'
 

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: codecov
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.9
 platform: ruby
 authors:
 - codecov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-06 00:00:00.000000000 Z
+date: 2020-08-31 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:
   - - ">="