Return-Path: X-Original-To: apmail-cordova-dev-archive@www.apache.org Delivered-To: apmail-cordova-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2B4BC10677 for ; Tue, 3 Mar 2015 19:21:10 +0000 (UTC) Received: (qmail 87793 invoked by uid 500); 3 Mar 2015 19:21:08 -0000 Delivered-To: apmail-cordova-dev-archive@cordova.apache.org Received: (qmail 87764 invoked by uid 500); 3 Mar 2015 19:21:08 -0000 Mailing-List: contact dev-help@cordova.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cordova.apache.org Delivered-To: mailing list dev@cordova.apache.org Received: (qmail 87646 invoked by uid 99); 3 Mar 2015 19:21:08 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Mar 2015 19:21:08 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 34C2AE03B9; Tue, 3 Mar 2015 19:21:08 +0000 (UTC) From: stevengill To: dev@cordova.apache.org Reply-To: dev@cordova.apache.org References: In-Reply-To: Subject: [GitHub] cordova-lib pull request: CB-8551 npm registry integration for fet... Content-Type: text/plain Message-Id: <20150303192108.34C2AE03B9@git1-us-west.apache.org> Date: Tue, 3 Mar 2015 19:21:08 +0000 (UTC) Github user stevengill commented on a diff in the pull request: https://github.com/apache/cordova-lib/pull/175#discussion_r25717156 --- 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.} 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.} 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 --- End diff -- LIES! I just followed the format of the other comments in this file. :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 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