Fixed merge conflicts

Author: dotnetCarpenter

.eslintrc.json

@@ -0,0 +1,14 @@
+{
+  "env": {
+    "node": true,
+    "mocha": true
+  },
+  "globals": {
+    "expect": true
+  },
+  "extends": ["eslint:recommended", "prettier"],
+  "rules": {
+    "no-console": "off",
+    "no-empty": ["error", { "allowEmptyCatch": true }]
+  }
+}

README.md

@@ -98,3 +98,4 @@ nyc report --reporter=text-lcov > coverage.lcov
 - v3.0.2 Security fixes
 - v3.0.3 Support non-git/hg root dirs
 - v3.0.4 Security fixes
+- v3.1.0 Custom yaml file. Allow codecov token from yml file.

bin/codecov

@@ -21,7 +21,8 @@ var args = argv.option([
   {name: 'url', short: 'u', type: 'string', description: "Your Codecov endpoint"},
   {name: 'flags', short: 'F', type: 'string', description: "Codecov Flags"},
   {name: 'dump', type: 'boolean', description: "Dump collected data and do not send to Codecov"},
-  {name: 'pipe', short: 'l', type: 'boolean', description: "Listen to stdin for coverage data"}
+  {name: 'pipe', short: 'l', type: 'boolean', description: "Listen to stdin for coverage data"},
+  {name: 'yml', short: 'y', type: 'string', description: "Configuration file Used to specify the location of the .codecov.yml config file. Defaults to codecov.yml and .codecov.yml"},
 ]).run();
 
 if (args.options.pipe) {

lib/codecov.js

@@ -1,7 +1,8 @@
 var fs = require('fs')
 var path = require('path')
-var request = require('request')
+var request = require('teeny-request').teenyRequest
 var urlgrey = require('urlgrey')
+var jsYaml = require('js-yaml')
 var walk = require('ignore-walk')
 var execSync = require('child_process').execSync
 
@@ -145,18 +146,19 @@ var sendToCodecovV2 = function(
   on_failure
 ) {
   // Direct to Codecov
-  request.post(
+  request(
     {
-      url: urlgrey(codecov_endpoint + '/upload/v2')
+      uri: urlgrey(codecov_endpoint + '/upload/v2')
         .query(query)
         .toString(),
+      method: 'POST',
       body: upload_body,
       headers: {
         'Content-Type': 'text/plain',
         Accept: 'text/plain',
       },
     },
-    function(err, response, result) {
+    function(err, response) {
       if (err || response.statusCode !== 200) {
         console.log('    ' + (err || response.body))
         return response
@@ -179,11 +181,12 @@ var sendToCodecovV3 = function(
   on_failure
 ) {
   // Direct to S3
-  request.post(
+  request(
     {
-      url: urlgrey(codecov_endpoint + '/upload/v4')
+      uri: urlgrey(codecov_endpoint + '/upload/v4')
         .query(query)
         .toString(),
+      method: 'POST',
       body: '',
       headers: {
         'Content-Type': 'text/plain',
@@ -201,16 +204,17 @@ var sendToCodecovV3 = function(
         )
       } else {
         var codecov_report_url = result.split('\n')[0]
-        request.put(
+        request(
           {
-            url: result.split('\n')[1],
+            uri: result.split('\n')[1],
+            method: 'PUT',
             body: upload_body,
             headers: {
               'Content-Type': 'text/plain',
               'x-amz-acl': 'public-read',
             },
           },
-          function(err, response, result) {
+          function(err) {
             if (err) {
               sendToCodecovV2(
                 codecov_endpoint,
@@ -240,6 +244,11 @@ var upload = function(args, on_success, on_failure) {
     'https://codecov.io'
   var query = {}
   var debug = []
+  var yamlFile =
+    args.options.yml ||
+    process.env.codecov_yml ||
+    process.env.CODECOV_YML ||
+    'codecov.yml'
 
   console.log(
     '' +
@@ -253,20 +262,22 @@ var upload = function(args, on_success, on_failure) {
       version
   )
 
-  query.yaml = ['codecov.yml', '.codecov.yml'].reduce(function(result, file) {
-    return (
-      result ||
-      (fs.existsSync(path.resolve(process.cwd(), file)) ? file : undefined)
-    )
-  }, undefined)
-
   if ((args.options.disable || '').split(',').indexOf('detect') === -1) {
     console.log('==> Detecting CI Provider')
     query = detectProvider()
   } else {
     debug.push('disabled detect')
   }
 
+  query.yaml = [yamlFile, '.codecov.yml'].reduce(function(result, file) {
+    return (
+      result ||
+      (fs.existsSync(path.resolve(process.cwd(), file))
+        ? path.resolve(process.cwd(), file)
+        : undefined)
+    )
+  }, undefined)
+
   if (args.options.build) {
     query.build = args.options.build
   }
@@ -289,8 +300,19 @@ var upload = function(args, on_success, on_failure) {
     query.flags = flags
   }
 
+  var yamlToken
+  try {
+    var loadedYamlFile = jsYaml.safeLoad(fs.readFileSync(query.yaml, 'utf8'))
+    yamlToken =
+      loadedYamlFile && loadedYamlFile.codecov && loadedYamlFile.codecov.token
+  } catch (e) {
+    // silently fail
+  }
   var token =
-    args.options.token || process.env.codecov_token || process.env.CODECOV_TOKEN
+    args.options.token ||
+    yamlToken ||
+    process.env.codecov_token ||
+    process.env.CODECOV_TOKEN
   if (token) {
     query.token = token
   }