[GitHub] cordova-lib pull request: CB-10654 make hooks fire when platforms ...
Github user tony-- commented on a diff in the pull request:
https://github.com/apache/cordova-lib/pull/395#discussion_r53677145
--- Diff: cordova-lib/src/cordova/platform.js ---
@@ -79,148 +79,156 @@ function addHelper(cmd, hooksRunner, projectRoot,
targets, opts) {
var platformsDir = path.join(projectRoot, 'platforms');
shell.mkdir('-p', platformsDir);
-return hooksRunner.fire('before_platform_' + cmd, opts)
-.then(function() {
-return promiseutil.Q_chainmap(targets, function(target) {
-// For each platform, download it and call its helper script.
-var parts = target.split('@');
-var platform = parts[0];
-var spec = parts[1];
-
-return Q.when().then(function() {
-if (!(platform in platforms)) {
-spec = platform;
-platform = null;
-}
+return promiseutil.Q_chainmap(targets, function(target) {
+// For each platform, download it and call its helper script.
+var parts = target.split('@');
+var platform = parts[0];
+var spec = parts[1];
+var platDetails = '';
+
+return Q.when().then(function() {
+if (!(platform in platforms)) {
+spec = platform;
+platform = null;
+}
-if(platform === 'amazon-fireos') {
-events.emit('warn', 'amazon-fireos has been
deprecated. Please use android instead.');
-}
-if(platform === 'wp8') {
-events.emit('warn', 'wp8 has been deprecated. Please
use windows instead.');
-}
-if (platform && !spec && cmd == 'add') {
-events.emit('verbose', 'No version supplied.
Retrieving version from config.xml...');
-spec = getVersionFromConfigFile(platform, cfg);
-}
+if(platform === 'amazon-fireos') {
+events.emit('warn', 'amazon-fireos has been deprecated.
Please use android instead.');
+}
+if(platform === 'wp8') {
+events.emit('warn', 'wp8 has been deprecated. Please use
windows instead.');
+}
+if (platform && !spec && cmd == 'add') {
+events.emit('verbose', 'No version supplied. Retrieving
version from config.xml...');
+spec = getVersionFromConfigFile(platform, cfg);
+}
+
+// If --save/autosave on && no version specified, use the
pinned version
+// e.g: 'cordova platform add android --save', 'cordova
platform update android --save'
+if( (opts.save || autosave) && !spec ){
+spec = platforms[platform].version;
+}
-// If --save/autosave on && no version specified, use the
pinned version
-// e.g: 'cordova platform add android --save', 'cordova
platform update android --save'
-if( (opts.save || autosave) && !spec ){
-spec = platforms[platform].version;
+if (spec) {
+var maybeDir = cordova_util.fixRelativePath(spec);
+if (cordova_util.isDirectory(maybeDir)) {
+return getPlatformDetailsFromDir(maybeDir, platform);
+}
+}
+return downloadPlatform(projectRoot, platform, spec, opts);
+}).then(function(platformDetails) {
+platDetails = platformDetails;
+var hookOpts = {
+platforms :[platDetails.platform],
+nohooks :[opts.nohooks]
+};
+return hooksRunner.fire('before_platform_' + cmd, hookOpts);
--- End diff --
I was only providing the opts that are used by HooksRunner and
scriptFinder, but I was planning to switch to cloning opts and replacing the
platform in my copy. Seems less brittle than my current approach.
---
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
[GitHub] cordova-lib pull request: CB-10654 make hooks fire when platforms ...
Github user nikhilkh commented on a diff in the pull request:
https://github.com/apache/cordova-lib/pull/395#discussion_r53669157
--- Diff: cordova-lib/src/cordova/platform.js ---
@@ -79,148 +79,156 @@ function addHelper(cmd, hooksRunner, projectRoot,
targets, opts) {
var platformsDir = path.join(projectRoot, 'platforms');
shell.mkdir('-p', platformsDir);
-return hooksRunner.fire('before_platform_' + cmd, opts)
-.then(function() {
-return promiseutil.Q_chainmap(targets, function(target) {
-// For each platform, download it and call its helper script.
-var parts = target.split('@');
-var platform = parts[0];
-var spec = parts[1];
-
-return Q.when().then(function() {
-if (!(platform in platforms)) {
-spec = platform;
-platform = null;
-}
+return promiseutil.Q_chainmap(targets, function(target) {
+// For each platform, download it and call its helper script.
+var parts = target.split('@');
+var platform = parts[0];
+var spec = parts[1];
+var platDetails = '';
+
+return Q.when().then(function() {
+if (!(platform in platforms)) {
+spec = platform;
+platform = null;
+}
-if(platform === 'amazon-fireos') {
-events.emit('warn', 'amazon-fireos has been
deprecated. Please use android instead.');
-}
-if(platform === 'wp8') {
-events.emit('warn', 'wp8 has been deprecated. Please
use windows instead.');
-}
-if (platform && !spec && cmd == 'add') {
-events.emit('verbose', 'No version supplied.
Retrieving version from config.xml...');
-spec = getVersionFromConfigFile(platform, cfg);
-}
+if(platform === 'amazon-fireos') {
+events.emit('warn', 'amazon-fireos has been deprecated.
Please use android instead.');
+}
+if(platform === 'wp8') {
+events.emit('warn', 'wp8 has been deprecated. Please use
windows instead.');
+}
+if (platform && !spec && cmd == 'add') {
+events.emit('verbose', 'No version supplied. Retrieving
version from config.xml...');
+spec = getVersionFromConfigFile(platform, cfg);
+}
+
+// If --save/autosave on && no version specified, use the
pinned version
+// e.g: 'cordova platform add android --save', 'cordova
platform update android --save'
+if( (opts.save || autosave) && !spec ){
+spec = platforms[platform].version;
+}
-// If --save/autosave on && no version specified, use the
pinned version
-// e.g: 'cordova platform add android --save', 'cordova
platform update android --save'
-if( (opts.save || autosave) && !spec ){
-spec = platforms[platform].version;
+if (spec) {
+var maybeDir = cordova_util.fixRelativePath(spec);
+if (cordova_util.isDirectory(maybeDir)) {
+return getPlatformDetailsFromDir(maybeDir, platform);
+}
+}
+return downloadPlatform(projectRoot, platform, spec, opts);
+}).then(function(platformDetails) {
+platDetails = platformDetails;
+var hookOpts = {
+platforms :[platDetails.platform],
+nohooks :[opts.nohooks]
+};
+return hooksRunner.fire('before_platform_' + cmd, hookOpts);
--- End diff --
Do we end up losing some of the original `opts` - as I do not see us
copying them over.
---
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
[GitHub] cordova-lib pull request: CB-10654 make hooks fire when platforms ...
Github user bso-intel commented on the pull request: https://github.com/apache/cordova-lib/pull/395#issuecomment-186517246 It looks great assuming that before_platform_add and after_platform_add hooks could be platform specific. My understanding about the current convention is a little different, though. Thanks, Tony. --- 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
[GitHub] cordova-lib pull request: CB-10654 make hooks fire when platforms ...
Github user bso-intel commented on a diff in the pull request:
https://github.com/apache/cordova-lib/pull/395#discussion_r53545261
--- Diff: cordova-lib/src/cordova/platform.js ---
@@ -79,148 +79,156 @@ function addHelper(cmd, hooksRunner, projectRoot,
targets, opts) {
var platformsDir = path.join(projectRoot, 'platforms');
shell.mkdir('-p', platformsDir);
-return hooksRunner.fire('before_platform_' + cmd, opts)
-.then(function() {
-return promiseutil.Q_chainmap(targets, function(target) {
-// For each platform, download it and call its helper script.
-var parts = target.split('@');
-var platform = parts[0];
-var spec = parts[1];
-
-return Q.when().then(function() {
-if (!(platform in platforms)) {
-spec = platform;
-platform = null;
-}
+return promiseutil.Q_chainmap(targets, function(target) {
+// For each platform, download it and call its helper script.
+var parts = target.split('@');
+var platform = parts[0];
+var spec = parts[1];
+var platDetails = '';
+
+return Q.when().then(function() {
+if (!(platform in platforms)) {
+spec = platform;
+platform = null;
+}
-if(platform === 'amazon-fireos') {
-events.emit('warn', 'amazon-fireos has been
deprecated. Please use android instead.');
-}
-if(platform === 'wp8') {
-events.emit('warn', 'wp8 has been deprecated. Please
use windows instead.');
-}
-if (platform && !spec && cmd == 'add') {
-events.emit('verbose', 'No version supplied.
Retrieving version from config.xml...');
-spec = getVersionFromConfigFile(platform, cfg);
-}
+if(platform === 'amazon-fireos') {
+events.emit('warn', 'amazon-fireos has been deprecated.
Please use android instead.');
+}
+if(platform === 'wp8') {
+events.emit('warn', 'wp8 has been deprecated. Please use
windows instead.');
+}
+if (platform && !spec && cmd == 'add') {
+events.emit('verbose', 'No version supplied. Retrieving
version from config.xml...');
+spec = getVersionFromConfigFile(platform, cfg);
+}
+
+// If --save/autosave on && no version specified, use the
pinned version
+// e.g: 'cordova platform add android --save', 'cordova
platform update android --save'
+if( (opts.save || autosave) && !spec ){
+spec = platforms[platform].version;
+}
-// If --save/autosave on && no version specified, use the
pinned version
-// e.g: 'cordova platform add android --save', 'cordova
platform update android --save'
-if( (opts.save || autosave) && !spec ){
-spec = platforms[platform].version;
+if (spec) {
+var maybeDir = cordova_util.fixRelativePath(spec);
+if (cordova_util.isDirectory(maybeDir)) {
+return getPlatformDetailsFromDir(maybeDir, platform);
+}
+}
+return downloadPlatform(projectRoot, platform, spec, opts);
+}).then(function(platformDetails) {
+platDetails = platformDetails;
+var hookOpts = {
+platforms :[platDetails.platform],
+nohooks :[opts.nohooks]
+};
+return hooksRunner.fire('before_platform_' + cmd, hookOpts);
--- End diff --
Now, the behavior is a little different than before.
Previously, the before_platform_add hook ran only once for all target
platforms.
This hook could be platform agnostic.
However, by moving the hookRunner inside per platform, this hook will run
every time each platform is added.
Not sure whether this is an issue or not, though.
---
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
[GitHub] cordova-lib pull request: CB-10654 make hooks fire when platforms ...
Github user bso-intel commented on a diff in the pull request:
https://github.com/apache/cordova-lib/pull/395#discussion_r53545199
--- Diff: cordova-lib/src/cordova/platform.js ---
@@ -79,148 +79,156 @@ function addHelper(cmd, hooksRunner, projectRoot,
targets, opts) {
var platformsDir = path.join(projectRoot, 'platforms');
shell.mkdir('-p', platformsDir);
-return hooksRunner.fire('before_platform_' + cmd, opts)
-.then(function() {
-return promiseutil.Q_chainmap(targets, function(target) {
-// For each platform, download it and call its helper script.
-var parts = target.split('@');
-var platform = parts[0];
-var spec = parts[1];
-
-return Q.when().then(function() {
-if (!(platform in platforms)) {
-spec = platform;
-platform = null;
-}
+return promiseutil.Q_chainmap(targets, function(target) {
+// For each platform, download it and call its helper script.
+var parts = target.split('@');
+var platform = parts[0];
+var spec = parts[1];
+var platDetails = '';
+
+return Q.when().then(function() {
+if (!(platform in platforms)) {
+spec = platform;
+platform = null;
+}
-if(platform === 'amazon-fireos') {
-events.emit('warn', 'amazon-fireos has been
deprecated. Please use android instead.');
-}
-if(platform === 'wp8') {
-events.emit('warn', 'wp8 has been deprecated. Please
use windows instead.');
-}
-if (platform && !spec && cmd == 'add') {
-events.emit('verbose', 'No version supplied.
Retrieving version from config.xml...');
-spec = getVersionFromConfigFile(platform, cfg);
-}
+if(platform === 'amazon-fireos') {
+events.emit('warn', 'amazon-fireos has been deprecated.
Please use android instead.');
+}
+if(platform === 'wp8') {
+events.emit('warn', 'wp8 has been deprecated. Please use
windows instead.');
+}
+if (platform && !spec && cmd == 'add') {
+events.emit('verbose', 'No version supplied. Retrieving
version from config.xml...');
+spec = getVersionFromConfigFile(platform, cfg);
+}
+
+// If --save/autosave on && no version specified, use the
pinned version
+// e.g: 'cordova platform add android --save', 'cordova
platform update android --save'
+if( (opts.save || autosave) && !spec ){
+spec = platforms[platform].version;
+}
-// If --save/autosave on && no version specified, use the
pinned version
-// e.g: 'cordova platform add android --save', 'cordova
platform update android --save'
-if( (opts.save || autosave) && !spec ){
-spec = platforms[platform].version;
+if (spec) {
+var maybeDir = cordova_util.fixRelativePath(spec);
+if (cordova_util.isDirectory(maybeDir)) {
+return getPlatformDetailsFromDir(maybeDir, platform);
+}
+}
+return downloadPlatform(projectRoot, platform, spec, opts);
+}).then(function(platformDetails) {
+platDetails = platformDetails;
+var hookOpts = {
+platforms :[platDetails.platform],
+nohooks :[opts.nohooks]
+};
+return hooksRunner.fire('before_platform_' + cmd, hookOpts);
+}).then(function() {
+platform = platDetails.platform;
+var platformPath = path.join(projectRoot, 'platforms',
platform);
+var platformAlreadyAdded = fs.existsSync(platformPath);
+
+if (cmd == 'add') {
+if (platformAlreadyAdded) {
+throw new CordovaError('Platform ' + platform + '
already added.');
}
-if (spec) {
-var maybeDir = cordova_util.fixRelativePath(spec);
-if (cordova_util.isDirectory(maybeDir)) {
-return getPlatformDetailsFromDir(maybeDir,
platform);
-}
+// Remove the .json file from the plugins
directory, so we start clean (otherwise we
+// can get into trouble not installing plugins if
[GitHub] cordova-lib pull request: CB-10654 make hooks fire when platforms ...
Github user bso-intel commented on a diff in the pull request:
https://github.com/apache/cordova-lib/pull/395#discussion_r53545185
--- Diff: cordova-lib/src/cordova/platform.js ---
@@ -79,148 +79,156 @@ function addHelper(cmd, hooksRunner, projectRoot,
targets, opts) {
var platformsDir = path.join(projectRoot, 'platforms');
shell.mkdir('-p', platformsDir);
-return hooksRunner.fire('before_platform_' + cmd, opts)
-.then(function() {
-return promiseutil.Q_chainmap(targets, function(target) {
-// For each platform, download it and call its helper script.
-var parts = target.split('@');
-var platform = parts[0];
-var spec = parts[1];
-
-return Q.when().then(function() {
-if (!(platform in platforms)) {
-spec = platform;
-platform = null;
-}
+return promiseutil.Q_chainmap(targets, function(target) {
+// For each platform, download it and call its helper script.
+var parts = target.split('@');
+var platform = parts[0];
+var spec = parts[1];
+var platDetails = '';
+
+return Q.when().then(function() {
+if (!(platform in platforms)) {
+spec = platform;
+platform = null;
+}
-if(platform === 'amazon-fireos') {
-events.emit('warn', 'amazon-fireos has been
deprecated. Please use android instead.');
-}
-if(platform === 'wp8') {
-events.emit('warn', 'wp8 has been deprecated. Please
use windows instead.');
-}
-if (platform && !spec && cmd == 'add') {
-events.emit('verbose', 'No version supplied.
Retrieving version from config.xml...');
-spec = getVersionFromConfigFile(platform, cfg);
-}
+if(platform === 'amazon-fireos') {
+events.emit('warn', 'amazon-fireos has been deprecated.
Please use android instead.');
+}
+if(platform === 'wp8') {
+events.emit('warn', 'wp8 has been deprecated. Please use
windows instead.');
+}
+if (platform && !spec && cmd == 'add') {
+events.emit('verbose', 'No version supplied. Retrieving
version from config.xml...');
+spec = getVersionFromConfigFile(platform, cfg);
+}
+
+// If --save/autosave on && no version specified, use the
pinned version
+// e.g: 'cordova platform add android --save', 'cordova
platform update android --save'
+if( (opts.save || autosave) && !spec ){
+spec = platforms[platform].version;
+}
-// If --save/autosave on && no version specified, use the
pinned version
-// e.g: 'cordova platform add android --save', 'cordova
platform update android --save'
-if( (opts.save || autosave) && !spec ){
-spec = platforms[platform].version;
+if (spec) {
+var maybeDir = cordova_util.fixRelativePath(spec);
+if (cordova_util.isDirectory(maybeDir)) {
+return getPlatformDetailsFromDir(maybeDir, platform);
+}
+}
+return downloadPlatform(projectRoot, platform, spec, opts);
+}).then(function(platformDetails) {
+platDetails = platformDetails;
+var hookOpts = {
+platforms :[platDetails.platform],
+nohooks :[opts.nohooks]
--- End diff --
opts.nohooks is already an array.
So you can change this line to the following
nohooks: opts.nohooks
---
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
[GitHub] cordova-lib pull request: CB-10654 make hooks fire when platforms ...
Github user tony-- commented on the pull request: https://github.com/apache/cordova-lib/pull/395#issuecomment-186428877 @bso-intel will you take a look, please? --- 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
[GitHub] cordova-lib pull request: CB-10654 make hooks fire when platforms ...
Github user tony-- commented on the pull request: https://github.com/apache/cordova-lib/pull/395#issuecomment-186425912 I'd like to see this get fixed, so I thought I'd submit a PR, but I'm a node noob - this definitely needs to be reviewed before being merged in. --- 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
[GitHub] cordova-lib pull request: CB-10654 make hooks fire when platforms ...
GitHub user tony-- opened a pull request:
https://github.com/apache/cordova-lib/pull/395
CB-10654 make hooks fire when platforms added from repo or dir
move `hooksRunner.fire('before_platform_'...) ` till after platform has
been resolved, pass resolved platform instead of target.
move `hooksRunner.fire('after_platform_'...) ` into platform loop, pass
resolved platform instead of target.
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/tony--/cordova-lib CB-10654
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/cordova-lib/pull/395.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #395
commit 045ab1ace5666a7d06752d9691e3e8298ec032bd
Author: Tony Homer
Date: 2016-02-19T21:43:09Z
CB-10654 make hooks fire when platforms added from repo or dir
---
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
