You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cordova.apache.org by ra...@apache.org on 2021/11/09 06:58:44 UTC
[cordova-ios] branch master updated: refactor(versions): DRY
version binary code (#1185)
This is an automated email from the ASF dual-hosted git repository.
raphinesse 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 d063f44 refactor(versions): DRY version binary code (#1185)
d063f44 is described below
commit d063f443bf74bee8eb8221cd3333eb947eb174ab
Author: Raphael von der GrĂ¼n <ra...@gmail.com>
AuthorDate: Tue Nov 9 07:58:40 2021 +0100
refactor(versions): DRY version binary code (#1185)
---
bin/apple_ios_version | 5 +----
bin/apple_osx_version | 5 +----
bin/apple_xcode_version | 10 +---------
bin/templates/scripts/cordova/lib/versions.js | 13 ++++++++++++-
tests/spec/unit/versions.spec.js | 12 ++++--------
5 files changed, 19 insertions(+), 26 deletions(-)
diff --git a/bin/apple_ios_version b/bin/apple_ios_version
index 1e8671b..9ab8dee 100755
--- a/bin/apple_ios_version
+++ b/bin/apple_ios_version
@@ -21,7 +21,4 @@
var versions = require('./templates/scripts/cordova/lib/versions.js');
-versions.get_apple_ios_version().catch(err => {
- console.log(err);
- process.exit(2);
-});
+versions.printOrDie('apple_ios');
diff --git a/bin/apple_osx_version b/bin/apple_osx_version
index 60292ad..af842f4 100755
--- a/bin/apple_osx_version
+++ b/bin/apple_osx_version
@@ -21,7 +21,4 @@
var versions = require('./templates/scripts/cordova/lib/versions.js');
-versions.get_apple_osx_version().catch(err => {
- console.log(err);
- process.exit(2);
-});
+versions.printOrDie('apple_osx');
diff --git a/bin/apple_xcode_version b/bin/apple_xcode_version
index b49b975..bd9ec67 100755
--- a/bin/apple_xcode_version
+++ b/bin/apple_xcode_version
@@ -21,12 +21,4 @@
var versions = require('./templates/scripts/cordova/lib/versions.js');
-versions.get_apple_xcode_version().then(
- version => {
- console.log(version);
- },
- err => {
- console.error(err);
- process.exit(2);
- }
-);
+versions.printOrDie('apple_xcode');
diff --git a/bin/templates/scripts/cordova/lib/versions.js b/bin/templates/scripts/cordova/lib/versions.js
index f891478..4c100d0 100644
--- a/bin/templates/scripts/cordova/lib/versions.js
+++ b/bin/templates/scripts/cordova/lib/versions.js
@@ -33,7 +33,7 @@ function fetchSdkVersionByType (sdkType) {
.map(line => line.match(/\d+\.\d+/)[0])
.sort(exports.compareVersions);
- console.log(versions[0]);
+ return versions[0];
});
}
@@ -117,3 +117,14 @@ exports.compareVersions = (...args) => {
const semverVersions = args.map(coerceToSemverIfInvalid);
return semver.compare(...semverVersions);
};
+
+exports.printOrDie = versionName =>
+ exports[`get_${versionName}_version`]().then(
+ version => {
+ console.log(version);
+ },
+ err => {
+ console.error(err);
+ process.exit(2);
+ }
+ );
diff --git a/tests/spec/unit/versions.spec.js b/tests/spec/unit/versions.spec.js
index 679a2e3..86162c5 100644
--- a/tests/spec/unit/versions.spec.js
+++ b/tests/spec/unit/versions.spec.js
@@ -23,22 +23,18 @@ const versions = require('../../../bin/templates/scripts/cordova/lib/versions');
// These tests can not run on windows.
if (process.platform === 'darwin') {
describe('versions', () => {
- beforeEach(() => {
- spyOn(console, 'log');
- });
-
describe('get_apple_ios_version method', () => {
it('should have found ios version.', () => {
- return versions.get_apple_ios_version().then(() => {
- expect(console.log).not.toHaveBeenCalledWith(undefined);
+ return versions.get_apple_ios_version().then(version => {
+ expect(version).not.toBeUndefined();
});
}, 10000);
});
describe('get_apple_osx_version method', () => {
it('should have found osx version.', () => {
- return versions.get_apple_osx_version().then(() => {
- expect(console.log).not.toHaveBeenCalledWith(undefined);
+ return versions.get_apple_osx_version().then(version => {
+ expect(version).not.toBeUndefined();
});
});
});
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org
For additional commands, e-mail: commits-help@cordova.apache.org