Merge pull request #114 from isleofcode/develop

Develop

Author: alexblom

README.md

@@ -31,11 +31,17 @@ guide](docs/migration-from-ember-cli.md).
   ember install ember-cordova
 ```
 
-You can optionally pass name & cordovaid params, which will set the id &
-display name of your Cordova application. If none exist, your Ember Apps
-name will be used.
+You can optionally pass the following params:
+- name: AppName (defaults to your ember app name)
+- cordovaid: String (defaults to your app name)
+- templatePath: String path to cordova template
 
-If you already have a Cordova project here it will not be overwritten.
+```cli
+ember install ember-cordova --name=AppName
+--cordovaid=com.isleofcode.app --templatePath=../template
+```
+
+If you already have a Cordova project at ember-cordova/cordova it will not be overwritten.
 
 1. #### Set your config.locationType to 'hash'.
 

blueprints/ember-cordova/index.js

@@ -13,6 +13,9 @@ module.exports = {
     }, {
       name: 'cordovaid',
       type: String
+    }, {
+      name: 'template-path',
+      type: String
     }
   ],
 
@@ -39,6 +42,6 @@ module.exports = {
       ui: this.ui
     });
 
-    return create.run();
+    return create.run(options.templatePath);
   }
 };

docs/cli.md

@@ -41,6 +41,7 @@ Build the ember and cordova project together running in the simulator or on a de
 + environment (default:development)
 + platform (default:ios)
 + release (default: debug)
++ cordova-output-path (default: ember-cordova/cordova/www)
 
 #### Examples
 + `ember cordova:build`
@@ -101,6 +102,7 @@ here](livereload.md).
 #### Available options
 + platform (default:ios)
 + reloadUrl (default:localhost:4200)
++ cordova-output-path (default: ember-cordova/cordova/www)
 
 #### Examples
 + `ember cdv:serve`

lib/commands/build.js

@@ -23,7 +23,7 @@ module.exports = {
     { name: 'platform',             type: String,  default: 'ios' },
     { name: 'verbose',              type: Boolean, default: false,         aliases: ['v'] },
     { name: 'environment',          type: String,  default: 'development', aliases: ['e', 'env', { 'dev': 'development' }, { 'prod': 'production' }] },
-    { name: 'output-path',          type: 'Path',  default: 'ember-cordova/cordova/www',       aliases: ['op', 'out'] },
+    { name: 'cordova-output-path',  type: 'Path',  default: 'ember-cordova/cordova/www',       aliases: ['op', 'out'] },
     { name: 'release',              type: Boolean, default: false }
   ],
   /* eslint-enable max-len */
@@ -65,7 +65,7 @@ module.exports = {
       ui: ui,
       project: project,
       environment: options.environment,
-      outputPath: options.outputPath
+      outputPath: options.cordovaOutputPath
     });
 
     cordovaBuild = new CdvBuildTask({

lib/commands/serve.js

@@ -46,7 +46,7 @@ module.exports = {
     { name: 'live-reload-base-url', type: String,                          aliases: ['lrbu'],  description: 'Defaults to baseURL' },
     { name: 'live-reload-port',     type: Number,                          aliases: ['lrp'],   description: '(Defaults to port number within [49152...65535])' },
     { name: 'environment',          type: String,  default: 'development', aliases: ['e', 'env', { 'dev': 'development' }, { 'prod': 'production' }] },
-    { name: 'output-path',          type: 'Path',  default: 'ember-cordova/cordova/www/',       aliases: ['op', 'out'] },
+    { name: 'cordova-output-path',  type: 'Path',  default: 'ember-cordova/cordova/www/',       aliases: ['op', 'out'] },
     { name: 'ssl',                  type: Boolean, default: false },
     { name: 'ssl-key',              type: String,  default: 'ssl/server.key' },
     { name: 'ssl-cert',             type: String,  default: 'ssl/server.crt' }
@@ -104,7 +104,7 @@ module.exports = {
       ui: this.ui,
       project: this.project,
       environment: options.environment,
-      outputPath: options.outputPath
+      outputPath: options.cordovaOutputPath
     });
 
     cordovaBuild = new CdvBuildTask({

lib/tasks/create-cordova-project.js

@@ -1,20 +1,16 @@
 'use strict';
 
 var Task            = require('./-task');
-
-var cordovaRun      = require('../utils/cordova-run');
 var cordovaPath     = require('../utils/cordova-path');
 var camelize        = require('../../lib/utils/string.js').camelize;
 var path            = require('path');
 var fs              = require('fs');
 var chalk           = require('chalk');
 
-var Promise         = require('ember-cli/lib/ext/promise');
-var cordovaCreate   = require('cordova-lib/src/cordova/create');
-var createPromise   = Promise.denodeify(cordovaCreate);
+var cordovaProj     = require('cordova-lib').cordova;
 
 module.exports = Task.extend({
-  run: function() {
+  run: function(templatePath) {
     var emberCdvPath = cordovaPath(this.project, true);
     if (!fs.existsSync(emberCdvPath)) {
       this.ui.writeLine('Initting ember-cordova directory');
@@ -23,17 +19,25 @@ module.exports = Task.extend({
 
     var cdvPath = path.join(emberCdvPath, 'cordova');
     if (!fs.existsSync(cdvPath)) {
-      fs.mkdirSync(cdvPath);
-
       var id = camelize(this.id);
       var name = camelize(this.name);
 
+      var config = {};
+      if (templatePath !== undefined) {
+        config = {
+          lib: {
+            www: { url: templatePath, template: true }
+          }
+        };
+      }
+
       //Args must be in specific order for cordova-lib
       var args = [];
       args.push(cdvPath);
       args.push(id);
       args.push(name);
-      return cordovaRun(createPromise, this.project, args);
+      args.push(config);
+      return cordovaProj.raw.create.apply(this, args);
     } else {
       this.ui.writeLine(chalk.yellow(
         'Warning: ember-cordova/cordova project already exists. ' +

lib/tasks/ember-build-serve.js

@@ -20,7 +20,7 @@ module.exports = Task.extend({
   run: function(options) {
     var builder = new Builder({
       ui: this.ui,
-      outputPath: options.outputPath,
+      outputPath: options.cordovaOutputPath,
       project: this.project,
       environment: options.environment
     });

node-tests/unit/blueprint/index.js renamed to node-tests/unit/blueprint/index-test.js

@@ -5,17 +5,25 @@ const mockProject   = require('../../fixtures/ember-cordova-mock/project');
 const CreateCordova = require('../../../lib/tasks/create-cordova-project');
 
 describe('Blueprint Index', () => {
+  let index, createDouble;
+
+  beforeEach(function() {
+    createDouble = td.replace(CreateCordova.prototype, 'run');
+    index = require('../../../blueprints/ember-cordova/index');
+    index.project = mockProject.project;
+  });
+
   afterEach(function() {
     td.reset();
   });
 
   it('attempts to create a cordova project', function() {
-    let createDouble = td.replace(CreateCordova.prototype, 'run');
-    let index = require('../../../blueprints/ember-cordova/index');
-    index.project = mockProject.project;
-
     index.afterInstall({});
+    td.verify(createDouble(undefined));
+  });
 
-    td.verify(createDouble());
+  it('passes template path', function() {
+    index.afterInstall({templatePath: 'templatePath'});
+    td.verify(createDouble('templatePath'));
   });
 });

node-tests/unit/tasks/create-cordova-project-test.js

@@ -5,21 +5,28 @@ const fs            = require('fs');
 const path          = require('path');
 const expect        = require('../../helpers/expect');
 
+const cordovaProj   = require('cordova-lib').cordova;
 const mockProject   = require('../../fixtures/ember-cordova-mock/project');
 const isObject      = td.matchers.isA(Object);
 const isString      = td.matchers.isA(String);
-const isArray       = td.matchers.isA(Array);
-
-const setupCreateTask = function() {
-  const CreateCdvTask = require('../../../lib/tasks/create-cordova-project');
-  return new CreateCdvTask(mockProject);
-};
 
 describe('Cordova Create Task', () => {
+  let create, rawDouble;
+
+  const setupCreateTask = function() {
+    rawDouble = td.replace(cordovaProj.raw, 'create');
+    const CreateCdvTask = require('../../../lib/tasks/create-cordova-project');
+    create = new CreateCdvTask(mockProject);
+  };
+
   beforeEach(() => {
     td.replace(fs, 'mkdirSync', () => {
       return true;
     });
+
+    td.replace(fs, 'existsSync', function() {
+      return false;
+    });
   });
 
   afterEach(() => {
@@ -34,46 +41,28 @@ describe('Cordova Create Task', () => {
       'ember-cordova'
     );
 
-    let create = setupCreateTask();
-
-    td.replace(fs, 'existsSync', function() {
-      return false;
-    });
+    setupCreateTask();
     td.replace(fs, 'mkdirSync');
 
     create.run();
-
     td.verify(fs.mkdirSync(expectedPath));
   });
 
-  it('generates a cordova build command', () => {
-    let cdvCreate = td.replace('cordova-lib/src/cordova/create');
-
-    td.replace(fs, 'existsSync', function() {
-      return false;
-    });
-
-    let create = setupCreateTask();
+  it('calls cordova.create.raw', () => {
+    setupCreateTask();
     create.run();
-
-    td.verify(cdvCreate(isString, isString, isString, isObject));
+    td.verify(rawDouble(isString, isString, isString, {}));
   });
 
   it('forces camelcased ids and names', () => {
-    let cdvCreate = td.replace('cordova-lib/src/cordova/create');
-
-    td.replace(fs, 'existsSync', function() {
-      return false;
-    });
-
-    let create = setupCreateTask();
+    setupCreateTask();
     create.id = 'ember-cordova-app';
     create.name = 'ember-cordova-app';
 
     create.run();
 
     /* eslint-disable max-len */
-    td.verify(cdvCreate(isString, 'emberCordovaApp', 'emberCordovaApp', isObject));
+    td.verify(rawDouble(isString, 'emberCordovaApp', 'emberCordovaApp', isObject));
     /* eslint-enable max-len */
   });
 
@@ -82,21 +71,18 @@ describe('Cordova Create Task', () => {
       return true;
     });
 
-    let create = setupCreateTask();
+    setupCreateTask();
     create.run();
 
     expect(create.ui.output).to.contain('project already exists');
   });
 
-  it('proxies via cordova run', () => {
-    const cordovaRun = td.replace('../../../lib/utils/cordova-run');
 
-    td.replace(fs, 'existsSync', function() {
-      return false;
-    });
+  it('builds with a template when provided', function() {
+    setupCreateTask();
+    create.run('templatePath');
 
-    let create = setupCreateTask();
-    create.run();
-    td.verify(cordovaRun(isObject, isObject, isArray));
+    var matcher = td.matchers.contains({lib: { www: { url: 'templatePath'}}});
+    td.verify(rawDouble(isString, isString, isString, matcher));
   });
 });