Promise return values tweaked

Author: chris-steele

lib/commands/install.js

@@ -565,7 +565,7 @@ module.exports = function (dependencies) {
                 if (installErrored.length == 1) {
                     var error = _.clone(Errors.ERROR_INSTALL_ERROR);
 
-                    if (p._installError) error.msg = p._installError;
+                    if (p._installError) error.message = p._installError;
 
                     return Q.reject(error);
                 }
@@ -592,7 +592,7 @@ module.exports = function (dependencies) {
             installErrored.forEach(function(p) {
                 var error = _.clone(Errors.ERROR_INSTALL_ERROR);
 
-                if (p._installError) error.msg = p._installError;
+                if (p._installError) error.message = p._installError;
 
                 report.push({
                     name:p.packageName,

lib/commands/uninstall.js

@@ -19,7 +19,7 @@ module.exports = {
         var project = new Project(Constants.DefaultProjectManifestPath, Constants.DefaultProjectFrameworkPath);
 
         if(!project.isProjectContainsManifestFile()) {
-            return Q.reject({error:Errors.ERROR_COURSE_DIR});
+            return Q.reject(Errors.ERROR_COURSE_DIR);
         }
 
         var plugin = Plugin.parse(pluginName);
@@ -58,14 +58,14 @@ module.exports = {
             if (removePath) {
                 rimraf(removePath, function() {
                     if (fs.existsSync(removePath)) {
-                        deferred.reject({error:Errors.ERROR_UNINSTALL});
+                        deferred.reject(Errors.ERROR_UNINSTALL);
                     } else {
                         project.remove(plugin);
                         deferred.resolve(pluginName);
                     }
                 });
             } else {
-                deferred.reject({error:Errors.ERROR_NOT_FOUND});
+                deferred.reject(Errors.ERROR_NOT_FOUND);
             }
         });
 

lib/commands/update.js

@@ -63,7 +63,7 @@ module.exports = function() {
             installedPlugins = {};
 
             if (!project.isProjectContainsManifestFile()) {
-                return Q.reject({error:Errors.ERROR_COURSE_DIR});
+                return Q.reject(Errors.ERROR_COURSE_DIR);
             }
 
             args = pluginName ? [pluginName] : ['all'];
@@ -251,7 +251,7 @@ module.exports = function() {
             if (isInteractive) {
                 return Q.reject({message:'No valid targets specified (please check spelling and case).'});
             }
-            return Q.reject({error:Errors.ERROR_NOTHING_TO_UPDATE});
+            return Q.reject(Errors.ERROR_NOTHING_TO_UPDATE);
         } else {
             return Q.resolve();
         }
@@ -473,7 +473,7 @@ module.exports = function() {
             return p.packageName;
         });
 
-        return Q.reject({error:Errors.ERROR_UPDATE_INCOMPATIBLE, context:names});
+        return Q.reject(Errors.ERROR_UPDATE_INCOMPATIBLE);
     }
 
     function promptToUpdateIncompatible() {
@@ -651,7 +651,7 @@ module.exports = function() {
                 if (errored.length == 1) {
                     var error = _.clone(Errors.ERROR_UPDATE_ERROR);
 
-                    if (p._updateError) error.msg = p._updateError;
+                    if (p._updateError) error.message = p._updateError;
 
                     return Q.reject(error);
                 }
@@ -686,7 +686,7 @@ module.exports = function() {
             errored.forEach(function(p) {
                 var error = _.clone(Errors.ERROR_UPDATE_ERROR);
 
-                if (p._updateError) error.msg = p._updateError;
+                if (p._updateError) error.message = p._updateError;
 
                 report.push({
                     name: p.packageName,

lib/errors.js

@@ -1,58 +1,58 @@
 module.exports = {
     ERROR_COURSE_DIR: {
       code: 0,
-      msg: "Commands must be run in an Adapt project directory"
+      message: "Commands must be run in an Adapt project directory"
     },
     ERROR_INCOMPATIBLE_VALID_REQUEST: {
       code: 1,
-      msg: "No compatible version exists (requested version is valid)"
+      message: "No compatible version exists (requested version is valid)"
     },
     ERROR_INCOMPATIBLE_BAD_REQUEST: {
       code: 2,
-      msg: "No compatible version exists (requested version is invalid)"
+      message: "No compatible version exists (requested version is invalid)"
     },
     ERROR_INCOMPATIBLE: {
       code: 3,
-      msg: "No compatible version exists"
+      message: "No compatible version exists"
     },
     ERROR_COMPATIBLE_INC_REQUEST: {
       code: 4,
-      msg: "Incompatible version requested (compatible version exists)"
+      message: "Incompatible version requested (compatible version exists)"
     },
     ERROR_COMPATIBLE_BAD_REQUEST: {
       code: 5,
-      msg: "Requested version is invalid"
+      message: "Requested version is invalid"
     },
     ERROR_UNINSTALL: {
       code: 6,
-      msg: "The plugin could not be uninstalled"
+      message: "The plugin could not be uninstalled"
     },
     ERROR_NOT_FOUND: {
       code: 7,
-      msg: "The plugin could not be found"
+      message: "The plugin could not be found"
     },
     ERROR_NOTHING_TO_UPDATE: {
       code: 8,
-      msg: "Could not resolve any plugins to update"
+      message: "Could not resolve any plugins to update"
     },
     ERROR_UPDATE_INCOMPATIBLE: {
       code: 9,
-      msg: "Incompatible update requested"
+      message: "Incompatible update requested"
     },
     ERROR_INSTALL_ERROR: {
       code: 10,
-      msg: "Unknown installation error"
+      message: "Unknown installation error"
     },
     ERROR_UPDATE_ERROR: {
       code: 11,
-      msg: "Unknown update error"
+      message: "Unknown update error"
     },
     ERROR_NO_RELEASES: {
       code: 12,
-      msg: "No published releases"
+      message: "No published releases"
     },
     ERROR_NO_UPDATE: {
       code: 13,
-      msg: "No update available"
+      message: "No update available"
     }
 }