[refactoring] Isolate file analysis from report ordering

Author: slyg

bin/jscomplexity-cli.js

@@ -45,4 +45,3 @@ getSpec(function(pattern, globOptions, isVerbose, outPutFileName, reporter){
     });
 
 });
-

bin/lib/getSpec.js

@@ -7,15 +7,24 @@ var pjson = require('../../package.json'),
       pattern : './**',
       isVerbose : false,
       outputFileName : 'jscomplexity-report.html',
-      reporter : 'all'
+      reporter : 'terminal'
     };
 
 program
   .version(pjson.version)
   .usage('[options]')
-  .option('-p, --pattern <pattern>', 'glob pattern - default is current directory')
-  .option('-o, --output <filename>', '(optional) customize html report filename - default is \''+ options.outputFileName +'\'')
-  .option('-r, --reporter <reporter>', '(optional) specify a reporter: \'terminal\', \'html\' or \'all\'  - default is \'all\'')
+  .option(
+    '-p, --pattern <pattern>',
+    'glob pattern - default is current directory'
+  )
+  .option(
+    '-o, --output <filename>',
+    '(optional) customize html report filename - default is \''+ options.outputFileName +'\''
+  )
+  .option(
+    '-r, --reporter <reporter>',
+    '(optional) specify a reporter: \'terminal\', \'html\' or \'all\' - default is \'terminal\''
+  )
   .option('-v, --verbose', '(optional) outputs analysisis logs')
   .parse(process.argv);
 
@@ -40,4 +49,4 @@ module.exports = function getSpec(callback){
     options.outputFileName,
     options.reporter
   );
-};
+};

bin/lib/outputCLIReport.js

@@ -18,4 +18,4 @@ module.exports = function logReport(report){
 
   console.log(table.toString());
 
-};
+};

bin/lib/outputHTMLReport.js

@@ -30,4 +30,4 @@ module.exports = function outputHTMLReport(data, filename){
 
   return writeFile(filename, html);
 
-};
+};

src/lib/analyser.js

@@ -17,20 +17,14 @@ var createFileReport = require('./createFileReport');
 
 function Analyser(isVerboseParam){
 
-  var
-    resolver = Promise.defer(),
-    isVerbose = isVerboseParam || false
-  ;
-
-  this.reportList = [];
-  this.failsList = [];
+  this.isVerbose = isVerboseParam || false;
 
   /**
    * Populates report with informations about one file
    *
    * @param {String} 'root'       The file folder's path
    * @param {Object} 'fileStats'  The informations about current file
-   * @returns {Promise}           The promise shall always fulfill
+   * @returns {Promise}           The promise shall always be fulfilled
    */
 
   this.analyse = function (fileRef) {
@@ -40,34 +34,30 @@ function Analyser(isVerboseParam){
       .then(function(){
         return readFileAsync(fileRef, 'utf8');
       })
+
       .then(function(data){
         return createFileReport(fileRef, data);
       })
-      .then(function(report){
-        if (isVerbose) {
-          console.log('%s | %s', report.complexity, fileRef);
+
+      .then(function(result){
+        if (this.isVerbose) {
+          console.log('%s | %s', result.complexity, fileRef);
         }
-        this.reportList.push(report);
+        return {
+          success : true,
+          result : result
+        };
       }.bind(this))
-      .caught(function(err){
-        this.failsList.push({ref : fileRef, message : err.message });
-      }.bind(this));
-
-  };
 
-  /**
-   * Returns report
-   *
-   * @returns {Object} The report object
-   */
+      .caught(function(err){
+        return {
+          success : false,
+          error : err
+        };
+      });
 
-  this.getResults = function(){
-    return {
-      report : _.chain(this.reportList).sortBy('complexity').reverse().value(),
-      fails : this.failsList
-    };
   };
 
 }
 
-module.exports = Analyser;
+module.exports = Analyser;

src/scan.js

@@ -34,16 +34,43 @@ module.exports = function (pattern, globOptions, isVerbose){
 
       .then(function (files) {
 
-        var reporter = new Analyser(isVerbose ? isVerbose : false),
+        var analyser = new Analyser(isVerbose ? isVerbose : false),
             filesReports = [];
 
         _.each(files, function(file){
-          filesReports.push(reporter.analyse(file));
+          filesReports.push(analyser.analyse(file));
         });
 
-        Promise.all(filesReports).then(function(){
-          resolve(reporter.getResults());
-        });
+        Promise.all(filesReports)
+
+          .then(function(results){
+
+            return Promise.props({
+
+              report : Promise
+                .filter(results, function(result){
+                  return result.success;
+                })
+                .map(function(result){
+                  return result.result;
+                })
+                .then(function(results){
+                  return _.chain(results).sortBy('complexity').reverse().value();
+                }),
+
+              fails : Promise
+                .filter(results, function(result){
+                  return !result.success;
+                })
+                .map(function(result){
+                  return result.error;
+                })
+
+            });
+
+          })
+
+          .then(resolve);
 
       })