@revopush/code-push-cli 0.0.1 → 0.0.3

package/script/command-executor.ts

@@ -2,26 +2,33 @@
 // Licensed under the MIT License.
 
 import AccountManager = require("./management-sdk");
+
 const childProcess = require("child_process");
 import debugCommand from "./commands/debug";
 import * as fs from "fs";
 import * as chalk from "chalk";
+
 const g2js = require("gradle-to-js/lib/parser");
 import * as moment from "moment";
+
 const opener = require("opener");
 import * as os from "os";
 import * as path from "path";
+
 const plist = require("plist");
 const progress = require("progress");
 const prompt = require("prompt");
 import * as Q from "q";
+
 const rimraf = require("rimraf");
 import * as semver from "semver";
+
 const Table = require("cli-table");
 const which = require("which");
 import wordwrap = require("wordwrap");
 import * as cli from "../script/types/cli";
 import sign from "./sign";
+
 const xcode = require("xcode");
 import {
   AccessKey,
@@ -38,23 +45,15 @@ import {
   Session,
   UpdateMetrics,
 } from "../script/types";
-import {
-  getAndroidHermesEnabled,
-  getiOSHermesEnabled,
-  runHermesEmitBinaryCommand,
-  isValidVersion
-} from "./react-native-utils";
-import {
-  fileDoesNotExistOrIsDirectory,
-  isBinaryOrZip,
-  fileExists
-} from "./utils/file-utils";
+import { getAndroidHermesEnabled, getiOSHermesEnabled, runHermesEmitBinaryCommand, isValidVersion } from "./react-native-utils";
+import { fileDoesNotExistOrIsDirectory, isBinaryOrZip, fileExists } from "./utils/file-utils";
 
-const configFilePath: string = path.join(process.env.LOCALAPPDATA || process.env.HOME, ".code-push.config");
+const configFilePath: string = path.join(process.env.LOCALAPPDATA || process.env.HOME, ".revopush.config");
 const emailValidator = require("email-validator");
 const packageJson = require("../../package.json");
 const parseXml = Q.denodeify(require("xml2js").parseString);
 import Promise = Q.Promise;
+
 const properties = require("properties");
 
 const CLI_HEADERS: Headers = {
@@ -290,7 +289,7 @@ function deleteFolder(folderPath: string): Promise<void> {
 }
 
 function deploymentAdd(command: cli.IDeploymentAddCommand): Promise<void> {
-  return sdk.addDeployment(command.appName, command.deploymentName).then((deployment: Deployment): void => {
+  return sdk.addDeployment(command.appName, command.deploymentName, command.key).then((deployment: Deployment): void => {
     log(
       'Successfully added the "' +
         command.deploymentName +
@@ -454,7 +453,7 @@ export function execute(command: cli.ICommand) {
 
         if (!connectionInfo) {
           throw new Error(
-            "You are not currently logged in. Run the 'code-push-standalone login' command to authenticate with the CodePush server."
+            "You are not currently logged in. Run the 'revopush login' command to authenticate with the CodePush server."
           );
         }
 
@@ -573,13 +572,10 @@ function getTotalActiveFromDeploymentMetrics(metrics: DeploymentMetrics): number
 }
 
 function initiateExternalAuthenticationAsync(action: string, serverUrl?: string): void {
-  const message: string =
-    `A browser is being launched to authenticate your account. Follow the instructions ` +
-    `it displays to complete your ${action === "register" ? "registration" : action}.`;
-
-  log(message);
   const hostname: string = os.hostname();
-  const url: string = `${serverUrl || AccountManager.SERVER_URL}/auth/${action}?hostname=${hostname}`;
+  const url: string = `${serverUrl || AccountManager.APP_SERVER_URL}/cli-login?hostname=${hostname}`;
+  log("Opening your browser...");
+  log(`Visit ${url} and enter the code`);
   opener(url);
 }
 
@@ -591,21 +587,21 @@ function link(command: cli.ILinkCommand): Promise<void> {
 function login(command: cli.ILoginCommand): Promise<void> {
   // Check if one of the flags were provided.
   if (command.accessKey) {
-    sdk = getSdk(command.accessKey, CLI_HEADERS, command.serverUrl);
+    sdk = getSdk(command.accessKey, CLI_HEADERS, command.apiServerUrl);
     return sdk.isAuthenticated().then((isAuthenticated: boolean): void => {
       if (isAuthenticated) {
-        serializeConnectionInfo(command.accessKey, /*preserveAccessKeyOnLogout*/ true, command.serverUrl);
+        serializeConnectionInfo(command.accessKey, /*preserveAccessKeyOnLogout*/ true, command.apiServerUrl);
       } else {
         throw new Error("Invalid access key.");
       }
     });
   } else {
-    return loginWithExternalAuthentication("login", command.serverUrl);
+    return loginWithExternalAuthentication("login", command.apiServerUrl, command.appServerUrl);
   }
 }
 
-function loginWithExternalAuthentication(action: string, serverUrl?: string): Promise<void> {
-  initiateExternalAuthenticationAsync(action, serverUrl);
+function loginWithExternalAuthentication(action: string, apiServerUrl?: string, appServerUrl?: string): Promise<void> {
+  initiateExternalAuthenticationAsync(action, appServerUrl);
   log(""); // Insert newline
 
   return requestAccessKey().then((accessKey: string): Promise<void> => {
@@ -614,11 +610,11 @@ function loginWithExternalAuthentication(action: string, serverUrl?: string): Pr
       return;
     }
 
-    sdk = getSdk(accessKey, CLI_HEADERS, serverUrl);
+    sdk = getSdk(accessKey, CLI_HEADERS, apiServerUrl);
 
     return sdk.isAuthenticated().then((isAuthenticated: boolean): void => {
       if (isAuthenticated) {
-        serializeConnectionInfo(accessKey, /*preserveAccessKeyOnLogout*/ false, serverUrl);
+        serializeConnectionInfo(accessKey, /*preserveAccessKeyOnLogout*/ false, apiServerUrl);
       } else {
         throw new Error("Invalid access key.");
       }
@@ -1081,11 +1077,7 @@ function getAppVersionFromXcodeProject(command: cli.IReleaseReactCommand, projec
   }
 
   const xcodeProj = xcode.project(resolvedPbxprojFile).parseSync();
-  const marketingVersion = xcodeProj.getBuildProperty(
-    "MARKETING_VERSION",
-    command.buildConfigurationName,
-    command.xcodeTargetName
-  );
+  const marketingVersion = xcodeProj.getBuildProperty("MARKETING_VERSION", command.buildConfigurationName, command.xcodeTargetName);
   if (!isValidVersion(marketingVersion)) {
     throw new Error(
       `The "MARKETING_VERSION" key in the "${resolvedPbxprojFile}" file needs to specify a valid semver string, containing both a major and minor version (e.g. 1.3.2, 1.1).`
@@ -1353,9 +1345,9 @@ export const releaseReact = (command: cli.IReleaseReactCommand): Promise<void> =
       )
       .then(async () => {
         const isHermesEnabled =
-        command.useHermes ||
-        (platform === "android" && (await getAndroidHermesEnabled(command.gradleFile))) || // Check if we have to run hermes to compile JS to Byte Code if Hermes is enabled in build.gradle and we're releasing an Android build
-        (platform === "ios" && (await getiOSHermesEnabled(command.podFile))); // Check if we have to run hermes to compile JS to Byte Code if Hermes is enabled in Podfile and we're releasing an iOS build
+          command.useHermes ||
+          (platform === "android" && (await getAndroidHermesEnabled(command.gradleFile))) || // Check if we have to run hermes to compile JS to Byte Code if Hermes is enabled in build.gradle and we're releasing an Android build
+          (platform === "ios" && (await getiOSHermesEnabled(command.podFile))); // Check if we have to run hermes to compile JS to Byte Code if Hermes is enabled in Podfile and we're releasing an iOS build
 
         if (isHermesEnabled) {
           log(chalk.cyan("\nRunning hermes compiler...\n"));
@@ -1521,7 +1513,7 @@ function sessionList(command: cli.ISessionListCommand): Promise<void> {
 
 function sessionRemove(command: cli.ISessionRemoveCommand): Promise<void> {
   if (os.hostname() === command.machineName) {
-    throw new Error("Cannot remove the current login session via this command. Please run 'code-push-standalone logout' instead.");
+    throw new Error("Cannot remove the current login session via this command. Please run 'revopush logout' instead.");
   } else {
     return confirm().then((wasConfirmed: boolean): Promise<void> => {
       if (wasConfirmed) {

package/script/command-parser.ts

@@ -9,7 +9,7 @@ import parseDuration = require("parse-duration");
 
 const packageJson = require("../../package.json");
 const ROLLOUT_PERCENTAGE_REGEX: RegExp = /^(100|[1-9][0-9]|[1-9])%?$/;
-const USAGE_PREFIX = "Usage: code-push-standalone";
+const USAGE_PREFIX = "Usage: revopush";
 
 // Command categories are:  access-key, app, release, deployment, deployment-key, login, logout, register
 let isValidCommandCategory = false;
@@ -20,13 +20,19 @@ let wasHelpShown = false;
 export function showHelp(showRootDescription?: boolean): void {
   if (!wasHelpShown) {
     if (showRootDescription) {
-      console.log(chalk.cyan("  _____        __  " + chalk.green("  ___           __ ")));
-      console.log(chalk.cyan(" / ___/__  ___/ /__" + chalk.green(" / _ \\__ _____ / / ")));
-      console.log(chalk.cyan("/ /__/ _ \\/ _  / -_)" + chalk.green(" ___/ // (_-</ _ \\")));
-      console.log(chalk.cyan("\\___/\\___/\\_,_/\\__/" + chalk.green("_/   \\_,_/___/_//_/")) + "    CLI v" + packageJson.version);
-      console.log(chalk.cyan("======================================"));
-      console.log("");
-      console.log("CodePush is a service that enables you to deploy mobile app updates directly to your users' devices.\n");
+      console.log(
+        chalk.blue(`
+ ____                 ____            _     
+|  _ \\ _____   _____ |  _ \\ _   _ ___| |__  
+| |_) / _ \\ \\ / / _ \\| |_) | | | / __| '_ \\ 
+|  _ <  __/\\ V / (_) |  __/| |_| \\__ \\ | | |
+|_| \\_\\___| \\_/ \\___/|_|    \\__,_|___/_| |_| CLI v${packageJson.version}
+============================================`)
+      );
+      console.log(
+        "Revopush is a service that enables you to deploy mobile app updates directly to your users' devices. " +
+          "Visit our website https://revopush.org/ \n"
+      );
     }
 
     yargs.showHelp();
@@ -322,6 +328,7 @@ yargs
       .command("list", "Lists the apps associated with your account", (yargs: yargs.Argv) => appList("list", yargs))
       .command("ls", "Lists the apps associated with your account", (yargs: yargs.Argv) => appList("ls", yargs))
       .command("transfer", "Transfer the ownership of an app to another account", (yargs: yargs.Argv) => {
+        isValidCommand = true;
         yargs
           .usage(USAGE_PREFIX + " app transfer <appName> <email>")
           .demand(/*count*/ 2, /*max*/ 2) // Require exactly two non-option arguments
@@ -376,7 +383,14 @@ yargs
         yargs
           .usage(USAGE_PREFIX + " deployment add <appName> <deploymentName>")
           .demand(/*count*/ 2, /*max*/ 2) // Require exactly two non-option arguments
-          .example("deployment add MyApp MyDeployment", 'Adds deployment "MyDeployment" to app "MyApp"');
+          .example("deployment add MyApp MyDeployment", 'Adds deployment "MyDeployment" to app "MyApp"')
+          .example("deployment add MyApp MyDeployment -k abc123", 'Adds deployment key "abc123"')
+          .option("key", {
+            alias: "k",
+            demand: false,
+            description: "Specify deployment key",
+            type: "string",
+          });
 
         addCommonConfiguration(yargs);
       })
@@ -405,23 +419,23 @@ yargs
 
     addCommonConfiguration(yargs);
   })
-  .command("link", "Link an additional authentication provider (e.g. GitHub) to an existing CodePush account", (yargs: yargs.Argv) => {
-    isValidCommandCategory = true;
-    isValidCommand = true;
-    yargs
-      .usage(USAGE_PREFIX + " link")
-      .demand(/*count*/ 0, /*max*/ 1) //set 'max' to one to allow usage of serverUrl undocument parameter for testing
-      .example("link", "Links an account on the CodePush server")
-      .check((argv: any, aliases: { [aliases: string]: string }): any => isValidCommand); // Report unrecognized, non-hyphenated command category.
+  /*  .command("link", "Link an additional authentication provider (e.g. GitHub) to an existing CodePush account", (yargs: yargs.Argv) => {
+        isValidCommandCategory = true;
+        isValidCommand = true;
+        yargs
+          .usage(USAGE_PREFIX + " link")
+          .demand(/!*count*!/ 0, /!*max*!/ 1) //set 'max' to one to allow usage of serverUrl undocument parameter for testing
+          .example("link", "Links an account on the CodePush server")
+          .check((argv: any, aliases: { [aliases: string]: string }): any => isValidCommand); // Report unrecognized, non-hyphenated command category.
 
-    addCommonConfiguration(yargs);
-  })
+        addCommonConfiguration(yargs);
+      })*/
   .command("login", "Authenticate with the CodePush server in order to begin managing your apps", (yargs: yargs.Argv) => {
     isValidCommandCategory = true;
     isValidCommand = true;
     yargs
       .usage(USAGE_PREFIX + " login [options]")
-      .demand(/*count*/ 0, /*max*/ 1) //set 'max' to one to allow usage of serverUrl undocument parameter for testing
+      .demand(/*count*/ 0, /*max*/ 2) //set 'max' to one to allow usage of serverUrl undocument parameter for testing
       .example("login", "Logs in to the CodePush server")
       .example("login --accessKey mykey", 'Logs in on behalf of the user who owns and created the access key "mykey"')
       .option("accessKey", {
@@ -786,15 +800,14 @@ yargs
         alias: "pod",
         default: null,
         demand: false,
-        description:  "Path to the cocopods config file (iOS only).",
+        description: "Path to the cocopods config file (iOS only).",
         type: "string",
       })
       .option("extraHermesFlags", {
         alias: "hf",
         default: [],
         demand: false,
-        description:
-          "Flags that get passed to Hermes, JavaScript to bytecode compiler. Can be specified multiple times.",
+        description: "Flags that get passed to Hermes, JavaScript to bytecode compiler. Can be specified multiple times.",
         type: "array",
       })
       .option("privateKeyPath", {
@@ -815,14 +828,16 @@ yargs
         alias: "xt",
         default: undefined,
         demand: false,
-        description: "Name of target (PBXNativeTarget) which specifies the binary version you want to target this release at (iOS only)",
+        description:
+          "Name of target (PBXNativeTarget) which specifies the binary version you want to target this release at (iOS only)",
         type: "string",
       })
       .option("buildConfigurationName", {
         alias: "c",
         default: undefined,
         demand: false,
-        description: "Name of build configuration which specifies the binary version you want to target this release at. For example, 'Debug' or 'Release' (iOS only)",
+        description:
+          "Name of build configuration which specifies the binary version you want to target this release at. For example, 'Debug' or 'Release' (iOS only)",
         type: "string",
       })
       .check((argv: any, aliases: { [aliases: string]: string }): any => {
@@ -1045,6 +1060,9 @@ export function createCommand(): cli.ICommand {
 
               deploymentAddCommand.appName = arg2;
               deploymentAddCommand.deploymentName = arg3;
+              if (argv["key"]) {
+                deploymentAddCommand.key = argv["key"] as any;
+              }
             }
             break;
 
@@ -1112,19 +1130,20 @@ export function createCommand(): cli.ICommand {
         }
         break;
 
-      case "link":
-        cmd = <cli.ILinkCommand>{
-          type: cli.CommandType.link,
-          serverUrl: getServerUrl(arg1),
-        };
-        break;
+      /*      case "link":
+                    cmd = <cli.ILinkCommand>{
+                      type: cli.CommandType.link,
+                      serverUrl: getServerUrl(arg1),
+                    };
+                    break;*/
 
       case "login":
         cmd = { type: cli.CommandType.login };
 
         const loginCommand = <cli.ILoginCommand>cmd;
 
-        loginCommand.serverUrl = getServerUrl(arg1);
+        loginCommand.apiServerUrl = getServerUrl(arg1);
+        loginCommand.appServerUrl = getServerUrl(arg2);
         loginCommand.accessKey = argv["accessKey"] as any;
         break;
 

package/script/management-sdk.ts

@@ -58,7 +58,8 @@ class AccountManager {
     OWNER: "Owner",
     COLLABORATOR: "Collaborator",
   };
-  public static SERVER_URL = "http://localhost:3000";
+  public static API_SERVER_URL = "https://api.revopush.org";
+  public static APP_SERVER_URL = "https://app.revopush.org";
 
   private static API_VERSION: number = 2;
 
@@ -77,7 +78,7 @@ class AccountManager {
 
     this._accessKey = accessKey;
     this._customHeaders = customHeaders;
-    this._serverUrl = serverUrl || AccountManager.SERVER_URL;
+    this._serverUrl = serverUrl || AccountManager.API_SERVER_URL;
   }
 
   public get accessKey(): string {
@@ -253,8 +254,8 @@ class AccountManager {
   }
 
   // Deployments
-  public addDeployment(appName: string, deploymentName: string): Promise<Deployment> {
-    const deployment = <Deployment>{ name: deploymentName };
+  public addDeployment(appName: string, deploymentName: string, deploymentKey?: string): Promise<Deployment> {
+    const deployment = <Deployment>{ name: deploymentName, key: deploymentKey };
     return this.post(urlEncode([`/apps/${appName}/deployments/`]), JSON.stringify(deployment), /*expectResponseBody=*/ true).then(
       (res: JsonResponse) => res.body.deployment
     );

package/script/types/cli.ts

@@ -107,6 +107,7 @@ export interface IDebugCommand extends ICommand {
 export interface IDeploymentAddCommand extends ICommand {
   appName: string;
   deploymentName: string;
+  key?: string;
   default: boolean;
 }
 
@@ -144,7 +145,8 @@ export interface ILinkCommand extends ICommand {
 }
 
 export interface ILoginCommand extends ICommand {
-  serverUrl?: string;
+  apiServerUrl?: string;
+  appServerUrl?: string;
   accessKey: string;
 }
 

package/.idea/cli.iml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

package/.idea/inspectionProfiles/Project_Default.xml

@@ -1,6 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
-  </profile>
-</component>

package/.idea/misc.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectRootManager">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>

package/.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/cli.iml" filepath="$PROJECT_DIR$/.idea/cli.iml" />
-    </modules>
-  </component>
-</project>

package/.idea/prettier.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="PrettierConfiguration">
-    <option name="myConfigurationMode" value="AUTOMATIC" />
-  </component>
-</project>

package/.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
-  </component>
-</project>