Merge pull request #110 from isleofcode/develop

alexblom · web-flow · commit 72b74c06714c · 2016-08-13T14:52:27.000-04:00
Develop
diff --git a/blueprints/ember-cordova/index.js b/blueprints/ember-cordova/index.js
@@ -1,7 +1,6 @@
 'use strict';
 
 var CreateTask        = require('../../lib/tasks/create-cordova-project');
-var VerifyCordovaTask = require('../../lib/tasks/verify-cordova-installed');
 var camelize          = require('../../lib/utils/string.js').camelize;
 
 module.exports = {
@@ -33,19 +32,13 @@ module.exports = {
   afterInstall: function(options) {
     var projectName = this.project.name();
 
-    var check = new VerifyCordovaTask({
-      command: 'ember g ember-cordova',
-      ui: this.ui
-    });
-
     var create = new CreateTask({
       id: options.cordovaid || camelize(projectName),
       name: options.name || camelize(projectName),
       project: this.project,
       ui: this.ui
     });
 
-    return check.run()
-      .then(function() { return create.run(); });
+    return create.run();
   }
 };
diff --git a/index.js b/index.js
@@ -1,14 +1,14 @@
 'use strict';
 
 var commands              = require('./lib/commands');
-var cordovaPath           = require('./lib/utils/cordova-path');
 var getNetworkIp          = require('./lib/utils/get-network-ip');
+var getPlatformAssets     = require('./lib/utils/get-platform-assets');
 
+var fs                    = require('fs');
+var path                  = require('path');
 var chalk                 = require('chalk');
 var mergeTrees            = require('broccoli-merge-trees');
 var Funnel                = require('broccoli-funnel');
-var path                  = require('path');
-var fs                    = require('fs');
 
 module.exports = {
   name: 'ember-cordova',
@@ -42,43 +42,32 @@ module.exports = {
     return commands;
   },
 
-  treeForPublic: function(tree) {
-    if (this.project.targetIsCordova) {
-      var platform = this.project.CORDOVA_PLATFORM;
-
-      var platformsPath = path.join(cordovaPath(this.project), 'platforms');
-      var pluginsPath;
+  cordovaAssetTree: function(tree, assets) {
+    var pluginsTree = new Funnel(this.treeGenerator(assets.path), {
+      srcDir:  '/',
+      include: assets.files,
+      destDir: '/'
+    });
 
-      if (platform === 'ios') {
-        pluginsPath = path.join(platformsPath, 'ios', 'www');
-      } else if (platform === 'android') {
-        pluginsPath = path.join(platformsPath, 'android', 'assets', 'www');
-      } else if (platform === 'browser') {
-        pluginsPath = path.join(platformsPath, 'browser', 'www');
-      }
+    return mergeTrees([tree, pluginsTree]);
+  },
 
-      var files = ['cordova_plugins.js'];
+  treeForPublic: function(tree) {
+    if (this.project.targetIsCordova) {
+      var platformAssets = getPlatformAssets(this.project);
 
-      files.forEach(function (file) {
-        var filePath = path.join(pluginsPath, file);
-        if (!fs.existsSync(filePath)) {
-          var err = new Error('ember-cordova: ' + filePath + ' did not exist. It is required for Device LiveReload to work.');
-          err.stack = null;
-          throw err;
-        }
-      });
+      if (platformAssets.path === undefined) {
+        throw new Error('ember-cordova: Did not receive platform asset path, canot not build');
+      };
 
-      if (fs.existsSync(path.join(pluginsPath, 'plugins'))) {
-        files.push('plugins/**');
+      var filePath = path.join(platformAssets.path, 'cordova_plugins.js');
+      if (!fs.existsSync(filePath)) {
+        var err = new Error('ember-cordova: cordova_plugins did not exist. It is required for Device LiveReload to work.');
+        err.stack = null;
+        throw err;
       }
 
-      var pluginsTree = new Funnel(this.treeGenerator(pluginsPath), {
-        srcDir:  '/',
-        include: files,
-        destDir: '/'
-      });
-
-      return mergeTrees([tree, pluginsTree]);
+      return this.cordovaAssetTree(tree, platformAssets);
     }
 
     return tree;
diff --git a/lib/commands/platform.js b/lib/commands/platform.js
@@ -26,11 +26,13 @@ module.exports = {
 
     var platformTask = new CordovaRawTask({
       project: this.project,
-      rawApi: 'platform',
+      rawApi: 'platforms',
       ui: this.ui
     });
 
-    return platformTask.run(validated.command, validated.args, options.save);
+    return platformTask.run(validated.command, validated.args, {
+      save: options.save
+    });
   }
 };
 
diff --git a/lib/commands/plugin.js b/lib/commands/plugin.js
@@ -26,11 +26,13 @@ module.exports = {
 
     var pluginTask = new CordovaRawTask({
       project: this.project,
-      rawApi: 'platform',
+      rawApi: 'plugins',
       ui: this.ui
     });
 
-    return pluginTask.run(validated.command, validated.args, options.save);
+    return pluginTask.run(validated.command, validated.args, {
+      save: options.save
+    });
   }
 };
 
diff --git a/lib/commands/serve.js b/lib/commands/serve.js
@@ -2,6 +2,7 @@
 
 var CdvBuildTask    = require('../tasks/cordova-build');
 var HookTask        = require('../tasks/run-hook');
+var BuildTask       = require('../tasks/ember-build');
 var ServeTask       = require('../tasks/ember-build-serve');
 var getPlatform     = require('../utils/get-platform');
 
@@ -54,7 +55,7 @@ module.exports = {
 
   run: function(options) {
     var hook, serve, cordovaBuild, validateCordovaConfig, validatePlugin,
-        validatePlatform;
+        validatePlatform, emberBuild;
 
     var platform = getPlatform(this.project.config(), options);
     this.project.CORDOVA_PLATFORM = platform;
@@ -93,6 +94,19 @@ module.exports = {
       ui: this.ui
     });
 
+    /*
+     TODO - rm me. Serve builds directly to outputPath anyway
+     This is required to init the cordova-build
+
+     cordova-builds can not be run while serve is
+    */
+    emberBuild = new BuildTask({
+      ui: this.ui,
+      project: this.project,
+      environment: options.environment,
+      outputPath: options.outputPath
+    });
+
     cordovaBuild = new CdvBuildTask({
       project: this.project,
       ui: this.ui
@@ -108,19 +122,20 @@ module.exports = {
       .then(validatePlatform.prepare())
       .then(validatePlugin.prepare())
       .then(hook.prepare('beforeBuild'))
+      .then(emberBuild.prepare())
+      .then(cordovaBuild.prepare(platform))
+      .then(hook.prepare('afterBuild'))
       .then(this._autoFindLiveReloadPort.bind(this, options))
       .then(function(serveOpts) {
-        var baseURL = this.project.config.baseURL;
-        if (baseURL === undefined) { baseURL = '/'; }
+        var config = this.project.config();
 
         _merge(serveOpts, {
-          baseURL: this.project.config().baseURL,
+          baseURL: config.baseURL || '/',
+          rootURL: config.rootURL || '/',
           project: this.project
         });
 
         return serve.run(serveOpts)
-          .then(cordovaBuild.prepare(platform))
-          .then(hook.prepare('afterBuild'))
           .then(function() {
             this.ui.writeLine(chalk.green(
               'ember-cordova: Device LiveReload is enabled'
diff --git a/lib/tasks/cordova-build.js b/lib/tasks/cordova-build.js
@@ -1,17 +1,20 @@
 'use strict';
 
 var Task            = require('./-task');
-var Promise         = require('ember-cli/lib/ext/promise');
+var CordovaRawTask  = require('../tasks/cordova-raw');
 
-var cordovaRun      = require('../utils/cordova-run');
-var cordovaBuild    = require('cordova-lib/src/cordova/build');
-var buildPromise    = Promise.denodeify(cordovaBuild);
 
 module.exports = Task.extend({
   run: function(platform, release) {
     var buildType = release ? '--release' : '--debug';
-    var opts = [{platforms: [platform], options: [buildType]}];
+    var opts = { platforms: [platform], options: [buildType] };
 
-    return cordovaRun(buildPromise, this.project, opts);
+    var build = new CordovaRawTask({
+      project: this.project,
+      rawApi: 'build',
+      ui: this.ui
+    });
+
+    return build.run(opts);
   }
 });
diff --git a/lib/tasks/cordova-raw.js b/lib/tasks/cordova-raw.js
@@ -3,15 +3,17 @@
 var Task            = require('./-task');
 var cordovaRun      = require('../utils/cordova-run');
 var cordovaProj     = require('cordova-lib').cordova;
+var easyError       = require('../utils/easy-error');
 
-var pluginPromise = function() {
-  return cordovaProj.raw[this.rawApi].apply(this, arguments);
+var cordovaRawPromise = function() {
+  return cordovaProj.raw[this.rawApi].apply(this, arguments)
+    .catch(function(err) {
+      easyError('ERROR ember-cordova with cordova raw \n' + err);
+    });
 };
 
 module.exports = Task.extend({
-  run: function(command, pluginNames, save) {
-    var opts = [command, pluginNames, { save: save }];
-
-    return cordovaRun(pluginPromise.bind(this), this.project, opts);
+  run: function() {
+    return cordovaRun(cordovaRawPromise.bind(this), this.project, arguments);
   }
 });
diff --git a/lib/tasks/verify-cordova-installed.js b/lib/tasks/verify-cordova-installed.js
@@ -14,7 +14,6 @@ var cordovaCheckText = '\nYou can check that cordova has been properly ' +
 
 module.exports = Task.extend({
   ui: undefined,
-  command: undefined,
   options: undefined,
 
   run: function() {
diff --git a/lib/utils/get-platform-assets.js b/lib/utils/get-platform-assets.js
@@ -0,0 +1,28 @@
+var path                  = require('path');
+var fs                    = require('fs');
+var cordovaPath           = require('./cordova-path');
+
+module.exports = function(project) {
+  var platform = project.CORDOVA_PLATFORM;
+
+  var platformsPath = path.join(cordovaPath(project), 'platforms');
+  var assetsPath;
+
+  if (platform === 'ios') {
+    assetsPath = path.join(platformsPath, 'ios', 'www');
+  } else if (platform === 'android') {
+    assetsPath = path.join(platformsPath, 'android', 'assets', 'www');
+  } else if (platform === 'browser') {
+    assetsPath = path.join(platformsPath, 'browser', 'www');
+  }
+
+  var files = ['cordova_plugins.js'];
+  if (fs.existsSync(path.join(assetsPath, 'plugins'))) {
+    files.push('plugins/**');
+  }
+
+  return {
+    path: assetsPath,
+    files: files
+  }
+};
diff --git a/node-tests/fixtures/ember-cordova-mock/project.js b/node-tests/fixtures/ember-cordova-mock/project.js
@@ -12,7 +12,8 @@ module.exports = {
   },
 
   project: {
-    root: path.resolve(__dirname, '..', '..', 'fixtures', 'ember-cordova-mock')
+    root: path.resolve(__dirname, '..', '..', 'fixtures', 'ember-cordova-mock'),
+    name: function() { return 'ember-cordova-mock' }
   },
 
   config: function() {},
diff --git a/node-tests/unit/blueprint/index.js b/node-tests/unit/blueprint/index.js
@@ -0,0 +1,21 @@
+'use strict';
+
+const td            = require('testdouble');
+const mockProject   = require('../../fixtures/ember-cordova-mock/project');
+const CreateCordova = require('../../../lib/tasks/create-cordova-project');
+
+describe('Blueprint Index', () => {
+  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());
+  });
+});
diff --git a/node-tests/unit/commands/platform-test.js b/node-tests/unit/commands/platform-test.js
@@ -6,7 +6,6 @@ const CdvRawTask    = require('../../../lib/tasks/cordova-raw');
 
 const mockProject   = require('../../fixtures/ember-cordova-mock/project');
 const isAnything    = td.matchers.anything();
-const isArray       = td.matchers.isA(Array);
 
 describe('Platform Command', () => {
   let rawDouble;
@@ -22,14 +21,14 @@ describe('Platform Command', () => {
     td.reset();
   });
 
-  it('passes command to Plugin Task', () => {
+  it('passes command to Cordova Raw Task', () => {
     PlatformCmd.run({}, ['add', 'cordova-plugin'])
-    td.verify(rawDouble('add', isArray, isAnything));
+    td.verify(rawDouble('add', ['cordova-plugin'], isAnything));
   });
 
   it('passes the save flag', () => {
     var opts = { save: false };
     PlatformCmd.run(opts, ['add', 'cordova-plugin']);
-    td.verify(rawDouble('add', isArray, false));
+    td.verify(rawDouble('add', ['cordova-plugin'], { save: false }));
   });
 });
diff --git a/node-tests/unit/commands/plugin-test.js b/node-tests/unit/commands/plugin-test.js
@@ -6,7 +6,6 @@ const CdvRawTask    = require('../../../lib/tasks/cordova-raw');
 
 const mockProject   = require('../../fixtures/ember-cordova-mock/project');
 const isAnything    = td.matchers.anything();
-const isArray       = td.matchers.isA(Array);
 
 describe('Plugin Command', () => {
   let rawDouble;
@@ -22,14 +21,14 @@ describe('Plugin Command', () => {
     td.reset();
   });
 
-  it('passes command to Plugin Task', () => {
+  it('passes command to Cordova Raw', () => {
     PluginCmd.run({}, ['add', 'cordova-plugin'])
-    td.verify(rawDouble('add', isArray, isAnything));
+    td.verify(rawDouble('add', ['cordova-plugin'], isAnything));
   });
 
   it('passes the save flag', () => {
     var opts = { save: false };
     PluginCmd.run(opts, ['add', 'cordova-plugin']);
-    td.verify(rawDouble('add', isArray, false));
+    td.verify(rawDouble('add', ['cordova-plugin'], { save: false }));
   });
 });
diff --git a/node-tests/unit/commands/serve-test.js b/node-tests/unit/commands/serve-test.js
diff --git a/node-tests/unit/index.js b/node-tests/unit/index.js
diff --git a/node-tests/unit/tasks/cordova-build-test.js b/node-tests/unit/tasks/cordova-build-test.js
diff --git a/node-tests/unit/tasks/cordova-raw-test.js b/node-tests/unit/tasks/cordova-raw-test.js
diff --git a/node-tests/unit/utils/get-platform-assets.js b/node-tests/unit/utils/get-platform-assets.js
diff --git a/package.json b/package.json
