ios commit: CB-12287: Remove hardcoded sim build destination

2017-01-24 Thread kshotts 
Repository: cordova-ios
Updated Branches:
  refs/heads/master 32a9eca36 -> 6e1d376a7


CB-12287: Remove hardcoded sim build destination

Edited title as was >50char; original was
CB-12287: Remove hardcoded simulator build destination

 This closes #286


Project: http://git-wip-us.apache.org/repos/asf/cordova-ios/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-ios/commit/6e1d376a
Tree: http://git-wip-us.apache.org/repos/asf/cordova-ios/tree/6e1d376a
Diff: http://git-wip-us.apache.org/repos/asf/cordova-ios/diff/6e1d376a

Branch: refs/heads/master
Commit: 6e1d376a7a093ca958a27178dd036a9331cd5b43
Parents: 32a9eca
Author: Kerri Shotts 
Authored: Mon Jan 9 23:29:00 2017 -0600
Committer: Kerri Shotts 
Committed: Tue Jan 24 22:33:52 2017 -0600

--
 bin/templates/scripts/cordova/lib/build.js  |  60 +--
 .../cordova/lib/list-emulator-build-targets | 108 +++
 tests/spec/unit/build.spec.js   |   4 +-
 3 files changed, 162 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cordova-ios/blob/6e1d376a/bin/templates/scripts/cordova/lib/build.js
--
diff --git a/bin/templates/scripts/cordova/lib/build.js 
b/bin/templates/scripts/cordova/lib/build.js
index c40bfe8..c276424 100644
--- a/bin/templates/scripts/cordova/lib/build.js
+++ b/bin/templates/scripts/cordova/lib/build.js
@@ -53,7 +53,33 @@ var buildFlagMatchers = {
 'shared_precomps_dir' : /^(SHARED_PRECOMPS_DIR=.*)/
 };
 
+/**
+ * Returns a promise that resolves to the default simulator target; the logic 
here
+ * matches what `cordova emulate ios` does. 
+ * 
+ * The return object has two properties: `name` (the Xcode destination name),
+ * `identifier` (the simctl identifier), and `simIdentifier` (essentially the 
cordova emulate target)
+ * 
+ * @return {Promise}
+ */
+function getDefaultSimulatorTarget() {
+return require('./list-emulator-build-targets').run()
+.then(function (emulators) {
+var targetEmulator;
+if (emulators.length > 0) {
+targetEmulator = emulators[0];
+}
+emulators.forEach(function (emulator) {
+if (emulator.name.indexOf('iPhone') === 0) {
+targetEmulator = emulator;
+}
+});
+return targetEmulator;
+});
+}
+
 module.exports.run = function (buildOpts) {
+var emulatorTarget = '';
 
 buildOpts = buildOpts || {};
 
@@ -93,6 +119,22 @@ return require('./list-devices').run()
 return check_reqs.check_ios_deploy();
 }
 }).then(function () {
+// CB-12287: Determine the device we should target when building for a 
simulator
+if (!buildOpts.device) {
+var promise;
+if (buildOpts.target) {
+// a target was given to us, find the matching Xcode 
destination name
+promise = 
require('./list-emulator-build-targets').targetForSimIdentifier(buildOpts.target);
+} else {
+// no target provided, pick a default one (matching our 
emulator logic)
+promise = getDefaultSimulatorTarget();
+}
+return promise.then(function(theTarget) { 
+emulatorTarget = theTarget.name;
+events.emit('log', 'Building for ' + emulatorTarget + ' 
Simulator');
+});
+}
+}).then(function () {
 return check_reqs.run();
 }).then(function () {
 return findXCodeProjectIn(projectPath);
@@ -125,7 +167,7 @@ return require('./list-devices').run()
 // remove the build/device folder before building
 return spawn('rm', [ '-rf', buildOutputDir ], projectPath)
 .then(function() {
-var xcodebuildArgs = getXcodeBuildArgs(projectName, projectPath, 
configuration, buildOpts.device, buildOpts.buildFlag);
+var xcodebuildArgs = getXcodeBuildArgs(projectName, projectPath, 
configuration, buildOpts.device, buildOpts.buildFlag, emulatorTarget);
 return spawn('xcodebuild', xcodebuildArgs, projectPath);
 });
 
@@ -224,13 +266,15 @@ module.exports.findXCodeProjectIn = findXCodeProjectIn;
 
 /**
  * Returns array of arguments for xcodebuild
- * @param  {String}  projectName   Name of xcode project
- * @param  {String}  projectPath   Path to project file. Will be used to set 
CWD for xcodebuild
- * @param  {String}  configuration Configuration name: debug|release
- * @param  {Boolean} isDevice  Flag that specify target for package 
(device/emulator)
- * @return {Array} Array of arguments that could be passed 
directly to spawn method
+ * @param  {String}  projectNameName of xcode project
+ * @param  {String}  projectPathPath to project file. Will

[cordova-create] Git Push Summary

2017-01-24 Thread steven 
Repository: cordova-create
Updated Tags:  refs/tags/rel/1.0.2 [created] f69198e5a

-
To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org
For additional commands, e-mail: commits-h...@cordova.apache.org

[cordova-js] Git Push Summary

2017-01-24 Thread steven 
Repository: cordova-js
Updated Tags:  refs/tags/rel/4.2.1 [created] 805809bc6

-
To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org
For additional commands, e-mail: commits-h...@cordova.apache.org

[cordova-plugman] Git Push Summary

2017-01-24 Thread steven 
Repository: cordova-plugman
Updated Tags:  refs/tags/rel/1.4.1 [created] 3d92a364f

-
To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org
For additional commands, e-mail: commits-h...@cordova.apache.org

[cordova-plugman] Git Push Summary

2017-01-24 Thread steven 
Repository: cordova-plugman
Updated Tags:  refs/tags/rel/4.2.1 [created] 46c3ce1fc

-
To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org
For additional commands, e-mail: commits-h...@cordova.apache.org

[cordova-cli] Git Push Summary

2017-01-24 Thread steven 
Repository: cordova-cli
Updated Tags:  refs/tags/rel/6.5.0 [created] ece2c9be8

-
To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org
For additional commands, e-mail: commits-h...@cordova.apache.org

[cordova-lib] Git Push Summary

2017-01-24 Thread steven 
Repository: cordova-lib
Updated Tags:  refs/tags/rel/common-2.0.0 [created] 3c08c7268

-
To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org
For additional commands, e-mail: commits-h...@cordova.apache.org

[cordova-lib] Git Push Summary

2017-01-24 Thread steven 
Repository: cordova-lib
Updated Tags:  refs/tags/rel/fetch-1.0.2 [created] 3c08c7268

-
To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org
For additional commands, e-mail: commits-h...@cordova.apache.org

[cordova-lib] Git Push Summary

2017-01-24 Thread steven 
Repository: cordova-lib
Updated Tags:  refs/tags/6.5.0 [created] 3c08c7268
  refs/tags/common-2.0.0 [created] 3c08c7268
  refs/tags/fetch-1.0.2 [created] 3c08c7268
  refs/tags/rel/6.5.0 [created] 3c08c7268

-
To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org
For additional commands, e-mail: commits-h...@cordova.apache.org

docs commit: added a few packages to blacklist for plugins.cordova.io

2017-01-24 Thread steven 
Repository: cordova-docs
Updated Branches:
  refs/heads/master b51fc232a -> 1047d52b3


added a few packages to blacklist for plugins.cordova.io


Project: http://git-wip-us.apache.org/repos/asf/cordova-docs/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-docs/commit/1047d52b
Tree: http://git-wip-us.apache.org/repos/asf/cordova-docs/tree/1047d52b
Diff: http://git-wip-us.apache.org/repos/asf/cordova-docs/diff/1047d52b

Branch: refs/heads/master
Commit: 1047d52b3e5ce97df1eb035cac3731d0f4698e40
Parents: b51fc23
Author: Steve Gill 
Authored: Tue Jan 24 11:01:30 2017 -0800
Committer: Steve Gill 
Committed: Tue Jan 24 11:01:30 2017 -0800

--
 www/static/plugins/blacklisted-plugins.json | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cordova-docs/blob/1047d52b/www/static/plugins/blacklisted-plugins.json
--
diff --git a/www/static/plugins/blacklisted-plugins.json 
b/www/static/plugins/blacklisted-plugins.json
index 4836042..90f8270 100755
--- a/www/static/plugins/blacklisted-plugins.json
+++ b/www/static/plugins/blacklisted-plugins.json
@@ -3,6 +3,10 @@
 "cordova-wp8",
 "cordova-wp8-testtest",
 "cordova-app-hello-world",
-"delete-this"
+"delete-this",
+"cordova-android",
+"cordova-fetch",
+"amilatemethods",
+"cordova-ios"
 ]
 }


-
To unsubscribe, e-mail: commits-unsubscr...@cordova.apache.org
For additional commands, e-mail: commits-h...@cordova.apache.org

cordova-paramedic git commit: Added --fileTransferServer arg to specify a custom file transfer server address

2017-01-24 Thread alsorokin 
Repository: cordova-paramedic
Updated Branches:
  refs/heads/master b27449fd9 -> ce67362e9


Added --fileTransferServer arg to specify a custom file transfer server address


Project: http://git-wip-us.apache.org/repos/asf/cordova-paramedic/repo
Commit: http://git-wip-us.apache.org/repos/asf/cordova-paramedic/commit/ce67362e
Tree: http://git-wip-us.apache.org/repos/asf/cordova-paramedic/tree/ce67362e
Diff: http://git-wip-us.apache.org/repos/asf/cordova-paramedic/diff/ce67362e

Branch: refs/heads/master
Commit: ce67362e92ef940df960e2fcc9e17b095c2aefde
Parents: b27449f
Author: Alexander Sorokin 
Authored: Tue Jan 24 13:16:04 2017 +0300
Committer: Alexander Sorokin 
Committed: Tue Jan 24 13:16:12 2017 +0300

--
 lib/ParamedicConfig.js | 11 ++-
 lib/PluginsManager.js  | 13 ++---
 lib/paramedic.js   |  2 +-
 main.js|  5 +
 4 files changed, 26 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cordova-paramedic/blob/ce67362e/lib/ParamedicConfig.js
--
diff --git a/lib/ParamedicConfig.js b/lib/ParamedicConfig.js
index 12d781c..9a674c1 100644
--- a/lib/ParamedicConfig.js
+++ b/lib/ParamedicConfig.js
@@ -66,7 +66,8 @@ ParamedicConfig.parseFromArguments = function (argv) {
 skipAppiumTests:  argv.skipAppium,
 skipMainTests:argv.skipMainTests,
 ci:   argv.ci,
-target:   argv.target
+target:   argv.target,
+fileTransferServer:   argv.fileTransferServer,
 });
 };
 
@@ -261,4 +262,12 @@ ParamedicConfig.prototype.setTarget = function (target) {
 this._config.target = target;
 };
 
+ParamedicConfig.prototype.getFileTransferServer = function () {
+return this._config.fileTransferServer;
+}
+
+ParamedicConfig.prototype.setFileTransferServer = function (server) {
+this._config.fileTransferServer = server;
+}
+
 module.exports = ParamedicConfig;

http://git-wip-us.apache.org/repos/asf/cordova-paramedic/blob/ce67362e/lib/PluginsManager.js
--
diff --git a/lib/PluginsManager.js b/lib/PluginsManager.js
index 222193f..df966f6 100644
--- a/lib/PluginsManager.js
+++ b/lib/PluginsManager.js
@@ -45,9 +45,16 @@ PluginsManager.prototype.installTestsForExistingPlugins = 
function () {
 if (fs.existsSync(path.join(plugin.dir, 'tests', 'plugin.xml'))) {
 var additionalArgs = '';
 if (plugin.id.indexOf('cordova-plugin-file-transfer') >= 0) {
-var server = new Server(0, me.config.getExternalServerUrl());
-var fileServerUrl = 
server.getConnectionAddress(me.config.getPlatformId()) + ':5000';
-additionalArgs += ' --variable FILETRANSFER_SERVER_ADDRESS=' + 
fileServerUrl;
+if (me.config.getFileTransferServer()) {
+// user specified a file transfer server address, so using 
it
+additionalArgs += ' --variable 
FILETRANSFER_SERVER_ADDRESS=' + me.config.getFileTransferServer();
+} else {
+// no server address specified, starting a local server
+var server = new Server(0, 
me.config.getExternalServerUrl());
+var fileServerUrl = 
server.getConnectionAddress(me.config.getPlatformId()) + ':5000';
+additionalArgs += ' --variable 
FILETRANSFER_SERVER_ADDRESS=' + fileServerUrl;
+}
+
 }
 me.installSinglePlugin(path.join(plugin.dir, 'tests') + 
additionalArgs);
 }

http://git-wip-us.apache.org/repos/asf/cordova-paramedic/blob/ce67362e/lib/paramedic.js
--
diff --git a/lib/paramedic.js b/lib/paramedic.js
index acf24e9..9c377f3 100644
--- a/lib/paramedic.js
+++ b/lib/paramedic.js
@@ -246,7 +246,7 @@ ParamedicRunner.prototype.maybeRunFileTransferServer = 
function () {
 return Q().then(function () {
 var plugins = self.config.getPlugins();
 for (var i = 0; i < plugins.length; i++) {
-if (plugins[i].indexOf('cordova-plugin-file-transfer') >= 0) {
+if (plugins[i].indexOf('cordova-plugin-file-transfer') >= 0 && 
!self.config.getFileTransferServer()) {
 return 
self.server.startFileTransferServer(self.tempFolder.name);
 }
 }

http://git-wip-us.apache.org/repos/asf/cordova-paramedic/blob/ce67362e/main.js
--
diff --git a/main.js b/main.js
index 4846db8..8563acb 100755
--- a/main.js
+++ b/main.js
@@ -58,6 +58,7 @@ var USAGE   = "Error missing args. \n" +