@hubspot/cli 3.0.9 → 3.0.10-beta.11

package/commands/watch.js

@@ -1,12 +1,7 @@
 const fs = require('fs');
 const path = require('path');
 
-const {
-  watch,
-  loadConfig,
-  validateConfig,
-  checkAndWarnGitInclusion,
-} = require('@hubspot/cli-lib');
+const { watch } = require('@hubspot/cli-lib');
 const { getCwd } = require('@hubspot/cli-lib/path');
 const { logger } = require('@hubspot/cli-lib/logger');
 
@@ -15,42 +10,26 @@ const {
   addAccountOptions,
   addModeOptions,
   addUseEnvironmentOptions,
-  setLogLevel,
   getAccountId,
   getMode,
 } = require('../lib/commonOpts');
-const { logDebugInfo } = require('../lib/debugInfo');
-const { validateAccount, validateMode } = require('../lib/validation');
+const { validateMode, loadAndValidateOptions } = require('../lib/validation');
 const { trackCommandUsage } = require('../lib/usageTracking');
+const { i18n } = require('@hubspot/cli-lib/lib/lang');
+
+const i18nKey = 'cli.commands.watch';
+const { EXIT_CODES } = require('../lib/enums/exitCodes');
 
 exports.command = 'watch <src> <dest>';
-exports.describe =
-  'Watch a directory on your computer for changes and upload the changed files to the HubSpot CMS';
+exports.describe = i18n(`${i18nKey}.describe`);
 
 exports.handler = async options => {
-  const {
-    src,
-    dest,
-    config: configPath,
-    remove,
-    initialUpload,
-    disableInitial,
-    notify,
-  } = options;
-
-  setLogLevel(options);
-  logDebugInfo(options);
-  loadConfig(configPath, options);
-  checkAndWarnGitInclusion();
-
-  if (
-    !(
-      validateConfig() &&
-      (await validateAccount(options)) &&
-      validateMode(options)
-    )
-  ) {
-    process.exit(1);
+  const { src, dest, remove, initialUpload, disableInitial, notify } = options;
+
+  await loadAndValidateOptions(options);
+
+  if (!validateMode(options)) {
+    process.exit(EXIT_CODES.ERROR);
   }
 
   const accountId = getAccountId(options);
@@ -60,32 +39,34 @@ exports.handler = async options => {
   try {
     const stats = fs.statSync(absoluteSrcPath);
     if (!stats.isDirectory()) {
-      logger.log(`The "${src}" is not a path to a directory`);
+      logger.log(
+        i18n(`${i18nKey}.errors.invalidPath`, {
+          path: src,
+        })
+      );
       return;
     }
   } catch (e) {
-    logger.log(`The "${src}" is not a path to a directory`);
+    logger.log(
+      i18n(`${i18nKey}.errors.invalidPath`, {
+        path: src,
+      })
+    );
     return;
   }
 
   if (!dest) {
-    logger.log('A destination directory needs to be passed');
+    logger.log(i18n(`${i18nKey}.errors.destinationRequired`));
     return;
   }
 
   if (disableInitial) {
-    logger.info(
-      'Passing the "--disable-initial" option is no longer necessary. Running "hs watch" no longer uploads the watched directory by default.'
-    );
+    logger.info(i18n(`${i18nKey}.warnings.disableInitial`));
   } else {
-    logger.info(
-      `The "watch" command no longer uploads the watched directory when started. The directory "${src}" was not uploaded.`
-    );
+    logger.info(i18n(`${i18nKey}.warnings.notUploaded`, { path: src }));
 
     if (!initialUpload) {
-      logger.info(
-        'To upload the directory run "hs upload" beforehand or add the "--initial-upload" option when running "hs watch".'
-      );
+      logger.info(i18n(`${i18nKey}.warnings.initialUpload`));
     }
   }
 
@@ -105,35 +86,32 @@ exports.builder = yargs => {
   addUseEnvironmentOptions(yargs, true);
 
   yargs.positional('src', {
-    describe:
-      'Path to the local directory your files are in, relative to your current working directory',
+    describe: i18n(`${i18nKey}.positionals.src.describe`),
     type: 'string',
   });
   yargs.positional('dest', {
-    describe: 'Path in HubSpot Design Tools. Can be a net new path',
+    describe: i18n(`${i18nKey}.positionals.dest.describe`),
     type: 'string',
   });
   yargs.option('remove', {
     alias: 'r',
-    describe:
-      'Will cause watch to delete files in your HubSpot account that are not found locally.',
+    describe: i18n(`${i18nKey}.options.remove.describe`),
     type: 'boolean',
   });
   yargs.option('initial-upload', {
     alias: 'i',
-    describe: 'Upload directory before watching for updates',
+    describe: i18n(`${i18nKey}.options.initialUpload.describe`),
     type: 'boolean',
   });
   yargs.option('disable-initial', {
     alias: 'd',
-    describe: 'Disable the initial upload when watching a directory (default)',
+    describe: i18n(`${i18nKey}.options.disableInitial.describe`),
     type: 'boolean',
     hidden: true,
   });
   yargs.option('notify', {
     alias: 'n',
-    describe:
-      'Log to specified file when a watch task is triggered and after workers have gone idle. Ex. --notify path/to/file',
+    describe: i18n(`${i18nKey}.options.notify.describe`),
     type: 'string',
     requiresArg: true,
   });

package/lib/__tests__/serverlessLogs.js

@@ -11,15 +11,15 @@ const ACCOUNT_ID = 123;
 describe('@hubspot/cli/lib/serverlessLogs', () => {
   describe('tailLogs()', () => {
     let stdinMock;
-    let spinner;
+    let spinnies;
 
     beforeEach(() => {
       jest.spyOn(process, 'exit').mockImplementation(() => {});
       stdinMock = mockStdIn.stdin();
-      spinner = {
-        start: jest.fn(),
-        stop: jest.fn(),
-        clear: jest.fn(),
+      spinnies = {
+        succeed: jest.fn(),
+        fail: jest.fn(),
+        stopAll: jest.fn(),
       };
     });
 
@@ -56,7 +56,7 @@ describe('@hubspot/cli/lib/serverlessLogs', () => {
       await tailLogs({
         accountId: ACCOUNT_ID,
         compact,
-        spinner,
+        spinnies,
         fetchLatest,
         tailCall,
       });
@@ -114,7 +114,7 @@ describe('@hubspot/cli/lib/serverlessLogs', () => {
       await tailLogs({
         accountId: ACCOUNT_ID,
         compact,
-        spinner,
+        spinnies,
         fetchLatest,
         tailCall,
       });
@@ -123,7 +123,6 @@ describe('@hubspot/cli/lib/serverlessLogs', () => {
         latestLogResponse,
         expect.objectContaining({ compact })
       );
-      expect(spinner.clear).toHaveBeenCalled();
       expect(tailCall).toHaveBeenCalledTimes(2);
     });
     it('handles no logs', async () => {
@@ -147,7 +146,7 @@ describe('@hubspot/cli/lib/serverlessLogs', () => {
       await tailLogs({
         accountId: ACCOUNT_ID,
         compact,
-        spinner,
+        spinnies,
         fetchLatest,
         tailCall,
       });

package/lib/commonOpts.js

@@ -6,48 +6,51 @@ const {
   DEFAULT_MODE,
   Mode,
 } = require('@hubspot/cli-lib');
+const { i18n } = require('@hubspot/cli-lib/lib/lang');
+
+const i18nKey = 'cli.lib.commonOpts';
 const { LOG_LEVEL } = Logger;
 
 const addAccountOptions = program =>
   program.option('portal', {
     alias: ['p', 'account', 'a'],
-    describe: 'HubSpot portal id or name from config',
+    describe: i18n(`${i18nKey}.options.portal.describe`),
     type: 'string',
   });
 
 const addConfigOptions = yargs =>
   yargs.option('config', {
     alias: 'c',
-    describe: 'path to a config file',
+    describe: i18n(`${i18nKey}.options.config.describe`),
     type: 'string',
   });
 
 const addOverwriteOptions = yargs =>
   yargs.option('overwrite', {
     alias: 'o',
-    describe: 'overwrite existing files',
+    describe: i18n(`${i18nKey}.options.overwrite.describe`),
     type: 'boolean',
     default: false,
   });
 
 const addModeOptions = (yargs, { read, write }) => {
   const modes = `<${Object.values(Mode).join(' | ')}>`;
-  const help = read
-    ? `read from ${modes}`
-    : write
-    ? `write to ${modes}`
-    : `${modes}`;
 
   return yargs.option('mode', {
     alias: 'm',
-    describe: help,
+    describe: i18n(
+      `${i18nKey}.options.modes.describe.${
+        read ? 'read' : write ? 'write' : 'default'
+      }`,
+      { modes }
+    ),
     type: 'string',
   });
 };
 
 const addTestingOptions = yargs =>
   yargs.option('qa', {
-    describe: 'run command in qa mode',
+    describe: i18n(`${i18nKey}.options.qa.describe`),
     type: 'boolean',
     default: false,
     hidden: true,
@@ -55,7 +58,7 @@ const addTestingOptions = yargs =>
 
 const addUseEnvironmentOptions = yargs =>
   yargs.option('use-env', {
-    describe: 'use environment variable config',
+    describe: i18n(`${i18nKey}.options.useEnv.describe`),
     type: 'boolean',
     default: false,
   });

package/lib/enums/exitCodes.js

@@ -0,0 +1,14 @@
+/*
+ * 0: Successful run
+ * 1: Config problem or internal error
+ * 2: Warnings or validation issues
+ */
+const EXIT_CODES = {
+  SUCCESS: 0,
+  ERROR: 1,
+  WARNING: 2,
+};
+
+module.exports = {
+  EXIT_CODES,
+};