fix-marketplace-install

microsoft · Jul 6, 2016 · de51e41 · de51e41
1 parent fc249eb
commit de51e41
Show file tree

Hide file tree

Showing 13 changed files with 32 additions and 429 deletions.
diff --git a/Tasks/codepush-patch/codepush-patch.js b/Tasks/codepush-patch/codepush-patch.js
@@ -1,55 +1,5 @@
-var path = require("path");
 var tl = require("vsts-task-lib");
-require("shelljs/global");
-
-// Global variables.
-var codePushCommandPrefix = "node " + path.join(__dirname, "node_modules", "code-push-cli", "script", "cli");
-
-// Export for unit testing.
-function log(message) {
-    console.log(message);
-}
-
-// Helper functions.
-function buildCommand(cmd, positionArgs, optionFlags) {
-    var command = codePushCommandPrefix + " " + cmd;
-
-    positionArgs && positionArgs.forEach(function (positionArg) {
-        command = command + " \"" + positionArg + "\"";
-    });
-
-    for (var flag in optionFlags) {
-        // If the value is falsey, the option flag doesn't have to be specified.
-        if (optionFlags[flag] || optionFlags[flag] === "") {
-            var flagValue = "" + optionFlags[flag];
-
-            command = command + " --" + flag;
-            command = command + " \"" + flagValue + "\"";
-        }
-    }
-
-    return command;
-}
-
-function executeCommandAndHandleResult(cmd, positionArgs, optionFlags) {
-    var command = buildCommand(cmd, positionArgs, optionFlags);
-
-    var result = exec(command, { silent: true });
-
-    if (result.code == 0) {
-        module.exports.log(result.output);
-    } else {
-        tl.setResult(1, result.output);
-        ensureLoggedOut();
-        throw new Error(result.output);
-    }
-
-    return result;
-}
-
-function ensureLoggedOut() {
-    exec(buildCommand("logout"), { silent: true });
-}
+var CodePushSdk = require("code-push");
 
 // The main function to be executed.
 function performPatchTask(accessKey, appName, deploymentName, label, description, isDisabled, isMandatory, rollout, appStoreVersion) {
@@ -75,37 +25,26 @@ function performPatchTask(accessKey, appName, deploymentName, label, description
         console.error("Access key required");
         tl.setResult(1, "Access key required");
     }
-
-    // Ensure all other users are logged out.
-    ensureLoggedOut();
-
-    // Log in to the CodePush CLI.
-    executeCommandAndHandleResult("login", /*positionArgs*/ null, { accessKey: accessKey });
-
-    // Run release command.
-    executeCommandAndHandleResult(
-        "patch",
-        [appName, deploymentName],
+
+    var codePushSdk = new CodePushSdk(accessKey);
+    codePushSdk.patchRelease(
+        appName, deploymentName, label, 
         {
             label: (label === "latest" ? false : label),
             description: (description === "noChange" ? false : description),
             disabled: (isDisabled === "noChange" ? false : isDisabled),
             mandatory: (isMandatory === "noChange" ? false : isMandatory),
-            rollout: (rollout === "noChange" ? false : rollout),
+            rollout: (rollout === "noChange" ? null : parseInt(rollout.replace("%", ""))),
             targetBinaryVersion: (appStoreVersion === "noChange" ? false : appStoreVersion)
-        }
-        );
-
-    // Log out.
-    ensureLoggedOut();
+        })
+        .done(function() {
+            tl.setResult(1, "Successfully patched " + appName + " - " + deploymentName + " (" + label + ")");
+        }, function(error) {
+            throw error;
+        });
 }
 
 module.exports = {
-    buildCommand: buildCommand,
-    commandPrefix: codePushCommandPrefix,
-    ensureLoggedOut: ensureLoggedOut,
-    executeCommandAndHandleResult: executeCommandAndHandleResult,
-    log: log,
     performPatchTask: performPatchTask
 }
 

diff --git a/Tasks/codepush-patch/package.json b/Tasks/codepush-patch/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vsts-task-code-push-patch",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Update the metadata for an existing release",
   "main": "codepush-patch.js",
   "scripts": {
@@ -10,7 +10,7 @@
   "author": "Microsoft Corporation",
   "license": "ISC",
   "dependencies": {
-    "code-push-cli": "^1.10.0-beta",
+    "code-push": "github:Microsoft/code-push#code-push-sdk-lite",
     "vsts-task-lib": "^0.5.7"
   },
   "devDependencies": {

diff --git a/Tasks/codepush-patch/task.json b/Tasks/codepush-patch/task.json
@@ -13,7 +13,7 @@
     "version": {
         "Major": "1",
         "Minor": "0",
-        "Patch": "0"
+        "Patch": "1"
     },
     "minimumAgentVersion": "1.83.0",
     "instanceNameFormat": "Patch the $(releaseLabel) release for $(deploymentName) ($(appName))",

diff --git a/Tasks/codepush-patch/test.js b/Tasks/codepush-patch/test.js
diff --git a/Tasks/codepush-promote/codepush-promote.js b/Tasks/codepush-promote/codepush-promote.js
@@ -1,58 +1,5 @@
-var path = require("path");
 var tl = require("vsts-task-lib");
-require("shelljs/global");
-
-// Global variables.
-var codePushCommandPrefix = "node " + path.join(__dirname, "node_modules", "code-push-cli", "script", "cli");
-
-// Export for unit testing.
-function log(message) {
-    console.log(message);
-}
-
-// Helper functions.
-function buildCommand(cmd, positionArgs, optionFlags) {
-    var command = codePushCommandPrefix + " " + cmd;
-
-    positionArgs && positionArgs.forEach(function (positionArg) {
-        command = command + " \"" + positionArg + "\"";
-    });
-
-    for (var flag in optionFlags) {
-        // If the value is falsey, the option flag doesn't have to be specified.
-        if (optionFlags[flag] || optionFlags[flag] === "") {
-            var flagValue = "" + optionFlags[flag];
-
-            command = command + " --" + flag;
-            // For boolean flags, the presence of the flag is enough to indicate its value.
-            if (flagValue != "true") {
-                command = command + " \"" + flagValue + "\"";
-            }
-        }
-    }
-
-    return command;
-}
-
-function executeCommandAndHandleResult(cmd, positionArgs, optionFlags) {
-    var command = buildCommand(cmd, positionArgs, optionFlags);
-
-    var result = exec(command, { silent: true });
-
-    if (result.code == 0) {
-        module.exports.log(result.output);
-    } else {
-        tl.setResult(1, result.output);
-        ensureLoggedOut();
-        throw new Error(result.output);
-    }
-
-    return result;
-}
-
-function ensureLoggedOut() {
-    exec(buildCommand("logout"), { silent: true });
-}
+var CodePushSdk = require("code-push");
 
 // The main function to be executed.
 function performPromoteTask(accessKey, appName, sourceDeploymentName, targetDeploymentName, appStoreVersion, description, rollout, isMandatory, isDisabled) {
@@ -84,31 +31,19 @@ function performPromoteTask(accessKey, appName, sourceDeploymentName, targetDepl
         description: description === "Inherit" ? null : description,
         disabled: isDisabled === "Inherit" ? null : isDisabled,        
         mandatory: isMandatory === "Inherit" ? null : isMandatory,
-        rollout: rollout        
+        rollout: parseInt(rollout.replace("%", ""))        
     };
 
-    // Ensure all other users are logged out.
-    ensureLoggedOut();
-
-    // Log in to the CodePush CLI.
-    executeCommandAndHandleResult("login", /*positionArgs*/ null, { accessKey: accessKey });
-
-    // Run promote command.
-    executeCommandAndHandleResult(
-        "promote",
-        [appName, sourceDeploymentName, targetDeploymentName],
-        updateMetadata);
-
-    // Log out.
-    ensureLoggedOut();
+    var codePushSdk = new CodePushSdk(accessKey);
+    return codePushSdk.promote(appName, sourceDeploymentName, targetDeploymentName, updateMetadata)
+        .done(function() {
+            tl.setResult(1, "Successfully promoted " + sourceDeploymentName + " to " + targetDeploymentName);
+        }, function(error) {
+            throw error;
+        });
 }
 
 module.exports = {
-    buildCommand: buildCommand,
-    commandPrefix: codePushCommandPrefix,
-    ensureLoggedOut: ensureLoggedOut,
-    executeCommandAndHandleResult: executeCommandAndHandleResult,
-    log: log,
     performPromoteTask: performPromoteTask
 }
 

diff --git a/Tasks/codepush-promote/package.json b/Tasks/codepush-promote/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vsts-task-code-push-promote",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "description": "Promote a CodePush release from one deployment to another",
   "main": "codepush-promote.js",
   "scripts": {
@@ -10,7 +10,7 @@
   "author": "Microsoft Corporation",
   "license": "ISC",
   "dependencies": {
-    "code-push-cli": "^1.10.0-beta",
+    "code-push": "github:Microsoft/code-push#code-push-sdk-lite",
     "vsts-task-lib": "^0.5.7"
   },
   "devDependencies": {

diff --git a/Tasks/codepush-promote/task.json b/Tasks/codepush-promote/task.json
@@ -13,7 +13,7 @@
     "version": {
         "Major": "1",
         "Minor": "2",
-        "Patch": "1"
+        "Patch": "2"
     },
     "minimumAgentVersion": "1.83.0",
     "instanceNameFormat": "Promote $(sourceDeploymentName) to $(targetDeploymentName) ($(appName))",