This is an automated email from the ASF dual-hosted git repository.
erisu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cordova-ios.git
The following commit(s) were added to refs/heads/master by this push:
new 14a5728 fix (node): require failure with shebang interpreter (#782)
14a5728 is described below
commit 14a57283e1b297693874cb7f48564ebd145a06dc
Author: エリス <[email protected]>
AuthorDate: Thu Feb 13 10:52:14 2020 +0900
fix (node): require failure with shebang interpreter (#782)
---
bin/lib/create.js | 2 -
bin/templates/scripts/cordova/Api.js | 15 +++-
bin/templates/scripts/cordova/lib/build.js | 6 +-
bin/templates/scripts/cordova/lib/list-devices | 48 ++----------
.../cordova/lib/list-emulator-build-targets | 90 +---------------------
.../scripts/cordova/lib/list-emulator-images | 25 ++----
.../scripts/cordova/lib/list-started-emulators | 31 ++------
.../cordova/lib/{list-devices => listDevices.js} | 12 ---
...r-build-targets => listEmulatorBuildTargets.js} | 10 ---
...{list-emulator-images => listEmulatorImages.js} | 12 ---
...t-started-emulators => listStartedEmulators.js} | 12 ---
bin/templates/scripts/cordova/lib/run.js | 8 +-
bin/templates/scripts/cordova/lib/versions.js | 2 -
bin/templates/scripts/cordova/version | 8 +-
tests/spec/unit/lib/list-devices.spec.js | 4 +-
tests/spec/unit/lib/list-emulator-images.spec.js | 4 +-
16 files changed, 46 insertions(+), 243 deletions(-)
diff --git a/bin/lib/create.js b/bin/lib/create.js
index 6a0d9f3..514f1d1 100755
--- a/bin/lib/create.js
+++ b/bin/lib/create.js
@@ -1,5 +1,3 @@
-#!/usr/bin/env node
-
/*
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
diff --git a/bin/templates/scripts/cordova/Api.js
b/bin/templates/scripts/cordova/Api.js
index 9a0ffc3..17ff99d 100644
--- a/bin/templates/scripts/cordova/Api.js
+++ b/bin/templates/scripts/cordova/Api.js
@@ -19,6 +19,15 @@
/* jslint node: true */
+/**
+ * @todo update coho to update this line.
+ * @todo use `package.json` instead but first
+ * figure out how this fit in with the platform-centered workflow structure.
+ * This workflow would not have the `package.json` file.
+ */
+// Coho updates this line
+const VERSION = '6.0.0-dev';
+
const fs = require('fs');
const path = require('path');
const unorm = require('unorm');
@@ -189,7 +198,7 @@ Api.prototype.getPlatformInfo = function () {
result.locations = this.locations;
result.root = this.root;
result.name = this.platform;
- result.version = require('./version');
+ result.version = Api.version();
result.projectConfig = new ConfigParser(this.locations.configXml);
return result;
@@ -685,4 +694,8 @@ Api.prototype.requirements = function () {
return check_reqs.check_all();
};
+Api.version = function () {
+ return VERSION;
+};
+
module.exports = Api;
diff --git a/bin/templates/scripts/cordova/lib/build.js
b/bin/templates/scripts/cordova/lib/build.js
index 3cb19a9..95cc39c 100644
--- a/bin/templates/scripts/cordova/lib/build.js
+++ b/bin/templates/scripts/cordova/lib/build.js
@@ -88,7 +88,7 @@ function getBundleIdentifier (projectObject) {
* @return {Promise}
*/
function getDefaultSimulatorTarget () {
- return require('./list-emulator-build-targets').run()
+ return require('./listEmulatorBuildTargets').run()
.then(emulators => {
let targetEmulator;
if (emulators.length > 0) {
@@ -137,7 +137,7 @@ module.exports.run = buildOpts => {
}
}
- return require('./list-devices').run()
+ return require('./listDevices').run()
.then(devices => {
if (devices.length > 0 && !(buildOpts.emulator)) {
// we also explicitly set device flag in options as we pass
@@ -155,7 +155,7 @@ module.exports.run = buildOpts => {
newTarget = newTarget.split(',')[0];
}
// a target was given to us, find the matching Xcode
destination name
- const promise =
require('./list-emulator-build-targets').targetForSimIdentifier(newTarget);
+ const promise =
require('./listEmulatorBuildTargets').targetForSimIdentifier(newTarget);
return promise.then(theTarget => {
if (!theTarget) {
return getDefaultSimulatorTarget().then(defaultTarget
=> {
diff --git a/bin/templates/scripts/cordova/lib/list-devices
b/bin/templates/scripts/cordova/lib/list-devices
index 473ff5c..5f89e21 100755
--- a/bin/templates/scripts/cordova/lib/list-devices
+++ b/bin/templates/scripts/cordova/lib/list-devices
@@ -19,48 +19,10 @@
under the License.
*/
-var Q = require('q');
-var exec = require('child_process').exec;
+const { run } = require('./listDevices');
-/**
- * Gets list of connected iOS devices
- * @return {Promise} Promise fulfilled with list of available iOS devices
- */
-function listDevices () {
- var commands = [
- Q.nfcall(exec, "ioreg -p IOUSB -l | sed -n -e '/iPad/,/USB Serial
Number/p' | grep 'Serial Number' | awk -F\\\" '{print $4 \" iPad\"}'"),
- Q.nfcall(exec, "ioreg -p IOUSB -l | sed -n -e '/iPhone/,/USB Serial
Number/p' | grep 'Serial Number' | awk -F\\\" '{print $4 \" iPhone\"}'"),
- Q.nfcall(exec, "ioreg -p IOUSB -l | sed -n -e '/iPod/,/USB Serial
Number/p' | grep 'Serial Number' | awk -F\\\" '{print $4 \" iPod\"}'")
- ];
-
- // wrap al lexec calls into promises and wait until they're fullfilled
- return Q.all(commands).then(function (results) {
- var accumulator = [];
- results.forEach(function (result) {
- var devicefound;
- // Each command promise resolves with array [stout, stderr], and
we need stdout only
- // Append stdout lines to accumulator
- devicefound = result[0].trim().split('\n');
- if (devicefound && devicefound.length) {
- devicefound.forEach(function (device) {
- if (device) {
- accumulator.push(device);
- }
- });
- }
- });
- return accumulator;
- });
-}
-
-exports.run = listDevices;
-
-// Check if module is started as separate script.
-// If so, then invoke main method and print out results.
-if (!module.parent) {
- listDevices().then(function (devices) {
- devices.forEach(function (device) {
- console.log(device);
- });
+run().then(devices => {
+ devices.forEach(device => {
+ console.log(device);
});
-}
+});
diff --git a/bin/templates/scripts/cordova/lib/list-emulator-build-targets
b/bin/templates/scripts/cordova/lib/list-emulator-build-targets
index 25dfe72..304c4c1 100755
--- a/bin/templates/scripts/cordova/lib/list-emulator-build-targets
+++ b/bin/templates/scripts/cordova/lib/list-emulator-build-targets
@@ -19,90 +19,8 @@
under the License.
*/
-var Q = require('q');
-var exec = require('child_process').exec;
+const { run } = require('./listEmulatorBuildTargets');
-/**
- * Returns a list of available simulator build targets of the form
- *
- * [
- * { name: <xcode-destination-name>,
- * identifier: <simctl-identifier>,
- * simIdentifier: <cordova emulate target>
- * }
- * ]
- *
- */
-function listEmulatorBuildTargets () {
- return Q.nfcall(exec, 'xcrun simctl list --json')
- .then(function (stdio) {
- return JSON.parse(stdio[0]);
- })
- .then(function (simInfo) {
- var devices = simInfo.devices;
- var deviceTypes = simInfo.devicetypes;
- return deviceTypes.reduce(function (typeAcc, deviceType) {
- if (!deviceType.name.match(/^[iPad|iPhone]/)) {
- // ignore targets we don't support (like Apple Watch or Apple
TV)
- return typeAcc;
- }
- var availableDevices = Object.keys(devices).reduce(function
(availAcc, deviceCategory) {
- var availableDevicesInCategory = devices[deviceCategory];
- availableDevicesInCategory.forEach(function (device) {
- if (device.name === deviceType.name || device.name ===
deviceType.name.replace(/-inch/g, ' inch')) {
- // Check new flag isAvailable (XCode 10.1+) or legacy
string availability (XCode 10 and lower)
- if (device.isAvailable || (device.availability &&
device.availability.toLowerCase().indexOf('unavailable') < 0)) {
- availAcc.push(device);
- }
- }
- });
- return availAcc;
- }, []);
- // we only want device types that have at least one available
device
- // (regardless of OS); this filters things out like iPhone 4s,
which
- // is present in deviceTypes, but probably not available on
the user's
- // system.
- if (availableDevices.length > 0) {
- typeAcc.push(deviceType);
- }
- return typeAcc;
- }, []);
- })
- .then(function (filteredTargets) {
- // the simIdentifier, or cordova emulate target name, is the very last
part
- // of identifier.
- return filteredTargets.map(function (target) {
- var identifierPieces = target.identifier.split('.');
- target.simIdentifier =
identifierPieces[identifierPieces.length - 1];
- return target;
- });
- });
-}
-
-exports.run = listEmulatorBuildTargets;
-
-/**
- * Given a simIdentifier, return the matching target.
- *
- * @param {string} simIdentifier a target, like "iPhone-SE"
- * @return {Object} the matching target, or undefined if no
match
- */
-exports.targetForSimIdentifier = function (simIdentifier) {
- return listEmulatorBuildTargets()
- .then(function (targets) {
- return targets.reduce(function (acc, target) {
- if (!acc && target.simIdentifier.toLowerCase() ===
simIdentifier.toLowerCase()) {
- acc = target;
- }
- return acc;
- }, undefined);
- });
-};
-
-// Check if module is started as separate script.
-// If so, then invoke main method and print out results.
-if (!module.parent) {
- listEmulatorBuildTargets().then(function (targets) {
- console.log(JSON.stringify(targets, null, 2));
- });
-}
+run().then(targets => {
+ console.log(JSON.stringify(targets, null, 2));
+});
diff --git a/bin/templates/scripts/cordova/lib/list-emulator-images
b/bin/templates/scripts/cordova/lib/list-emulator-images
index 99557e2..db9b72a 100755
--- a/bin/templates/scripts/cordova/lib/list-emulator-images
+++ b/bin/templates/scripts/cordova/lib/list-emulator-images
@@ -19,25 +19,10 @@
under the License.
*/
-var Q = require('q');
-var iossim = require('ios-sim');
+const { run } = require('./listEmulatorImages');
-/**
- * Gets list of iOS devices available for simulation
- * @return {Promise} Promise fulfilled with list of devices available for
simulation
- */
-function listEmulatorImages () {
- return Q.resolve(iossim.getdevicetypes());
-}
-
-exports.run = listEmulatorImages;
-
-// Check if module is started as separate script.
-// If so, then invoke main method and print out results.
-if (!module.parent) {
- listEmulatorImages().then(function (names) {
- names.forEach(function (name) {
- console.log(name);
- });
+run().then(names => {
+ names.forEach(name => {
+ console.log(name);
});
-}
+});
diff --git a/bin/templates/scripts/cordova/lib/list-started-emulators
b/bin/templates/scripts/cordova/lib/list-started-emulators
index 3626df8..7f06cf2 100755
--- a/bin/templates/scripts/cordova/lib/list-started-emulators
+++ b/bin/templates/scripts/cordova/lib/list-started-emulators
@@ -19,31 +19,10 @@
under the License.
*/
-var Q = require('q');
-var exec = require('child_process').exec;
+const { run } = require('./listStartedEmulators');
-/**
- * Gets list of running iOS simulators
- * @return {Promise} Promise fulfilled with list of running iOS simulators
- */
-function listStartedEmulators () {
- // wrap exec call into promise
- return Q.nfcall(exec, 'ps aux | grep -i "[i]OS Simulator"')
- .then(function () {
- return Q.nfcall(exec, 'defaults read com.apple.iphonesimulator
"SimulateDevice"');
- }).then(function (stdio) {
- return stdio[0].trim().split('\n');
- });
-}
-
-exports.run = listStartedEmulators;
-
-// Check if module is started as separate script.
-// If so, then invoke main method and print out results.
-if (!module.parent) {
- listStartedEmulators().then(function (emulators) {
- emulators.forEach(function (emulator) {
- console.log(emulator);
- });
+run().then(emulators => {
+ emulators.forEach(emulator => {
+ console.log(emulator);
});
-}
+});
diff --git a/bin/templates/scripts/cordova/lib/list-devices
b/bin/templates/scripts/cordova/lib/listDevices.js
similarity index 88%
copy from bin/templates/scripts/cordova/lib/list-devices
copy to bin/templates/scripts/cordova/lib/listDevices.js
index 473ff5c..f6bf2dd 100755
--- a/bin/templates/scripts/cordova/lib/list-devices
+++ b/bin/templates/scripts/cordova/lib/listDevices.js
@@ -1,5 +1,3 @@
-#!/usr/bin/env node
-
/*
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -54,13 +52,3 @@ function listDevices () {
}
exports.run = listDevices;
-
-// Check if module is started as separate script.
-// If so, then invoke main method and print out results.
-if (!module.parent) {
- listDevices().then(function (devices) {
- devices.forEach(function (device) {
- console.log(device);
- });
- });
-}
diff --git a/bin/templates/scripts/cordova/lib/list-emulator-build-targets
b/bin/templates/scripts/cordova/lib/listEmulatorBuildTargets.js
similarity index 93%
copy from bin/templates/scripts/cordova/lib/list-emulator-build-targets
copy to bin/templates/scripts/cordova/lib/listEmulatorBuildTargets.js
index 25dfe72..73ba526 100755
--- a/bin/templates/scripts/cordova/lib/list-emulator-build-targets
+++ b/bin/templates/scripts/cordova/lib/listEmulatorBuildTargets.js
@@ -1,5 +1,3 @@
-#!/usr/bin/env node
-
/*
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -98,11 +96,3 @@ exports.targetForSimIdentifier = function (simIdentifier) {
}, undefined);
});
};
-
-// Check if module is started as separate script.
-// If so, then invoke main method and print out results.
-if (!module.parent) {
- listEmulatorBuildTargets().then(function (targets) {
- console.log(JSON.stringify(targets, null, 2));
- });
-}
diff --git a/bin/templates/scripts/cordova/lib/list-emulator-images
b/bin/templates/scripts/cordova/lib/listEmulatorImages.js
similarity index 80%
copy from bin/templates/scripts/cordova/lib/list-emulator-images
copy to bin/templates/scripts/cordova/lib/listEmulatorImages.js
index 99557e2..81d346c 100755
--- a/bin/templates/scripts/cordova/lib/list-emulator-images
+++ b/bin/templates/scripts/cordova/lib/listEmulatorImages.js
@@ -1,5 +1,3 @@
-#!/usr/bin/env node
-
/*
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -31,13 +29,3 @@ function listEmulatorImages () {
}
exports.run = listEmulatorImages;
-
-// Check if module is started as separate script.
-// If so, then invoke main method and print out results.
-if (!module.parent) {
- listEmulatorImages().then(function (names) {
- names.forEach(function (name) {
- console.log(name);
- });
- });
-}
diff --git a/bin/templates/scripts/cordova/lib/list-started-emulators
b/bin/templates/scripts/cordova/lib/listStartedEmulators.js
similarity index 82%
copy from bin/templates/scripts/cordova/lib/list-started-emulators
copy to bin/templates/scripts/cordova/lib/listStartedEmulators.js
index 3626df8..c898ddc 100755
--- a/bin/templates/scripts/cordova/lib/list-started-emulators
+++ b/bin/templates/scripts/cordova/lib/listStartedEmulators.js
@@ -1,5 +1,3 @@
-#!/usr/bin/env node
-
/*
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -37,13 +35,3 @@ function listStartedEmulators () {
}
exports.run = listStartedEmulators;
-
-// Check if module is started as separate script.
-// If so, then invoke main method and print out results.
-if (!module.parent) {
- listStartedEmulators().then(function (emulators) {
- emulators.forEach(function (emulator) {
- console.log(emulator);
- });
- });
-}
diff --git a/bin/templates/scripts/cordova/lib/run.js
b/bin/templates/scripts/cordova/lib/run.js
index aff43f7..b03f657 100644
--- a/bin/templates/scripts/cordova/lib/run.js
+++ b/bin/templates/scripts/cordova/lib/run.js
@@ -46,7 +46,7 @@ module.exports.run = runOptions => {
let useDevice = !!runOptions.device;
- return require('./list-devices').run()
+ return require('./listDevices').run()
.then(devices => {
if (devices.length > 0 && !(runOptions.emulator)) {
useDevice = true;
@@ -174,7 +174,7 @@ function deployToSim (appPath, target) {
events.emit('log', 'Deploying to simulator');
if (!target) {
// Select target device for emulator
- return require('./list-emulator-images').run()
+ return require('./listEmulatorImages').run()
.then(emulators => {
if (emulators.length > 0) {
target = emulators[0];
@@ -217,7 +217,7 @@ function iossimLaunch (appPath, devicetypeid, log, exit) {
}
function listDevices () {
- return require('./list-devices').run()
+ return require('./listDevices').run()
.then(devices => {
events.emit('log', 'Available iOS Devices:');
devices.forEach(device => {
@@ -227,7 +227,7 @@ function listDevices () {
}
function listEmulators () {
- return require('./list-emulator-images').run()
+ return require('./listEmulatorImages').run()
.then(emulators => {
events.emit('log', 'Available iOS Simulators:');
emulators.forEach(emulator => {
diff --git a/bin/templates/scripts/cordova/lib/versions.js
b/bin/templates/scripts/cordova/lib/versions.js
index b414eb9..0e78229 100755
--- a/bin/templates/scripts/cordova/lib/versions.js
+++ b/bin/templates/scripts/cordova/lib/versions.js
@@ -1,5 +1,3 @@
-#!/usr/bin/env node
-
/*
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
diff --git a/bin/templates/scripts/cordova/version
b/bin/templates/scripts/cordova/version
index b8a4cf4..6bb657b 100755
--- a/bin/templates/scripts/cordova/version
+++ b/bin/templates/scripts/cordova/version
@@ -26,10 +26,6 @@
*/
// Coho updates this line
-var VERSION = '6.0.0-dev';
+const Api = require('./Api');
-module.exports.version = VERSION;
-
-if (!module.parent) {
- console.log(VERSION);
-}
+console.log(Api.version());
diff --git a/tests/spec/unit/lib/list-devices.spec.js
b/tests/spec/unit/lib/list-devices.spec.js
index 5a30770..b154764 100644
--- a/tests/spec/unit/lib/list-devices.spec.js
+++ b/tests/spec/unit/lib/list-devices.spec.js
@@ -17,10 +17,10 @@
under the License.
*/
-const list_devices =
require('../../../../bin/templates/scripts/cordova/lib/list-devices');
+const list_devices =
require('../../../../bin/templates/scripts/cordova/lib/listDevices');
const Q = require('q');
-describe('cordova/lib/list-devices', () => {
+describe('cordova/lib/listDevices', () => {
describe('run method', () => {
beforeEach(() => {
spyOn(Q, 'all').and.returnValue(Q.resolve([]));
diff --git a/tests/spec/unit/lib/list-emulator-images.spec.js
b/tests/spec/unit/lib/list-emulator-images.spec.js
index 853f089..8153bef 100644
--- a/tests/spec/unit/lib/list-emulator-images.spec.js
+++ b/tests/spec/unit/lib/list-emulator-images.spec.js
@@ -22,10 +22,10 @@
// allow for interacting with iOS Simulators. On Windows+Linux we are
// bound to not-have-that.
if (process.platform === 'darwin') {
- const list_emus =
require('../../../../bin/templates/scripts/cordova/lib/list-emulator-images');
+ const list_emus =
require('../../../../bin/templates/scripts/cordova/lib/listEmulatorImages');
const iossim = require('ios-sim');
- describe('cordova/lib/list-emulator-images', () => {
+ describe('cordova/lib/listEmulatorImages', () => {
describe('run method', () => {
beforeEach(() => {
spyOn(iossim, 'getdevicetypes');
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
