You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by an...@apache.org on 2013/07/15 00:08:57 UTC
[4/7] git commit: 0.9.4. Added an always-logged "results" event that
is emitted when plugins are installed + uninstalled.
0.9.4. Added an always-logged "results" event that is emitted when plugins are installed + uninstalled.
Project: http://git-wip-us.apache.org/repos/asf/cordova-plugman/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugman/commit/55226483
Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugman/tree/55226483
Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugman/diff/55226483
Branch: refs/heads/plugman-registry
Commit: 5522648327934de398fb52e15b958be09a7a6e37
Parents: a3f704e
Author: Fil Maj <ma...@gmail.com>
Authored: Fri Jul 12 08:59:33 2013 -0700
Committer: Fil Maj <ma...@gmail.com>
Committed: Fri Jul 12 08:59:33 2013 -0700
----------------------------------------------------------------------
main.js | 1 +
package.json | 2 +-
spec/install.spec.js | 2 +-
src/install.js | 4 ++--
src/uninstall.js | 3 ++-
5 files changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/55226483/main.js
----------------------------------------------------------------------
diff --git a/main.js b/main.js
index 262c264..4361aba 100755
--- a/main.js
+++ b/main.js
@@ -66,6 +66,7 @@ if (cli_opts.debug) {
}
plugman.on('warn', console.warn);
plugman.on('error', console.error);
+plugman.on('results', console.log);
if (cli_opts.v) {
console.log(package.name + ' version ' + package.version);
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/55226483/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index 50f99ee..dffb36c 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
"author": "Andrew Lunny <al...@gmail.com>",
"name": "plugman",
"description": "install/uninstall Cordova plugins",
- "version": "0.9.3",
+ "version": "0.9.4",
"repository": {
"type": "git",
"url": "git://git-wip-us.apache.org/repos/asf/cordova-plugman.git"
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/55226483/spec/install.spec.js
----------------------------------------------------------------------
diff --git a/spec/install.spec.js b/spec/install.spec.js
index fd84e0e..770b0f9 100644
--- a/spec/install.spec.js
+++ b/spec/install.spec.js
@@ -58,7 +58,7 @@ describe('install', function() {
dependent_plugins:{}
});
install('android', temp, dummyplugin, plugins_dir, {});
- expect(spy).toHaveBeenCalledWith('log', 'Plugin "'+dummy_id+'" already installed, \'sall good.');
+ expect(spy).toHaveBeenCalledWith('results', 'Plugin "'+dummy_id+'" already installed, \'sall good.');
});
it('should check version if plugin has engine tag', function(){
var spy = spyOn(semver, 'satisfies').andReturn(true);
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/55226483/src/install.js
----------------------------------------------------------------------
diff --git a/src/install.js b/src/install.js
index 3868ccf..9523f83 100644
--- a/src/install.js
+++ b/src/install.js
@@ -88,7 +88,7 @@ function runInstall(actions, platform, project_dir, plugin_dir, plugins_dir, opt
}
});
if (is_installed) {
- require('../plugman').emit('log', 'Plugin "' + plugin_id + '" already installed, \'sall good.');
+ require('../plugman').emit('results', 'Plugin "' + plugin_id + '" already installed, \'sall good.');
if (callback) callback();
return;
}
@@ -292,7 +292,7 @@ function handleInstall(actions, plugin_id, plugin_et, platform, project_dir, plu
// call prepare after a successful install
require('./../plugman').prepare(project_dir, platform, plugins_dir);
- require('../plugman').emit('log', plugin_id + ' installed.');
+ require('../plugman').emit('results', plugin_id + ' installed.');
if (callback) callback();
}
});
http://git-wip-us.apache.org/repos/asf/cordova-plugman/blob/55226483/src/uninstall.js
----------------------------------------------------------------------
diff --git a/src/uninstall.js b/src/uninstall.js
index 9bc6666..3b73a53 100644
--- a/src/uninstall.js
+++ b/src/uninstall.js
@@ -68,7 +68,7 @@ module.exports.uninstallPlugin = function(id, plugins_dir, callback) {
} else {
// axe the directory
shell.rm('-rf', plugin_dir);
- require('../plugman').emit('log', id + ' removed.');
+ require('../plugman').emit('results', 'Deleted "' + plugin_dir + '".');
if (callback) callback();
}
};
@@ -167,6 +167,7 @@ function handleUninstall(actions, platform, plugin_id, plugin_et, project_dir, w
else throw err;
} else {
// WIN!
+ require('../plugman').emit('results', plugin_id + ' uninstalled.');
// queue up the plugin so prepare can remove the config changes
config_changes.add_uninstalled_plugin_to_prepare_queue(plugins_dir, path.basename(plugin_dir), platform, is_top_level);
// call prepare after a successful uninstall