Refactor clasp open (#537)

Signed-off-by: campionfellin <campionfellin@gmail.com>
google · Feb 17, 2019 · 36c9491 · 36c9491
1 parent c7486cd
commit 36c9491
Show file tree

Hide file tree

Showing 3 changed files with 95 additions and 71 deletions.
diff --git a/src/commands.ts b/src/commands.ts
@@ -734,76 +734,6 @@ export const version = async (description: string) => {
   console.log(LOG.VERSION_CREATED(versions.data.versionNumber || -1));
 };
 
-/**
- * Opens an Apps Script project's script.google.com editor.
- * @param scriptId {string} The Apps Script project to open.
- * @param cmd.webapp {boolean} If true, the command will open the webapps URL.
- * @param cmd.creds {boolean} If true, the command will open the credentials URL.
- */
-export const openCmd = async (scriptId: any, cmd: {
-  webapp: boolean,
-  creds: boolean,
-}) => {
-  await checkIfOnline();
-  const projectSettings = await getProjectSettings();
-  if (!scriptId) scriptId = projectSettings.scriptId;
-  if (scriptId.length < 30) {
-    return logError(null, ERROR.SCRIPT_ID_INCORRECT(scriptId));
-  }
-  // We've specified to open creds.
-  if (cmd.creds) {
-    const projectId = projectSettings.projectId;
-    if (!projectId) {
-      return logError(null, ERROR.NO_GCLOUD_PROJECT);
-    }
-    console.log(LOG.OPEN_CREDS(projectId));
-    return open(URL.CREDS(projectId), { wait: false });
-  }
-
-  // If we're not a web app, open the script URL.
-  if (!cmd.webapp) {
-    console.log(LOG.OPEN_PROJECT(scriptId));
-    return open(URL.SCRIPT(scriptId), { wait: false });
-  }
-
-  // Web app: Otherwise, open the latest deployment.
-  await loadAPICredentials();
-  const deploymentsList = await script.projects.deployments.list({
-    scriptId,
-  });
-  if (deploymentsList.status !== 200) {
-    return logError(deploymentsList.statusText);
-  }
-  const deployments = deploymentsList.data.deployments || [];
-  if (!deployments.length) {
-    logError(null, ERROR.SCRIPT_ID_INCORRECT(scriptId));
-  }
-  const choices = deployments
-    .sort((d1: any, d2: any) => d1.updateTime.localeCompare(d2.updateTime))
-    .map((deployment: any) => {
-      const DESC_PAD_SIZE = 30;
-      const id = deployment.deploymentId;
-      const description = deployment.deploymentConfig.description;
-      const versionNumber = deployment.deploymentConfig.versionNumber;
-      return {
-        name:
-          padEnd(ellipsize(description || '', DESC_PAD_SIZE), DESC_PAD_SIZE) +
-          `@${padEnd(versionNumber || 'HEAD', 4)} - ${id}`,
-        value: deployment,
-      };
-    });
-  const answers = await prompt([
-    {
-      type: 'list',
-      name: 'deployment',
-      message: 'Open which deployment?',
-      choices,
-    },
-  ]);
-  console.log(LOG.OPEN_WEBAPP(answers.deployment.deploymentId));
-  open(getWebApplicationURL(answers.deployment), { wait: false });
-};
-
 /**
  * Acts as a router to apis subcommands
  * Calls functions for list, enable, or disable

diff --git a/src/commands/openCmd.ts b/src/commands/openCmd.ts
@@ -0,0 +1,94 @@
+import {
+  loadAPICredentials,
+  script,
+} from './../auth';
+
+import { URL } from './../urls';
+
+import {
+  checkIfOnline,
+  ERROR,
+  getProjectSettings,
+  getWebApplicationURL,
+  LOG,
+  logError,
+} from './../utils';
+
+const ellipsize = require('ellipsize');
+const open = require('opn');
+const padEnd = require('string.prototype.padend');
+
+// setup inquirer
+const inquirer = require('inquirer');
+const prompt = inquirer.prompt;
+inquirer.registerPrompt('autocomplete', require('inquirer-autocomplete-prompt'));
+
+/**
+ * Opens an Apps Script project's script.google.com editor.
+ * @param scriptId {string} The Apps Script project to open.
+ * @param cmd.webapp {boolean} If true, the command will open the webapps URL.
+ * @param cmd.creds {boolean} If true, the command will open the credentials URL.
+ */
+export default async (scriptId: any, cmd: {
+  webapp: boolean,
+  creds: boolean,
+}) => {
+  await checkIfOnline();
+  const projectSettings = await getProjectSettings();
+  if (!scriptId) scriptId = projectSettings.scriptId;
+  if (scriptId.length < 30) {
+    return logError(null, ERROR.SCRIPT_ID_INCORRECT(scriptId));
+  }
+  // We've specified to open creds.
+  if (cmd.creds) {
+    const projectId = projectSettings.projectId;
+    if (!projectId) {
+      return logError(null, ERROR.NO_GCLOUD_PROJECT);
+    }
+    console.log(LOG.OPEN_CREDS(projectId));
+    return open(URL.CREDS(projectId), { wait: false });
+  }
+
+  // If we're not a web app, open the script URL.
+  if (!cmd.webapp) {
+    console.log(LOG.OPEN_PROJECT(scriptId));
+    return open(URL.SCRIPT(scriptId), { wait: false });
+  }
+
+  // Web app: Otherwise, open the latest deployment.
+  await loadAPICredentials();
+  const deploymentsList = await script.projects.deployments.list({
+    scriptId,
+  });
+  if (deploymentsList.status !== 200) {
+    return logError(deploymentsList.statusText);
+  }
+  const deployments = deploymentsList.data.deployments || [];
+  if (!deployments.length) {
+    logError(null, ERROR.SCRIPT_ID_INCORRECT(scriptId));
+  }
+  const choices = deployments
+    .sort((d1: any, d2: any) => d1.updateTime.localeCompare(d2.updateTime))
+    .map((deployment: any) => {
+      const DESC_PAD_SIZE = 30;
+      const id = deployment.deploymentId;
+      const description = deployment.deploymentConfig.description;
+      const versionNumber = deployment.deploymentConfig.versionNumber;
+      return {
+        name:
+          padEnd(ellipsize(description || '', DESC_PAD_SIZE), DESC_PAD_SIZE) +
+          `@${padEnd(versionNumber || 'HEAD', 4)} - ${id}`,
+        value: deployment,
+      };
+    });
+  const answers = await prompt([
+    {
+      type: 'list',
+      name: 'deployment',
+      message: 'Open which deployment?',
+      choices,
+    },
+  ]);
+  console.log(LOG.OPEN_WEBAPP(answers.deployment.deploymentId));
+  open(getWebApplicationURL(answers.deployment), { wait: false });
+};
diff --git a/src/index.ts b/src/index.ts
@@ -30,7 +30,6 @@ import {
   deployments,
   login,
   logs,
-  openCmd,
   run,
   setting,
   undeploy,
@@ -47,6 +46,7 @@ import logout from './commands/logout';
 import versions from './commands/versions';
 import defaultCmd from './commands/defaultCmd';
 import help from './commands/help';
+import openCmd from './commands/openCmd';
 
 // const commander = require('commander');