codecov 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b2e67c7bb37041adf9adb9dbe2fd8f9c2966131d338961785a29b25090e7206
-  data.tar.gz: 2ada93e046953b7e77397831259a21fcaef09012f4ea0c2c4584668b080d68a6
+  metadata.gz: 7cd3288a24f1d4655e837e068c45a5be7817d60c08de8acebb5ca0f3afcb0569
+  data.tar.gz: a42575d126b29448adda5177e95ac961070098aca3761c7074b4b6a1b9827154
 SHA512:
-  metadata.gz: faf56288e9f75ee77f230da561da1ee87e3305fa7220e4b5962e2011e7f7d8c1f3c1a234a386ac698b00ad8999f500787f6b218c78c9009cb25bc096c056093c
-  data.tar.gz: 233cbebb75102d82b62daf1087a490493ee3cef84de7e91163bc8c5040076f2f1798ebde32aa7971c2234c306adcc13c7a3abcc1929489c1aba124a319f195cb
+  metadata.gz: 00210aa6e8cbf2837c5c199e3f7b2ce3d80a7c171f4bb84f94c0202da55fff0b33fe7ea6ad2ec39ed65086d41b6c375433954197d0fd9343e4de0bc7cf437c83
+  data.tar.gz: e492d90061f8db4c1df141d5d2e04d520cf4f8704a923f5556ed5a50d28bc6fcf2ec9cf72acea749671da975cef11420a60d1c8bf20498291bb5761f79e3e35f

data/lib/codecov.rb

@@ -8,7 +8,7 @@ require 'colorize'
 require 'zlib'
 
 class SimpleCov::Formatter::Codecov
-  VERSION = '0.2.6'
+  VERSION = '0.2.7'
 
   ### CIs
   RECOGNIZED_CIS = [
@@ -337,6 +337,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
@@ -354,8 +355,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
@@ -421,11 +425,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'

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'],
@@ -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" \
@@ -92,6 +105,7 @@ class TestCodecov < Minitest::Test
 
   def setup
     ENV['CI'] = nil
+    ENV['CIRCLECI'] = nil
     ENV['GITHUB_ACTIONS'] = nil
     ENV['TRAVIS'] = nil
   end
@@ -215,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'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: codecov
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - codecov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-18 00:00:00.000000000 Z
+date: 2020-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: minitest-ci
+  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'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement