@optimizely/ocp-cli 1.0.0-beta.8 → 1.0.0

package/dist/index.js

@@ -4,12 +4,24 @@ const oo_cli_1 = require("oo-cli");
 const path = require("path");
 const EnvironmentalOutput_1 = require("./lib/EnvironmentalOutput");
 const checkForUpdate_1 = require("./lib/checkForUpdate");
-function run() {
+const os = require("os");
+const fs = require("fs");
+const formatError_1 = require("./lib/formatError");
+const migrateOptiCli_1 = require("./lib/migrateOptiCli");
+const die_1 = require("./lib/die");
+async function run() {
+    await (0, migrateOptiCli_1.migrateOptiCli)();
+    const configFolder = path.join(os.homedir(), '.ocp');
+    if (!fs.existsSync(configFolder)) {
+        (0, die_1.die)('No ~/.ocp config folder found. ' +
+            'Follow the instruction in ' +
+            'https://docs.developers.optimizely.com/optimizely-connect-platform/docs/ocp-cli-commands ' +
+            'to set up your development environment.');
+    }
     (0, EnvironmentalOutput_1.showEnvironment)();
     const manifest = require(path.join(__dirname, './oo-cli.manifest.json'));
-    (0, checkForUpdate_1.checkForUpdate)(manifest)
-        .then(() => new oo_cli_1.Runner(__dirname, manifest).run())
-        .catch((e) => console.log(e.message));
+    await (0, checkForUpdate_1.checkForUpdate)(manifest);
+    new oo_cli_1.Runner(__dirname, manifest).run();
 }
-run();
+run().catch((e) => (0, die_1.die)((0, formatError_1.formatError)(e)));
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;AAAA,mCAAgC;AAChC,6BAA6B;AAC7B,mEAA4D;AAC5D,yDAAsD;AAEtD,SAAS,GAAG;IACR,IAAA,qCAAe,GAAE,CAAC;IAElB,MAAM,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,wBAAwB,CAAC,CAAC,CAAC;IACzE,IAAA,+BAAc,EAAC,QAAQ,CAAC;SACrB,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,eAAM,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC,GAAG,EAAE,CAAC;SACjD,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;AAC5C,CAAC;AAED,GAAG,EAAE,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;AAAA,mCAAgC;AAChC,6BAA6B;AAC7B,mEAA4D;AAC5D,yDAAsD;AACtD,yBAAyB;AACzB,yBAAyB;AACzB,mDAA8C;AAC9C,yDAAoD;AACpD,mCAA8B;AAE9B,KAAK,UAAU,GAAG;IAChB,MAAM,IAAA,+BAAc,GAAE,CAAC;IAEvB,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,MAAM,CAAC,CAAC;IACrD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE;QAC9B,IAAA,SAAG,EACD,iCAAiC;YACjC,4BAA4B;YAC5B,2FAA2F;YAC3F,yCAAyC,CAC1C,CAAC;KACL;IAED,IAAA,qCAAe,GAAE,CAAC;IAElB,MAAM,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,wBAAwB,CAAC,CAAC,CAAC;IACzE,MAAM,IAAA,+BAAc,EAAC,QAAQ,CAAC,CAAC;IAE/B,IAAI,eAAM,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC,GAAG,EAAE,CAAC;AACxC,CAAC;AAED,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,SAAG,EAAC,IAAA,yBAAW,EAAC,CAAC,CAAC,CAAC,CAAC,CAAC"}

package/dist/lib/checkForUpdate.js

@@ -13,6 +13,14 @@ const LAST_VERSION_CHECK_FILE = '.lastcheck';
 const _24hours = 24 * 60 * 60 * 1000;
 async function checkForUpdate(manifest) {
     var _a;
+    const installed = (_a = manifest.package) === null || _a === void 0 ? void 0 : _a.version;
+    const prerelease = semver.prerelease(installed);
+    const isBeta = prerelease && prerelease[0] === 'beta';
+    if (isBeta) {
+        console.log(chalk.yellow(`You are running beta version (${installed})'. ` +
+            `${chalk.italic.grey('yarn global upgrade @optimizely/ocp-cli --latest')} to upgrade to the latest release version`));
+        return;
+    }
     const lastCheck = getLastCheck();
     if (lastCheck) {
         const now = new Date();
@@ -24,7 +32,6 @@ async function checkForUpdate(manifest) {
         let upToDate = true;
         const latest = await fetchLatest();
         if (latest) {
-            const installed = (_a = manifest.package) === null || _a === void 0 ? void 0 : _a.version;
             if (semver.gt(latest, installed)) {
                 upToDate = false;
                 if (await TerminalConfirm_1.TerminalConfirm.ask(chalk.yellow('A new version of OCP CLI is available. Update now?'))) {

package/dist/lib/checkForUpdate.js.map

@@ -1 +1 @@
-{"version":3,"file":"checkForUpdate.js","sourceRoot":"","sources":["../../src/lib/checkForUpdate.ts"],"names":[],"mappings":";;;AAAA,+BAA+B;AAC/B,yBAAyB;AACzB,yBAAyB;AACzB,6BAA6B;AAC7B,iCAAiC;AAEjC,qDAAkD;AAClD,uDAAoD;AACpD,uDAAqD;AAOrD,MAAM,uBAAuB,GAAG,YAAY,CAAC;AAC7C,MAAM,QAAQ,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;AAE9B,KAAK,UAAU,cAAc,CAAC,QAA4B;;IAC/D,MAAM,SAAS,GAAG,YAAY,EAAE,CAAC;IACjC,IAAI,SAAS,EAAE;QACb,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,IAAI,GAAG,CAAC,OAAO,EAAE,GAAG,SAAS,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,QAAQ,IAAI,SAAS,CAAC,QAAQ,EAAE;YAC7E,OAAO;SACR;KACF;IAED,IAAI;QACF,IAAI,QAAQ,GAAG,IAAI,CAAC;QACpB,MAAM,MAAM,GAAG,MAAM,WAAW,EAAE,CAAC;QACnC,IAAI,MAAM,EAAE;YACV,MAAM,SAAS,GAAG,MAAA,QAAQ,CAAC,OAAO,0CAAE,OAAQ,CAAC;YAC7C,IAAI,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,SAAS,CAAC,EAAE;gBAChC,QAAQ,GAAG,KAAK,CAAC;gBACjB,IAAI,MAAM,iCAAe,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,oDAAoD,CAAC,CAAC,EAAE;oBACjG,kCAAgB,CAAC,IAAI,CAAC,kDAAkD,CAAC,CAAC;iBAC3E;aACF;SACF;QACD,YAAY,CAAC,QAAQ,CAAC,CAAC;KACxB;IAAC,OAAO,CAAC,EAAE;QACV,OAAO;KACR;AACH,CAAC;AAzBD,wCAyBC;AAED,KAAK,UAAU,WAAW;IACxB,OAAO,+BAAc,CAAC,IAAI,CAAC,mDAAmD,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;AAChG,CAAC;AAED,SAAS,YAAY;IACnB,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,QAAQ,uBAAuB,EAAE,CAAC,CAAC;IACxE,IAAI,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;QACvB,MAAM,IAAI,GAAG,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAC/B,MAAM,QAAQ,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,EAAC,QAAQ,EAAE,OAAO,EAAC,CAAC,KAAK,MAAM,CAAC;QACvE,OAAO,EAAC,IAAI,EAAE,IAAI,CAAC,KAAK,EAAE,QAAQ,EAAC,CAAC;KACrC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAS,YAAY,CAAC,QAAiB;IACrC,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,QAAQ,uBAAuB,EAAE,CAAC,CAAC;IACxE,EAAE,CAAC,aAAa,CAAC,IAAI,EAAE,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC;AAC9C,CAAC"}
+{"version":3,"file":"checkForUpdate.js","sourceRoot":"","sources":["../../src/lib/checkForUpdate.ts"],"names":[],"mappings":";;;AAAA,+BAA+B;AAC/B,yBAAyB;AACzB,yBAAyB;AACzB,6BAA6B;AAC7B,iCAAiC;AAEjC,qDAAkD;AAClD,uDAAoD;AACpD,uDAAqD;AAOrD,MAAM,uBAAuB,GAAG,YAAY,CAAC;AAC7C,MAAM,QAAQ,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;AAE9B,KAAK,UAAU,cAAc,CAAC,QAA4B;;IAC/D,MAAM,SAAS,GAAG,MAAA,QAAQ,CAAC,OAAO,0CAAE,OAAQ,CAAC;IAC7C,MAAM,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC;IAChD,MAAM,MAAM,GAAG,UAAU,IAAI,UAAU,CAAC,CAAC,CAAC,KAAK,MAAM,CAAC;IAEtD,IAAI,MAAM,EAAE;QACV,OAAO,CAAC,GAAG,CACP,KAAK,CAAC,MAAM,CACR,iCAAiC,SAAS,MAAM;YAChD,GAAG,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,kDAAkD,CAAC,2CAA2C,CACtH,CACJ,CAAC;QACF,OAAO;KACR;IAED,MAAM,SAAS,GAAG,YAAY,EAAE,CAAC;IACjC,IAAI,SAAS,EAAE;QACb,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,IAAI,GAAG,CAAC,OAAO,EAAE,GAAG,SAAS,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,QAAQ,IAAI,SAAS,CAAC,QAAQ,EAAE;YAC7E,OAAO;SACR;KACF;IAED,IAAI;QACF,IAAI,QAAQ,GAAG,IAAI,CAAC;QACpB,MAAM,MAAM,GAAG,MAAM,WAAW,EAAE,CAAC;QACnC,IAAI,MAAM,EAAE;YACV,IAAI,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,SAAS,CAAC,EAAE;gBAChC,QAAQ,GAAG,KAAK,CAAC;gBACjB,IAAI,MAAM,iCAAe,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,oDAAoD,CAAC,CAAC,EAAE;oBACjG,kCAAgB,CAAC,IAAI,CAAC,kDAAkD,CAAC,CAAC;iBAC3E;aACF;SACF;QACD,YAAY,CAAC,QAAQ,CAAC,CAAC;KACxB;IAAC,OAAO,CAAC,EAAE;QACV,OAAO;KACR;AACH,CAAC;AAtCD,wCAsCC;AAED,KAAK,UAAU,WAAW;IACxB,OAAO,+BAAc,CAAC,IAAI,CAAC,mDAAmD,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;AAChG,CAAC;AAED,SAAS,YAAY;IACnB,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,QAAQ,uBAAuB,EAAE,CAAC,CAAC;IACxE,IAAI,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;QACvB,MAAM,IAAI,GAAG,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAC/B,MAAM,QAAQ,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,EAAE,EAAC,QAAQ,EAAE,OAAO,EAAC,CAAC,KAAK,MAAM,CAAC;QACvE,OAAO,EAAC,IAAI,EAAE,IAAI,CAAC,KAAK,EAAE,QAAQ,EAAC,CAAC;KACrC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAS,YAAY,CAAC,QAAiB;IACrC,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,QAAQ,uBAAuB,EAAE,CAAC,CAAC;IACxE,EAAE,CAAC,aAAa,CAAC,IAAI,EAAE,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC;AAC9C,CAAC"}

package/dist/lib/migrateOptiCli.d.ts

@@ -0,0 +1 @@
+export declare function migrateOptiCli(): Promise<void>;

package/dist/lib/migrateOptiCli.js

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.migrateOptiCli = void 0;
+const path = require("path");
+const os = require("os");
+const fs = require("fs");
+const chalk = require("chalk");
+const TerminalConfirm_1 = require("./TerminalConfirm");
+const dotenv = require("dotenv");
+async function migrateOptiCli() {
+    const configFolder = path.join(os.homedir(), '.ocp');
+    if (fs.existsSync(configFolder) || !fs.existsSync(path.join(os.homedir(), '.opti'))) {
+        return;
+    }
+    const question = chalk.yellow('No ~/.ocp config folder found, but the config folder for legacy opti CLI exists. ' +
+        'Do you want to copy opti CLI configuration? (y/n)');
+    const copyConfig = await TerminalConfirm_1.TerminalConfirm.ask(question);
+    if (copyConfig) {
+        fs.cpSync(path.join(os.homedir(), '.opti'), path.join(os.homedir(), '.ocp'), { recursive: true });
+        ['.env', '.env.staging'].forEach((envFile) => {
+            const envFilePath = path.join(os.homedir(), '.ocp', envFile);
+            if (fs.existsSync(envFilePath)) {
+                fs.writeFileSync(envFilePath, fs.readFileSync(envFilePath, 'utf8').replace('OPTI_ENV', 'OCP_ENV'));
+            }
+        });
+        dotenv.config({ path: path.join(os.homedir(), '.ocp/.env') });
+    }
+}
+exports.migrateOptiCli = migrateOptiCli;
+//# sourceMappingURL=migrateOptiCli.js.map

package/dist/lib/migrateOptiCli.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"migrateOptiCli.js","sourceRoot":"","sources":["../../src/lib/migrateOptiCli.ts"],"names":[],"mappings":";;;AAAA,6BAA6B;AAC7B,yBAAyB;AACzB,yBAAyB;AACzB,+BAA+B;AAC/B,uDAAkD;AAClD,iCAAiC;AAE1B,KAAK,UAAU,cAAc;IAClC,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,MAAM,CAAC,CAAC;IACrD,IAAI,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,OAAO,CAAC,CAAC,EAAE;QACnF,OAAO;KACR;IAED,MAAM,QAAQ,GAAG,KAAK,CAAC,MAAM,CAC3B,mFAAmF;QACnF,mDAAmD,CACpD,CAAC;IAEF,MAAM,UAAU,GAAG,MAAM,iCAAe,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IACvD,IAAI,UAAU,EAAE;QACd,EAAE,CAAC,MAAM,CACP,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,OAAO,CAAC,EAChC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,MAAM,CAAC,EAC/B,EAAC,SAAS,EAAE,IAAI,EAAC,CAClB,CAAC;QACF,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC3C,MAAM,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;YAC7D,IAAI,EAAE,CAAC,UAAU,CAAC,WAAW,CAAC,EAAE;gBAC9B,EAAE,CAAC,aAAa,CACd,WAAW,EACX,EAAE,CAAC,YAAY,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC,OAAO,CAAC,UAAU,EAAE,SAAS,CAAC,CACpE,CAAC;aACH;QACH,CAAC,CAAC,CAAC;QAEH,MAAM,CAAC,MAAM,CAAC,EAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,WAAW,CAAC,EAAC,CAAC,CAAC;KAC7D;AACH,CAAC;AA9BD,wCA8BC"}

package/dist/oo-cli.manifest.json

@@ -1134,7 +1134,7 @@
   },
   "commands": [],
   "package": {
-    "version": "1.0.0-beta.8",
+    "version": "1.0.0",
     "name": "@optimizely/ocp-cli",
     "license": "Apache-2.0",
     "executable": "ocp"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optimizely/ocp-cli",
-  "version": "1.0.0-beta.8",
+  "version": "1.0.0",
   "description": "Optimizely Connect Platform command line interface",
   "repository": "https://github.com/ZaiusInc/ocp-cli",
   "license": "Apache-2.0",

package/src/index.ts

@@ -2,14 +2,31 @@ import { Runner } from 'oo-cli';
 import * as path from 'path';
 import { showEnvironment } from './lib/EnvironmentalOutput';
 import { checkForUpdate } from './lib/checkForUpdate';
+import * as os from 'os';
+import * as fs from 'fs';
+import {formatError} from './lib/formatError';
+import {migrateOptiCli} from './lib/migrateOptiCli';
+import {die} from './lib/die';
 
-function run() {
-    showEnvironment();
+async function run() {
+  await migrateOptiCli();
 
-    const manifest = require(path.join(__dirname, './oo-cli.manifest.json'));
-    checkForUpdate(manifest)
-      .then(() => new Runner(__dirname, manifest).run())
-      .catch((e) => console.log(e.message));
+  const configFolder = path.join(os.homedir(), '.ocp');
+  if (!fs.existsSync(configFolder)) {
+      die(
+        'No ~/.ocp config folder found. ' +
+        'Follow the instruction in ' +
+        'https://docs.developers.optimizely.com/optimizely-connect-platform/docs/ocp-cli-commands ' +
+        'to set up your development environment.'
+      );
+  }
+
+  showEnvironment();
+
+  const manifest = require(path.join(__dirname, './oo-cli.manifest.json'));
+  await checkForUpdate(manifest);
+
+  new Runner(__dirname, manifest).run();
 }
 
-run();
+run().catch((e) => die(formatError(e)));

package/src/lib/checkForUpdate.ts

@@ -17,6 +17,20 @@ const LAST_VERSION_CHECK_FILE = '.lastcheck';
 const _24hours = 24 * 60 * 60 * 1000;
 
 export async function checkForUpdate(manifest: ManifestDefinition): Promise<void> {
+  const installed = manifest.package?.version!;
+  const prerelease = semver.prerelease(installed);
+  const isBeta = prerelease && prerelease[0] === 'beta';
+
+  if (isBeta) {
+    console.log(
+        chalk.yellow(
+            `You are running beta version (${installed})'. ` +
+            `${chalk.italic.grey('yarn global upgrade @optimizely/ocp-cli --latest')} to upgrade to the latest release version`
+        )
+    );
+    return;
+  }
+
   const lastCheck = getLastCheck();
   if (lastCheck) {
     const now = new Date();
@@ -29,7 +43,6 @@ export async function checkForUpdate(manifest: ManifestDefinition): Promise<void
     let upToDate = true;
     const latest = await fetchLatest();
     if (latest) {
-      const installed = manifest.package?.version!;
       if (semver.gt(latest, installed)) {
         upToDate = false;
         if (await TerminalConfirm.ask(chalk.yellow('A new version of OCP CLI is available. Update now?'))) {

package/src/lib/migrateOptiCli.ts

@@ -0,0 +1,38 @@
+import * as path from 'path';
+import * as os from 'os';
+import * as fs from 'fs';
+import * as chalk from 'chalk';
+import {TerminalConfirm} from './TerminalConfirm';
+import * as dotenv from 'dotenv';
+
+export async function migrateOptiCli() {
+  const configFolder = path.join(os.homedir(), '.ocp');
+  if (fs.existsSync(configFolder) || !fs.existsSync(path.join(os.homedir(), '.opti'))) {
+    return;
+  }
+
+  const question = chalk.yellow(
+    'No ~/.ocp config folder found, but the config folder for legacy opti CLI exists. ' +
+    'Do you want to copy opti CLI configuration? (y/n)'
+  );
+
+  const copyConfig = await TerminalConfirm.ask(question);
+  if (copyConfig) {
+    fs.cpSync(
+      path.join(os.homedir(), '.opti'),
+      path.join(os.homedir(), '.ocp'),
+      {recursive: true}
+    );
+    ['.env', '.env.staging'].forEach((envFile) => {
+      const envFilePath = path.join(os.homedir(), '.ocp', envFile);
+      if (fs.existsSync(envFilePath)) {
+        fs.writeFileSync(
+          envFilePath,
+          fs.readFileSync(envFilePath, 'utf8').replace('OPTI_ENV', 'OCP_ENV')
+        );
+      }
+    });
+
+    dotenv.config({path: path.join(os.homedir(), '.ocp/.env')});
+  }
+}