fix(run): update run and emulate to pass additional options on to app-scripts. (#1735)

Author: jthoms1

lib/ionic/emulate.js

@@ -78,7 +78,7 @@ function run(ionic, argv, rawCliArguments) {
 hasServeCommand=results[3];
 
 if(hasBuildCommand&&!(isLiveReload&&hasServeCommand)){
-returnnpmScripts.runIonicScript('build');
+returnnpmScripts.runIonicScript('build',rawArgs.slice(2));
 }
 returnQ();
 })

lib/ionic/run.js

@@ -78,7 +78,7 @@ function run(ionic, argv, rawCliArguments) {
 hasServeCommand=results[3];
 
 if(hasBuildCommand&&!(isLiveReload&&hasServeCommand)){
-returnnpmScripts.runIonicScript('build');
+returnnpmScripts.runIonicScript('build',rawArgs.slice(2));
 }
 returnQ();
 })

lib/utils/cordova.js

@@ -321,6 +321,11 @@ function startAppScriptsServer(argv) {
 runLivereload: true,
 isPlatformServe: true
 });
+options=consolidateOptions(['port','p'],options);
+options=consolidateOptions(['liveReloadPort','r'],options);
+options=consolidateOptions(['consolelogs','c'],options);
+options=consolidateOptions(['serverlogs','s'],options);
+options=consolidateOptions(['livereload','l'],options);
 
 returnServe.getAddress(options)
 .then(function(){
@@ -338,15 +343,13 @@ function startAppScriptsServer(argv) {
 // Execute the serve command from app-scripts
 // Also remove platform from the raw args passed
 returnnpmScripts.runIonicScript('serve',
-[
-'--port',options.port,
-'--address',options.address,
-'--liveReloadPort',options.liveReloadPort,
+optionsToArray(options)
+
+// Serve specific options not related to the actual run or emulate code
+.concat([
 '--iscordovaserve',
 '--nobrowser'
-]
-.concat(options.consolelogs ? '--consolelogs' : [])
-.concat(options.serverlogs ? '--serverlogs' : [])
+])
 );
 })
 .then(function(){
@@ -356,6 +359,49 @@ function startAppScriptsServer(argv) {
 });
 }
 
+/**
+ * Consolidate a list of options based on those passed to it.
+ *
+ * @param {Array} list of option names. Consolidate will be to the first array element name
+ * @param {Object} key/value object that is to be used as the source of consolidation
+ * @return {Object} key/value object with consolidated options
+ */
+functionconsolidateOptions(list,options){
+varnewOptions=_.extend({},options);
+
+list.forEach(function(optionName){
+deletenewOptions[optionName];
+});
+
+varvalue=list.reduce(function(final,optionName){
+if(options.hasOwnProperty(optionName)&&!!options[optionName]){
+final=options[optionName];
+}
+returnfinal;
+},null);
+
+if(value!==null){
+newOptions[list[0]]=value;
+}
+
+returnnewOptions;
+}
+
+functionoptionsToArray(options){
+returnObject.keys(options)
+.filter(function(itemName){
+returnitemName!=='_'&&itemName.indexOf('$')!==0;
+})
+.reduce(function(array,optionName){
+if(typeofoptions[optionName]==='boolean'&&options[optionName]){
+array.push('--'+optionName);
+}elseif(typeofoptions[optionName]!=='boolean'){
+array.push('--'+optionName,options[optionName]);
+}
+returnarray;
+},[]);
+}
+
 module.exports={
 isPlatformInstalled: isPlatformInstalled,
 arePluginsInstalled: arePluginsInstalled,

spec/utils/cordova.spec.js

@@ -423,3 +423,94 @@ describe('filterArgumentsForCordova', function() {
 });
 });
 
+describe('consolidate options',function(){
+varconsolidateOptions=cordovaUtils.__get__('consolidateOptions');
+
+it('should consolidate options to the first array element',function(){
+varoptions={
+_: ['run','ios'],
+consolelogs: false,
+c: true,
+serverlogs: false,
+s: true,
+debug: false,
+release: false,
+l: true,
+p: 8100,
+r: 6000,
+'$0': 'ionic',
+v2: true,
+runLivereload: true,
+isPlatformServe: true
+};
+varresults=consolidateOptions(['port','p'],options);
+expect(results).toEqual({
+_: ['run','ios'],
+consolelogs: false,
+c: true,
+serverlogs: false,
+s: true,
+debug: false,
+release: false,
+l: true,
+port: 8100,
+r: 6000,
+'$0': 'ionic',
+v2: true,
+runLivereload: true,
+isPlatformServe: true
+});
+});
+
+it('should consolidate duplicates',function(){
+varoptions={
+_: ['run','ios'],
+consolelogs: false,
+c: true,
+serverlogs: false,
+s: true,
+debug: false,
+release: false,
+l: true,
+p: 8100,
+port: 8100,
+r: 6000,
+'$0': 'ionic',
+v2: true,
+runLivereload: true,
+isPlatformServe: true
+};
+varresults=consolidateOptions(['port','p'],options);
+expect(results).toEqual({
+_: ['run','ios'],
+consolelogs: false,
+c: true,
+serverlogs: false,
+s: true,
+debug: false,
+release: false,
+l: true,
+port: 8100,
+r: 6000,
+'$0': 'ionic',
+v2: true,
+runLivereload: true,
+isPlatformServe: true
+});
+});
+});
+
+describe('optionsToArray options',function(){
+varoptionsToArray=cordovaUtils.__get__('optionsToArray');
+
+it('should convert argv options into an array',function(){
+varprocessArguments=['node','ionic','run','ios','--port','8100','--livereload'];
+varrawCliArguments=processArguments.slice(2);
+varargv=optimist(rawCliArguments).argv;
+varresults=optionsToArray(argv);
+expect(results).toEqual([
+'--port',8100,
+'--livereload',
+]);
+});
+});