diff --git a/bin/codePush.js b/bin/www/codePush.js
similarity index 98%
rename from bin/codePush.js
rename to bin/www/codePush.js
index 6c34f4a..f0ddd43 100644
--- a/bin/codePush.js
+++ b/bin/www/codePush.js
@@ -4,7 +4,7 @@
PLEASE DO NOT MODIFY THIS FILE AS YOU WILL LOSE YOUR CHANGES WHEN RECOMPILING.
ALSO, PLEASE DO NOT SUBMIT PULL REQUESTS WITH CHANGES TO THIS FILE.
INSTEAD, EDIT THE TYPESCRIPT SOURCES UNDER THE WWW FOLDER.
- FOR MORE INFORMATION, PLEASE SEE CONTRIBUTING.MD.
+ FOR MORE INFORMATION, PLEASE SEE CONTRIBUTING.md.
*********************************************************************************************/
diff --git a/bin/codePushUtil.js b/bin/www/codePushUtil.js
similarity index 96%
rename from bin/codePushUtil.js
rename to bin/www/codePushUtil.js
index db40d6f..71681b2 100644
--- a/bin/codePushUtil.js
+++ b/bin/www/codePushUtil.js
@@ -4,7 +4,7 @@
PLEASE DO NOT MODIFY THIS FILE AS YOU WILL LOSE YOUR CHANGES WHEN RECOMPILING.
ALSO, PLEASE DO NOT SUBMIT PULL REQUESTS WITH CHANGES TO THIS FILE.
INSTEAD, EDIT THE TYPESCRIPT SOURCES UNDER THE WWW FOLDER.
- FOR MORE INFORMATION, PLEASE SEE CONTRIBUTING.MD.
+ FOR MORE INFORMATION, PLEASE SEE CONTRIBUTING.md.
*********************************************************************************************/
diff --git a/bin/fileUtil.js b/bin/www/fileUtil.js
similarity index 99%
rename from bin/fileUtil.js
rename to bin/www/fileUtil.js
index 7464f04..4a8286b 100644
--- a/bin/fileUtil.js
+++ b/bin/www/fileUtil.js
@@ -4,7 +4,7 @@
PLEASE DO NOT MODIFY THIS FILE AS YOU WILL LOSE YOUR CHANGES WHEN RECOMPILING.
ALSO, PLEASE DO NOT SUBMIT PULL REQUESTS WITH CHANGES TO THIS FILE.
INSTEAD, EDIT THE TYPESCRIPT SOURCES UNDER THE WWW FOLDER.
- FOR MORE INFORMATION, PLEASE SEE CONTRIBUTING.MD.
+ FOR MORE INFORMATION, PLEASE SEE CONTRIBUTING.md.
*********************************************************************************************/
diff --git a/bin/httpRequester.js b/bin/www/httpRequester.js
similarity index 97%
rename from bin/httpRequester.js
rename to bin/www/httpRequester.js
index acd3cae..284f2db 100644
--- a/bin/httpRequester.js
+++ b/bin/www/httpRequester.js
@@ -4,7 +4,7 @@
PLEASE DO NOT MODIFY THIS FILE AS YOU WILL LOSE YOUR CHANGES WHEN RECOMPILING.
ALSO, PLEASE DO NOT SUBMIT PULL REQUESTS WITH CHANGES TO THIS FILE.
INSTEAD, EDIT THE TYPESCRIPT SOURCES UNDER THE WWW FOLDER.
- FOR MORE INFORMATION, PLEASE SEE CONTRIBUTING.MD.
+ FOR MORE INFORMATION, PLEASE SEE CONTRIBUTING.md.
*********************************************************************************************/
diff --git a/bin/localPackage.js b/bin/www/localPackage.js
similarity index 99%
rename from bin/localPackage.js
rename to bin/www/localPackage.js
index fd43185..4c088a9 100644
--- a/bin/localPackage.js
+++ b/bin/www/localPackage.js
@@ -4,7 +4,7 @@
PLEASE DO NOT MODIFY THIS FILE AS YOU WILL LOSE YOUR CHANGES WHEN RECOMPILING.
ALSO, PLEASE DO NOT SUBMIT PULL REQUESTS WITH CHANGES TO THIS FILE.
INSTEAD, EDIT THE TYPESCRIPT SOURCES UNDER THE WWW FOLDER.
- FOR MORE INFORMATION, PLEASE SEE CONTRIBUTING.MD.
+ FOR MORE INFORMATION, PLEASE SEE CONTRIBUTING.md.
*********************************************************************************************/
@@ -13,8 +13,7 @@
var __extends = (this && this.__extends) || function (d, b) {
for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
function __() { this.constructor = d; }
- __.prototype = b.prototype;
- d.prototype = new __();
+ d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
};
var Package = require("./package");
var NativeAppInfo = require("./nativeAppInfo");
diff --git a/bin/nativeAppInfo.js b/bin/www/nativeAppInfo.js
similarity index 98%
rename from bin/nativeAppInfo.js
rename to bin/www/nativeAppInfo.js
index bf83bca..1a482bd 100644
--- a/bin/nativeAppInfo.js
+++ b/bin/www/nativeAppInfo.js
@@ -4,7 +4,7 @@
PLEASE DO NOT MODIFY THIS FILE AS YOU WILL LOSE YOUR CHANGES WHEN RECOMPILING.
ALSO, PLEASE DO NOT SUBMIT PULL REQUESTS WITH CHANGES TO THIS FILE.
INSTEAD, EDIT THE TYPESCRIPT SOURCES UNDER THE WWW FOLDER.
- FOR MORE INFORMATION, PLEASE SEE CONTRIBUTING.MD.
+ FOR MORE INFORMATION, PLEASE SEE CONTRIBUTING.md.
*********************************************************************************************/
diff --git a/bin/package.js b/bin/www/package.js
similarity index 92%
rename from bin/package.js
rename to bin/www/package.js
index c2dab0f..dded250 100644
--- a/bin/package.js
+++ b/bin/www/package.js
@@ -4,7 +4,7 @@
PLEASE DO NOT MODIFY THIS FILE AS YOU WILL LOSE YOUR CHANGES WHEN RECOMPILING.
ALSO, PLEASE DO NOT SUBMIT PULL REQUESTS WITH CHANGES TO THIS FILE.
INSTEAD, EDIT THE TYPESCRIPT SOURCES UNDER THE WWW FOLDER.
- FOR MORE INFORMATION, PLEASE SEE CONTRIBUTING.MD.
+ FOR MORE INFORMATION, PLEASE SEE CONTRIBUTING.md.
*********************************************************************************************/
diff --git a/bin/remotePackage.js b/bin/www/remotePackage.js
similarity index 96%
rename from bin/remotePackage.js
rename to bin/www/remotePackage.js
index f6fcf21..8824b76 100644
--- a/bin/remotePackage.js
+++ b/bin/www/remotePackage.js
@@ -4,7 +4,7 @@
PLEASE DO NOT MODIFY THIS FILE AS YOU WILL LOSE YOUR CHANGES WHEN RECOMPILING.
ALSO, PLEASE DO NOT SUBMIT PULL REQUESTS WITH CHANGES TO THIS FILE.
INSTEAD, EDIT THE TYPESCRIPT SOURCES UNDER THE WWW FOLDER.
- FOR MORE INFORMATION, PLEASE SEE CONTRIBUTING.MD.
+ FOR MORE INFORMATION, PLEASE SEE CONTRIBUTING.md.
*********************************************************************************************/
@@ -14,8 +14,7 @@
var __extends = (this && this.__extends) || function (d, b) {
for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
function __() { this.constructor = d; }
- __.prototype = b.prototype;
- d.prototype = new __();
+ d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
};
var LocalPackage = require("./localPackage");
var Package = require("./package");
diff --git a/gulpfile.js b/gulpfile.js
index 64357e6..f92f316 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -1,7 +1,10 @@
var gulp = require("gulp");
+var path = require("path");
var sourcePath = "./www";
+var testPath = "./test";
var binPath = "./bin";
+var tsFiles = "/**/*.ts";
/* This message is appended to the compiled JS files to avoid contributions to the compiled sources.*/
var compiledSourceWarningMessage = "\n \
@@ -10,26 +13,43 @@ var compiledSourceWarningMessage = "\n \
PLEASE DO NOT MODIFY THIS FILE AS YOU WILL LOSE YOUR CHANGES WHEN RECOMPILING. \n \
ALSO, PLEASE DO NOT SUBMIT PULL REQUESTS WITH CHANGES TO THIS FILE. \n \
INSTEAD, EDIT THE TYPESCRIPT SOURCES UNDER THE WWW FOLDER. \n \
- FOR MORE INFORMATION, PLEASE SEE CONTRIBUTING.MD. \n \
+ FOR MORE INFORMATION, PLEASE SEE CONTRIBUTING.md. \n \
*********************************************************************************************/ \n\n\n";
-gulp.task("compile", function () {
+/* TypeScript compilation parameters */
+var tsCompileOptions = {
+ "noImplicitAny": true,
+ "noEmitOnError": true,
+ "target": "ES5",
+ "module": "commonjs",
+ "sourceMap": false,
+ "sortOutput": true,
+ "removeComments": true
+};
+
+gulp.task("compile", function (callback) {
+ var runSequence = require("run-sequence");
+ runSequence("compile-src", "compile-test", callback);
+});
+
+gulp.task("compile-test", function () {
var ts = require("gulp-typescript");
var insert = require("gulp-insert");
- var tsCompileOptions = {
- "noImplicitAny": true,
- "noEmitOnError": true,
- "target": "ES5",
- "module": "commonjs",
- "sourceMap": false,
- "sortOutput": true,
- "removeComments": true
- };
- return gulp.src([sourcePath + "/**/*.ts"])
+ return gulp.src([testPath + tsFiles])
.pipe(ts(tsCompileOptions))
.pipe(insert.prepend(compiledSourceWarningMessage))
- .pipe(gulp.dest(binPath));
+ .pipe(gulp.dest(path.join(binPath, testPath)));
+});
+
+gulp.task("compile-src", function () {
+ var ts = require("gulp-typescript");
+ var insert = require("gulp-insert");
+
+ return gulp.src([sourcePath + tsFiles])
+ .pipe(ts(tsCompileOptions))
+ .pipe(insert.prepend(compiledSourceWarningMessage))
+ .pipe(gulp.dest(path.join(binPath, sourcePath)));
});
gulp.task("tslint", function () {
@@ -73,17 +93,17 @@ gulp.task("tslint", function () {
}
}
- return gulp.src(sourcePath + "/**/*.ts")
+ return gulp.src([sourcePath + tsFiles, testPath + tsFiles])
.pipe(tslint({ configuration: config }))
.pipe(tslint.report("verbose"));
});
-gulp.task("clean", function (callback) {
+gulp.task("clean", function () {
var del = require("del");
- del([binPath + "/**"], { force: true }, callback);
+ return del([binPath + "/**"], { force: true });
});
gulp.task("default", function (callback) {
var runSequence = require("run-sequence");
- runSequence("clean", "compile", "tslint");
+ runSequence("clean", "compile", "tslint", callback);
});
\ No newline at end of file
diff --git a/package.json b/package.json
index d2df532..e79f8aa 100644
--- a/package.json
+++ b/package.json
@@ -24,6 +24,11 @@
"gulp-insert": "latest",
"gulp-tslint": "latest",
"del": "latest",
- "run-sequence": "latest"
+ "run-sequence": "latest",
+ "q": "latest",
+ "replace": "latest",
+ "mkdirp": "latest",
+ "express": "latest",
+ "body-parser": "latest"
}
}
\ No newline at end of file
diff --git a/plugin.xml b/plugin.xml
index fd01ce0..dfddd45 100644
--- a/plugin.xml
+++ b/plugin.xml
@@ -10,35 +10,35 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/test/cordova-plugin-code-push-acquisition/plugin.xml b/test/cordova-plugin-code-push-acquisition/plugin.xml
new file mode 100644
index 0000000..f60d545
--- /dev/null
+++ b/test/cordova-plugin-code-push-acquisition/plugin.xml
@@ -0,0 +1,11 @@
+
+
+ CodePushAcquisition
+ Code Push Acquisition Plugin for Apache Cordova
+ Apache 2.0
+ cordova,code,push,acquisition
+ https://github.com/Microsoft/hybrid-mobile-deploy.git
+
+
+
+
\ No newline at end of file
diff --git a/test/cordova-plugin-code-push-acquisition/script/acquisition-sdk.js b/test/cordova-plugin-code-push-acquisition/script/acquisition-sdk.js
new file mode 100644
index 0000000..f1097da
--- /dev/null
+++ b/test/cordova-plugin-code-push-acquisition/script/acquisition-sdk.js
@@ -0,0 +1,86 @@
+///
+var AcquisitionManager = (function () {
+ function AcquisitionManager(httpRequester, configuration) {
+ this._httpRequester = httpRequester;
+ this._serverUrl = configuration.serverUrl;
+ if (this._serverUrl.slice(-1) !== "/") {
+ this._serverUrl += "/";
+ }
+ this._deploymentKey = configuration.deploymentKey;
+ this._ignoreAppVersion = configuration.ignoreAppVersion;
+ }
+ AcquisitionManager.prototype.queryUpdateWithCurrentPackage = function (currentPackage, callback) {
+ var _this = this;
+ if (!currentPackage || !currentPackage.appVersion) {
+ throw new Error("Calling common acquisition SDK with incorrect package"); // Unexpected; indicates error in our implementation
+ }
+ var updateRequest = {
+ deploymentKey: this._deploymentKey,
+ appVersion: currentPackage.appVersion,
+ packageHash: currentPackage.packageHash,
+ isCompanion: this._ignoreAppVersion
+ };
+ var requestUrl = this._serverUrl + "updateCheck?" + queryStringify(updateRequest);
+ this._httpRequester.request(0 /* GET */, requestUrl, function (error, response) {
+ if (error) {
+ callback(error, null);
+ return;
+ }
+ if (response.statusCode !== 200) {
+ callback(new Error(response.statusCode + ": " + response.body), null);
+ return;
+ }
+ try {
+ var responseObject = JSON.parse(response.body);
+ var updateInfo = responseObject.updateInfo;
+ }
+ catch (error) {
+ callback(error, null);
+ return;
+ }
+ if (!updateInfo) {
+ callback(error, null);
+ return;
+ }
+ else if (updateInfo.updateAppVersion) {
+ callback(null, { updateAppVersion: true, appVersion: updateInfo.appVersion });
+ return;
+ }
+ else if (!updateInfo.isAvailable) {
+ callback(null, null);
+ return;
+ }
+ var remotePackage = {
+ deploymentKey: _this._deploymentKey,
+ description: updateInfo.description,
+ label: updateInfo.label,
+ appVersion: updateInfo.appVersion,
+ isMandatory: updateInfo.isMandatory,
+ packageHash: updateInfo.packageHash,
+ packageSize: updateInfo.packageSize,
+ downloadUrl: updateInfo.downloadURL
+ };
+ callback(null, remotePackage);
+ });
+ };
+ return AcquisitionManager;
+})();
+exports.AcquisitionManager = AcquisitionManager;
+function queryStringify(object) {
+ var queryString = "";
+ var isFirst = true;
+ for (var property in object) {
+ if (object.hasOwnProperty(property)) {
+ var value = object[property];
+ if (!isFirst) {
+ queryString += "&";
+ }
+ queryString += encodeURIComponent(property) + "=";
+ if (value !== null && typeof value !== "undefined") {
+ queryString += encodeURIComponent(value);
+ }
+ isFirst = false;
+ }
+ }
+ return queryString;
+}
diff --git a/test/projectManager.ts b/test/projectManager.ts
new file mode 100644
index 0000000..1d39741
--- /dev/null
+++ b/test/projectManager.ts
@@ -0,0 +1,106 @@
+///
+///
+///
+///
+///
+
+"use strict";
+
+import child_process = require("child_process");
+import replace = require("replace");
+import path = require("path");
+import Q = require("q");
+import fs = require("fs");
+import mkdirp = require("mkdirp");
+
+var del = require("del");
+
+/**
+ * In charge of Cordova project related operations.
+ */
+export class ProjectManager {
+ public static ANDROID_KEY_PLACEHOLDER: string = "CODE_PUSH_ANDROID_DEPOYMENT_KEY";
+ public static IOS_KEY_PLACEHOLDER: string = "CODE_PUSH_IOS_DEPLOYMENT_KEY";
+ public static SERVER_URL_PLACEHOLDER: string = "CODE_PUSH_SERVER_URL";
+
+ /**
+ * Creates a new cordova test application at the specified path, and configures it
+ * with the given server URL, android and ios deployment keys.
+ */
+ public static setupTemplate(destinationPath: string, templatePath: string, serverURL: string, androidKey: string, iosKey: string, appName: string, appNamespace: string): Q.Promise {
+ var configXmlPath = path.join(destinationPath, "config.xml");
+ var indexHtmlPath = path.join(destinationPath, "www/index.html");
+ var indexJsPath = path.join(destinationPath, "www/js/index.js");
+
+ if (fs.existsSync(destinationPath)) {
+ del.sync([destinationPath], { force: true });
+ }
+ mkdirp.sync(destinationPath);
+
+ return ProjectManager.execAndLogChildProcess("cordova create " + destinationPath + " " + appNamespace + " " + appName + " --copy-from " + templatePath)
+ .then(ProjectManager.replaceString.bind(undefined, configXmlPath, ProjectManager.ANDROID_KEY_PLACEHOLDER, androidKey))
+ .then(ProjectManager.replaceString.bind(undefined, configXmlPath, ProjectManager.IOS_KEY_PLACEHOLDER, iosKey))
+ .then(ProjectManager.replaceString.bind(undefined, configXmlPath, ProjectManager.SERVER_URL_PLACEHOLDER, serverURL))
+ .then(ProjectManager.replaceString.bind(undefined, indexHtmlPath, ProjectManager.SERVER_URL_PLACEHOLDER, serverURL))
+ .then(ProjectManager.replaceString.bind(undefined, indexJsPath, ProjectManager.SERVER_URL_PLACEHOLDER, serverURL));
+ }
+
+ /**
+ * Adds a plugin to a Cordova project.
+ */
+ public static addPlugin(projectFolder: string, plugin: string): Q.Promise {
+ return ProjectManager.execAndLogChildProcess("cordova plugin add " + plugin, { cwd: projectFolder });
+ }
+
+ /**
+ * Adds a platform to a Cordova project.
+ */
+ public static buildPlatform(projectFolder: string, platformName: string): Q.Promise {
+ return ProjectManager.execAndLogChildProcess("cordova build " + platformName, { cwd: projectFolder });
+ }
+
+ /**
+ * Runs a project to a given target / platform.
+ */
+ public static runPlatform(projectFolder: string, platformName: string, skipBuild: boolean = false, target?: string): Q.Promise {
+ var runTarget = target ? " --target " + target : "";
+ var nobuild = skipBuild ? " --nobuild" : "";
+ return ProjectManager.execAndLogChildProcess("cordova run " + platformName + runTarget + nobuild, { cwd: projectFolder });
+ }
+
+ /**
+ * Adds a platform to a Cordova project.
+ */
+ public static addPlatform(projectFolder: string, platformName: string): Q.Promise {
+ return ProjectManager.execAndLogChildProcess("cordova platform add " + platformName, { cwd: projectFolder });
+ }
+
+ /**
+ * Replaces a regex in a file with a given string.
+ */
+ public static replaceString(filePath: string, regex: string, replacement: string): void {
+ replace({ regex: regex, replacement: replacement, recursive: false, silent: false, paths: [filePath] });
+ }
+
+ /**
+ * Executes a child process and logs its output to the console.
+ */
+ private static execAndLogChildProcess(command: string, options?: child_process.IExecOptions): Q.Promise {
+ var deferred = Q.defer();
+
+ child_process.exec(command, options, (error: Error, stdout: Buffer, stderr: Buffer) => {
+
+ stdout && console.log(stdout);
+ stderr && console.error(stderr);
+
+ if (error) {
+ console.error(error);
+ deferred.reject(error);
+ } else {
+ deferred.resolve(undefined);
+ }
+ });
+
+ return deferred.promise;
+ }
+}
\ No newline at end of file
diff --git a/test/serverUtil.ts b/test/serverUtil.ts
new file mode 100644
index 0000000..ae123ac
--- /dev/null
+++ b/test/serverUtil.ts
@@ -0,0 +1,22 @@
+"use strict";
+
+/**
+ * Class used to mock the codePush.checkForUpdate() response from the server.
+ */
+export class CheckForUpdateResponseMock {
+ downloadURL: string;
+ isAvailable: boolean;
+ packageSize: number;
+ updateAppVersion: boolean;
+ appVersion: string;
+ description: string;
+ label: string;
+ packageHash: string;
+ isMandatory: boolean;
+}
+
+export class TestMessage {
+ public static CHECK_UP_TO_DATE = "CHECK_UP_TO_DATE";
+ public static CHECK_UPDATE_AVAILABLE = "CHECK_UPDATE_AVAILABLE";
+ public static CHECK_ERROR = "CHECK_ERROR";
+}
\ No newline at end of file
diff --git a/test/template/config.xml b/test/template/config.xml
new file mode 100644
index 0000000..4bfb4e3
--- /dev/null
+++ b/test/template/config.xml
@@ -0,0 +1,42 @@
+
+
+ CodePushTest
+
+ A sample Apache Cordova application that is used for testing the Code Push plugin.
+
+
+ Apache Cordova Team
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/test/template/www/index.html b/test/template/www/index.html
new file mode 100644
index 0000000..cffd856
--- /dev/null
+++ b/test/template/www/index.html
@@ -0,0 +1,49 @@
+
+
+
+
+
+
+
+
+
+
+ Hello World
+
+
+
+
+
Hello, CodePush (Store Version)
+
Waiting for device...
+