Remove async library

lib/git/js-git-service.js

@@ -1,5 +1,4 @@
 var path = require('path');
-var whilst = require('async/whilst');
 var helper = require('../helper.js');
 
 var jsGitService = {};
@@ -102,7 +101,7 @@ jsGitService.getCommitHistory = function (folder, n, branch, remote, cb) {
     ref = remote ? 'refs/remotes/origin/' + branch : 'refs/heads/' + branch;
   }
 
-  jsGitService.getLastCommitByRef(repo, ref, function (err, commit) {
+  jsGitService.getLastCommitByRef(repo, ref, async function (err, commit) {
     if (err) {
       return cb(err);
     }
@@ -114,38 +113,31 @@ jsGitService.getCommitHistory = function (folder, n, branch, remote, cb) {
 
     var count = 1;
     var parentCommitHash = helper.last(commit.parents); // last parent is the parent in the 'git log' meaning
-
-    whilst(
-      function () {
-        return count < n && parentCommitHash;
-      },
-      function (callback) {
-
-        jsGitService.getCommitByHash(repo, parentCommitHash, function (err, commit) {
-          if (err) {
-            return callback(err);
-          }
-          if (!commit) {
-            parentCommitHash = null;
-            return callback(null);
-          }
-
-          commit.hash = parentCommitHash; // add hash back to commit as not a property when loaded by hash
-
-          count++;
-          commitHistory.push(commit);
-          parentCommitHash = helper.last(commit.parents);
-          callback(null);
+    try {
+      while (count < n && parentCommitHash) {
+        await new Promise(async (resolve, reject) => {
+          jsGitService.getCommitByHash(repo, parentCommitHash, function (err, commit) {
+            if (err) {
+              return reject(err);
+            }
+            if (!commit) {
+              parentCommitHash = null;
+              return resolve();
+            }
+
+            commit.hash = parentCommitHash; // add hash back to commit as not a property when loaded by hash
+
+            count++;
+            commitHistory.push(commit);
+            parentCommitHash = helper.last(commit.parents);
+            resolve();
+          });
         });
-      },
-      function (err) {
-        if (err) {
-          return cb(err);
-        }
-
-        return cb(null, commitHistory);
       }
-    );
+      return cb(null, commitHistory);
+    } catch (err) {
+      return cb(err);
+    }
   });
 };
 

lib/helper.js

@@ -21,8 +21,33 @@ function last(array) {
   return length ? array[length - 1] : undefined;
 }
 
+function fromCallback(func) {
+  return new Promise(
+    (resolve, reject) => func((err, result) => (err ? reject(err) : resolve(result))),
+  );
+}
+
+async function findAsync(promises) {
+  var foundResult = undefined;
+  await promises.reduce(
+    (resultPromise, promise) => resultPromise.then((result) => {
+      if (!foundResult) {
+        if (result) {
+          foundResult = result;
+        } else {
+          return promise.then();
+        }
+      }
+    }),
+    Promise.resolve(),
+  );
+  return foundResult;
+}
+
 module.exports = {
-  get: get,
-  last: last,
-  trimNewLine: trimNewLine,
+  findAsync,
+  fromCallback,
+  get,
+  last,
+  trimNewLine,
 };

lib/hg/hg.js

@@ -1,7 +1,5 @@
 var exec = require("child_process").exec;
-
 var fs   = require("fs");
-
 var cliCommand = require('../cliCommand.js');
 
 var halt = false;
@@ -24,56 +22,57 @@ function checkReturn(dataArray, cb) {
         dataArray[key] = dataArray[key].replace(/\n/g, '');
       }
     });
-		cb(null, dataArray);
+		cb(dataArray);
 	}
-};
-
+}
 
-module.exports.parse = function parseHg(folder, cb) {
-	var data = {};
+module.exports.parse = async function parseHg(folder) {
+	return new Promise((resolve, reject) => {
+		var data = {};
 
-  data.type = 'mercurial';
-  data.commit_history = []; // temporary
+		data.type = 'mercurial';
+		data.commit_history = []; // temporary
 
-	exec(cliCommand(folder, "hg paths default"), function(err, stdout, stderr) {
-		if(err !== null) {
-			error("mercurial", "fetching path", stderr, cb);
-		}
-		else {
-			data.url = stdout;
-			checkReturn(data, cb);
-		}
+		exec(cliCommand(folder, "hg paths default"), function(err, stdout, stderr) {
+			if(err !== null) {
+				error("mercurial", "fetching path", stderr, reject);
+			}
+			else {
+				data.url = stdout;
+				checkReturn(data, resolve);
+			}
+		});
+		exec(cliCommand(folder, "hg log --limit 1 --template 'changeset: {rev}:{node|short}\nsummary: {desc}'"), function(err, stdout, stderr) {
+			if(err !== null) {
+				error("mercurial", "fetching log", stderr, reject);
+			}
+			else {
+				var changeset = stdout.match(/^changeset:\s+([^\n]+)$/m);
+				//date = stdout.match(/^date:\s+:([^\n]+)$/m);
+				var summary = stdout.match(/^summary:\s+([^\n]+)$/m);
+				data.revision = changeset[1];
+				data.comment = summary[1];
+				//data.update_time = date;
+				checkReturn(data, resolve);
+			}
+		});
+		exec(cliCommand(folder, "hg branch"), function(err, stdout, stderr) {
+			if(err !== null) {
+				error("mercurial", "fetching branch", stderr, reject);
+			}
+			else {
+				data.branch = stdout;
+				checkReturn(data, resolve);
+			}
+		});
+		fs.stat(folder+".hg", function(err, stats) {
+			if(err !== null) {
+				error("mercurial", "fetching stats", "no error available", reject);
+			}
+			else {
+				data.update_time = stats.mtime;
+				checkReturn(data, resolve);
+			}
+		});
 	});
-	exec(cliCommand(folder, "hg log --limit 1 --template 'changeset: {rev}:{node|short}\nsummary: {desc}'"), function(err, stdout, stderr) {
-		if(err !== null) {
-			error("mercurial", "fetching log", stderr, cb);
-		}
-		else {
-			var changeset = stdout.match(/^changeset:\s+([^\n]+)$/m);
-			//date = stdout.match(/^date:\s+:([^\n]+)$/m);
-			var summary = stdout.match(/^summary:\s+([^\n]+)$/m);
-			data.revision = changeset[1];
-			data.comment = summary[1];
-			//data.update_time = date;
-			checkReturn(data, cb);
-		}
-	});
-	exec(cliCommand(folder, "hg branch"), function(err, stdout, stderr) {
-		if(err !== null) {
-			error("mercurial", "fetching branch", stderr, cb);
-		}
-		else {
-			data.branch = stdout;
-			checkReturn(data, cb);
-		}
-	});
-	fs.stat(folder+".hg", function(err, stats) {
-		if(err !== null) {
-			error("mercurial", "fetching stats", "no error available", cb);
-		}
-		else {
-			data.update_time = stats.mtime;
-			checkReturn(data, cb);
-		}
-	});
-}
+};

lib/identify.js

@@ -1,20 +1,20 @@
 var fs = require('fs');
-var eachSeries = require('async/eachSeries');
+var helper = require('./helper');
 
-module.exports = function(folder, cb) {
+var allTypes = ['git', 'hg', 'svn'];
+
+module.exports = async function(folder) {
   if (folder[folder.length - 1] !== '/')
     folder += '/';
 
-  eachSeries(['git', 'hg', 'svn'],
-  function(type, callback) {
-    fs.exists(folder+'.'+type, function(exists) {
-      if (exists)
-        return callback(type);
-      else
-        return callback();
-    });
-  },
-  function(final) {
-    return cb(final ? final : 'No versioning system found', folder);
-  });
+  const type = await helper.findAsync(allTypes.map(
+    async function (type) {
+      const exists = await new Promise((resolve) => {
+        fs.exists(folder + '.' + type, resolve);
+      });
+      return exists ? type : undefined;
+    }
+  ));
+
+  return { type, folder };
 };