cordova-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a...@apache.org
Subject [7/7] git commit: merging latest master
Date Sun, 14 Jul 2013 22:09:00 GMT
merging latest master


Project: http://git-wip-us.apache.org/repos/asf/cordova-plugman/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugman/commit/1dbf5ae8
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugman/tree/1dbf5ae8
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugman/diff/1dbf5ae8

Branch: refs/heads/plugman-registry
Commit: 1dbf5ae8c0965351a92b659d90b2f36c89887901
Parents: 5a22d2a b340813
Author: Anis Kadri <anis@apache.org>
Authored: Sun Jul 14 15:08:55 2013 -0700
Committer: Anis Kadri <anis@apache.org>
Committed: Sun Jul 14 15:08:55 2013 -0700

----------------------------------------------------------------------
 README.md                              |  2 +-
 main.js                                |  1 +
 package.json                           |  5 ++++-
 spec/install.spec.js                   | 18 +++++++++++++++++-
 spec/plugins/ChildBrowser/plugin.xml   |  6 +++---
 spec/plugins/VariablePlugin/plugin.xml |  2 ++
 spec/prepare.spec.js                   |  4 ----
 src/install.js                         | 28 ++++++++++++++++++++--------
 src/prepare.js                         |  7 +------
 src/uninstall.js                       |  8 +++++++-
 10 files changed, 56 insertions(+), 25 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/1dbf5ae8/main.js
----------------------------------------------------------------------
diff --cc main.js
index cd16733,4361aba..003ddbc
--- a/main.js
+++ b/main.js
@@@ -71,13 -66,12 +71,14 @@@ if (cli_opts.debug) 
  }
  plugman.on('warn', console.warn);
  plugman.on('error', console.error);
+ plugman.on('results', console.log);
 -
 -if (cli_opts.v) {
 +if (cli_opts.version) {
      console.log(package.name + ' version ' + package.version);
 +} 
 +else if (cli_opts.help) {
 +    console.log(plugman.help());
  }
 -else if (!cli_opts.platform || !cli_opts.project || !cli_opts.plugin) {
 +else if ((cli_opts.install || cli_opts.uninstall || cli_opts.argv.original.length == 0)
&& (!cli_opts.platform || !cli_opts.project || !cli_opts.plugin)) {
      console.log(plugman.help());
  }
  else if (cli_opts.uninstall) {

http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/1dbf5ae8/package.json
----------------------------------------------------------------------


Mime
View raw message