fix(run): fix livereload option for v2 run

Author: tlancina

lib/ionic/cordova.js

@@ -9,12 +9,10 @@ var Task = require('./task').Task,
     shelljs = require('shelljs'),
     prompt = require('prompt'),
     IonicAppLib = require('ionic-app-lib'),
-    IonicProject = IonicAppLib.project,
     IonicResources = IonicAppLib.resources,
     ConfigXml = IonicAppLib.configXml,
     Cordova = IonicAppLib.cordova,
     Hooks = IonicAppLib.hooks,
-    Serve = IonicAppLib.serve,
     State = IonicAppLib.state,
     Utils = IonicAppLib.utils,
     Logging = IonicAppLib.logging;
@@ -30,6 +28,14 @@ IonicTask.prototype.run = function(ionic, argv) {
       appDirectory = process.cwd(),
       q;
 
+  if (argv.v2) {
+    Serve = IonicAppLib.v2.serve;
+    IonicProject = IonicAppLib.v2.project;
+  } else {
+    Serve = IonicAppLib.serve;
+    IonicProject = IonicAppLib.project;
+  }
+
   try {
     // Patch - before doing a `ionic run ios`, we need to make sure they have that platform installed.
     // if not, try to install it.
@@ -128,6 +134,7 @@ IonicTask.prototype.run = function(ionic, argv) {
     .then(function(){
       // TODO :(
       if (  argv.v2 &&
+            !self.isLiveReload &&
             !argv.b && !argv.nobundle &&
             (cmdName === 'build' || cmdName === 'emulate' || cmdName === 'run' || cmdName === 'upload'))
       {
@@ -367,7 +374,8 @@ IonicTask.prototype.setupLiveReload = function(argv) {
   var project = null;
 
   try {
-    project = IonicProject.load(process.cwd());
+    var cwd = process.cwd();
+    project = argv.v2 ? IonicProject.loadConfig(cwd) : IonicProject.load(cwd);
   } catch (ex) {
     console.log('Error occured', ex);
     return Utils.fail(ex.message);
@@ -415,6 +423,9 @@ IonicTask.prototype.setupLiveReload = function(argv) {
     }).then(function(){
       d.resolve();
     });
+    if (argv.v2) {
+      options.config = project.get();
+    }
     return Serve.start(options);
   })
   .then(function() {