chore(): rename variables to create a consistent usage of IonicAppLib across the codebase.

Author: jthoms1

lib/cli.js

@@ -13,7 +13,7 @@ var fs = require('fs');
 var settings = require('../package.json');
 var Tasks = require('./config/commands').allCommands;
 var orderedListOfTasks = require('./config/commands').orderedListOfCommands;
-var Utils = IonicAppLib.utils;
+var appLibUtils = IonicAppLib.utils;
 var Logging = IonicAppLib.logging;
 var log = Logging.logger;
 var Q = require('q');
@@ -144,7 +144,7 @@ Cli.run = function run(processArgv) {
       return Q.fcall(task.run.bind(task), Cli, argv, rawCliArguments);
     }
 
-    var root = Utils.cdIonicRoot();
+    var root = appLibUtils.cdIonicRoot();
     var project = IonicProject.load(root);
     argv.v2 = project && project.get('v2');
 
@@ -190,7 +190,7 @@ Cli.run = function run(processArgv) {
     return Cli.runWithGulp(argv, task, rawCliArguments);
 
   } catch (ex) {
-    return Utils.fail(ex);
+    return appLibUtils.fail(ex);
   }
 };
 
@@ -521,7 +521,7 @@ Cli.printNewsUpdates = function printNewsUpdates(skipNewsCheck) {
         log.info('+---------------------------------------------------------+\n'.green);
       } catch (ex) {
         q.reject('Error occurred in downloading the CLI messages:', ex);
-        Utils.fail(ex);
+        appLibUtils.fail(ex);
       }
       q.resolve(messagesJson);
     } else {
@@ -542,14 +542,14 @@ Cli.gatherInfo = function gatherInfo() {
 Cli.handleUncaughtExceptions = function handleUncaughtExceptions(err) {
   log.error('An uncaught exception occurred and has been reported to Ionic'.red.bold);
   var errorMessage = typeof err === 'string' ? err : err.message;
-  Utils.errorHandler(errorMessage);
+  appLibUtils.errorHandler(errorMessage);
   process.exit(1);
 };
 
 Cli.attachErrorHandling = function attachErrorHandling() {
-  Utils.errorHandler = function errorHandler(msg) {
+  appLibUtils.errorHandler = function errorHandler(msg) {
     try {
-      log.debug('Cli.Utils.errorHandler msg', msg, typeof msg);
+      log.debug('Cli.appLibUtils.errorHandler msg', msg, typeof msg);
       var stack = typeof msg == 'string' ? '' : msg.stack;
       var errorMessage = typeof msg == 'string' ? msg : msg.message;
       if (msg) {
@@ -578,11 +578,11 @@ Cli.attachErrorHandling = function attachErrorHandling() {
 // Backwards compatability for those commands that havent been
 // converted yet.
 Cli.fail = function fail(err, taskHelp) {
-  Utils.fail(err, taskHelp);
+  appLibUtils.fail(err, taskHelp);
 };
 
 Cli.getContentSrc = function getContentSrc() {
-  return Utils.getContentSrc(process.cwd());
+  return appLibUtils.getContentSrc(process.cwd());
 };
 
 Cli.doRuntimeCheck = function doRuntimeCheck(version) {

lib/ionic/address.js

@@ -2,6 +2,7 @@
 
 var extend = Object.assign || require('util')._extend; // eslint-disable-line no-underscore-dangle
 var IonicAppLib = require('ionic-app-lib');
+var IonicConfig = IonicAppLib.config;
 var Serve = IonicAppLib.serve;
 
 var settings =  {
@@ -13,9 +14,9 @@ var settings =  {
 function run(ionic, argv) { // eslint-disable-line no-unused-vars
 
   // reset any address configs
-  var ionicConfig = IonicAppLib.config.load();
-  ionicConfig.set('ionicServeAddress', null);
-  ionicConfig.set('platformServeAddress', null);
+  var ionConfig = IonicConfig.load();
+  ionConfig.set('ionicServeAddress', null);
+  ionConfig.set('platformServeAddress', null);
   return Serve.getAddress({ isAddressCmd: true });
 }
 

lib/ionic/lib.js

@@ -11,7 +11,7 @@ var unzip = require('unzip');
 var argv = require('optimist').argv;
 var prompt = require('prompt');
 var IonicAppLib = require('ionic-app-lib');
-var utils = IonicAppLib.utils;
+var appLibUtils = IonicAppLib.utils;
 var log = IonicAppLib.logging.logger;
 var exec = require('child_process').exec;
 var Q = require('q');
@@ -33,7 +33,7 @@ var settings =  {
 function run(ionic, argv) {
 
   if (!fs.existsSync(path.resolve('www'))) {
-    return utils.fail('"www" directory cannot be found. Make sure the working directory ' +
+    return appLibUtils.fail('"www" directory cannot be found. Make sure the working directory ' +
                       'is at the top level of an Ionic project.', 'lib');
   }