refactor: meta is generated by cli-utils

imhoffd · imhoffd · commit 188fbcca734e · 2017-07-26T18:03:55.000-05:00
diff --git a/packages/cli-utils/src/definitions.ts b/packages/cli-utils/src/definitions.ts
@@ -509,7 +509,7 @@ export interface IonicEnvironment {
   readonly events: ICLIEventEmitter;
   readonly log: ILogger;
   readonly prompt: PromptModule;
-  meta?: {
+  meta: {
     local: boolean; // CLI running in local mode?
     binPath: string;
     libPath: string;
diff --git a/packages/cli-utils/src/index.ts b/packages/cli-utils/src/index.ts
@@ -197,6 +197,11 @@ export async function generateIonicEnvironment(plugin: RootPlugin, pargv: string
     hooks,
     load,
     log,
+    meta: {
+      local: env['IONIC_CLI_LOCAL'] ? true : false,
+      binPath: env['IONIC_CLI_BIN'],
+      libPath: env['IONIC_CLI_LIB'],
+    },
     namespace: plugin.namespace,
     open,
     plugins: {
diff --git a/packages/ionic/bin/ionic b/packages/ionic/bin/ionic
@@ -8,15 +8,15 @@ process.on('unhandledRejection', function(r) { console.error(r); });
 var semver = require('semver');
 
 if (semver.lt(process.version, 'v6.4.0')) {
-  var chalk = require('chalk');
-  console.log(chalk.red('ERR') + ': Your Node.js version is ' + chalk.bold(process.version) + '. Please update to the latest Node 6 LTS version (or latest Node).');
+  console.log('ERR: Your Node.js version is ' + process.version + '. Please update to the latest Node 6 LTS version (or latest Node).');
   process.exit(1);
 }
 
 var bootstrap = require('@ionic/cli-utils/bootstrap');
 
 bootstrap.detectLocalCLI().then(function(localPath) {
-  var cli = require(localPath || '../');
+  var cli = require(localPath ? localPath : '../');
+  process.env.IONIC_CLI_LOCAL = localPath;
   process.env.IONIC_CLI_BIN = __filename;
-  cli.run(process.argv, process.env, { local: localPath ? true : false });
+  cli.run(process.argv, process.env);
 });
diff --git a/packages/ionic/src/index.ts b/packages/ionic/src/index.ts
@@ -138,7 +138,7 @@ export function registerHooks(hooks: IHookEngine) {
 }
 
 
-export async function run(pargv: string[], env: { [k: string]: string; }, opts: { local?: boolean; } = {}) {
+export async function run(pargv: string[], env: { [k: string]: string; }) {
   const now = new Date();
   let exitCode = 0;
   let err: any;
@@ -148,23 +148,17 @@ export async function run(pargv: string[], env: { [k: string]: string; }, opts:
 
   const ienv = await generateIonicEnvironment(exports, pargv, env);
 
-  ienv.meta = {
-    local: opts.local || false,
-    binPath: env['IONIC_CLI_BIN'],
-    libPath: env['IONIC_CLI_LIB'],
-  };
-
-  registerHooks(ienv.hooks);
-
   try {
-    const configData = await ienv.config.load();
+    const config = await ienv.config.load();
+
+    registerHooks(ienv.hooks);
 
     ienv.log.debug(() => util.inspect(ienv.meta, { breakLength: Infinity, colors: chalk.enabled }));
 
     if (env['IONIC_EMAIL'] && env['IONIC_PASSWORD']) {
       ienv.log.debug(() => `${chalk.bold('IONIC_EMAIL')} / ${chalk.bold('IONIC_PASSWORD')} environment variables detected`);
 
-      if (configData.user.email !== env['IONIC_EMAIL']) {
+      if (config.user.email !== env['IONIC_EMAIL']) {
         ienv.log.debug(() => `${chalk.bold('IONIC_EMAIL')} mismatch with current session--attempting login`);
 
         try {
@@ -214,18 +208,18 @@ export async function run(pargv: string[], env: { [k: string]: string; }, opts:
       }
 
       if (ienv.flags.interactive) {
-        if (typeof configData.daemon.updates === 'undefined') {
+        if (typeof config.daemon.updates === 'undefined') {
           const confirm = await ienv.prompt({
             type: 'confirm',
             name: 'confirm',
             message: `The Ionic CLI can automatically check for CLI updates in the background. Would you like to enable this?`,
           });
 
-          configData.daemon.updates = confirm;
+          config.daemon.updates = confirm;
           await ienv.config.save();
         }
 
-        if (configData.daemon.updates) {
+        if (config.daemon.updates) {
           await Promise.all([checkForDaemon(ienv), checkForUpdates(ienv)]);
         }
       }
@@ -238,7 +232,7 @@ export async function run(pargv: string[], env: { [k: string]: string; }, opts:
         exitCode = r;
       }
 
-      configData.lastCommand = now.toISOString();
+      config.lastCommand = now.toISOString();
     }
 
   } catch (e) {
