Merge pull request #41 from codacy/detect-files-language

Detect files language and send separate reports per language

Author: rtfpessoa

.editorconfig

@@ -0,0 +1,16 @@
+# This file is for unifying the coding style for different editors and IDEs
+# editorconfig.org
+
+root = true
+
+[*]
+end_of_line = lf
+charset = utf-8
+insert_final_newline = true
+trim_trailing_whitespace = true
+indent_style = space
+indent_size = 4
+max_line_length = 120
+
+[Makefile]
+indent_style = tab

lib/handleInput.js

@@ -7,7 +7,7 @@
         var commit = opts.commit;
         var format = opts.format || 'lcov';
         var pathPrefix = opts.prefix || '';
-        var language = opts.language || 'javascript';
+        var language = opts.language;
         var loggerImpl;
 
         loggerImpl = logger({

lib/reporter.js

@@ -1,4 +1,4 @@
-(function (request, Joi, Promise, util, logger) {
+(function(request, Joi, Promise, util, lodash, logger) {
     'use strict';
 
     var optionsValidation = Joi.object({
@@ -15,7 +15,96 @@
         }).required())
     }).example({total: 50, fileReports: [{filename: 'filename', total: 10, coverage: {1: 1, 2: 3}}]});
 
-    module.exports = function (options) {
+    var languageMap = {
+        js: 'javascript',
+        jsx: 'javascript',
+        ts: 'typescript',
+        tsx: 'typescript',
+        coffee: 'coffeescript'
+    }
+
+    function sendByLanguage(endpoint, commitId, token, data) {
+        var reportsByLanguage = lodash.groupBy(data.fileReports, function(elem) {
+            return languageMap[lodash.head(lodash.takeRight(elem.filename.split('.'), 1))] || 'javascript';
+        });
+
+        var languageResponses = lodash.map(reportsByLanguage, function(fileReports, language) {
+            var weighedCoverage = lodash.reduce(fileReports, function(accom, elem) {
+                return accom + (elem.total * Object.keys(elem.coverage).length);
+            }, 0);
+
+            var coveredLines = lodash.reduce(fileReports, function(accom, elem) {
+                return accom + Object.keys(elem.coverage).length;
+            }, 0);
+
+            var finalCoverage = weighedCoverage / coveredLines;
+
+            var dataPerLanguage = lodash.clone(data);
+            dataPerLanguage.fileReports = fileReports;
+            dataPerLanguage.total = Math.floor(finalCoverage);
+
+            return sendLanguage(endpoint, commitId, language, token, dataPerLanguage);
+        });
+
+        return Promise.all(languageResponses)
+            .then(function(errs) {
+                errs = lodash.filter(errs, function(e) {
+                    return !lodash.isUndefined(e)
+                });
+
+                if (errs.length) {
+                    return Promise.reject(errs[0]);
+                }
+
+                logger.trace('All languages sent successfully');
+                return Promise.resolve();
+            }, function(err) {
+                logger.trace('Failed to send some languages');
+                return Promise.reject(err);
+            });
+    }
+
+    function sendForLanguage(endpoint, commitId, language, token, data) {
+        return sendLanguage(endpoint, commitId, language, token, data)
+            .then(function(err) {
+                if (err) {
+                    return Promise.reject(err);
+                }
+                return Promise.resolve();
+            }, function(err) {
+                return Promise.reject(err);
+            });
+    }
+
+    function sendLanguage(endpoint, commitId, language, token, data) {
+        var url = endpoint.replace(':commitId', commitId).replace(':language', language);
+        logger.trace(util.format('Sending POST to %s', url));
+        return request({
+            url: url,
+            method: 'POST',
+            json: data,
+            headers: {
+                // jscs:disable
+                project_token: token
+                // jscs:enable
+            },
+            resolveWithFullResponse: true
+        }).then(function(res) {
+            if (res.statusCode !== 200) {
+                var err = new Error(util.format('Expected Status Code of 200, but got [%s]', res.statusCode));
+                logger.error(util.format('Status Code [%s] - Error [%j]', res.statusCode, res.error));
+                return Promise.reject(err);
+            }
+            logger.debug('Successfully sent coverage data');
+            return Promise.resolve();
+        }, function(res) {
+            var err = new Error(util.format('Expected Successful Status Code, but got [%s]', res.statusCode));
+            logger.error(util.format('Status Code [%s] - Error [%j]', res.statusCode, res.error));
+            return Promise.reject(err);
+        });
+    }
+
+    module.exports = function(options) {
         logger.trace(util.format('Creating reporter for %j', options));
         var optionsValid = Joi.validate(options, optionsValidation, {
             stripUnknown: true
@@ -31,48 +120,25 @@
 
         return {
             sendCoverage: function sendCoverage(token, commitId, language, data) {
-                return new Promise(function (resolve, reject) {
-                    logger.trace(util.format('Sending Coverage for token [%s] and commitId [%s]', token, commitId));
-                    var tokenValid = Joi.validate(token, tokenValidation);
-                    var commitIdValid = Joi.validate(commitId, commitIdValidation);
-                    var dataValid = Joi.validate(data, coverageDataValidation, {
-                        stripUnknown: true
-                    });
-                    var validationErr = tokenValid.error || commitIdValid.error || dataValid.error;
-
-                    if (validationErr) {
-                        logger.error(validationErr);
-                        return reject(validationErr);
-                    }
-
-                    var url = endpoint.replace(':commitId', commitId).replace(':language', language);
-                    logger.trace(util.format('Sending POST to %s', url));
-
-                    return request({
-                        url: url,
-                        method: 'POST',
-                        json: data,
-                        headers: {
-                            // jscs:disable
-                            project_token: token
-                            // jscs:enable
-                        },
-                        resolveWithFullResponse: true
-                    }).then(function (res) {
-                        if (res.statusCode !== 200) {
-                            var err = new Error(util.format('Expected Status Code of 200, but got [%s]', res.statusCode));
-                            logger.error(util.format('Status Code [%s] - Error [%j]', res.statusCode, res.error));
-                            return reject(err);
-                        }
-                        logger.debug('Successfully sent coverage data');
-                        resolve();
-                    }, function (res) {
-                        var err = new Error(util.format('Expected Successful Status Code, but got [%s]', res.statusCode));
-                        logger.error(util.format('Status Code [%s] - Error [%j]', res.statusCode, res.error));
-                        reject(err);
-                    });
+                logger.trace(util.format('Sending Coverage for token [%s] and commitId [%s]', token, commitId));
+                var tokenValid = Joi.validate(token, tokenValidation);
+                var commitIdValid = Joi.validate(commitId, commitIdValidation);
+                var dataValid = Joi.validate(data, coverageDataValidation, {
+                    stripUnknown: true
                 });
+                var validationErr = tokenValid.error || commitIdValid.error || dataValid.error;
+
+                if (validationErr) {
+                    logger.error(validationErr);
+                    return Promise.reject(validationErr);
+                }
+
+                if (language) {
+                    return sendForLanguage(endpoint, commitId, language, token, data);
+                }
+
+                return sendByLanguage(endpoint, commitId, token, data);
             }
         };
     };
-}(require('request-promise'), require('joi'), require('bluebird'), require('util'), require('./logger')()));
+}(require('request-promise'), require('joi'), require('bluebird'), require('util'), require('lodash'), require('./logger')()));

package.json

@@ -32,6 +32,7 @@
     "commander": "^2.x",
     "joi": "^6.4.x",
     "lcov-parse": "0.x",
+    "lodash": "^4.17.4",
     "log-driver": "^1.x",
     "request-promise": "^0.x"
   },

test/cli.js

@@ -62,7 +62,7 @@
                 }
 
                 expect(res).to.match(/Started with: token \["1234"], commitId \["4321"], language \[undefined], endpoint \["something"], format \["lcov"], path prefix \["asdf\/"], verbose \[true], debug \[true]/);
-                expect(res).to.match(/Handling input for: token \["1234"], commitId \["4321"], language \["javascript"], endpoint \["something"], format \["lcov"], path prefix \["asdf\/"], verbose \[true], debug \[true]/);
+                expect(res).to.match(/Handling input for: token \["1234"], commitId \["4321"], language \[undefined], endpoint \["something"], format \["lcov"], path prefix \["asdf\/"], verbose \[true], debug \[true]/);
                 done();
             });
         });

test/handleInput.js

@@ -14,7 +14,7 @@
             var bodyValidator = Joi.object({
                 total: Joi.number().valid(50),
                 fileReports: Joi.array().items(Joi.object({
-                    filename: Joi.string().valid('filename'),
+                    filename: Joi.string().valid('filename.js'),
                     total: Joi.number().valid(10),
                     coverage: Joi.object({
                         1: Joi.number().valid(1),
@@ -27,7 +27,7 @@
                 total: 50,
                 fileReports: [
                     {
-                        filename: 'filename',
+                        filename: 'filename.js',
                         total: 10,
                         coverage: {
                             1: 1,

test/lcov.js

@@ -4,7 +4,6 @@
     var expect = helper.chai.expect;
     var lcovData = fs.readFileSync(__dirname + '/mock/lcov.info').toString();
     var noStatsLcovData = fs.readFileSync(__dirname + '/mock/no-lines.info').toString();
-    var nadaLcovData = fs.readFileSync(__dirname + '/mock/nada.info').toString();
 
     describe('Lcov Parser', function () {
         it('should be able to parse lcov data', function () {
@@ -105,21 +104,5 @@
                     return true;
                 });
         });
-        it('should be able to parse lcov data without anything', function () {
-            return expect(parser.getParser('lcov').parse('', nadaLcovData))
-                .to.eventually.satisfy(function (data) {
-                    expect(JSON.stringify(data)).to.equal(JSON.stringify({
-                        total: 0,
-                        fileReports: [
-                            {
-                                filename: '',
-                                coverage: {},
-                                total: 0
-                            }
-                        ]
-                    }));
-                    return true;
-                });
-        });
     });
 }(require('fs'), require('../lib/coverageParser'), require('./helper'), require('path')));

test/mock/nada.info

@@ -11,7 +11,7 @@
             bodyValidator = Joi.object({
                 total: Joi.number().valid(50),
                 fileReports: Joi.array().items(Joi.object({
-                    filename: Joi.string().valid('filename'),
+                    filename: Joi.string().valid('filename.js'),
                     total: Joi.number().valid(10),
                     coverage: Joi.object({
                         1: Joi.number().valid(1),
@@ -24,7 +24,7 @@
                 total: 50,
                 fileReports: [
                     {
-                        filename: 'filename',
+                        filename: 'filename.js',
                         total: 10,
                         coverage: {
                             1: 1,