CB-10518 Correct log level and error messages for some cordova errors This closes #383
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/b7920505 Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/b7920505 Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/b7920505 Branch: refs/heads/common-1.1.x Commit: b7920505e56e4371b868bc5f0a3f852d4249fe31 Parents: 87d8e17 Author: Vladimir Kotikov <v-vlk...@microsoft.com> Authored: Tue Feb 16 16:20:31 2016 +0300 Committer: Vladimir Kotikov <v-vlk...@microsoft.com> Committed: Wed Feb 17 11:54:49 2016 +0300 ---------------------------------------------------------------------- cordova-lib/src/cordova/compile.js | 5 ----- cordova-lib/src/cordova/create.js | 7 +++---- cordova-lib/src/cordova/run.js | 6 ------ cordova-lib/src/cordova/targets.js | 5 +++-- cordova-lib/src/hooks/HooksRunner.js | 4 ++-- cordova-lib/src/plugman/browserify.js | 8 ++++---- cordova-lib/src/util/unpack.js | 6 +++--- 7 files changed, 15 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/b7920505/cordova-lib/src/cordova/compile.js ---------------------------------------------------------------------- diff --git a/cordova-lib/src/cordova/compile.js b/cordova-lib/src/cordova/compile.js index 7bdabb4..5834925 100644 --- a/cordova-lib/src/cordova/compile.js +++ b/cordova-lib/src/cordova/compile.js @@ -19,8 +19,6 @@ var cordova_util = require('./util'), HooksRunner = require('../hooks/HooksRunner'), - events = require('cordova-common').events, - Q = require('q'), promiseUtil = require('../util/promise-util'), platform_lib = require('../platforms/platforms'); @@ -39,8 +37,5 @@ module.exports = function compile(options) { }); }).then(function() { return hooksRunner.fire('after_compile', options); - }, function(error) { - events.emit('log', 'ERROR building one of the platforms: ' + error + '\nYou may not have the required environment or OS to build this project'); - return Q.reject(error); }); }; http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/b7920505/cordova-lib/src/cordova/create.js ---------------------------------------------------------------------- diff --git a/cordova-lib/src/cordova/create.js b/cordova-lib/src/cordova/create.js index 3ad96aa..5d8cef7 100644 --- a/cordova-lib/src/cordova/create.js +++ b/cordova-lib/src/cordova/create.js @@ -191,8 +191,7 @@ function create(dir, optionalId, optionalName, cfg) { return remoteLoad.gitClone(gitURL, branch).fail( function(err) { - events.emit('verbose', err); - return Q.reject('Failed to retrieve '+ cfg.lib.www.url + ' using git.'); + return Q.reject(new CordovaError('Failed to retrieve '+ cfg.lib.www.url + ' using git: ' + err.message)); } ); } else if (isNPM) { @@ -210,8 +209,8 @@ function create(dir, optionalId, optionalName, cfg) { return remoteLoad.npmFetch(packageName, packageVersion).fail( function(err) { - events.emit('verbose', err); - return Q.reject('Failed to retrieve '+ cfg.lib.www.url + ' using npm.'); + events.emit('warn', err.message); + return Q.reject(new CordovaError('Failed to retrieve '+ cfg.lib.www.url + ' using npm: ' + err.message)); } ); } else { http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/b7920505/cordova-lib/src/cordova/run.js ---------------------------------------------------------------------- diff --git a/cordova-lib/src/cordova/run.js b/cordova-lib/src/cordova/run.js index 6c6e10d..fcfc9c6 100644 --- a/cordova-lib/src/cordova/run.js +++ b/cordova-lib/src/cordova/run.js @@ -19,7 +19,6 @@ var cordova_util = require('./util'), HooksRunner = require('../hooks/HooksRunner'), - events = require('cordova-common').events, Q = require('q'), platform_lib = require('../platforms/platforms'); @@ -43,10 +42,5 @@ module.exports = function run(options) { })); }).then(function() { return hooksRunner.fire('after_run', options); - }, function(error) { - events.emit('log', 'ERROR running one or more of the platforms: ' + error + '\nYou may not have the required environment or OS to run this project'); - - // CB-10567 bubble up `run` error, so the caller still could get rejected promise - return Q.reject(error); }); }; http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/b7920505/cordova-lib/src/cordova/targets.js ---------------------------------------------------------------------- diff --git a/cordova-lib/src/cordova/targets.js b/cordova-lib/src/cordova/targets.js index f7e1d73..0ba8d58 100644 --- a/cordova-lib/src/cordova/targets.js +++ b/cordova-lib/src/cordova/targets.js @@ -25,9 +25,10 @@ var cordova_util = require('./util'), function handleError(error) { if (error.code === 'ENOENT') { - events.emit('log', 'Platform does not support ' + this.script); + events.emit('warn', 'Platform does not support ' + this.script); } else { - events.emit('log', 'An unexpected error has occured'); + events.emit('warn', 'An unexpected error has occured while running ' + this.script + + ' with code ' + error.code + ': ' + error); } } http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/b7920505/cordova-lib/src/hooks/HooksRunner.js ---------------------------------------------------------------------- diff --git a/cordova-lib/src/hooks/HooksRunner.js b/cordova-lib/src/hooks/HooksRunner.js index eea1a59..299b775 100644 --- a/cordova-lib/src/hooks/HooksRunner.js +++ b/cordova-lib/src/hooks/HooksRunner.js @@ -85,7 +85,7 @@ HooksRunner.prototype.prepareOptions = function(opts) { try { opts.cordova.version = opts.cordova.version || require('../../package').version; } catch(ex) { - events.emit('error', 'HooksRunner could not load package.json: ' + ex.message); + events.emit('warn', 'HooksRunner could not load package.json: ' + ex.message); } return opts; @@ -263,4 +263,4 @@ function isHookDisabled(opts, hook) { } return false; } - + http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/b7920505/cordova-lib/src/plugman/browserify.js ---------------------------------------------------------------------- diff --git a/cordova-lib/src/plugman/browserify.js b/cordova-lib/src/plugman/browserify.js index 3d2b278..fd7d832 100644 --- a/cordova-lib/src/plugman/browserify.js +++ b/cordova-lib/src/plugman/browserify.js @@ -54,8 +54,8 @@ function generateFinalBundle(platform, libraryRelease, outReleaseFile, commitId, }); outReleaseFileStream.on('error', function(err) { - events.emit('log', 'error while generating cordova.js'); - deferred.reject(); + events.emit('warn', 'error while generating cordova.js'); + deferred.reject(err); }); return deferred.promise; } @@ -74,8 +74,8 @@ function getPlatformVersion(cId, project_dir) { var versionPath = path.join(project_dir, '/cordova/version'); childProcess.exec('"' + versionPath + '"', function(err, stdout, stderr) { if (err) { - events.emit('log', 'Error running platform version script'); - events.emit('log', err); + err.message = 'Failed to get platform version (will use \'N/A\' instead).\n' + err.message; + events.emit('warn', err); deferred.resolve('N/A'); } else { deferred.resolve(stdout.trim()); http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/b7920505/cordova-lib/src/util/unpack.js ---------------------------------------------------------------------- diff --git a/cordova-lib/src/util/unpack.js b/cordova-lib/src/util/unpack.js index 637f10b..f0ec451 100644 --- a/cordova-lib/src/util/unpack.js +++ b/cordova-lib/src/util/unpack.js @@ -35,17 +35,17 @@ function unpackTgz(package_tgz, unpackTarget) { fs.createReadStream(package_tgz) .on('error', function (err) { - events.emit('verbose', 'Unable to open tarball ' + package_tgz + ': ' + err); + events.emit('warn', 'Unable to open tarball ' + package_tgz + ': ' + err); reject(err); }) .pipe(zlib.createUnzip()) .on('error', function (err) { - events.emit('verbose', 'Error during unzip for ' + package_tgz + ': ' + err); + events.emit('warn', 'Error during unzip for ' + package_tgz + ': ' + err); reject(err); }) .pipe(tar.Extract(extractOpts)) .on('error', function(err) { - events.emit('verbose', 'Error during untar for ' + package_tgz + ': ' + err); + events.emit('warn', 'Error during untar for ' + package_tgz + ': ' + err); reject(err); }) .on('end', resolve); --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org For additional commands, e-mail: commits-h...@cordova.apache.org