codecov 0.2.8 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e49b9d2e3374ac7e3f5d6514045a0454c767e200db364059887cb0d0a8a3e13f
-  data.tar.gz: 83f5c298eb2be003da0302d329241f5eaa64a9d5d2d747be0b845437607bce88
+  metadata.gz: cdd8c92464da131becf5bae150b12f4ae3513d84c7f77ba059ee771ee662eca4
+  data.tar.gz: 592ed8f011c9e618aa2b71cf2c0ba7a9fb7a7ff1aa9ad80db72743f7f658cf24
 SHA512:
-  metadata.gz: 4c8aba631f40e6fddca4d507613de63caf64207fda359518faceb9267e327cf0d4611ba864083e7ef8158fee9b8f4dfab10e8dfdd6e7f1f6e5d30ac4ae8275cb
-  data.tar.gz: b15d9af39b437902e7f59a749bdf54dee8e12a97f4e78f8c4b918d001ca66606731a17986e4f52e0fe1e4a51b9c87ca652768395d60869da6cb5025cee876827
+  metadata.gz: ec4048e6ecb6c5780bfa1e4320a1edc177a5b96b6b2a3a7ba3a41416e5e1b40ea69e64d9cbeb58b920a566e9d3379244a4a21496500210adc9b51116325e5f0e
+  data.tar.gz: 4564c29b679ea650270560c719a1a178c8ab2d65fa9157e7892f06d02855b01ef5dcfe6be35e7cd47a836bec72abb74c1dc36002d9c030344549f987df9d930f

data/lib/codecov.rb

@@ -7,7 +7,7 @@ require 'simplecov'
 require 'zlib'
 
 class SimpleCov::Formatter::Codecov
-  VERSION = '0.2.8'
+  VERSION = '0.2.9'
 
   ### CIs
   RECOGNIZED_CIS = [
@@ -17,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',
@@ -58,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')
@@ -85,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
@@ -157,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'
@@ -324,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)
@@ -350,7 +362,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}"
 
@@ -368,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(
@@ -381,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)
@@ -412,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
@@ -423,7 +435,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(
@@ -444,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
 
@@ -499,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)
@@ -585,24 +597,17 @@ 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)
+  # Convenience color methods
+  def black(str)
+    str.nil? ? '' : "\e[30m#{str}\e[0m"
   end
 
-  def red
-    colorize(31)
+  def red(str)
+    str.nil? ? '' : "\e[31m#{str}\e[0m"
   end
 
-  def green
-    colorize(32)
+  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,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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: codecov
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors:
 - codecov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-24 00:00:00.000000000 Z
+date: 2020-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json