@hubspot/cli 3.0.10-beta.0 → 3.0.10-beta.1

package/commands/project/upload.js

@@ -32,6 +32,7 @@ const {
   validateProjectConfig,
   pollBuildStatus,
   ensureProjectExists,
+  pollDeployStatus,
 } = require('../../lib/projects');
 
 const loadAndValidateOptions = async options => {
@@ -50,7 +51,9 @@ exports.command = 'upload [path]';
 exports.describe = false;
 
 const uploadProjectFiles = async (accountId, projectName, filePath) => {
-  const spinnies = new Spinnies();
+  const spinnies = new Spinnies({
+    succeedColor: 'white',
+  });
 
   spinnies.add('upload', {
     text: `Uploading ${chalk.bold(projectName)} project files to ${chalk.bold(
@@ -96,11 +99,7 @@ const uploadProjectFiles = async (accountId, projectName, filePath) => {
     );
   }
 
-  try {
-    await pollBuildStatus(accountId, projectName, buildId);
-  } catch (err) {
-    logger.log(err);
-  }
+  return { buildId };
 };
 
 exports.handler = async options => {
@@ -130,7 +129,64 @@ exports.handler = async options => {
   output.on('close', async function() {
     logger.debug(`Project files compressed: ${archive.pointer()} bytes`);
 
-    await uploadProjectFiles(accountId, projectConfig.name, tempFile.name);
+    const { buildId } = await uploadProjectFiles(
+      accountId,
+      projectConfig.name,
+      tempFile.name
+    );
+
+    const {
+      isAutoDeployEnabled,
+      deployStatusTaskLocator,
+      status,
+      subbuildStatuses,
+    } = await pollBuildStatus(accountId, projectConfig.name, buildId);
+
+    if (status === 'FAILURE') {
+      const failedSubbuilds = subbuildStatuses.filter(
+        subbuild => subbuild.status === 'FAILURE'
+      );
+
+      logger.log('-'.repeat(50));
+      logger.log(
+        `Build #${buildId} failed because there was a problem\nbuilding ${
+          failedSubbuilds.length === 1
+            ? failedSubbuilds[0].buildName
+            : failedSubbuilds.length + ' components'
+        }\n`
+      );
+      logger.log('See below for a summary of errors.');
+      logger.log('-'.repeat(50));
+
+      failedSubbuilds.forEach(subbuild => {
+        logger.log(
+          `\n--- ${subbuild.buildName} failed to build with the following error ---`
+        );
+        logger.error(subbuild.errorMessage);
+      });
+
+      return;
+    }
+
+    if (isAutoDeployEnabled && deployStatusTaskLocator) {
+      logger.log(
+        `Build #${buildId} succeeded. ${chalk.bold(
+          'Automatically deploying'
+        )} to ${accountId}`
+      );
+      await pollDeployStatus(
+        accountId,
+        projectConfig.name,
+        deployStatusTaskLocator.id,
+        buildId
+      );
+    } else {
+      logger.log('-'.repeat(50));
+      logger.log(chalk.bold(`Build #${buildId} succeeded\n`));
+      logger.log('🚀 Ready to take your project live?');
+      logger.log(`Run \`${chalk.hex('f5c26b')('hs project deploy')}\``);
+      logger.log('-'.repeat(50));
+    }
 
     try {
       tempFile.removeCallback();

package/lib/links.js

@@ -1,3 +1,4 @@
+const supportsHyperlinks = require('supports-hyperlinks');
 const { getEnv } = require('@hubspot/cli-lib/lib/config');
 const { ENVIRONMENTS } = require('@hubspot/cli-lib/lib/constants');
 const { getHubSpotWebsiteOrigin } = require('@hubspot/cli-lib/lib/urls');
@@ -120,9 +121,18 @@ const openLink = (accountId, shortcut) => {
   logger.success(`We opened ${match.url} in your browser`);
 };
 
+const link = (linkText, url) => {
+  if (supportsHyperlinks.stdout) {
+    return ['\u001B]8;;', url, '\u0007', linkText, '\u001B]8;;\u0007'].join('');
+  } else {
+    return `${linkText}: ${url}`;
+  }
+};
+
 module.exports = {
   getSiteLinks,
   getSiteLinksAsArray,
   logSiteLinks,
   openLink,
+  link,
 };

package/lib/projects.js

@@ -11,10 +11,8 @@ const { getHubSpotWebsiteOrigin } = require('@hubspot/cli-lib/lib/urls');
 const {
   ENVIRONMENTS,
   POLLING_DELAY,
-  PROJECT_BUILD_STATUS,
-  PROJECT_BUILD_STATUS_TEXT,
-  PROJECT_DEPLOY_STATUS,
-  PROJECT_DEPLOY_STATUS_TEXT,
+  PROJECT_OVERALL_STATUS,
+  PROJECT_TEXT,
 } = require('@hubspot/cli-lib/lib/constants');
 const {
   getBuildStatus,
@@ -27,10 +25,29 @@ const {
   ApiErrorContext,
 } = require('@hubspot/cli-lib/errorHandlers');
 
-const isBuildComplete = build => {
+const PROJECT_STRINGS = {
+  BUILD: {
+    INITIALIZE: (name, numOfComponents) =>
+      `Building ${chalk.bold(
+        name
+      )}\n\nFound ${numOfComponents} components in this project ...\n`,
+    SUCCESS: name => `Built ${chalk.bold(name)}`,
+    FAIL: name => `Failed to build ${chalk.bold(name)}`,
+  },
+  DEPLOY: {
+    INITIALIZE: (name, numOfComponents) =>
+      `Deploying ${chalk.bold(
+        name
+      )}\n\nFound ${numOfComponents} components in this project ...\n`,
+    SUCCESS: name => `Deployed ${chalk.bold(name)}`,
+    FAIL: name => `Failed to deploy ${chalk.bold(name)}`,
+  },
+};
+
+const isTaskComplete = task => {
   return (
-    build.status === PROJECT_BUILD_STATUS.SUCCESS ||
-    build.status === PROJECT_BUILD_STATUS.FAILURE
+    task.status === PROJECT_OVERALL_STATUS.SUCCESS ||
+    task.status === PROJECT_OVERALL_STATUS.FAILURE
   );
 };
 
@@ -188,183 +205,107 @@ const showWelcomeMessage = (projectName, accountId) => {
   );
 };
 
-const pollBuildStatus = async (accountId, name, buildId) => {
-  const buildStatus = await getBuildStatus(accountId, name, buildId);
-  const spinnies = new Spinnies();
-
-  logger.log();
-  logger.log(`Building ${chalk.bold(name)}`);
-  logger.log();
-  logger.log(`Found ${buildStatus.subbuildStatuses.length} deployables ...`);
-  logger.log();
+const makeGetTaskStatus = taskType => {
+  let statusFn, statusText, statusStrings;
+  switch (taskType) {
+    case 'build':
+      statusFn = getBuildStatus;
+      statusText = PROJECT_TEXT.BUILD;
+      statusStrings = PROJECT_STRINGS.BUILD;
+      break;
+    case 'deploy':
+      statusFn = getDeployStatus;
+      statusText = PROJECT_TEXT.DEPLOY;
+      statusStrings = PROJECT_STRINGS.DEPLOY;
+      break;
+    default:
+      logger.error(`Cannot get status for task type ${taskType}`);
+  }
 
-  for (let subBuild of buildStatus.subbuildStatuses) {
-    spinnies.add(subBuild.buildName, {
-      text: `${chalk.bold(subBuild.buildName)} #${buildId} ${
-        PROJECT_BUILD_STATUS_TEXT[PROJECT_BUILD_STATUS.ENQUEUED]
-      }`,
+  return async (accountId, taskName, taskId) => {
+    const spinnies = new Spinnies({
+      succeedColor: 'white',
+      failColor: 'white',
     });
-  }
 
-  return new Promise((resolve, reject) => {
-    const pollInterval = setInterval(async () => {
-      const buildStatus = await getBuildStatus(accountId, name, buildId).catch(
-        reject
-      );
-      const { status, subbuildStatuses } = buildStatus;
-
-      if (spinnies.hasActiveSpinners()) {
-        subbuildStatuses.forEach(subBuild => {
-          if (!spinnies.pick(subBuild.buildName)) {
-            return;
-          }
+    spinnies.add('overallTaskStatus', { text: 'Beginning' });
 
-          const updatedText = `${chalk.bold(subBuild.buildName)} #${buildId} ${
-            PROJECT_BUILD_STATUS_TEXT[subBuild.status]
-          }`;
+    const initialTaskStatus = await statusFn(accountId, taskName, taskId);
 
-          switch (subBuild.status) {
-            case PROJECT_BUILD_STATUS.SUCCESS:
-              spinnies.succeed(subBuild.buildName, {
-                text: updatedText,
-              });
-              break;
-            case PROJECT_BUILD_STATUS.FAILURE:
-              spinnies.fail(subBuild.buildName, {
-                text: updatedText,
-              });
-              break;
-            default:
-              spinnies.update(subBuild.buildName, {
-                text: updatedText,
-              });
-              break;
-          }
-        });
-      }
-
-      if (isBuildComplete(buildStatus)) {
-        clearInterval(pollInterval);
-
-        if (status === PROJECT_BUILD_STATUS.SUCCESS) {
-          logger.success(
-            `Your project ${chalk.bold(name)} ${
-              PROJECT_BUILD_STATUS_TEXT[status]
-            }.`
-          );
-        } else if (status === PROJECT_BUILD_STATUS.FAILURE) {
-          logger.error(
-            `Your project ${chalk.bold(name)} ${
-              PROJECT_BUILD_STATUS_TEXT[status]
-            }.`
-          );
-          subbuildStatuses.forEach(subBuild => {
-            if (subBuild.status === PROJECT_BUILD_STATUS.FAILURE) {
-              logger.error(
-                `${chalk.bold(subBuild.buildName)} failed to build. ${
-                  subBuild.errorMessage
-                }.`
-              );
-            }
-          });
-        }
-        resolve(buildStatus);
-      }
-    }, POLLING_DELAY);
-  });
-};
-
-const pollDeployStatus = async (accountId, name, deployId, deployedBuildId) => {
-  const deployStatus = await getDeployStatus(accountId, name, deployId);
-  const spinnies = new Spinnies();
+    spinnies.update('overallTaskStatus', {
+      text: statusStrings.INITIALIZE(
+        taskName,
+        initialTaskStatus[statusText.SUBTASK_KEY].length
+      ),
+    });
 
-  logger.log();
-  logger.log(`Deploying ${chalk.bold(name)}`);
-  logger.log();
-  logger.log(
-    `Found ${deployStatus.subdeployStatuses.length} sub-build deploys ...`
-  );
-  logger.log();
+    for (let subTask of initialTaskStatus[statusText.SUBTASK_KEY]) {
+      spinnies.add(subTask[statusText.SUBTASK_NAME_KEY], {
+        text: `${chalk.bold(subTask[statusText.SUBTASK_NAME_KEY])} #${taskId} ${
+          statusText.STATUS_TEXT[statusText.STATES.ENQUEUED]
+        }\n`,
+      });
+    }
 
-  for (let subdeploy of deployStatus.subdeployStatuses) {
-    spinnies.add(subdeploy.deployName, {
-      text: `${chalk.bold(subdeploy.deployName)} #${deployedBuildId} ${
-        PROJECT_DEPLOY_STATUS_TEXT[PROJECT_DEPLOY_STATUS.ENQUEUED]
-      }`,
-    });
-  }
+    return new Promise((resolve, reject) => {
+      const pollInterval = setInterval(async () => {
+        const taskStatus = await statusFn(accountId, taskName, taskId).catch(
+          reject
+        );
 
-  return new Promise((resolve, reject) => {
-    const pollInterval = setInterval(async () => {
-      const deployStatus = await getDeployStatus(
-        accountId,
-        name,
-        deployId
-      ).catch(reject);
+        const { status, [statusText.SUBTASK_KEY]: subTaskStatus } = taskStatus;
 
-      const { status, subdeployStatuses } = deployStatus;
+        if (spinnies.hasActiveSpinners()) {
+          subTaskStatus.forEach(subTask => {
+            if (!spinnies.pick(subTask[statusText.SUBTASK_NAME_KEY])) {
+              return;
+            }
 
-      if (spinnies.hasActiveSpinners()) {
-        subdeployStatuses.forEach(subdeploy => {
-          if (!spinnies.pick(subdeploy.deployName)) {
-            return;
-          }
+            const updatedText = `${chalk.bold(
+              subTask[statusText.SUBTASK_NAME_KEY]
+            )} #${taskId} ${statusText.STATUS_TEXT[subTask.status]}\n`;
+
+            switch (subTask.status) {
+              case statusText.STATES.SUCCESS:
+                spinnies.succeed(subTask[statusText.SUBTASK_NAME_KEY], {
+                  text: updatedText,
+                });
+                break;
+              case statusText.STATES.FAILURE:
+                spinnies.fail(subTask.buildName, {
+                  text: updatedText,
+                });
+                break;
+              default:
+                spinnies.update(subTask.buildName, {
+                  text: updatedText,
+                });
+                break;
+            }
+          });
 
-          const updatedText = `${chalk.bold(
-            subdeploy.deployName
-          )} #${deployedBuildId} ${
-            PROJECT_DEPLOY_STATUS_TEXT[subdeploy.status]
-          }`;
+          if (isTaskComplete(taskStatus)) {
+            subTaskStatus.forEach(subBuild => {
+              spinnies.remove(subBuild[statusText.SUBTASK_NAME_KEY]);
+            });
 
-          switch (subdeploy.status) {
-            case PROJECT_DEPLOY_STATUS.SUCCESS:
-              spinnies.succeed(subdeploy.deployName, {
-                text: updatedText,
-              });
-              break;
-            case PROJECT_DEPLOY_STATUS.FAILURE:
-              spinnies.fail(subdeploy.deployName, {
-                text: updatedText,
+            if (status === statusText.STATES.SUCCESS) {
+              spinnies.succeed('overallTaskStatus', {
+                text: statusStrings.SUCCESS(taskName),
               });
-              break;
-            default:
-              spinnies.update(subdeploy.deployName, {
-                text: updatedText,
+            } else if (status === statusText.STATES.FAILURE) {
+              spinnies.fail('overallTaskStatus', {
+                text: statusStrings.FAIL(taskName),
               });
-              break;
-          }
-        });
-      }
-
-      if (isBuildComplete(deployStatus)) {
-        clearInterval(pollInterval);
-
-        if (status === PROJECT_DEPLOY_STATUS.SUCCESS) {
-          logger.success(
-            `Your project ${chalk.bold(name)} ${
-              PROJECT_DEPLOY_STATUS_TEXT[status]
-            }.`
-          );
-        } else if (status === PROJECT_DEPLOY_STATUS.FAILURE) {
-          logger.error(
-            `Your project ${chalk.bold(name)} ${
-              PROJECT_DEPLOY_STATUS_TEXT[status]
-            }.`
-          );
-          subdeployStatuses.forEach(subdeploy => {
-            if (subdeploy.status === PROJECT_DEPLOY_STATUS.FAILURE) {
-              logger.error(
-                `${chalk.bold(subdeploy.deployName)} failed to build. ${
-                  subdeploy.errorMessage
-                }.`
-              );
             }
-          });
+
+            clearInterval(pollInterval);
+            resolve(taskStatus);
+          }
         }
-        resolve(deployStatus);
-      }
-    }, POLLING_DELAY);
-  });
+      }, POLLING_DELAY);
+    });
+  };
 };
 
 module.exports = {
@@ -373,7 +314,7 @@ module.exports = {
   getOrCreateProjectConfig,
   validateProjectConfig,
   showWelcomeMessage,
-  pollBuildStatus,
-  pollDeployStatus,
+  pollBuildStatus: makeGetTaskStatus('build'),
+  pollDeployStatus: makeGetTaskStatus('deploy'),
   ensureProjectExists,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hubspot/cli",
-  "version": "3.0.10-beta.0",
+  "version": "3.0.10-beta.1",
   "description": "CLI for working with HubSpot",
   "license": "Apache-2.0",
   "repository": {
@@ -8,8 +8,8 @@
     "url": "https://github.com/HubSpot/hubspot-cms-tools"
   },
   "dependencies": {
-    "@hubspot/cli-lib": "^3.0.10-beta.0",
-    "@hubspot/serverless-dev-runtime": "^3.0.10-beta.0",
+    "@hubspot/cli-lib": "^3.0.10-beta.1",
+    "@hubspot/serverless-dev-runtime": "^3.0.10-beta.1",
     "archiver": "^5.3.0",
     "chalk": "^4.1.0",
     "express": "^4.17.1",
@@ -20,6 +20,7 @@
     "ora": "^4.0.3",
     "shelljs": "0.8.3",
     "spinnies": "^0.5.1",
+    "supports-hyperlinks": "^2.2.0",
     "tmp": "^0.2.1",
     "update-notifier": "3.0.1",
     "yargs": "15.4.1"
@@ -37,5 +38,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "e093dec502e0bfc8c44f5edf86894431ce555117"
+  "gitHead": "d3426a88d8355cdae053f02853a535c09ba84a7b"
 }