picked all the lint

orodio · Nov 18, 2013 · 45063ae · 45063ae
1 parent 5feb745
commit 45063ae
Show file tree

Hide file tree

Showing 2 changed files with 67 additions and 46 deletions.
diff --git a/grunt/config/server.js b/grunt/config/server.js
@@ -4,38 +4,49 @@ module.exports = function(grunt){
   var coverageWriteStream;
 
   grunt.task.registerTask('finalize-coverage-stream', function(){
-    if (!coverageWriteStream) return;
+    if (!coverageWriteStream) {
+      return;
+    }
     var done = this.async();
     coverageWriteStream.once('close', done);
     coverageWriteStream.end();
     coverageWriteStream = null;
   });
 
   function consoleLoggerMiddleware(req, res, next) {
-    if (!(req.method == 'POST'
-      && req._parsedUrl.pathname.replace(/\//g,'') == 'console'
-      && Array.isArray(req.body))
-    ) {
+    if (!(req.method == 'POST' && req._parsedUrl.pathname.replace(/\//g,'') == 'console' && Array.isArray(req.body))) {
       return next();
     }
     res.write('<!doctype html><meta charset=utf-8>');
     res.end('Got it, thanks!');
 
     req.body.forEach(function(log){
-      if (log.message.indexOf('not ok ') === 0) log.type = 'error';
-      else if (log.message.indexOf('ok ') === 0) log.type = 'ok';
-      else if (log.message.indexOf('COVER') === 0) log.type = 'coverage';
-      else if (log.message.indexOf('DONE\t') === 0) log.type = 'coverage done';
+      if (log.message.indexOf('not ok ') === 0) {
+        log.type = 'error';
+      } else if (log.message.indexOf('ok ') === 0) {
+        log.type = 'ok';
+      } else if (log.message.indexOf('COVER') === 0) {
+        log.type = 'coverage';
+      } else if (log.message.indexOf('DONE\t') === 0) {
+        log.type = 'coverage done';
+      }
 
-      if (log.type == 'error') grunt.log.error(log.message);
-      else if (log.type == 'ok') grunt.log.ok(log.message);
-      else if (log.type == 'log') grunt.log.writeln(log.message);
-      else if (log.type == 'coverage') {
-        if (!coverageWriteStream) coverageWriteStream = require('fs').createWriteStream(__dirname + '/../../coverage.log');
+      if (log.type == 'error') {
+        grunt.log.error(log.message);
+      } else if (log.type == 'ok') {
+        grunt.log.ok(log.message);
+      } else if (log.type == 'log') {
+        grunt.log.writeln(log.message);
+      } else if (log.type == 'coverage') {
+        if (!coverageWriteStream) {
+          coverageWriteStream = require('fs').createWriteStream(__dirname + '/../../coverage.log');
+        }
         coverageWriteStream.write(log.message + '\n');
+      } else if (log.type == 'coverage done') {
+        grunt.task.run('finalize-coverage-stream');
+      } else {
+        grunt.verbose.writeln(log);
       }
-      else if (log.type == 'coverage done') grunt.task.run('finalize-coverage-stream');
-      else grunt.verbose.writeln(log);
     });
   }
 
@@ -85,7 +96,7 @@ module.exports = function(grunt){
             connect.static(options.base),
             connect.directory(options.base)
           ];
-        },
+        }
       }
     }
   };

diff --git a/grunt/tasks/coverage-parse.js b/grunt/tasks/coverage-parse.js
@@ -1,48 +1,58 @@
+"use strict";
 var grunt = require('grunt');
 
 module.exports = function(){
   var ROOT = require('path').normalize(__dirname + '/../..');
   var done = this.async();
   var uncoveredExpressionCount = 0;
   var uncoveredLineCount = 0;
-  
+
   require('fs').createReadStream(ROOT + '/coverage.log')
   .pipe(require('coverify/parse')(function(error, results){
-    if (error) grunt.fatal(error);
-
+    if (error) {
+      grunt.fatal(error);
+    }
+
     Object.keys(results)
-    .sort(function(a, b){
-      if (results[a].length > results[b].length) return -1;
-      if (results[a].length < results[b].length) return 1;
-      return 0;
-    })
-    .forEach(function(path){
-      if (results[path].length === 0) return;
-      var relativePath = path.replace(ROOT, '');
-      uncoveredExpressionCount += results[path].length;
-      grunt.log.error(results[path].length + ' expressions not covered ' + relativePath);
+      .sort(function(a, b){
+        if (results[a].length > results[b].length) {
+          return -1;
+        }
+        if (results[a].length < results[b].length) {
+          return 1;
+        }
+        return 0;
+      })
+      .forEach(function(path){
+        if (results[path].length === 0) {
+          return;
+        }
+        var relativePath = path.replace(ROOT, '');
+        uncoveredExpressionCount += results[path].length;
+        grunt.log.error(results[path].length + ' expressions not covered ' + relativePath);
 
-      results[path].forEach(function(c){
-        uncoveredLineCount += c.code.split('\n').length;
-        // console.log(
-        //   'https://github.com/' + process.env.TRAVIS_REPO_SLUG + '/blob/' + process.env.TRAVIS_BRANCH + relativePath + '#L' + (c.lineNum+1) + '-L' + (c.lineNum+1 + c.code.split('\n').length)
-        // );
-        console.log(
-          'txmt://open?url=' + encodeURIComponent('file://' + path) + '&line=' + (c.lineNum+1) + '&column=' + (c.column[0]+2)
-        );
-        // console.log(c.code.split('\n').map(function(line){return '\t' + line}).join('\n'))
-      });
-      console.log('');
-    });
+        results[path].forEach(function(c){
+          uncoveredLineCount += c.code.split('\n').length;
+          console.log('txmt://open?url=' + encodeURIComponent('file://' + path) + '&line=' + (c.lineNum+1) + '&column=' + (c.column[0]+2));
+        });
+        console.log('');
+      })
+    ;
 
     Object.keys(results).sort().forEach(function(path){
-      if (results[path].length > 0) return;
+      if (results[path].length > 0) {
+        return;
+      }
       var relativePath = path.replace(ROOT, '');
       grunt.log.ok('100% coverage ' + relativePath);
     });
 
-    if (uncoveredExpressionCount > 0) grunt.log.error(uncoveredExpressionCount + ' expressions not covered');
-    if (uncoveredLineCount > 0) grunt.log.error(uncoveredLineCount + ' lines not covered');
+    if (uncoveredExpressionCount > 0) {
+      grunt.log.error(uncoveredExpressionCount + ' expressions not covered');
+    }
+    if (uncoveredLineCount > 0) {
+      grunt.log.error(uncoveredLineCount + ' lines not covered');
+    }
     done();
   }));
-}
+};