@hubspot/cli 3.0.11-beta.1 → 3.0.12-beta.1

package/bin/hubspot

@@ -0,0 +1,3 @@
+#!/usr/bin/env node
+
+require('./cli');

package/commands/create/api-sample.js

@@ -10,7 +10,7 @@ const fs = require('fs-extra');
 const ora = require('ora');
 const { fetchJsonFromRepository } = require('@hubspot/cli-lib/github');
 const { GITHUB_RELEASE_TYPES } = require('@hubspot/cli-lib/lib/constants');
-const { createProject } = require('@hubspot/cli-lib/projects');
+const { cloneGitHubRepo } = require('@hubspot/cli-lib/github');
 const { i18n } = require('@hubspot/cli-lib/lib/lang');
 
 const i18nKey = 'cli.commands.create.subcommands.apiSample';
@@ -60,7 +60,7 @@ module.exports = {
         sampleLanguage,
       })
     );
-    const created = await createProject(
+    const created = await cloneGitHubRepo(
       filePath,
       assetType,
       sampleType,

package/commands/create/app.js

@@ -1,8 +1,8 @@
-const { createProject } = require('@hubspot/cli-lib/projects');
+const { cloneGitHubRepo } = require('@hubspot/cli-lib/github');
 
 module.exports = {
   hidden: true,
   dest: ({ name, assetType }) => name || assetType,
   execute: async ({ options, dest, assetType }) =>
-    createProject(dest, assetType, 'crm-card-weather-app', '', options),
+    cloneGitHubRepo(dest, assetType, 'crm-card-weather-app', '', options),
 };

package/commands/create/react-app.js

@@ -1,7 +1,7 @@
-const { createProject } = require('@hubspot/cli-lib/projects');
+const { cloneGitHubRepo } = require('@hubspot/cli-lib/github');
 
 module.exports = {
   dest: ({ name, assetType }) => name || assetType,
   execute: async ({ options, dest, assetType }) =>
-    createProject(dest, assetType, 'cms-react-boilerplate', '', options),
+    cloneGitHubRepo(dest, assetType, 'cms-react-boilerplate', '', options),
 };

package/commands/create/vue-app.js

@@ -1,7 +1,7 @@
-const { createProject } = require('@hubspot/cli-lib/projects');
+const { cloneGitHubRepo } = require('@hubspot/cli-lib/github');
 
 module.exports = {
   dest: ({ name, assetType }) => name || assetType,
   execute: async ({ options, dest, assetType }) =>
-    createProject(dest, assetType, 'cms-vue-boilerplate', '', options),
+    cloneGitHubRepo(dest, assetType, 'cms-vue-boilerplate', '', options),
 };

package/commands/create/webpack-serverless.js

@@ -1,9 +1,9 @@
-const { createProject } = require('@hubspot/cli-lib/projects');
+const { cloneGitHubRepo } = require('@hubspot/cli-lib/github');
 
 module.exports = {
   dest: ({ name, assetType }) => name || assetType,
   execute: async ({ options, dest, assetType }) =>
-    createProject(
+    cloneGitHubRepo(
       dest,
       assetType,
       'cms-webpack-serverless-boilerplate',

package/commands/create/website-theme.js

@@ -1,4 +1,4 @@
-const { createProject } = require('@hubspot/cli-lib/projects');
+const { cloneGitHubRepo } = require('@hubspot/cli-lib/github');
 const { GITHUB_RELEASE_TYPES } = require('@hubspot/cli-lib/lib/constants');
 const { getIsInProject } = require('../../lib/projects');
 
@@ -14,6 +14,6 @@ module.exports = {
       // releaseType has to be 'REPOSITORY' to download a specific branch
       options.releaseType = GITHUB_RELEASE_TYPES.REPOSITORY;
     }
-    createProject(dest, assetType, 'cms-theme-boilerplate', 'src', options);
+    cloneGitHubRepo(dest, assetType, 'cms-theme-boilerplate', 'src', options);
   },
 };

package/commands/project/create.js

@@ -11,7 +11,10 @@ const path = require('path');
 const {
   createProjectPrompt,
 } = require('../../lib/prompts/createProjectPrompt');
-const { createProjectConfig } = require('../../lib/projects');
+const {
+  createProjectConfig,
+  showProjectWelcomeMessage,
+} = require('../../lib/projects');
 const { i18n } = require('@hubspot/cli-lib/lib/lang');
 
 const i18nKey = 'cli.commands.project.subcommands.create';
@@ -33,6 +36,8 @@ exports.handler = async options => {
     options.name || name,
     options.template || template
   );
+
+  showProjectWelcomeMessage();
 };
 
 exports.builder = yargs => {

package/commands/project/download.js

@@ -0,0 +1,127 @@
+const path = require('path');
+
+const {
+  getAccountId,
+  addUseEnvironmentOptions,
+} = require('../../lib/commonOpts');
+const { trackCommandUsage } = require('../../lib/usageTracking');
+const { getCwd } = require('@hubspot/cli-lib/path');
+const {
+  logApiErrorInstance,
+  ApiErrorContext,
+} = require('@hubspot/cli-lib/errorHandlers');
+const { logger } = require('@hubspot/cli-lib/logger');
+const { extractZipArchive } = require('@hubspot/cli-lib/archive');
+const {
+  downloadProject,
+  fetchProjectBuilds,
+} = require('@hubspot/cli-lib/api/dfs');
+const {
+  createProjectConfig,
+  ensureProjectExists,
+} = require('../../lib/projects');
+const { loadAndValidateOptions } = require('../../lib/validation');
+const { i18n } = require('@hubspot/cli-lib/lib/lang');
+
+const i18nKey = 'cli.commands.project.subcommands.download';
+const { EXIT_CODES } = require('../../lib/enums/exitCodes');
+
+exports.command = 'download <name> [dest]';
+exports.describe = i18n(`${i18nKey}.describe`);
+
+exports.handler = async options => {
+  await loadAndValidateOptions(options);
+
+  const { name: projectName, dest, buildNumber } = options;
+  const accountId = getAccountId(options);
+
+  trackCommandUsage('project-download', { projectName }, accountId);
+
+  await ensureProjectExists(accountId, projectName, { allowCreate: false });
+
+  const absoluteDestPath = dest ? path.resolve(getCwd(), dest) : getCwd();
+
+  const projectConfigCreated = await createProjectConfig(
+    absoluteDestPath,
+    projectName,
+    'none'
+  );
+
+  if (!projectConfigCreated) {
+    logger.log(i18n(`${i18nKey}.logs.downloadCancelled`));
+    process.exit(EXIT_CODES.SUCCESS);
+  }
+
+  let success = false;
+  let buildNumberToDownload = buildNumber;
+
+  if (!buildNumberToDownload) {
+    let projectBuildsResult;
+
+    try {
+      projectBuildsResult = await fetchProjectBuilds(accountId, projectName);
+    } catch (e) {
+      logApiErrorInstance(e, new ApiErrorContext({ accountId }));
+      process.exit(EXIT_CODES.ERROR);
+    }
+
+    const { results: projectBuilds } = projectBuildsResult;
+
+    if (projectBuilds && projectBuilds.length) {
+      const latestBuild = projectBuilds[0];
+      buildNumberToDownload = latestBuild.buildId;
+    }
+  }
+
+  const zippedProject = await downloadProject(
+    accountId,
+    projectName,
+    buildNumberToDownload
+  );
+
+  success = await extractZipArchive(
+    zippedProject,
+    projectName,
+    path.resolve(absoluteDestPath, 'src'),
+    {
+      includesRootDir: false,
+    }
+  );
+
+  if (!success) {
+    logger.log(i18n(`${i18nKey}.errors.downloadFailed`));
+    process.exit(EXIT_CODES.ERROR);
+  }
+
+  logger.log(
+    i18n(`${i18nKey}.logs.downloadSucceeded`, {
+      buildId: buildNumberToDownload,
+      projectName,
+    })
+  );
+  process.exit(EXIT_CODES.SUCCESS);
+};
+
+exports.builder = yargs => {
+  addUseEnvironmentOptions(yargs, true);
+
+  yargs.positional('name', {
+    describe: i18n(`${i18nKey}.positionals.name.describe`),
+    type: 'string',
+  });
+  yargs.positional('dest', {
+    describe: i18n(`${i18nKey}.positionals.dest.describe`),
+    type: 'string',
+  });
+  yargs.option('buildNumber', {
+    describe: i18n(`${i18nKey}.options.buildNumber.describe`),
+    type: 'number',
+  });
+  yargs.example([
+    [
+      '$0 project download myProject myProjectFolder',
+      i18n(`${i18nKey}.examples.default`),
+    ],
+  ]);
+  return yargs;
+};

package/commands/project/upload.js

@@ -1,9 +1,4 @@
 const chalk = require('chalk');
-const fs = require('fs');
-const path = require('path');
-const archiver = require('archiver');
-const tmp = require('tmp');
-const Spinnies = require('spinnies');
 const {
   addAccountOptions,
   addConfigOptions,
@@ -11,84 +6,25 @@ const {
   addUseEnvironmentOptions,
 } = require('../../lib/commonOpts');
 const { trackCommandUsage } = require('../../lib/usageTracking');
-const {
-  logApiErrorInstance,
-  ApiErrorContext,
-} = require('@hubspot/cli-lib/errorHandlers');
 const { uiLine, uiAccountDescription } = require('../../lib/ui');
 const { logger } = require('@hubspot/cli-lib/logger');
-const { uploadProject } = require('@hubspot/cli-lib/api/dfs');
-const { shouldIgnoreFile } = require('@hubspot/cli-lib/ignoreRules');
 const { loadAndValidateOptions } = require('../../lib/validation');
 const {
+  ensureProjectExists,
   getProjectConfig,
-  validateProjectConfig,
+  handleProjectUpload,
   pollBuildStatus,
-  ensureProjectExists,
   pollDeployStatus,
+  validateProjectConfig,
 } = require('../../lib/projects');
 const { i18n } = require('@hubspot/cli-lib/lib/lang');
+const { EXIT_CODES } = require('../../lib/enums/exitCodes');
 
 const i18nKey = 'cli.commands.project.subcommands.upload';
-const { EXIT_CODES } = require('../../lib/enums/exitCodes');
 
 exports.command = 'upload [path]';
 exports.describe = i18n(`${i18nKey}.describe`);
 
-const uploadProjectFiles = async (accountId, projectName, filePath) => {
-  const spinnies = new Spinnies({
-    succeedColor: 'white',
-  });
-  const accountIdentifier = uiAccountDescription(accountId);
-
-  spinnies.add('upload', {
-    text: i18n(`${i18nKey}.loading.upload.add`, {
-      accountIdentifier,
-      projectName,
-    }),
-  });
-
-  let buildId;
-
-  try {
-    const upload = await uploadProject(accountId, projectName, filePath);
-
-    buildId = upload.buildId;
-
-    spinnies.succeed('upload', {
-      text: i18n(`${i18nKey}.loading.upload.succeed`, {
-        accountIdentifier,
-        projectName,
-      }),
-    });
-
-    logger.debug(
-      i18n(`${i18nKey}.debug.buildCreated`, {
-        buildId,
-        projectName,
-      })
-    );
-  } catch (err) {
-    spinnies.fail('upload', {
-      text: i18n(`${i18nKey}.loading.upload.fail`, {
-        accountIdentifier,
-        projectName,
-      }),
-    });
-
-    logApiErrorInstance(
-      err,
-      new ApiErrorContext({
-        accountId,
-        projectName,
-      })
-    );
-    process.exit(EXIT_CODES.ERROR);
-  }
-
-  return { buildId };
-};
-
 exports.handler = async options => {
   await loadAndValidateOptions(options);
 
@@ -101,32 +37,10 @@ exports.handler = async options => {
 
   validateProjectConfig(projectConfig, projectDir);
 
-  await ensureProjectExists(accountId, projectConfig.name, forceCreate);
-
-  const tempFile = tmp.fileSync({ postfix: '.zip' });
-
-  logger.debug(
-    i18n(`${i18nKey}.debug.compressing`, {
-      path: tempFile.name,
-    })
-  );
-
-  const output = fs.createWriteStream(tempFile.name);
-  const archive = archiver('zip');
+  await ensureProjectExists(accountId, projectConfig.name, { forceCreate });
 
-  output.on('close', async function() {
+  const startPolling = async (tempFile, buildId) => {
     let exitCode = EXIT_CODES.SUCCESS;
-    logger.debug(
-      i18n(`${i18nKey}.debug.compressed`, {
-        byteCount: archive.pointer(),
-      })
-    );
-
-    const { buildId } = await uploadProjectFiles(
-      accountId,
-      projectConfig.name,
-      tempFile.name
-    );
 
     const {
       isAutoDeployEnabled,
@@ -183,21 +97,9 @@ exports.handler = async options => {
     }
 
     process.exit(exitCode);
-  });
-
-  archive.on('error', function(err) {
-    throw err;
-  });
-
-  archive.pipe(output);
-
-  archive.directory(
-    path.resolve(projectDir, projectConfig.srcDir),
-    false,
-    file => (shouldIgnoreFile(file.name) ? false : file)
-  );
+  };
 
-  archive.finalize();
+  await handleProjectUpload(accountId, projectConfig, projectDir, startPolling);
 };
 
 exports.builder = yargs => {

package/commands/project/watch.js

@@ -1,6 +1,5 @@
 const { i18n } = require('@hubspot/cli-lib/lib/lang');
 const { createWatcher } = require('@hubspot/cli-lib/projectsWatch');
-const { cancelStagedBuild } = require('@hubspot/cli-lib/api/dfs');
 const {
   logApiErrorInstance,
   ApiErrorContext,
@@ -14,11 +13,17 @@ const {
 } = require('../../lib/commonOpts');
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const {
+  ensureProjectExists,
   getProjectConfig,
-  validateProjectConfig,
+  handleProjectUpload,
   pollBuildStatus,
   pollDeployStatus,
+  validateProjectConfig,
 } = require('../../lib/projects');
+const {
+  cancelStagedBuild,
+  fetchProjectBuilds,
+} = require('@hubspot/cli-lib/api/dfs');
 const { loadAndValidateOptions } = require('../../lib/validation');
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
 
@@ -76,13 +81,35 @@ exports.handler = async options => {
 
   validateProjectConfig(projectConfig, projectDir);
 
-  await createWatcher(
+  await ensureProjectExists(accountId, projectConfig.name);
+
+  const { results } = await fetchProjectBuilds(
     accountId,
-    projectConfig,
-    projectDir,
-    handleBuildStatus,
-    handleSigInt
+    projectConfig.name,
+    options
   );
+
+  const startWatching = async () => {
+    await createWatcher(
+      accountId,
+      projectConfig,
+      projectDir,
+      handleBuildStatus,
+      handleSigInt
+    );
+  };
+
+  // Upload all files if no build exists for this project yet
+  if (!results || !results.length) {
+    await handleProjectUpload(
+      accountId,
+      projectConfig,
+      projectDir,
+      startWatching
+    );
+  } else {
+    await startWatching();
+  }
 };
 
 exports.builder = yargs => {

package/commands/project.js

@@ -5,6 +5,7 @@ const upload = require('./project/upload');
 const listBuilds = require('./project/listBuilds');
 const logs = require('./project/logs');
 const watch = require('./project/watch');
+const download = require('./project/download');
 
 exports.command = 'project';
 exports.describe = false; //'Commands for working with projects';
@@ -20,6 +21,7 @@ exports.builder = yargs => {
   yargs.command(watch).demandCommand(0, '');
   yargs.command(listBuilds).demandCommand(0, '');
   yargs.command(logs).demandCommand(1, '');
+  yargs.command(download).demandCommand(0, '');
 
   return yargs;
 };

package/lib/projects.js

@@ -1,20 +1,20 @@
 const fs = require('fs-extra');
 const path = require('path');
-
+const archiver = require('archiver');
+const tmp = require('tmp');
 const chalk = require('chalk');
 const findup = require('findup-sync');
 const Spinnies = require('spinnies');
 const { logger } = require('@hubspot/cli-lib/logger');
 const { getEnv } = require('@hubspot/cli-lib/lib/config');
-const {
-  createProject: createProjectTemplate,
-} = require('@hubspot/cli-lib/projects');
+const { cloneGitHubRepo } = require('@hubspot/cli-lib/github');
 const { getHubSpotWebsiteOrigin } = require('@hubspot/cli-lib/lib/urls');
 const {
   ENVIRONMENTS,
   POLLING_DELAY,
   PROJECT_TEMPLATES,
-  PROJECT_TEXT,
+  PROJECT_BUILD_TEXT,
+  PROJECT_DEPLOY_TEXT,
   PROJECT_CONFIG_FILE,
 } = require('@hubspot/cli-lib/lib/constants');
 const {
@@ -22,42 +22,18 @@ const {
   getBuildStatus,
   getDeployStatus,
   fetchProject,
+  uploadProject,
 } = require('@hubspot/cli-lib/api/dfs');
 const {
   logApiErrorInstance,
   ApiErrorContext,
 } = require('@hubspot/cli-lib/errorHandlers');
+const { shouldIgnoreFile } = require('@hubspot/cli-lib/ignoreRules');
 const { getCwd } = require('@hubspot/cli-lib/path');
 const { promptUser } = require('./prompts/promptUtils');
 const { EXIT_CODES } = require('./enums/exitCodes');
 const { uiLine, uiAccountDescription } = require('../lib/ui');
-
-const PROJECT_STRINGS = {
-  BUILD: {
-    INITIALIZE: (name, numOfComponents) =>
-      `Building ${chalk.bold(name)}\n\nFound ${numOfComponents} component${
-        numOfComponents !== 1 ? 's' : ''
-      } in this project ...\n`,
-    SUCCESS: name => `Built ${chalk.bold(name)}`,
-    FAIL: name => `Failed to build ${chalk.bold(name)}`,
-    SUBTASK_FAIL: (taskId, name) =>
-      `Build #${taskId} failed because there was a problem\nbuilding ${chalk.bold(
-        name
-      )}`,
-  },
-  DEPLOY: {
-    INITIALIZE: (name, numOfComponents) =>
-      `Deploying ${chalk.bold(name)}\n\nFound ${numOfComponents} component${
-        numOfComponents !== 1 ? 's' : ''
-      } in this project ...\n`,
-    SUCCESS: name => `Deployed ${chalk.bold(name)}`,
-    FAIL: name => `Failed to deploy ${chalk.bold(name)}`,
-    SUBTASK_FAIL: (taskId, name) =>
-      `Deploy for build #${taskId} failed because there was a\nproblem deploying ${chalk.bold(
-        name
-      )}`,
-  },
-};
+const { i18n } = require('@hubspot/cli-lib/lib/lang');
 
 const writeProjectConfig = (configPath, config) => {
   try {
@@ -127,14 +103,16 @@ const createProjectConfig = async (projectPath, projectName, template) => {
     ]);
 
     if (!shouldContinue) {
-      return;
+      return false;
     }
   }
 
   const projectConfigPath = path.join(projectPath, PROJECT_CONFIG_FILE);
 
   logger.log(
-    `Creating project in ${projectPath ? projectPath : 'the current folder'}`
+    `Creating project config in ${
+      projectPath ? projectPath : 'the current folder'
+    }`
   );
 
   if (template === 'none') {
@@ -145,7 +123,7 @@ const createProjectConfig = async (projectPath, projectName, template) => {
       srcDir: 'src',
     });
   } else {
-    await createProjectTemplate(
+    await cloneGitHubRepo(
       projectPath,
       'project',
       PROJECT_TEMPLATES.find(t => t.name === template).repo,
@@ -158,7 +136,7 @@ const createProjectConfig = async (projectPath, projectName, template) => {
     });
   }
 
-  return projectConfig;
+  return true;
 };
 
 const validateProjectConfig = (projectConfig, projectDir) => {
@@ -184,14 +162,18 @@ const validateProjectConfig = (projectConfig, projectDir) => {
   }
 };
 
-const ensureProjectExists = async (accountId, projectName, forceCreate) => {
+const ensureProjectExists = async (
+  accountId,
+  projectName,
+  { forceCreate, allowCreate } = { forceCreate: false, allowCreate: true }
+) => {
   try {
     await fetchProject(accountId, projectName);
   } catch (err) {
     if (err.statusCode === 404) {
       let shouldCreateProject = forceCreate;
 
-      if (!shouldCreateProject) {
+      if (allowCreate && !shouldCreateProject) {
         const promptResult = await promptUser([
           {
             name: 'shouldCreateProject',
@@ -232,12 +214,114 @@ const getProjectDetailUrl = (projectName, accountId) => {
   return `${baseUrl}/developer-projects/${accountId}/project/${projectName}`;
 };
 
-const showWelcomeMessage = () => {
+const uploadProjectFiles = async (accountId, projectName, filePath) => {
+  const i18nKey = 'cli.commands.project.subcommands.upload';
+  const spinnies = new Spinnies({
+    succeedColor: 'white',
+  });
+  const accountIdentifier = uiAccountDescription(accountId);
+
+  spinnies.add('upload', {
+    text: i18n(`${i18nKey}.loading.upload.add`, {
+      accountIdentifier,
+      projectName,
+    }),
+  });
+
+  let buildId;
+
+  try {
+    const upload = await uploadProject(accountId, projectName, filePath);
+
+    buildId = upload.buildId;
+
+    spinnies.succeed('upload', {
+      text: i18n(`${i18nKey}.loading.upload.succeed`, {
+        accountIdentifier,
+        projectName,
+      }),
+    });
+
+    logger.debug(
+      i18n(`${i18nKey}.debug.buildCreated`, {
+        buildId,
+        projectName,
+      })
+    );
+  } catch (err) {
+    spinnies.fail('upload', {
+      text: i18n(`${i18nKey}.loading.upload.fail`, {
+        accountIdentifier,
+        projectName,
+      }),
+    });
+
+    logApiErrorInstance(
+      err,
+      new ApiErrorContext({
+        accountId,
+        projectName,
+      })
+    );
+    process.exit(EXIT_CODES.ERROR);
+  }
+
+  return { buildId };
+};
+
+const handleProjectUpload = async (
+  accountId,
+  projectConfig,
+  projectDir,
+  callbackFunc
+) => {
+  const i18nKey = 'cli.commands.project.subcommands.upload';
+  const tempFile = tmp.fileSync({ postfix: '.zip' });
+
+  logger.debug(
+    i18n(`${i18nKey}.debug.compressing`, {
+      path: tempFile.name,
+    })
+  );
+
+  const output = fs.createWriteStream(tempFile.name);
+  const archive = archiver('zip');
+
+  output.on('close', async function() {
+    logger.debug(
+      i18n(`${i18nKey}.debug.compressed`, {
+        byteCount: archive.pointer(),
+      })
+    );
+
+    const { buildId } = await uploadProjectFiles(
+      accountId,
+      projectConfig.name,
+      tempFile.name
+    );
+
+    if (callbackFunc) {
+      callbackFunc(tempFile, buildId);
+    }
+  });
+
+  archive.pipe(output);
+
+  archive.directory(
+    path.resolve(projectDir, projectConfig.srcDir),
+    false,
+    file => (shouldIgnoreFile(file.name) ? false : file)
+  );
+
+  archive.finalize();
+};
+
+const showProjectWelcomeMessage = () => {
   logger.log('');
   logger.log(chalk.bold('Welcome to HubSpot Developer Projects!'));
-  logger.log(
-    '\n-------------------------------------------------------------\n'
-  );
+  logger.log('\n');
+  uiLine();
+  logger.log('\n');
   logger.log(chalk.bold("What's next?\n"));
   logger.log('🎨 Add components to your project with `hs create`.\n');
   logger.log(
@@ -249,35 +333,22 @@ const showWelcomeMessage = () => {
   logger.log(
     `🔗 Use \`hs project --help\` to learn more about available commands.\n`
   );
-  logger.log('-------------------------------------------------------------');
+  uiLine();
 };
 
-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}`);
-  }
+const makePollTaskStatusFunc = ({ statusFn, statusText, statusStrings }) => {
+  const isTaskComplete = task => {
+    if (
+      !task[statusText.SUBTASK_KEY].length ||
+      task.status === statusText.STATES.FAILURE
+    ) {
+      return true;
+    } else if (task.status === statusText.STATES.SUCCESS) {
+      return task.isAutoDeployEnabled ? !!task.deployStatusTaskLocator : true;
+    }
+  };
 
   return async (accountId, taskName, taskId, buildId) => {
-    const isTaskComplete = task => {
-      if (task.status === statusText.STATES.FAILURE) {
-        return true;
-      } else if (task.status === statusText.STATES.SUCCESS) {
-        return task.isAutoDeployEnabled ? !!task.deployStatusTaskLocator : true;
-      }
-    };
-
     const spinnies = new Spinnies({
       succeedColor: 'white',
       failColor: 'white',
@@ -296,9 +367,12 @@ const makeGetTaskStatus = taskType => {
     });
 
     for (let subTask of initialTaskStatus[statusText.SUBTASK_KEY]) {
-      spinnies.add(subTask[statusText.SUBTASK_NAME_KEY], {
-        text: `${chalk.bold(subTask[statusText.SUBTASK_NAME_KEY])} #${buildId ||
-          taskId} ${statusText.STATUS_TEXT[statusText.STATES.ENQUEUED]}\n`,
+      const subTaskName = subTask[statusText.SUBTASK_NAME_KEY];
+
+      spinnies.add(subTaskName, {
+        text: `${chalk.bold(subTaskName)} #${buildId || taskId} ${
+          statusText.STATUS_TEXT[statusText.STATES.ENQUEUED]
+        }\n`,
       });
     }
 
@@ -312,29 +386,25 @@ const makeGetTaskStatus = taskType => {
 
         if (spinnies.hasActiveSpinners()) {
           subTaskStatus.forEach(subTask => {
-            if (!spinnies.pick(subTask[statusText.SUBTASK_NAME_KEY])) {
+            const subTaskName = subTask[statusText.SUBTASK_NAME_KEY];
+
+            if (!spinnies.pick(subTaskName)) {
               return;
             }
 
-            const updatedText = `${chalk.bold(
-              subTask[statusText.SUBTASK_NAME_KEY]
-            )} #${taskId} ${statusText.STATUS_TEXT[subTask.status]}\n`;
+            const updatedText = `${chalk.bold(subTaskName)} #${taskId} ${
+              statusText.STATUS_TEXT[subTask.status]
+            }\n`;
 
             switch (subTask.status) {
               case statusText.STATES.SUCCESS:
-                spinnies.succeed(subTask[statusText.SUBTASK_NAME_KEY], {
-                  text: updatedText,
-                });
+                spinnies.succeed(subTaskName, { text: updatedText });
                 break;
               case statusText.STATES.FAILURE:
-                spinnies.fail(subTask[statusText.SUBTASK_NAME_KEY], {
-                  text: updatedText,
-                });
+                spinnies.fail(subTaskName, { text: updatedText });
                 break;
               default:
-                spinnies.update(subTask[statusText.SUBTASK_NAME_KEY], {
-                  text: updatedText,
-                });
+                spinnies.update(subTaskName, { text: updatedText });
                 break;
             }
           });
@@ -388,15 +458,50 @@ const makeGetTaskStatus = taskType => {
   };
 };
 
+const pollBuildStatus = makePollTaskStatusFunc({
+  statusFn: getBuildStatus,
+  statusText: PROJECT_BUILD_TEXT,
+  statusStrings: {
+    INITIALIZE: (name, numOfComponents) =>
+      `Building ${chalk.bold(name)}\n\nFound ${numOfComponents} component${
+        numOfComponents !== 1 ? 's' : ''
+      } in this project ...\n`,
+    SUCCESS: name => `Built ${chalk.bold(name)}`,
+    FAIL: name => `Failed to build ${chalk.bold(name)}`,
+    SUBTASK_FAIL: (taskId, name) =>
+      `Build #${taskId} failed because there was a problem\nbuilding ${chalk.bold(
+        name
+      )}`,
+  },
+});
+
+const pollDeployStatus = makePollTaskStatusFunc({
+  statusFn: getDeployStatus,
+  statusText: PROJECT_DEPLOY_TEXT,
+  statusStrings: {
+    INITIALIZE: (name, numOfComponents) =>
+      `Deploying ${chalk.bold(name)}\n\nFound ${numOfComponents} component${
+        numOfComponents !== 1 ? 's' : ''
+      } in this project ...\n`,
+    SUCCESS: name => `Deployed ${chalk.bold(name)}`,
+    FAIL: name => `Failed to deploy ${chalk.bold(name)}`,
+    SUBTASK_FAIL: (taskId, name) =>
+      `Deploy for build #${taskId} failed because there was a\nproblem deploying ${chalk.bold(
+        name
+      )}`,
+  },
+});
+
 module.exports = {
   writeProjectConfig,
   getProjectConfig,
   getIsInProject,
+  handleProjectUpload,
   createProjectConfig,
   validateProjectConfig,
-  showWelcomeMessage,
+  showProjectWelcomeMessage,
   getProjectDetailUrl,
-  pollBuildStatus: makeGetTaskStatus('build'),
-  pollDeployStatus: makeGetTaskStatus('deploy'),
+  pollBuildStatus,
+  pollDeployStatus,
   ensureProjectExists,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hubspot/cli",
-  "version": "3.0.11-beta.1",
+  "version": "3.0.12-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.11-beta.1",
-    "@hubspot/serverless-dev-runtime": "^3.0.11-beta.1",
+    "@hubspot/cli-lib": "^3.0.12-beta.1",
+    "@hubspot/serverless-dev-runtime": "^3.0.12-beta.1",
     "archiver": "^5.3.0",
     "chalk": "^4.1.2",
     "express": "^4.17.1",
@@ -39,5 +39,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7667862d4e75e8f896b25030956dcfc1dc6124ca"
+  "gitHead": "01b4b086b16f92ec7a0c5022ed0beb4de6a16ae7"
 }