@appcircle/codepush-cli 0.0.2 → 0.0.3

package/bin/test/cli.js

@@ -256,138 +256,6 @@ describe("CLI", () => {
     afterEach(() => {
         sandbox.restore();
     });
-    it("accessKeyAdd creates access key with name and default ttl", (done) => {
-        var command = {
-            type: cli.CommandType.accessKeyAdd,
-            name: "Test name",
-        };
-        cmdexec.execute(command).done(() => {
-            sinon.assert.calledTwice(log);
-            assert.equal(log.args[0].length, 1);
-            var actual = log.args[0][0];
-            var expected = `Successfully created the "Test name" access key: key123`;
-            assert.equal(actual, expected);
-            actual = log.args[1][0];
-            expected = "Make sure to save this key value somewhere safe, since you won't be able to view it from the CLI again!";
-            assert.equal(actual, expected);
-            done();
-        });
-    });
-    it("accessKeyAdd creates access key with name and specified ttl", (done) => {
-        var ttl = 10000;
-        var command = {
-            type: cli.CommandType.accessKeyAdd,
-            name: "Test name",
-            ttl,
-        };
-        cmdexec.execute(command).done(() => {
-            sinon.assert.calledTwice(log);
-            assert.equal(log.args[0].length, 1);
-            var actual = log.args[0][0];
-            var expected = `Successfully created the "Test name" access key: key123`;
-            assert.equal(actual, expected);
-            actual = log.args[1][0];
-            expected = "Make sure to save this key value somewhere safe, since you won't be able to view it from the CLI again!";
-            assert.equal(actual, expected);
-            done();
-        });
-    });
-    it("accessKeyPatch updates access key with new name", (done) => {
-        var command = {
-            type: cli.CommandType.accessKeyPatch,
-            oldName: "Test name",
-            newName: "Updated name",
-        };
-        cmdexec.execute(command).done(() => {
-            sinon.assert.calledOnce(log);
-            assert.equal(log.args[0].length, 1);
-            var actual = log.args[0][0];
-            var expected = `Successfully renamed the access key "Test name" to "Updated name".`;
-            assert.equal(actual, expected);
-            done();
-        });
-    });
-    it("accessKeyPatch updates access key with new ttl", (done) => {
-        var ttl = 10000;
-        var command = {
-            type: cli.CommandType.accessKeyPatch,
-            oldName: "Test name",
-            ttl,
-        };
-        cmdexec.execute(command).done(() => {
-            sinon.assert.calledOnce(log);
-            assert.equal(log.args[0].length, 1);
-            var actual = log.args[0][0];
-            var expected = `Successfully changed the expiration date of the "Test name" access key to Wednesday, August 17, 2016 12:07 PM.`;
-            assert.equal(actual, expected);
-            done();
-        });
-    });
-    it("accessKeyPatch updates access key with new name and ttl", (done) => {
-        var ttl = 10000;
-        var command = {
-            type: cli.CommandType.accessKeyPatch,
-            oldName: "Test name",
-            newName: "Updated name",
-            ttl,
-        };
-        cmdexec.execute(command).done(() => {
-            sinon.assert.calledOnce(log);
-            assert.equal(log.args[0].length, 1);
-            var actual = log.args[0][0];
-            var expected = `Successfully renamed the access key "Test name" to "Updated name" and changed its expiration date to Wednesday, August 17, 2016 12:07 PM.`;
-            assert.equal(actual, expected);
-            done();
-        });
-    });
-    it("accessKeyList lists access key name and expires fields", (done) => {
-        var command = {
-            type: cli.CommandType.accessKeyList,
-            format: "json",
-        };
-        cmdexec.execute(command).done(() => {
-            sinon.assert.calledOnce(log);
-            assert.equal(log.args[0].length, 1);
-            var actual = log.args[0][0];
-            var expected = [
-                {
-                    createdTime: 0,
-                    name: "Test name",
-                    expires: NOW + DEFAULT_ACCESS_KEY_MAX_AGE,
-                },
-            ];
-            assertJsonDescribesObject(actual, expected);
-            done();
-        });
-    });
-    it("accessKeyRemove removes access key", (done) => {
-        var command = {
-            type: cli.CommandType.accessKeyRemove,
-            accessKey: "8",
-        };
-        var removeAccessKey = sandbox.spy(cmdexec.sdk, "removeAccessKey");
-        cmdexec.execute(command).done(() => {
-            sinon.assert.calledOnce(removeAccessKey);
-            sinon.assert.calledWithExactly(removeAccessKey, "8");
-            sinon.assert.calledOnce(log);
-            sinon.assert.calledWithExactly(log, 'Successfully removed the "8" access key.');
-            done();
-        });
-    });
-    it("accessKeyRemove does not remove access key if cancelled", (done) => {
-        var command = {
-            type: cli.CommandType.accessKeyRemove,
-            accessKey: "8",
-        };
-        var removeAccessKey = sandbox.spy(cmdexec.sdk, "removeAccessKey");
-        wasConfirmed = false;
-        cmdexec.execute(command).done(() => {
-            sinon.assert.notCalled(removeAccessKey);
-            sinon.assert.calledOnce(log);
-            sinon.assert.calledWithExactly(log, "Access key removal cancelled.");
-            done();
-        });
-    });
     it("appAdd reports new app name and ID", (done) => {
         var command = {
             type: cli.CommandType.appAdd,
@@ -1202,72 +1070,6 @@ describe("CLI", () => {
         })
             .done();
     });
-    it("sessionList lists session name and expires fields", (done) => {
-        var command = {
-            type: cli.CommandType.sessionList,
-            format: "json",
-        };
-        cmdexec.execute(command).done(() => {
-            sinon.assert.calledOnce(log);
-            assert.equal(log.args[0].length, 1);
-            var actual = log.args[0][0];
-            var expected = [
-                {
-                    loggedInTime: 0,
-                    machineName: TEST_MACHINE_NAME,
-                },
-            ];
-            assertJsonDescribesObject(actual, expected);
-            done();
-        });
-    });
-    it("sessionRemove removes session", (done) => {
-        var machineName = TEST_MACHINE_NAME;
-        var command = {
-            type: cli.CommandType.sessionRemove,
-            machineName: machineName,
-        };
-        var removeSession = sandbox.spy(cmdexec.sdk, "removeSession");
-        cmdexec.execute(command).done(() => {
-            sinon.assert.calledOnce(removeSession);
-            sinon.assert.calledWithExactly(removeSession, machineName);
-            sinon.assert.calledOnce(log);
-            sinon.assert.calledWithExactly(log, `Successfully removed the login session for "${machineName}".`);
-            done();
-        });
-    });
-    it("sessionRemove does not remove session if cancelled", (done) => {
-        var machineName = TEST_MACHINE_NAME;
-        var command = {
-            type: cli.CommandType.sessionRemove,
-            machineName: machineName,
-        };
-        var removeSession = sandbox.spy(cmdexec.sdk, "removeSession");
-        wasConfirmed = false;
-        cmdexec.execute(command).done(() => {
-            sinon.assert.notCalled(removeSession);
-            sinon.assert.calledOnce(log);
-            sinon.assert.calledWithExactly(log, "Session removal cancelled.");
-            done();
-        });
-    });
-    it("sessionRemove does not remove current session", (done) => {
-        var machineName = os.hostname();
-        var command = {
-            type: cli.CommandType.sessionRemove,
-            machineName: machineName,
-        };
-        wasConfirmed = false;
-        cmdexec
-            .execute(command)
-            .then(() => {
-            done(new Error("Did not throw error."));
-        })
-            .catch(() => {
-            done();
-        })
-            .done();
-    });
     function releaseHelperFunction(command, done, expectedError) {
         cmdexec.execute(command).done(() => {
             throw "Error Expected";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appcircle/codepush-cli",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "description": "Management CLI for the CodePush service",
   "main": "./script/cli.js",
   "scripts": {

package/script/command-executor.ts

@@ -49,6 +49,7 @@ import {
   isBinaryOrZip,
   fileExists
 } from "./utils/file-utils";
+import { DeploymentKey } from "./types/rest-definitions";
 
 const configFilePath: string = path.join(process.env.LOCALAPPDATA || process.env.HOME, ".code-push.config");
 const emailValidator = require("email-validator");
@@ -121,60 +122,6 @@ export const confirm = (message: string = "Are you sure?"): Promise<boolean> =>
   });
 };
 
-function accessKeyAdd(command: cli.IAccessKeyAddCommand): Promise<void> {
-  return sdk.addAccessKey(command.name, command.ttl).then((accessKey: AccessKey) => {
-    log(`Successfully created the "${command.name}" access key: ${accessKey.key}`);
-    log("Make sure to save this key value somewhere safe, since you won't be able to view it from the CLI again!");
-  });
-}
-
-function accessKeyPatch(command: cli.IAccessKeyPatchCommand): Promise<void> {
-  const willUpdateName: boolean = isCommandOptionSpecified(command.newName) && command.oldName !== command.newName;
-  const willUpdateTtl: boolean = isCommandOptionSpecified(command.ttl);
-
-  if (!willUpdateName && !willUpdateTtl) {
-    throw new Error("A new name and/or TTL must be provided.");
-  }
-
-  return sdk.patchAccessKey(command.oldName, command.newName, command.ttl).then((accessKey: AccessKey) => {
-    let logMessage: string = "Successfully ";
-    if (willUpdateName) {
-      logMessage += `renamed the access key "${command.oldName}" to "${command.newName}"`;
-    }
-
-    if (willUpdateTtl) {
-      const expirationDate = moment(accessKey.expires).format("LLLL");
-      if (willUpdateName) {
-        logMessage += ` and changed its expiration date to ${expirationDate}`;
-      } else {
-        logMessage += `changed the expiration date of the "${command.oldName}" access key to ${expirationDate}`;
-      }
-    }
-
-    log(`${logMessage}.`);
-  });
-}
-
-function accessKeyList(command: cli.IAccessKeyListCommand): Promise<void> {
-  throwForInvalidOutputFormat(command.format);
-
-  return sdk.getAccessKeys().then((accessKeys: AccessKey[]): void => {
-    printAccessKeys(command.format, accessKeys);
-  });
-}
-
-function accessKeyRemove(command: cli.IAccessKeyRemoveCommand): Promise<void> {
-  return confirm().then((wasConfirmed: boolean): Promise<void> => {
-    if (wasConfirmed) {
-      return sdk.removeAccessKey(command.accessKey).then((): void => {
-        log(`Successfully removed the "${command.accessKey}" access key.`);
-      });
-    }
-
-    log("Access key removal cancelled.");
-  });
-}
-
 function appAdd(command: cli.IAppAddCommand): Promise<void> {
   return sdk.addApp(command.appName).then((app: App): Promise<void> => {
     log('Successfully added the "' + command.appName + '" app, along with the following default deployments:');
@@ -196,6 +143,12 @@ function appList(command: cli.IAppListCommand): Promise<void> {
   });
 }
 
+function appDeploymentKeyList(command: cli.IAppDeploymentKeysCommand): Promise<void> {
+  return sdk.getDeploymentKeys(command.appName).then((retrievedKeys: DeploymentKey[]): void => {
+    printAppDeploymentKeyList(retrievedKeys);
+  });
+}
+
 function appRemove(command: cli.IAppRemoveCommand): Promise<void> {
   return confirm("Are you sure you want to remove this app? Note that its deployment keys will be PERMANENTLY unrecoverable.").then(
     (wasConfirmed: boolean): Promise<void> => {
@@ -439,15 +392,6 @@ export function execute(command: cli.ICommand) {
     switch (command.type) {
       // Must not be logged in
       case cli.CommandType.login:
-      case cli.CommandType.register:
-        if (connectionInfo) {
-          throw new Error("You are already logged in from this machine.");
-        }
-        break;
-
-      // It does not matter whether you are logged in or not
-      case cli.CommandType.link:
-        break;
 
       // Must be logged in
       default:
@@ -464,23 +408,14 @@ export function execute(command: cli.ICommand) {
     }
 
     switch (command.type) {
-      case cli.CommandType.accessKeyAdd:
-        return accessKeyAdd(<cli.IAccessKeyAddCommand>command);
-
-      case cli.CommandType.accessKeyPatch:
-        return accessKeyPatch(<cli.IAccessKeyPatchCommand>command);
-
-      case cli.CommandType.accessKeyList:
-        return accessKeyList(<cli.IAccessKeyListCommand>command);
-
-      case cli.CommandType.accessKeyRemove:
-        return accessKeyRemove(<cli.IAccessKeyRemoveCommand>command);
-
       case cli.CommandType.appAdd:
         return appAdd(<cli.IAppAddCommand>command);
 
       case cli.CommandType.appList:
         return appList(<cli.IAppListCommand>command);
+      
+      case cli.CommandType.appDeploymentKeyList:
+        return appDeploymentKeyList(<cli.IAppDeploymentKeysCommand>command);
 
       case cli.CommandType.appRemove:
         return appRemove(<cli.IAppRemoveCommand>command);
@@ -509,9 +444,6 @@ export function execute(command: cli.ICommand) {
       case cli.CommandType.deploymentRename:
         return deploymentRename(<cli.IDeploymentRenameCommand>command);
 
-      case cli.CommandType.link:
-        return link(<cli.ILinkCommand>command);
-
       case cli.CommandType.login:
         return login(<cli.ILoginCommand>command);
 
@@ -524,9 +456,6 @@ export function execute(command: cli.ICommand) {
       case cli.CommandType.promote:
         return promote(<cli.IPromoteCommand>command);
 
-      case cli.CommandType.register:
-        return register(<cli.IRegisterCommand>command);
-
       case cli.CommandType.release:
         return release(<cli.IReleaseCommand>command);
 
@@ -536,12 +465,6 @@ export function execute(command: cli.ICommand) {
       case cli.CommandType.rollback:
         return rollback(<cli.IRollbackCommand>command);
 
-      case cli.CommandType.sessionList:
-        return sessionList(<cli.ISessionListCommand>command);
-
-      case cli.CommandType.sessionRemove:
-        return sessionRemove(<cli.ISessionRemoveCommand>command);
-
       default:
         // We should never see this message as invalid commands should be caught by the argument parser.
         throw new Error("Invalid command:  " + JSON.stringify(command));
@@ -656,6 +579,16 @@ function printAppList(format: string, apps: App[]): void {
   }
 }
 
+function printAppDeploymentKeyList(deploymentKeys: DeploymentKey[]): void {
+  const headers = ["Name", "Deployment Key"];
+    printTable(headers, (dataSource: any[]): void => {
+      deploymentKeys.forEach((deploymentKey: DeploymentKey, index: number): void => {
+        const row = [deploymentKey.name, wordwrap(50)(deploymentKey.deploymentKey)];
+        dataSource.push(row);
+      });
+    });
+}
+
 function getCollaboratorDisplayName(email: string, collaboratorProperties: CollaboratorProperties): string {
   return collaboratorProperties.permission === AccountManager.AppPermission.OWNER ? email + chalk.magenta(" (Owner)") : email;
 }