Github user stevengill commented on a diff in the pull request:
https://github.com/apache/cordova-lib/pull/175#discussion_r25716498
--- Diff: cordova-lib/src/plugman/registry/registry.js ---
@@ -322,3 +324,102 @@ function makeRequest (method, where, what, cb_) {
return req;
}
+
+/**
+ * @method fetchNPM
+ * @param {Array} with one element - the plugin id or "id@version"
+ * @return {Promise.<string>} Promised path to fetched package.
+ */
+function fetchNPM(plugin, client) {
+ return initSettings(true)
+ .then(function (settings) {
+ return Q.nfcall(npm.load)
+ // configure npm here instead of passing parameters to npm.load
due to CB-7670
+ .then(function () {
+ for (var prop in settings){
+ npm.config.set(prop, settings[prop]);
+ }
+ });
+ })
+ .then(function() {
+ events.emit('log', 'Fetching plugin "' + plugin + '" via npm');
+ return Q.ninvoke(npm.commands, 'cache', ['add', plugin]);
+ })
+ .then(function(info) {
+ var cl = (client === 'plugman' ? 'plugman' : 'cordova-cli');
+ bumpCounter(info, cl);
+ var pluginDir = path.resolve(npm.cache, info.name, info.version,
'package');
+ // 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 npm registry failed');
+ return Q.reject(error);
+ });
+}
+
+
+/**
+ * @method fetchPlugReg
+ * @param {Array} with one element - the plugin id or "id@version"
+ * @return {Promise.<string>} Promised path to fetched package.
+ */
+function fetchPlugReg(plugin, client) {
+ return initSettings()
+ .then(function (settings) {
+ return Q.nfcall(npm.load)
+ // configure npm here instead of passing parameters to npm.load
due to CB-7670
+ .then(function () {
+ for (var prop in settings){
+ npm.config.set(prop, settings[prop]);
+ }
+ });
+ })
+ .then(function() {
+ events.emit('log', 'Fetching plugin "' + plugin + '" via plugin
registry');
+ return Q.ninvoke(npm.commands, 'cache', ['add', plugin]);
+ })
+ .then(function(info) {
+ var cl = (client === 'plugman' ? 'plugman' : 'cordova-cli');
+ bumpCounter(info, cl);
+ var pluginDir = path.resolve(npm.cache, info.name, info.version,
'package');
+ // 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.
--- End diff --
Just because you asked so nicely! :smile:
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@cordova.apache.org
For additional commands, e-mail: dev-h...@cordova.apache.org
