You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by st...@apache.org on 2015/03/06 01:26:47 UTC
[11/27] cordova-lib git commit: CB-8551 Skip CPR if pluginID isn't
reverse domain name style
CB-8551 Skip CPR if pluginID isn't reverse domain name style
Project: http://git-wip-us.apache.org/repos/asf/cordova-lib/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-lib/commit/9b36f209
Tree: http://git-wip-us.apache.org/repos/asf/cordova-lib/tree/9b36f209
Diff: http://git-wip-us.apache.org/repos/asf/cordova-lib/diff/9b36f209
Branch: refs/heads/master
Commit: 9b36f209427b46e8d199f535565815bcb3cfe4b0
Parents: db4d274
Author: Steve Gill <st...@gmail.com>
Authored: Thu Feb 26 19:57:17 2015 -0800
Committer: Steve Gill <st...@gmail.com>
Committed: Thu Feb 26 19:57:17 2015 -0800
----------------------------------------------------------------------
cordova-lib/src/plugman/registry/registry.js | 42 ++++++++++++++++++++---
1 file changed, 38 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cordova-lib/blob/9b36f209/cordova-lib/src/plugman/registry/registry.js
----------------------------------------------------------------------
diff --git a/cordova-lib/src/plugman/registry/registry.js b/cordova-lib/src/plugman/registry/registry.js
index 2943a77..75e234c 100644
--- a/cordova-lib/src/plugman/registry/registry.js
+++ b/cordova-lib/src/plugman/registry/registry.js
@@ -167,9 +167,11 @@ module.exports = {
*/
fetch: function(plugin, client) {
plugin = plugin.shift();
- return fetchPlugReg(plugin, client)
+ return checkPluginID(plugin)
+ .then(function() {
+ return fetchPlugReg(plugin, client);
+ })
.fail(function() {
- events.emit('log', 'Fetching from cordova plugin registry failed');
module.exports.settings = null;
return fetchNPM(plugin,client);
});
@@ -352,7 +354,6 @@ function fetchNPM(plugin, client) {
return unpack.unpackTgz(package_tgz, pluginDir);
})
.fail(function(error) {
- //console.log(error)
events.emit('log', 'Fetching from npm registry failed');
return Q.reject(error)
});
@@ -386,6 +387,39 @@ function fetchPlugReg(plugin, client) {
// Unpack the plugin that was added to the cache (CB-8154)
var package_tgz = path.resolve(npm.cache, info.name, info.version, 'package.tgz');
return unpack.unpackTgz(package_tgz, pluginDir);
- });
+ })
+ .fail(function(error) {
+ events.emit('log', 'Fetching from cordova plugin registry failed');
+ return Q.reject(error)
+ });;
}
+/**
+ * @method checkPluginID
+ * @param {Array} with one element - the plugin id or "id@version"
+ * @return {Promise.<string>} Promised path to fetched package.
+ */
+function checkPluginID(plugin) {
+ //if plugin id is not reverse domain name style, skip CPR and fetch from npm
+
+ //Create regex to for digits, words and dashes and three dots in plugin ids which excludes @VERSION.
+ var re = /([\w-]*\.[\w-]*\.[\w-]*\.[\w-]*[^@])/;
+ var pluginID = plugin.match(re);
+ //If pluginID equals null, plugin is not reverse domain name style
+ if(pluginID === null) {
+ events.emit('verbose', 'Skipping CPR');
+ //Q.reject will send us straight to the fail method which is where fetchNPM gets called.
+ return Q.reject();
+ } else {
+ //Reverse domain name style plugin ID
+ //Check if a mapping exists for the pluginID
+ //if it does, warn the users to use package-name
+ var packageName = pluginMapper[pluginID[0]];
+ if(packageName) {
+ events.emit('log', 'WARNING: ' + plugin + ' has been renamed to '
+ + packageName + ' and moved to npm. Please use `cordova plugin add '
+ + packageName + '` next time.');
+ }
+ }
+ return Q();
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org