From be7d72f74e69d6317a69456b1ab5f93bfcbe257a Mon Sep 17 00:00:00 2001
From: Tamir Duberstein <tamird@gmail.com>
Date: Tue, 6 Sep 2016 12:08:47 -0400
Subject: [PATCH 1/2] whitespace

---
 github.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/github.js b/github.js
index decab50..037fbd9 100644
--- a/github.js
+++ b/github.js
@@ -420,14 +420,14 @@ GithubLocation.prototype = {
             + (showAuthCommand ? '\nTo resolve use %jspm registry config github% to configure the credentials, or update them in your ~/.netrc file.' : ''));
         apiWarned = true;
       }
-      
+
       if (res.headers.status.match(/^401/))
         return apiFailWarn('lack of authorization', true);
       if (res.headers.status.match(/^406/))
         return apiFailWarn('insufficient permissions. Ensure you have public_repo access.');
       if (res.headers['x-ratelimit-remaining'] == '0') {
         if (self.auth)
-          return apiFailWarn('the rate limit being reached, which will be reset in `' + 
+          return apiFailWarn('the rate limit being reached, which will be reset in `' +
               Math.round((res.headers['x-ratelimit-reset'] * 1000 - new Date(res.headers.date).getTime()) / 60000) + ' minutes`.');
         return apiFailWarn('the rate limit being reached.', true);
       }
@@ -456,7 +456,7 @@ GithubLocation.prototype = {
 
     var self = this;
 
-    if ((packageConfig.dependencies || packageConfig.peerDependencies || packageConfig.optionalDependencies) && 
+    if ((packageConfig.dependencies || packageConfig.peerDependencies || packageConfig.optionalDependencies) &&
         !packageConfig.registry && (!packageConfig.jspm || !(packageConfig.jspm.dependencies || packageConfig.jspm.peerDependencies || packageConfig.jspm.optionalDependencies))) {
       var hasDependencies = false;
       for (var p in packageConfig.dependencies)

From a67325a1cc8a1af70b4de0ba2c29fc0356c2915c Mon Sep 17 00:00:00 2001
From: Tamir Duberstein <tamird@gmail.com>
Date: Tue, 6 Sep 2016 11:03:34 -0400
Subject: [PATCH 2/2] Use the GitHub API for all operations

Fixes #99.
---
 exec-git.js  | 66 ----------------------------------------
 github.js    | 86 +++++++++++++++++++---------------------------------
 test/pool.js | 35 ---------------------
 3 files changed, 32 insertions(+), 155 deletions(-)
 delete mode 100644 exec-git.js
 delete mode 100644 test/pool.js

diff --git a/exec-git.js b/exec-git.js
deleted file mode 100644
index 1bd6edf..0000000
--- a/exec-git.js
+++ /dev/null
@@ -1,66 +0,0 @@
-var Promise = require('bluebird').Promise;
-var exec = require('child_process').exec;
-var os = require('os');
-
-function Pool(count) {
-  this.count = count;
-  this.queue = [];
-  this.promises = new Array(count);
-}
-
-/* Run the function immediately. */
-function run(pool, idx, executionFunction) {
-  var p = Promise.resolve()
-    .then(executionFunction)
-    .then(function() {
-      delete pool.promises[idx];
-      var next = pool.queue.pop();
-      if (next)
-        pool.execute(next);
-    });
-  pool.promises[idx] = p;
-  return p;
-}
-
-/* Defer function to run once all running and queued functions have run. */
-function enqueue(pool, executeFunction) {
-  return new Promise(function(resolve) {
-    pool.queue.push(function() {
-      return Promise.resolve().then(executeFunction).then(resolve);
-    });
-  });
-}
-
-/* Take a function to execute within pool, and return promise delivering the functions
- * result immediately once it is run. */
-Pool.prototype.execute = function(executionFunction) {
-  var idx = -1;
-
-  for (var i=0; i<this.count; i++)
-    if (!this.promises[i])
-      idx = i;
-
-  if (idx !== -1)
-    return run(this, idx, executionFunction);
-  else
-    return enqueue(this, executionFunction);
-};
-
-if (process.platform === 'win32') {
-  var gitPool = new Pool(Math.min(os.cpus().length, 2));
-  module.exports = function(command, execOpt, callback) {
-    return gitPool.execute(function() {
-      return new Promise(function(resolve){
-        exec('git ' + command, execOpt, function(err, stdout, stderr){
-          callback(err, stdout, stderr);
-          resolve();
-        });
-      });
-    });
-  };
-}
-else {
-  module.exports = function(command, execOpt, callback) {
-    exec('git ' + command, execOpt, callback);
-  };
-}
diff --git a/github.js b/github.js
index 037fbd9..625ae28 100644
--- a/github.js
+++ b/github.js
@@ -28,8 +28,6 @@ try {
 }
 catch(e) {}
 
-var execGit = require('./exec-git');
-
 function createRemoteStrings(auth, hostname) {
   var authString = auth.username ? (encodeURIComponent(auth.username) + ':' + encodeURIComponent(auth.password) + '@') : '';
   hostname = hostname || 'github.com';
@@ -112,32 +110,15 @@ var GithubLocation = function(options, ui) {
 
   this.ui = ui;
 
-  this.execOpt = {
-    cwd: options.tmpDir,
-    timeout: options.timeout * 1000,
-    killSignal: 'SIGKILL',
-    maxBuffer: this.max_repo_size || 2 * 1024 * 1024,
-    env: extend({}, process.env)
-  };
-
   this.defaultRequestOptions = {
     strictSSL: 'strictSSL' in options ? options.strictSSL : true
   };
 
-  if (!this.defaultRequestOptions.strictSSL) {
-    this.execOpt.env.GIT_SSL_NO_VERIFY = '1'
-  }
-
-  var self = this, envMap = {
-    ca: 'GIT_SSL_CAINFO',
-    cert: 'GIT_SSL_CERT',
-    key: 'GIT_SSL_KEY'
-  };
+  var self = this;
 
   ['ca', 'cert', 'key'].forEach(function(key) {
     if (key in options) {
       var path = expandTilde(options[key]);
-      self.execOpt.env[envMap[key]] = path;
       self.defaultRequestOptions[key] = fs.readFileSync(path, 'ascii');
     }
   });
@@ -338,44 +319,40 @@ GithubLocation.prototype = {
   // { versions: { versionhash } }
   // { notfound: true }
   lookup: function(repo) {
-    var execOpt = this.execOpt;
-    var remoteString = this.remoteString;
-    return new Promise(function(resolve, reject) {
-      execGit('ls-remote ' + remoteString.replace(/(['"()])/g, '\\\$1') + repo + '.git refs/tags/* refs/heads/*', execOpt, function(err, stdout, stderr) {
-        if (err) {
-          if (err.toString().indexOf('not found') == -1) {
-            var error = new Error(stderr);
-            error.hideStack = true;
-            error.retriable = true;
-            reject(error);
-          }
-          else
-            resolve({ notfound: true });
-        }
+    var remoteString = this.apiRemoteString;
+    var authSuffix = this.authSuffix;
+
+    var promises = ['heads', 'tags'].map(function(scope) {
+      return asp(request)(extend({
+        uri: remoteString + 'repos/' + repo + '/git/refs/' + scope + authSuffix,
+        headers: {
+          'User-Agent': 'jspm',
+          'Accept': 'application/vnd.github.v3.raw'
+        },
+      }, this.defaultRequestOptions
+      ));
+    });
 
-        versions = {};
-        var refs = stdout.split('\n');
-        for (var i = 0; i < refs.length; i++) {
-          if (!refs[i])
-            continue;
+    return Promise.all(promises).then(function(values) {
+      var versions = {};
 
-          var hash = refs[i].substr(0, refs[i].indexOf('\t'));
-          var refName = refs[i].substr(hash.length + 1);
+      values.forEach(function(res) {
+        JSON.parse(res.body).forEach(function(entry) {
+          var hash = entry.object.sha;
+          var refName = entry.ref;
           var version;
           var versionObj = { hash: hash, meta: {} };
 
-          if (refName.substr(0, 11) == 'refs/heads/') {
-            version = refName.substr(11);
+          if (refName.startsWith('refs/heads/')) {
+            version = refName.substr('refs/heads/'.length);
             versionObj.stable = false;
-          }
-
-          else if (refName.substr(0, 10) == 'refs/tags/') {
-            if (refName.substr(refName.length - 3, 3) == '^{}')
-              version = refName.substr(10, refName.length - 13);
+          } else if (refName.startsWith('refs/tags/')) {
+            if (refName.endsWith('^{}'))
+              version = refName.substr('refs/tags/'.length, refName.length - 13); // TODO: what is this "13"?
             else
-              version = refName.substr(10);
+              version = refName.substr('refs/tags/'.length);
 
-            if (version.substr(0, 1) == 'v' && semver.valid(version.substr(1))) {
+            if (version.startsWith('v') && semver.valid(version.substr(1))) {
               version = version.substr(1);
               // note when we remove a "v" which versions we need to add it back to
               // to work out the tag version again
@@ -384,10 +361,12 @@ GithubLocation.prototype = {
           }
 
           versions[version] = versionObj;
-        }
+        })
+      })
 
-        resolve({ versions: versions });
-      });
+      return { versions: versions };
+    }).catch(function(reason) {
+      return { notfound: true };
     });
   },
 
@@ -534,7 +513,6 @@ GithubLocation.prototype = {
     if (meta.vPrefix)
       version = 'v' + version;
 
-    var execOpt = this.execOpt;
     var max_repo_size = this.max_repo_size;
     var remoteString = this.remoteString;
     var authSuffix = this.authSuffix;
diff --git a/test/pool.js b/test/pool.js
deleted file mode 100644
index e5aa3f5..0000000
--- a/test/pool.js
+++ /dev/null
@@ -1,35 +0,0 @@
-var Pool = require('../pool');
-var exec = require('child_process').exec;
-
-test('Controls concurrency', function(done) {
-  var pool = new Pool(5);
-
-  var count = 0;
-  var counts = [];
-  function f() {
-    return new Promise(function(resolve) {
-      count++;
-      counts.push(count);
-      exec('sleep 0.01', function() {
-        count--;
-        resolve();
-      });
-    });
-  }
-  var calls = [];
-  for (var i=0; i<100; i++)
-    calls[i] = pool.execute(f);
-
-  Promise.all(calls)
-  .then(function() {
-    var i;
-    // burn in, number running == number executed
-    for (i=0; i<5; i++)
-      assert.equal(counts[i],i + 1);
-    // maxed out, number running == pool max
-    for (i=4; i<100; i++)
-      assert.equal(counts[i], 5);
-  })
-  .then(done)
-  .catch(done);
-});