fix(migration):

A promise is not properly identified and returning an empty resolve ends up in
db-migrate hanging up forever.

Fixes #343

Author: wzrdtales

lib/skeleton.js

@@ -57,35 +57,41 @@ var Skeleton = Class.extend({
     var cb_executed = false;
 
     return new Promise(function(resolve, reject) {
-      var r = function( err ) {
-        if ( cb_executed === false ) {
+      var migration,
+        r = function( err ) {
+          if ( cb_executed === false ) {
 
-          cb_executed = true;
+            cb_executed = true;
 
-          if( err )
-            reject( err );
-          else
-            resolve();
-        }
-      };
+            if( err )
+              reject( err );
+            else
+              resolve();
+          }
+        };
 
       params[ params.length++ ] = r;
 
-      Promise.resolve(require(this.path).up.apply(this, params))
-      .then(function( Promise ) {
-        if( Promise !== undefined && cb_executed === false ) {
+      migration = require(this.path).up.apply(this, params);
+
+      if( migration instanceof Promise ) {
 
-          cb_executed = true;
-          resolve();
-        }
-      }).catch(function(err) {
+        migration
+        .then(function() {
+          if( cb_executed === false ) {
 
-        if ( cb_executed === false ) {
+            cb_executed = true;
+            resolve();
+          }
+        }).catch(function(err) {
+
+          if ( cb_executed === false ) {
 
-          cb_executed = true;
-          reject( err );
-        }
-      });
+            cb_executed = true;
+            reject( err );
+          }
+        });
+      }
     }.bind(this));
   },
 
@@ -94,34 +100,40 @@ var Skeleton = Class.extend({
     var cb_executed = false;
 
     return new Promise(function(resolve, reject) {
-      var r = function( err ) {
-        if ( cb_executed === false ) {
+      var migration,
+          r = function( err ) {
+            if ( cb_executed === false ) {
 
-          cb_executed = true;
+              cb_executed = true;
+
+              if( err )
+                reject( err );
+              else
+                resolve();
+            }
+          };
 
-          if( err )
-            reject( err );
-          else
-            resolve();
-        }
-      };
       params[ params.length++ ] = r;
+      migration = require(this.path).down.apply(this, params);
 
-      Promise.resolve(require(this.path).down.apply(this, params))
-      .then(function( Promise ) {
-        if( Promise !== undefined && cb_executed === false ) {
+      if( migration instanceof Promise ) {
 
-          cb_executed = true;
-          resolve();
-        }
-      }).catch(function(err) {
+        migration
+        .then(function( Promise ) {
+          if( Promise !== undefined && cb_executed === false ) {
 
-        if ( cb_executed === false ) {
+            cb_executed = true;
+            resolve();
+          }
+        }).catch(function(err) {
+
+          if ( cb_executed === false ) {
 
-          cb_executed = true;
-          reject( err );
-        }
-      });
+            cb_executed = true;
+            reject( err );
+          }
+        });
+      }
     }.bind(this));
   },