[refactoring] Simplify and rename modules

Author: slyg

src/lib/analyse.js

@@ -0,0 +1,48 @@
+/*jshint -W079 */
+var Promise = require('bluebird'),
+    cr = require('escomplex'),
+    treeWalker = require('escomplex-ast-moz'),
+    esprima = require('esprima');
+
+/**
+ * Builds final complexity report of
+ * a given file from its reference and content
+ *
+ * @param {String} 'fileRef'    The file path
+ * @param {String} 'fileData'   The file content stringified
+ * @returns {Promise}           The fulfilled promise returns the report {Object}
+ */
+
+module.exports = function analyse (fileRef){
+
+  return function(fileData){
+
+    return new Promise(function(resolve, reject){
+
+      var report;
+
+      try {
+        report = cr.analyse( esprima.parse(fileData, {loc : true}),  treeWalker);
+      } catch(e){
+        reject('parsing error');
+      }
+
+      resolve({
+        path            : fileRef,
+        escapedPath     : fileRef.replace(/\\/g, '\\'), // windows use
+        complexity      : report.aggregate.cyclomatic,
+        lineNumber      : report.aggregate.sloc.logical,
+        maintainability : report.aggregate.halstead.effort,
+        halstead        : {
+            length         : report.aggregate.halstead.length,
+            vocabulary     : Math.round(report.aggregate.halstead.vocabulary),
+            difficulty     : Math.round(report.aggregate.halstead.difficulty),
+            bugs           : Math.round(report.aggregate.halstead.bugs)
+        }
+      });
+
+    });
+
+  };
+
+};

src/lib/analyser.js

@@ -0,0 +1,45 @@
+/*jshint -W079 */
+var Promise = require('bluebird'),
+    _ = require('lodash'),
+    fs = require('fs'),
+    readFileAsync = Promise.promisify(fs.readFile, fs);
+
+var analyse = require('./analyse');
+
+/**
+ * Promise of a report on a single file
+ *
+ * @param {String} 'fileRef'    The file's path
+ * @param {Object} 'fileStats'  The informations about current file
+ * @returns {Promise}           The promise shall always be fulfilled
+ */
+
+module.exports = function report (fileRef, isVerbose) {
+
+  return readFileAsync(fileRef, 'utf8')
+
+    .then(analyse(fileRef))
+
+    .then(function(result){
+
+      if (this.isVerbose) {
+        console.log('%s | %s', result.complexity, fileRef);
+      }
+
+      return {
+        success : true,
+        result : result
+      };
+
+    }.bind(this))
+
+    .caught(function(err){
+
+      return {
+        success : false,
+        error : err
+      };
+
+    });
+
+};

src/lib/createFileReport.js

@@ -6,7 +6,7 @@ var Promise = require('bluebird'),
     path = require('path')
 ;
 
-var Analyser = require('./lib/analyser');
+var reportAsync = require('./lib/report');
 
 /**
  * Scan a file tree seeking for js files and generates a complexity report
@@ -34,11 +34,10 @@ module.exports = function (pattern, globOptions, isVerbose){
 
       .then(function (files) {
 
-        var analyser = new Analyser(isVerbose ? isVerbose : false),
-            filesReports = [];
+        var filesReports = [];
 
         _.each(files, function(file){
-          filesReports.push(analyser.analyse(file));
+          filesReports.push(reportAsync(file, isVerbose ? isVerbose : false));
         });
 
         Promise.all(filesReports)