Use promises for suggestions

package.json

@@ -25,7 +25,8 @@
     "redis": "~0.10.1",
     "camp": "~13.11.9",
     "semver": "~2.3.0",
-    "bower": "~1.3.11"
+    "bower": "~1.3.11",
+    "promise": "~6.1.0"
   },
   "devDependencies": {
     "ass": "~0.0.6",

suggest.js

@@ -1,5 +1,6 @@
 var nodeUrl = require('url');
 var request = require('request');
+var Promise = require('promise');
 var serverSecrets;
 try {
   // Everything that cannot be checked in but is useful server-side
@@ -24,23 +25,26 @@ var suggest = function(data, end, ask) {
   }
 };
 
+// url: string
+// cb: function({badges})
 var github = function(url, cb) {
-  var badges = [];
   var userRepo = url.pathname.slice(1).split('/');
   var user = userRepo[0];
   var repo = userRepo[1];
-  githubLicense(user, repo, function(err, badge) {
+  Promise.all([
-    if (err == null) {
+    githubLicense(user, repo),
-      badges.push(badge);
+  ]).then(function(badges) {
-    }
     cb({badges:badges});
+  }).catch(function(err) {
+    cb({badges:badges, err:err});
   });
 };
 
 // user: eg, qubyte
 // repo: eg, rubidium
-// end: function(err, {link, badge})
+// returns a promise of {link, badge, name}
-var githubLicense = function(user, repo, end) {
+var githubLicense = function(user, repo) {
+  return new Promise(function(resolve, reject) {
     // Step 1: Get the repo's default branch.
     var apiUrl = 'https://api.github.com/repos/' + user + '/' + repo + '';
     // Using our OAuth App secret grants us 5000 req/hour
@@ -53,9 +57,9 @@ var githubLicense = function(user, repo, end) {
     // A special User-Agent is required:
     // http://developer.github.com/v3/#user-agent-required
     request(apiUrl, { headers: { 'User-Agent': 'Shields.io' } }, function(err, res, buffer) {
-    if (err != null) { end(err); return; }
+      if (err != null) { reject(err); return; }
       try {
-      if ((+res.headers['x-ratelimit-remaining']) === 0) { end(Error('rate limited')); return; }
+        if ((+res.headers['x-ratelimit-remaining']) === 0) { reject(Error('rate limited')); return; }
         var data = JSON.parse(buffer);
         var defaultBranch = data.default_branch;
         // Step 2: Get the SHA-1 hash of the branch tip.
@@ -65,9 +69,9 @@ var githubLicense = function(user, repo, end) {
             + '&client_secret=' + serverSecrets.gh_client_secret;
         }
         request(apiUrl, { headers: { 'User-Agent': 'Shields.io' } }, function(err, res, buffer) {
-        if (err != null) { end(err); return; }
+          if (err != null) { reject(err); return; }
           try {
-          if ((+res.headers['x-ratelimit-remaining']) === 0) { end(Error('rate limited')); return; }
+            if ((+res.headers['x-ratelimit-remaining']) === 0) { reject(Error('rate limited')); return; }
             var data = JSON.parse(buffer);
             var branchTip = data.commit.sha;
             // Step 3: Get the tree at the commit.
@@ -77,9 +81,9 @@ var githubLicense = function(user, repo, end) {
                 + '&client_secret=' + serverSecrets.gh_client_secret;
             }
             request(apiUrl, { headers: { 'User-Agent': 'Shields.io' } }, function(err, res, buffer) {
-            if (err != null) { end(err); return; }
+              if (err != null) { reject(err); return; }
               try {
-              if ((+res.headers['x-ratelimit-remaining']) === 0) { end(Error('rate limited')); return; }
+                if ((+res.headers['x-ratelimit-remaining']) === 0) { reject(Error('rate limited')); return; }
                 var data = JSON.parse(buffer);
                 var treeArray = data.tree;
                 var licenseBlob;
@@ -96,7 +100,7 @@ var githubLicense = function(user, repo, end) {
                   }
                 }
                 // Could not find license file
-              if (!licenseBlob) { end(Error('no license file')); return; }
+                if (!licenseBlob) { reject(Error('no license file')); return; }
 
                 // Step 4: Get the license blob.
                 var apiUrl = 'https://api.github.com/repos/' + user + '/' + repo + '/git/blobs/' + licenseBlob;
@@ -111,13 +115,13 @@ var githubLicense = function(user, repo, end) {
                 // https://developer.github.com/v3/media/
                 request(apiUrl, { headers: { 'User-Agent': 'Shields.io', 'Accept': 'appplication/vnd.github.raw' } },
                 function(err, res, buffer) {
-                if (err != null) { end(err); return; }
+                  if (err != null) { reject(err); return; }
                   try {
-                  if ((+res.headers['x-ratelimit-remaining']) === 0) { end(Error('rate limited')); return; }
+                    if ((+res.headers['x-ratelimit-remaining']) === 0) { reject(Error('rate limited')); return; }
                     var license = guessLicense(buffer);
                     if (license) {
                       badgeData.text[1] = license;
-                    end(null, {
+                      resolve({
                         link: link,
                         badge: shieldsBadge(badgeData),
                         name: 'GitHub license'
@@ -125,16 +129,17 @@ var githubLicense = function(user, repo, end) {
                       return;
                     } else {
                       // Not a recognized license
-                    end(Error('unknown license'));
+                      reject(Error('unknown license'));
                       return;
                     }
-                } catch(e) { end(e); return; }
+                  } catch(e) { reject(e); return; }
                 });
-            } catch(e) { end(e); return; }
+              } catch(e) { reject(e); return; }
             });
-        } catch(e) { end(e); return; }
+          } catch(e) { reject(e); return; }
+        });
+      } catch(e) { reject(e); return; }
     });
-    } catch(e) { end(e); return; }
   });
 };