codecov 0.2.7 → 0.2.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7cd3288a24f1d4655e837e068c45a5be7817d60c08de8acebb5ca0f3afcb0569
-  data.tar.gz: a42575d126b29448adda5177e95ac961070098aca3761c7074b4b6a1b9827154
+  metadata.gz: 98728653c21cce7decd7a9b031e54e950da789d70c464bb61e53e1964372ac1d
+  data.tar.gz: 8d45300d929ff5bd39cb5cfb562960ef1bf3b36b1f51754376f25c8ac8ae3a31
 SHA512:
-  metadata.gz: 00210aa6e8cbf2837c5c199e3f7b2ce3d80a7c171f4bb84f94c0202da55fff0b33fe7ea6ad2ec39ed65086d41b6c375433954197d0fd9343e4de0bc7cf437c83
-  data.tar.gz: e492d90061f8db4c1df141d5d2e04d520cf4f8704a923f5556ed5a50d28bc6fcf2ec9cf72acea749671da975cef11420a60d1c8bf20498291bb5761f79e3e35f
+  metadata.gz: bdd1f35739f17cc5110ea0c2fa51bf4939812b96ff96009311dfb52ea67b63107cdbfbb8ad6e9b76f1cdc1104a136407bf1f9e89d1509c717131d9b03e62a986
+  data.tar.gz: 84673f1a411a1b7746b04448a79aa9a84b3e5606d14f7c70b6adee66be765f66ba2caed073cda2dc837788b7a67cc3a0c6c232655533e1170ea0865b30f77c93

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.7'
+  VERSION = '0.2.12'
 
   ### CIs
   RECOGNIZED_CIS = [
@@ -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',
@@ -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
@@ -158,6 +160,18 @@ 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] = if ENV['CODEBUILD_SOURCE_VERSION']
+                      matched = ENV['CODEBUILD_SOURCE_VERSION'].match(%r{pr/(?<pr>.*)})
+                      matched.nil? ? ENV['CODEBUILD_SOURCE_VERSION'] : matched['pr']
+                    end
     when CODESHIP
       # https://www.codeship.io/documentation/continuous-integration/set-environment-variables/
       params[:service] = 'codeship'
@@ -308,6 +322,7 @@ class SimpleCov::Formatter::Codecov
       puts 'Error uploading coverage reports to Codecov. Sorry'
       puts e.class.name
       puts e
+      puts "Backtrace:\n\t#{e.backtrace}"
       return response
     end
 
@@ -325,7 +340,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)
@@ -351,7 +366,7 @@ 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}"
 
@@ -369,7 +384,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(
@@ -382,13 +397,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)
@@ -403,7 +418,7 @@ class SimpleCov::Formatter::Codecov
     )
     req.body = report
     res = retry_request(req, https)
-    if res.body == ''
+    if res&.body == ''
       {
         'uploaded' => true,
         'url' => reports_url,
@@ -413,8 +428,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')
       nil
     end
   end
@@ -424,7 +439,7 @@ 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 [green('-> '), 'Uploading to Codecov'].join(' ')
     puts "#{url}#{uri.path}?#{query_without_token}"
 
     req = Net::HTTP::Post.new(
@@ -445,7 +460,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
 
@@ -497,16 +512,21 @@ class SimpleCov::Formatter::Codecov
     ].freeze
 
     invalid_directories = [
-      'node_modules/'
+      'node_modules/',
+      'public/',
+      'storage/',
+      'tmp/',
+      'vendor/'
     ]
 
-    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)
+      if File.file?(file) && !file.end_with?(*invalid_file_types) && invalid_directories.none? { |dir| file.include?(dir) }
         network.push(file)
       end
     end
+
     network.push('<<<<<< network')
     network
   end
@@ -586,4 +606,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

@@ -167,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
@@ -612,6 +618,48 @@ 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_codebuild_source_version_is_other_than_pr_number
+    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'] = 'git-commit-hash-12345'
+    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('git-commit-hash-12345', result['params'][:pr])
+    assert_equal('owner/repo', result['params'][:slug])
+    assert_equal('master', result['params'][:branch])
+    assert_equal('git-commit-hash-12345', 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,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: codecov
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.12
 platform: ruby
 authors:
 - codecov
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-21 00:00:00.000000000 Z
+date: 2020-10-09 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: colorize
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -149,7 +135,7 @@ homepage: https://github.com/codecov/codecov-ruby
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -164,8 +150,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key:
+rubygems_version: 3.0.3
+signing_key: 
 specification_version: 4
 summary: hosted code coverage ruby/rails reporter
 test_files: