cleanup part 3

lib/analyze/analyzer.js

@@ -21,36 +21,37 @@ function Analyzer() {
 }
 
 Analyzer.prototype.analyze = function(urls, collector, downloadErrors, analysisErrors, urlAnalysedCallback, completionCallback) {
-  var self = this;
-  if (urls.length === 0) {
-    completionCallback(downloadErrors, analysisErrors);
-  }
+
+  /**
+  To keep it simple, we run each task in a serie so
+  that they will not interfer with each other
+  */
 
   var tasks = [
-    function(asyncDoneCallback) {
+    function(cb) {
       if (config.runYslow)
-        yslow.analyze(urls, asyncDoneCallback);
-      else asyncDoneCallback(undefined, {});
+        yslow.analyze(urls, cb);
+      else cb(undefined, {});
     },
-    function(asyncDoneCallback) {
+    function(cb) {
       if (config.googleKey)
-        gpsi.analyze(urls, asyncDoneCallback);
-      else asyncDoneCallback(undefined, {});
+        gpsi.analyze(urls, cb);
+      else cb(undefined, {});
     },
-    function(asyncDoneCallback) {
+    function(cb) {
       if (config.browser)
-        browsertime.analyze(urls, asyncDoneCallback);
-      else asyncDoneCallback(undefined, {});
+        browsertime.analyze(urls, cb);
+      else cb(undefined, {});
     },
-    function(asyncDoneCallback) {
+    function(cb) {
       if (config.webpagetestUrl)
-        webpagetest.analyze(urls, asyncDoneCallback);
-      else asyncDoneCallback(undefined, {});
+        webpagetest.analyze(urls, cb);
+      else cb(undefined, {});
     },
-    function(asyncDoneCallback) {
+    function(cb) {
       if (config.screenshot)
-        screenshots.analyze(urls, asyncDoneCallback);
-      else asyncDoneCallback(undefined, {});
+        screenshots.analyze(urls, cb);
+      else cb(undefined, {});
     }
   ];
 

lib/analyze/screenshots.js

@@ -63,7 +63,7 @@ function analyzeUrl(args, asyncDoneCallback) {
   if (config.basicAuth)
     childArgs.push(config.basicAuth);
 
-  log.log('info', "Taking screenshots for " + url);
+  log.log('info', "Taking screenshot for " + url);
 
   childProcess.execFile(binPath, childArgs, {
     timeout: 60000