cordova-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stevengill <...@git.apache.org>
Subject [GitHub] cordova-lib pull request: CB-8551 npm registry integration for fet...
Date Tue, 03 Mar 2015 19:13:06 GMT
Github user stevengill commented on a diff in the pull request:

    https://github.com/apache/cordova-lib/pull/175#discussion_r25716406
  
    --- 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.
    +        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.');
    --- End diff --
    
    It actually doesn't convert and continue. It just warns and continues. `cordova plugin
add org.apache.cordova.device` would output `WARNING: org.apache.cordova.device has been renamed
to cordova-plugin-device and moved to npm. Please use `cordova plugin add cordova-plugin-device
next time.` It would then continue on and fetch org.apache.cordova.device from CPR and you
would see the log for it succeeding. 
    
    Users should still be able to see that the plugin succeeded with the rest of the output
in their terminal. But if you feel like we should be more clear with this message, I can change
it up. It is important we make sure our users understand what's up!
    



---
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 infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@cordova.apache.org
For additional commands, e-mail: dev-help@cordova.apache.org


Mime
View raw message