From 3dbdb541ed909477405dd474c853c3f50b8d21b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andre=CC=81=20Cruz?= <andremiguelcruz@msn.com>
Date: Sun, 14 Apr 2013 18:01:33 +0100
Subject: [PATCH] Some more refactoring.

---
 lib/resolve/resolvers/GitFsResolver.js     |  3 +--
 lib/resolve/resolvers/GitRemoteResolver.js |  7 -------
 lib/resolve/resolvers/GitResolver.js       | 21 ++++++++++++++-------
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/lib/resolve/resolvers/GitFsResolver.js b/lib/resolve/resolvers/GitFsResolver.js
index ee93f72f..a2f22458 100644
--- a/lib/resolve/resolvers/GitFsResolver.js
+++ b/lib/resolve/resolvers/GitFsResolver.js
@@ -26,8 +26,7 @@ GitFsResolver.prototype._resolveSelf = function () {
 
     return this._copy()
     .then(this._fetch.bind(this))
-    .then(this._findResolution.bind(this))
-    .then(this._checkout.bind(this));
+    .then(GitResolver.prototype._resolveSelf.bind(this));
 };
 
 // -----------------
diff --git a/lib/resolve/resolvers/GitRemoteResolver.js b/lib/resolve/resolvers/GitRemoteResolver.js
index 1d9339f1..a239703d 100644
--- a/lib/resolve/resolvers/GitRemoteResolver.js
+++ b/lib/resolve/resolvers/GitRemoteResolver.js
@@ -13,13 +13,6 @@ mout.object.mixIn(GitRemoteResolver, GitResolver);
 
 // -----------------
 
-GitRemoteResolver.prototype._resolveSelf = function () {
-    this._sourcePath = this._source;
-
-    return this._findResolution()
-    .then(this._checkout.bind(this));
-};
-
 GitRemoteResolver.prototype._checkout = function (resolution) {
     var dir = this._tempDir,
         branch;
diff --git a/lib/resolve/resolvers/GitResolver.js b/lib/resolve/resolvers/GitResolver.js
index 4ee632bb..5ad0bf83 100644
--- a/lib/resolve/resolvers/GitResolver.js
+++ b/lib/resolve/resolvers/GitResolver.js
@@ -18,6 +18,11 @@ util.inherits(GitResolver, Resolver);
 
 // -----------------
 
+GitResolver.prototype._resolveSelf = function () {
+    return this._findResolution()
+    .then(this._checkout.bind(this));
+};
+
 GitResolver.prototype.hasNew = function (oldTarget, oldResolution) {
     return this._findResolution()
     .then(function (resolution) {
@@ -38,9 +43,16 @@ GitResolver.prototype.hasNew = function (oldTarget, oldResolution) {
     });
 };
 
+// -----------------
+
+// Abstract functions that should be implemented by concrete git resolvers
+GitResolver.prototype._checkout = function () {};
+GitResolver.fetchRefs = function (source) {};
+
+// -----------------
+
 GitResolver.prototype._findResolution = function () {
-    var promise,
-        branches,
+    var branches,
         target,
         self = this.constructor;
 
@@ -89,11 +101,6 @@ GitResolver.prototype._findResolution = function () {
 
 // ------------------------------
 
-// Abstract function, should be implemented by concrete git resolvers
-GitResolver.fetchRefs = function (source) {};
-
-// ------------------------------
-
 GitResolver.fetchVersions = function (source) {
     if (this._versions && this._versions[source]) {
         return Q.resolve(this._versions[source]);