Merge pull request #37 from codacy/feature/languageParam2

rtfpessoa · web-flow · commit 93b586efde3f · 2017-01-25T17:38:18.000Z
Allow to pass a language other than Javascript as param
diff --git a/.buddyrc b/.buddyrc
@@ -12,4 +12,4 @@
     418
   ],
   "reporter": "simple"
-}
+}
diff --git a/.eslintignore b/.eslintignore
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -0,0 +1,123 @@
+{
+  "env": {
+    "mocha": true,
+    "node": true
+  },
+  "globals": {},
+  "rules": {
+    "camelcase": [
+      2,
+      {
+        "properties": "never"
+      }
+    ],
+    "curly": [
+      2,
+      "all"
+    ],
+    "eqeqeq": 2,
+    "wrap-iife": 2,
+    "indent": [
+      2,
+      4,
+      {
+        "SwitchCase": 1
+      }
+    ],
+    "no-use-before-define": [
+      2,
+      {
+        "functions": false
+      }
+    ],
+    "new-cap": 2,
+    "no-caller": 2,
+    "no-empty": [
+      2,
+      {
+        "allowEmptyCatch": true
+      }
+    ],
+    "no-irregular-whitespace": 2,
+    "no-new": 2,
+    "quotes": [
+      2,
+      "single"
+    ],
+    "no-undef": 2,
+    "no-unused-vars": 2,
+    "strict": [
+      2,
+      "function"
+    ],
+    "no-eq-null": 2,
+    "keyword-spacing": [
+      2,
+      {}
+    ],
+    "space-before-blocks": [
+      2,
+      "always"
+    ],
+    "space-before-function-paren": [
+      2,
+      {
+        "anonymous": "ignore",
+        "named": "never"
+      }
+    ],
+    "array-bracket-spacing": [
+      2,
+      "never",
+      {}
+    ],
+    "space-in-parens": [
+      2,
+      "never"
+    ],
+    "quote-props": [
+      2,
+      "as-needed"
+    ],
+    "no-underscore-dangle": 2,
+    "key-spacing": [
+      2,
+      {
+        "beforeColon": false,
+        "afterColon": true
+      }
+    ],
+    "comma-style": [
+      2,
+      "last"
+    ],
+    "space-unary-ops": [
+      2,
+      {
+        "words": false,
+        "nonwords": false
+      }
+    ],
+    "space-infix-ops": 2,
+    "no-with": 2,
+    "no-multiple-empty-lines": 2,
+    "no-mixed-spaces-and-tabs": 2,
+    "no-trailing-spaces": 2,
+    "comma-dangle": [
+      2,
+      "never"
+    ],
+    "brace-style": [
+      2,
+      "1tbs",
+      {
+        "allowSingleLine": true
+      }
+    ],
+    "dot-notation": 2,
+    "yoda": [
+      2,
+      "never"
+    ]
+  }
+}
diff --git a/.jscsrc b/.jscsrc
diff --git a/.jshintrc b/.jshintrc
diff --git a/.jsinspectrc b/.jsinspectrc
@@ -5,4 +5,4 @@
   "color": true,
   "ignore": "node_modules|coverage|reports",
   "reporter": "json"
-}
+}
diff --git a/appveyor.yml b/appveyor.yml
@@ -7,11 +7,10 @@ version: "{build}"
 # What combinations to test
 environment:
   matrix:
-    # node.js
-    - nodejs_version: "0.10"
-    - nodejs_version: "0.11"
-    - nodejs_version: "0.12"
     - nodejs_version: 4
+    - nodejs_version: 5
+    - nodejs_version: 6
+    - nodejs_version: 7
 
 install:
   # Get the latest stable version of Node.js
diff --git a/bin/codacy-coverage.js b/bin/codacy-coverage.js
@@ -20,6 +20,7 @@
         .option('-f, --format [value]', 'Coverage input format')
         .option('-t, --token [value]', 'Codacy Project API Token')
         .option('-c, --commit [value]', 'Commit SHA hash')
+        .option('-l, --language [value', 'Project Language')
         .option('-e, --endpoint [value]', 'Codacy API Endpoint')
         .option('-p, --prefix [value]', 'Project path prefix')
         .option('-v, --verbose', 'Display verbose output')
@@ -31,8 +32,8 @@
         debug: program.debug
     });
 
-    loggerImpl.info(util.format('Started with: token [%j], commitId [%j], endpoint [%j], format [%j], path prefix [%j], verbose [%j], debug [%j]',
-        program.token, program.commit, program.endpoint, program.format, program.prefix, program.verbose, program.debug));
+    loggerImpl.info(util.format('Started with: token [%j], commitId [%j], language [%j], endpoint [%j], format [%j], path prefix [%j], verbose [%j], debug [%j]',
+        program.token, program.commit, program.language, program.endpoint, program.format, program.prefix, program.verbose, program.debug));
 
     process.stdin.on('end', function () {
         loggerImpl.trace('Received file through stdin');
diff --git a/circle.yml b/circle.yml
@@ -1,9 +1,11 @@
 test:
   override:
-    - nvm install 0.10.33 && npm test
-    - nvm install 0.11.14 && npm test
-    - nvm install 0.12.0 && npm test
-    - nvm install 4.0.0 && npm test
+    - nvm install 0.10.48 && npm run test-only
+    - nvm install 0.11.16 && npm run test-only
+    - nvm install 0.12.18 && npm run test-only
+    - nvm install 4.7.2 && npm run test
+    - nvm install 5.12.0 && npm run test
+    - nvm install 6.9.4 && npm run test
+    - nvm install 7.4.0 && npm run test
   post:
     - chmod +x ./bin/codacy-coverage.js && cat ./coverage/lcov.info | node ./bin/codacy-coverage.js
-    
diff --git a/lib/handleInput.js b/lib/handleInput.js
@@ -7,6 +7,7 @@
         var commit = opts.commit;
         var format = opts.format || 'lcov';
         var pathPrefix = opts.prefix || '';
+        var language = opts.language || 'javascript';
         var loggerImpl;
 
         loggerImpl = logger({
@@ -18,8 +19,8 @@
             return Promise.reject(new Error('Token is required'));
         }
 
-        loggerImpl.info(util.format('Handling input for: token [%j], commitId [%j], endpoint [%j], format [%j], path prefix [%j], verbose [%j], debug [%j]',
-            token, commit, opts.endpoint, format, pathPrefix, opts.verbose, opts.debug));
+        loggerImpl.info(util.format('Handling input for: token [%j], commitId [%j], language [%j], endpoint [%j], format [%j], path prefix [%j], verbose [%j], debug [%j]',
+            token, commit, language, opts.endpoint, format, pathPrefix, opts.verbose, opts.debug));
 
         // Parse the coverage data for the given format and retrieve the commit id if we don't have it.
         return Promise.all([parser.getParser(format).parse(pathPrefix, input), getGitData.getCommitId(commit)]).spread(function (parsedCoverage, commitId) {
@@ -28,7 +29,7 @@
             loggerImpl.debug('Sending coverage');
             return reporter({
                 endpoint: opts.endpoint
-            }).sendCoverage(token, commitId, parsedCoverage);
+            }).sendCoverage(token, commitId, language, parsedCoverage);
         });
     };
 }(require('./coverageParser'), require('./reporter'), require('./getGitData'), require('./logger'), require('bluebird'), require('util')));
diff --git a/lib/reporter.js b/lib/reporter.js
@@ -26,11 +26,11 @@
             throw optionsValid.error;
         }
 
-        var endpoint = (options.endpoint || 'https://api.codacy.com') + '/2.0/coverage/:commitId/javascript';
+        var endpoint = (options.endpoint || 'https://api.codacy.com') + '/2.0/coverage/:commitId/:language';
         logger.debug('Setting up reporter communicating to: ' + endpoint);
 
         return {
-            sendCoverage: function sendCoverage(token, commitId, data) {
+            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);
@@ -45,7 +45,7 @@
                         return reject(validationErr);
                     }
 
-                    var url = endpoint.replace(':commitId', commitId);
+                    var url = endpoint.replace(':commitId', commitId).replace(':language', language);
                     logger.trace(util.format('Sending POST to %s', url));
 
                     return request({
@@ -54,7 +54,7 @@
                         json: data,
                         headers: {
                             // jscs:disable
-                            'project_token': token
+                            project_token: token
                             // jscs:enable
                         },
                         resolveWithFullResponse: true
diff --git a/lib/util.js b/lib/util.js
@@ -11,4 +11,4 @@
         }
     };
 
-})();
+}());
diff --git a/package.json b/package.json
@@ -44,11 +44,11 @@
     "mocha": "^2.x",
     "nock": "^2.0.x",
     "istanbul": "~0.x",
-    "jscs": "^1.x",
-    "jshint": "^2.x",
-    "jsinspect": "~0.x"
+    "jsinspect": "~0.x",
+    "eslint": "^3.x"
   },
   "scripts": {
-    "test": "istanbul cover node_modules/mocha/bin/_mocha -- --check-leaks  --timeout 30000 --reporter spec test/ && jshint --show-non-errors . && jscs . && buddy index.js lib test && nsp check"
+    "test": "istanbul cover node_modules/mocha/bin/_mocha -- --check-leaks  --timeout 30000 --reporter spec test/ && eslint . && buddy index.js lib test && nsp check",
+    "test-only": "istanbul cover node_modules/mocha/bin/_mocha -- --check-leaks  --timeout 30000 --reporter spec test/ && buddy index.js lib test && nsp check"
   }
 }
diff --git a/test/cli.js b/test/cli.js
@@ -61,8 +61,8 @@
                     return done(err);
                 }
 
-                expect(res).to.match(/Started with: token \["1234"], commitId \["4321"], endpoint \["something"], format \["lcov"], path prefix \["asdf\/"], verbose \[true], debug \[true]/);
-                expect(res).to.match(/Handling input for: token \["1234"], commitId \["4321"], endpoint \["something"], format \["lcov"], path prefix \["asdf\/"], verbose \[true], debug \[true]/);
+                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]/);
                 done();
             });
         });
diff --git a/test/handleInput.js b/test/handleInput.js
@@ -45,9 +45,9 @@
                         json: sampleCoverageData,
                         resolveWithFullResponse: true
                     }).promise()).to.eventually.satisfy(function (res) {
-                            expect(res.statusCode).to.equal(200);
-                            return true;
-                        });
+                        expect(res.statusCode).to.equal(200);
+                        return true;
+                    });
                 });
         });
         it('should be able to parse lcov data', function () {
diff --git a/test/reporter.js b/test/reporter.js
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -12,4 +12,4 @@`
`12`	`12`	`418`
`13`	`13`	`],`
`14`	`14`	`"reporter": "simple"`
`15`		`-}`
	`15`	`+}`