@hubspot/cli 5.0.0 → 5.0.1

package/commands/auth.js

@@ -31,16 +31,23 @@ const {
 const {
   addConfigOptions,
   setLogLevel,
+  getAccountId,
   addTestingOptions,
 } = require('../lib/commonOpts');
 const { logDebugInfo } = require('../lib/debugInfo');
-const { trackCommandUsage } = require('../lib/usageTracking');
+const { trackAuthAction, trackCommandUsage } = require('../lib/usageTracking');
 const { authenticateWithOauth } = require('../lib/oauth');
 const { EXIT_CODES } = require('../lib/enums/exitCodes');
 const { uiFeatureHighlight } = require('../lib/ui');
 
 const i18nKey = 'cli.commands.auth';
 
+const TRACKING_STATUS = {
+  STARTED: 'started',
+  ERROR: 'error',
+  COMPLETE: 'complete',
+};
+
 const ALLOWED_AUTH_METHODS = [
   OAUTH_AUTH_METHOD.value,
   PERSONAL_ACCESS_KEY_AUTH_METHOD.value,
@@ -71,6 +78,7 @@ exports.handler = async options => {
   checkAndWarnGitInclusion(getConfigPath());
 
   trackCommandUsage('auth');
+  trackAuthAction('auth', authType, TRACKING_STATUS.STARTED);
 
   let configData;
   let updatedConfig;
@@ -122,6 +130,7 @@ exports.handler = async options => {
   }
 
   if (!successAuthMethod) {
+    await trackAuthAction('auth', authType, TRACKING_STATUS.ERROR);
     process.exit(EXIT_CODES.ERROR);
   }
 
@@ -157,6 +166,9 @@ exports.handler = async options => {
     'accountsListCommand',
   ]);
 
+  const accountId = getAccountId({ account: accountName });
+  await trackAuthAction('auth', authType, TRACKING_STATUS.COMPLETE, accountId);
+
   process.exit(EXIT_CODES.SUCCESS);
 };
 

package/commands/create.js

@@ -76,6 +76,8 @@ exports.handler = async options => {
   const argsToPass = { assetType, name, dest, options };
   dest = argsToPass.dest = resolveLocalPath(asset.dest(argsToPass));
 
+  trackCommandUsage('create', { assetType }, getAccountId(options));
+
   try {
     await fs.ensureDir(dest);
   } catch (e) {
@@ -94,8 +96,6 @@ exports.handler = async options => {
   if (asset.validate && !asset.validate(argsToPass)) return;
 
   await asset.execute(argsToPass);
-
-  trackCommandUsage('create', { assetType }, getAccountId(options));
 };
 
 exports.builder = yargs => {

package/commands/init.js

@@ -133,11 +133,17 @@ exports.handler = async options => {
     );
     uiFeatureHighlight(['helpCommand', 'authCommand', 'accountsListCommand']);
 
-    trackAuthAction('init', authType, TRACKING_STATUS.COMPLETE, accountId);
+    await trackAuthAction(
+      'init',
+      authType,
+      TRACKING_STATUS.COMPLETE,
+      accountId
+    );
     process.exit(EXIT_CODES.SUCCESS);
   } catch (err) {
     logErrorInstance(err);
-    trackAuthAction('init', authType, TRACKING_STATUS.ERROR);
+    await trackAuthAction('init', authType, TRACKING_STATUS.ERROR);
+    process.exit(EXIT_CODES.ERROR);
   }
 };
 

package/lang/en.lyaml

@@ -1071,7 +1071,7 @@ en:
         createProjectPrompt:
           enterName: "[--name] Give your project a name: "
           enterLocation: "[--location] Where should the project be created?"
-          selectTemplate: "[--template] Start from a template?"
+          selectTemplate: "[--template] Choose a project template: "
           errors:
             nameRequired: "A project name is required"
             locationRequired: "A project location is required"

package/lib/projectStructure.js

@@ -32,11 +32,13 @@ function getAppCardConfigs(appConfig, appPath) {
 
   if (cards) {
     cards.forEach(({ file }) => {
-      const cardConfigPath = path.join(appPath, file);
-      const cardConfig = loadConfigFile(cardConfigPath);
+      if (typeof file === 'string') {
+        const cardConfigPath = path.join(appPath, file);
+        const cardConfig = loadConfigFile(cardConfigPath);
 
-      if (cardConfig) {
-        cardConfigs.push(cardConfig);
+        if (cardConfig) {
+          cardConfigs.push(cardConfig);
+        }
       }
     });
   }
@@ -84,14 +86,16 @@ async function findProjectComponents(projectSourceDir) {
           0,
           projectFile.indexOf(APP_COMPONENT_CONFIG)
         );
-        const isLegacy = getIsLegacyApp(parsedAppConfig, appPath);
-
-        components.push({
-          type: COMPONENT_TYPES.app,
-          config: parsedAppConfig,
-          runnable: !isLegacy,
-          path: appPath,
-        });
+        if (typeof appPath === 'string') {
+          const isLegacy = getIsLegacyApp(parsedAppConfig, appPath);
+
+          components.push({
+            type: COMPONENT_TYPES.app,
+            config: parsedAppConfig,
+            runnable: !isLegacy,
+            path: appPath,
+          });
+        }
       }
     }
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hubspot/cli",
-  "version": "5.0.0",
+  "version": "5.0.1",
   "description": "CLI for working with HubSpot",
   "license": "Apache-2.0",
   "repository": {
@@ -42,5 +42,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "c84420be1abb52575cf159de243d41542653d0bb"
+  "gitHead": "0f88273233124d513c4338fed7bd01fa4678251d"
 }