Merge pull request #101 from isleofcode/develop

Develop

Author: alexblom

docs/cli.md

@@ -85,3 +85,18 @@ Passes commands straight to cordova, without interference.
 
 #### Examples
 + `ember cordova platform add ios`
+
+##Setting default Platform
+
+If you are only ever building for one platform, you can set a default
+in config.environment.js.
+
+This is handy if the defaults don't work out for you, e.g. you are
+only shipping for Android.
+
+in config/environment.js:
+```
+cordova: {
+  platform: 'android'
+}
+```

docs/livereload.md

@@ -29,12 +29,13 @@ or ios) and any options accepted by Ember serve.
 ## Advanced Configuration
 
 There are times you may find yourself wanting to enable live-reload 
-from a remote host and port, or to customize a local url.
+from a remote host and port, or to customize a local url because we are
+not detecting it correctly.
 
 ## Customize the device live-reload url
 
 In all cases below, `<url>` refers to the full url including protocol,
-host, and port.
+host, and port, e.g. http://localhost:4200
 
 *via commandline arg*
 
@@ -48,11 +49,13 @@ or
 ember cdv:s -r "<url>"
 ```
 
-*via .ember-cli*
+*via config/environment.js*
 
 ```json
 {
-  deviceLiveReloadUrl: "<url>"
+  cordova: {
+    reloadUrl: "<url>"
+  }
 }
 ```
 

index.js

@@ -13,15 +13,19 @@ var fs                    = require('fs');
 module.exports = {
   name: 'ember-cordova',
 
-  config: function(/* env, baseConfig */) {
+  config: function(env, baseConfig) {
     if (this.project.targetIsCordova) {
       var conf = { cordova: {} };
       if (!!this.project.RELOAD_PORT) {
         //If cordova live reload, set the reload url
-        var networkAddress = getNetworkIp();
-        var deviceServerUrl = 'http://' + networkAddress + ':' + this.project.RELOAD_PORT;
+        if (baseConfig.cordova && baseConfig.cordova.reloadUrl) {
+          conf.cordova.reloadUrl = baseConfig.cordova.reloadUrl;
+        } else {
+          var networkAddress = getNetworkIp();
+          var deviceServerUrl = 'http://' + networkAddress + ':' + this.project.RELOAD_PORT;
 
-        conf.cordova.reloadUrl = deviceServerUrl;
+          conf.cordova.reloadUrl = deviceServerUrl;
+        }
       }
 
       return conf;

lib/commands/build.js

@@ -3,6 +3,7 @@
 var CdvBuildTask    = require('../tasks/cordova-build');
 var HookTask        = require('../tasks/run-hook');
 var BuildTask       = require('../tasks/ember-build');
+var getPlatform     = require('../utils/get-platform');
 
 var ValidatePlatformTask    = require('../tasks/validate-platform');
 var validateLocationType    = require('../utils/validate-location-type');
@@ -31,8 +32,13 @@ module.exports = {
     var ui = this.ui;
     var project = this.project;
 
+    var platform = getPlatform(project.config(), options);
+    project.targetIsCordova = true;
+
+    //Confirm location type is hash
     validateLocationType(this.project.config());
 
+    //Warn the user if allow-navigation is still on
     validateCordovaConfig = getCordovaConfig(this.project)
       .then(function(cordovaConfig) {
         return validateAllowNavigation(
@@ -41,9 +47,6 @@ module.exports = {
         );
       });
 
-    project.targetIsCordova = true;
-    var platform = project.CORDOVA_PLATFORM = options.platform;
-
     validatePlatform = new ValidatePlatformTask({
       project: this.project,
       ui: this.ui,

lib/commands/open.js

@@ -1,6 +1,7 @@
 'use strict';
 
-var OpenAppTask = require('../tasks/open-app');
+var OpenAppTask     = require('../tasks/open-app');
+var getPlatform     = require('../utils/get-platform');
 
 module.exports = {
   name: 'cordova:open',
@@ -15,9 +16,11 @@ module.exports = {
   ],
 
   run: function(options) {
+    var platform = getPlatform(this.project.config(), options);
+
     var open = new OpenAppTask({
       application: options.application,
-      platform: options.platform,
+      platform: platform,
       project: this.project,
       ui: this.ui
     });

lib/commands/serve.js

@@ -3,6 +3,7 @@
 var CdvBuildTask    = require('../tasks/cordova-build');
 var HookTask        = require('../tasks/run-hook');
 var ServeTask       = require('../tasks/ember-build-serve');
+var getPlatform     = require('../utils/get-platform');
 
 var Promise         = require('ember-cli/lib/ext/promise');
 var PortFinder      = require('portfinder');
@@ -55,12 +56,16 @@ module.exports = {
     var hook, serve, cordovaBuild, validateCordovaConfig, validatePlugin,
         validatePlatform;
 
-    validateLocationType(this.project.config());
+    var platform = getPlatform(this.project.config(), options);
 
+    //Vars for live reload addon service
     this.project.targetIsCordova = true;
-    var platform = this.project.CORDOVA_PLATFORM = options.platform;
     this.project.RELOAD_PORT = options.port;
 
+    //Confirm location type is hash
+    validateLocationType(this.project.config());
+
+    //Warn user we require allow-navigation on
     validateCordovaConfig = getCordovaConfig(this.project)
     .then(function(cordovaConfig) {
       return validateAllowNavigation(

lib/utils/get-platform.js

@@ -0,0 +1,7 @@
+module.exports = function getPlatform(config, options) {
+  var platform, defaultPlatform;
+  defaultPlatform = config && config.cordova && config.cordova.platform;
+  defaultPlatform ? platform = defaultPlatform : platform = options.platform;
+
+  return platform;
+}

node-tests/fixtures/ember-cordova-mock/project.js

@@ -7,10 +7,15 @@ module.exports = {
   env: 'development',
   id: 'ember-cordova-mock',
   name: 'ember-cordova-mock',
-  platform: 'ios',
+  cordova: {
+    platform: 'ios'
+  },
 
   project: {
     root: path.resolve(__dirname, '..', '..', 'fixtures', 'ember-cordova-mock')
   },
+
+  config: function() {},
+
   ui: new MockUI()
 }

node-tests/unit/commands/build-test.js

@@ -89,11 +89,11 @@ describe('Build Command', () => {
     it('passes platform to cordova build task', () => {
       let passedPlatform = 'ios';
 
-      runBuild({
+      return runBuild({
         platform: passedPlatform
+      }).then(function() {
+        expect(cordovaPlatform).to.equal(passedPlatform);
       });
-
-      expect(cordovaPlatform).to.equal(passedPlatform);
     });
   });
 

node-tests/unit/tasks/open-app-test.js

@@ -7,8 +7,8 @@ const OpenAppTask   = require('../../../lib/tasks/open-app');
 const expect        = require('../../helpers/expect');
 const openCommand   = require('../../../lib/utils/open-app-command');
 
-
 const mockProject   = require('../../fixtures/ember-cordova-mock/project');
+const _merge         = require('lodash').merge;
 const isObject      = td.matchers.isA(Object);
 
 describe('Open App Task', () => {
@@ -22,7 +22,7 @@ describe('Open App Task', () => {
       'ember-cordova-mock/ember-cordova/cordova'
     );
 
-    openApp = new OpenAppTask(mockProject);
+    openApp = new OpenAppTask(_merge(mockProject, { platform: 'ios' }));
   });
 
   afterEach(() => {

node-tests/unit/utils/get-platform-test.js

@@ -0,0 +1,20 @@
+'use strict';
+
+const expect        = require('../../helpers/expect');
+const getPlatform   = require('../../../lib/utils/get-platform');
+const mockProject   = require('../../fixtures/ember-cordova-mock/project');
+
+describe('Get Platform Util', () => {
+  it('returns the default platform if one is set', function() {
+    expect(
+      getPlatform(mockProject)
+    ).to.equal('ios');
+  });
+
+  it('returns the cflag platform is there is no default', function() {
+    expect(
+      getPlatform({}, {platform: 'android'})
+    ).to.equal('android');
+  });
+});
+

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ember-cordova",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "Tooling for cordova and crosswalk hybrid applications built with Ember",
   "homepage": "https://github.com/isleofcode/ember-cordova",
   "repository": {