1 files changed, 85 insertions, 83 deletions

diff --git a/lib/utils/git.js b/lib/utils/git.js
index 72c8818..52b1096 100644
--- a/lib/utils/git.js
+++ b/lib/utils/git.js
@@ -1,127 +1,129 @@
-var  Q = require('q');
 var _ = require('lodash');
 var path = require('path');
 var crc = require('crc');
-var exec = Q.denodeify(require('child_process').exec);
 var URI = require('urijs');
-var pathUtil = require('./path');
 
+var pathUtil = require('./path');
+var Promise = require('./promise');
+var command = require('./command');
 var fs = require('./fs');
 
 var GIT_PREFIX = 'git+';
-var GIT_TMP = null;
-
-
-// Check if an url is a git dependency url
-function checkGitUrl(giturl) {
-    return (giturl.indexOf(GIT_PREFIX) === 0);
-}
 
-// Validates a SHA in hexadecimal
-function validateSha(str) {
-    return (/[0-9a-f]{40}/).test(str);
+function Git() {
+    this.tmpDir;
+    this.cloned = {};
 }
 
-// Parse and extract infos
-function parseGitUrl(giturl) {
-    var ref, uri, fileParts, filepath;
-
-    if (!checkGitUrl(giturl)) return null;
-    giturl = giturl.slice(GIT_PREFIX.length);
-
-    uri = new URI(giturl);
-    ref = uri.fragment() || 'master';
-    uri.fragment(null);
-
-    // Extract file inside the repo (after the .git)
-    fileParts =uri.path().split('.git');
-    filepath = fileParts.length > 1? fileParts.slice(1).join('.git') : '';
-    if (filepath[0] == '/') filepath = filepath.slice(1);
-
-    // Recreate pathname without the real filename
-    uri.path(_.first(fileParts)+'.git');
+// Return an unique ID for a combinaison host/ref
+Git.prototype.repoID = function(host, ref) {
+    return crc.crc32(host+'#'+(ref || '')).toString(16);
+};
 
-    return {
-        host: uri.toString(),
-        ref: ref || 'master',
-        filepath: filepath
-    };
-}
+// Allocate a temporary folder for cloning repos in it
+Git.prototype.allocateDir = function() {
+    var that = this;
 
-// Clone a git repo from a specific ref
-function cloneGitRepo(host, ref) {
-    var isBranch = false;
+    if (this.tmpDir) return Promise();
 
-    ref = ref || 'master';
-    if (!validateSha(ref)) isBranch = true;
+    return fs.tmpDir()
+    .then(function(dir) {
+        that.tmpDir = dir;
+    });
+};
 
-    return Q()
+// Clone a git repository if non existant
+Git.prototype.clone = function(host, ref) {
+    var that = this;
 
-    // Create temporary folder to store git repos
-    .then(function() {
-        if (GIT_TMP) return;
-        return fs.tmp.dir()
-            .then(function(_tmp) {
-                GIT_TMP = _tmp;
-            });
-    })
+    return this.allocateDir()
 
     // Return or clone the git repo
     .then(function() {
         // Unique ID for repo/ref combinaison
-        var repoId = crc.crc32(host+'#'+ref).toString(16);
+        var repoId = that.repoID(host, ref);
 
         // Absolute path to the folder
-        var repoPath = path.resolve(GIT_TMP, repoId);
-
-        return fs.exists(repoPath)
-            .then(function(doExists) {
-                if (doExists) return;
-
-                // Clone repo
-                return exec('git clone '+host+' '+repoPath)
-                .then(function() {
-                    return exec('git checkout '+ref, { cwd: repoPath });
-                });
-            })
-            .thenResolve(repoPath);
+        var repoPath = path.join(that.tmpDir, repoId);
+
+        if (that.cloned[repoId]) return repoPath;
+
+        // Clone repo
+        return command.exec('git clone '+host+' '+repoPath)
+
+        // Checkout reference if specified
+        .then(function() {
+            that.cloned[repoId] = true;
+
+            if (!ref) return;
+            return command.exec('git checkout '+ref, { cwd: repoPath });
+        })
+        .thenResolve(repoPath);
     });
-}
+};
 
 // Get file from a git repo
-function resolveFileFromGit(giturl) {
-    if (_.isString(giturl)) giturl = parseGitUrl(giturl);
-    if (!giturl) return Q(null);
+Git.prototype.resolve = function(giturl) {
+    // Path to a file in a git repo?
+    if (!Git.isUrl(giturl)) {
+        if (this.resolveRoot(giturl)) return Promise(giturl);
+        return Promise(null);
+    }
+    if (_.isString(giturl)) giturl = Git.parseUrl(giturl);
+    if (!giturl) return Promise(null);
 
     // Clone or get from cache
-    return cloneGitRepo(giturl.host, giturl.ref)
+    return this.clone(giturl.host, giturl.ref)
     .then(function(repo) {
-
-        // Resolve relative path
         return path.resolve(repo, giturl.filepath);
     });
-}
+};
 
 // Return root of git repo from a filepath
-function resolveGitRoot(filepath) {
+Git.prototype.resolveRoot = function(filepath) {
     var relativeToGit, repoId;
 
     // No git repo cloned, or file is not in a git repository
-    if (!GIT_TMP || !pathUtil.isInRoot(GIT_TMP, filepath)) return null;
+    if (!this.tmpDir || !pathUtil.isInRoot(this.tmpDir, filepath)) return null;
 
     // Extract first directory (is the repo id)
-    relativeToGit = path.relative(GIT_TMP, filepath);
+    relativeToGit = path.relative(this.tmpDir, filepath);
     repoId = _.first(relativeToGit.split(path.sep));
     if (!repoId) return;
 
     // Return an absolute file
-    return path.resolve(GIT_TMP, repoId);
-}
+    return path.resolve(this.tmpDir, repoId);
+};
+
+// Check if an url is a git dependency url
+Git.isUrl = function(giturl) {
+    return (giturl.indexOf(GIT_PREFIX) === 0);
+};
+
+// Parse and extract infos
+Git.parseUrl = function(giturl) {
+    var ref, uri, fileParts, filepath;
 
+    if (!Git.isUrl(giturl)) return null;
+    giturl = giturl.slice(GIT_PREFIX.length);
+
+    uri = new URI(giturl);
+    ref = uri.fragment() || null;
+    uri.fragment(null);
+
+    // Extract file inside the repo (after the .git)
+    fileParts = uri.path().split('.git');
+    filepath = fileParts.length > 1? fileParts.slice(1).join('.git') : '';
+    if (filepath[0] == '/') filepath = filepath.slice(1);
 
-module.exports = {
-    checkUrl: checkGitUrl,
-    parseUrl: parseGitUrl,
-    resolveFile: resolveFileFromGit,
-    resolveRoot: resolveGitRoot
+    // Recreate pathname without the real filename
+    uri.path(_.first(fileParts)+'.git');
+
+    return {
+        host: uri.toString(),
+        ref: ref,
+        filepath: filepath
+    };
 };
+
+module.exports = Git;