Merge pull request #52 from isleofcode/feat-testing

Feat testing

Author: alexblom

dist/.keep

@@ -41,7 +41,6 @@ module.exports = {
   },
 
   contentFor: function (type) {
-    var is = this._isTargetCordova();
     if (this._isTargetCordova() && type === 'body') {
       return '<script src="cordova.js"></script>';
     }

index.js

@@ -1,6 +1,8 @@
 'use strict';
 
-var BuildTask       = require('../tasks/build');
+var EmberBuildTask  = require('../tasks/ember-build');
+var CdvBuildTask    = require('../tasks/cordova-build');
+var LinkTask        = require('../tasks/link-environment');
 var HookTask        = require('../tasks/run-hook');
 
 var path            = require('path');
@@ -24,20 +26,30 @@ module.exports = {
   run: function(options) {
     var platform = options.platform || defaultPlatform(this.project);
 
-    var build = new BuildTask({
-      env: options.environment,
-      platform: platform,
+    var hook = new HookTask({
       project: this.project,
       ui: this.ui
     });
 
-    var hook = new HookTask({
+    var emberBuild = new EmberBuildTask({
+      project: this.project,
+      ui: this.ui
+    });
+
+    var link = new LinkTask({
+      project: this.project,
+      ui: this.ui
+    });
+
+    var cordovaBuild = new CdvBuildTask({
       project: this.project,
       ui: this.ui
     });
 
     return hook.run('beforeBuild')
-           .then(build.run())
+           .then(emberBuild.run(options.environment))
+           .then(link.run())
+           .then(cordovaBuild.run(platform))
            .then(hook.run('afterBuild'));
   }
 };

lib/commands/build.js

@@ -1,6 +1,7 @@
 'use strict';
 
-var CordovaTask     = require('../tasks/cordova');
+var BashTask        = require('../tasks/bash');
+var cordovaPath     = require('../utils/cordova-path');
 
 var path            = require('path');
 var chalk           = require('chalk');
@@ -45,12 +46,17 @@ module.exports = {
   },
 
   run: function(options, rawArgs) {
-    var cordovaCommand = new CordovaTask({
-      project: this.project,
-      rawArgs: rawArgs,
-      ui: this.ui
-    });
-
-    return cordovaCommand.run();
+    var joinedArgs = rawArgs.join(' ');
+    var cdvCommand = 'cordova ' + joinedArgs;
+
+    var msg = "Running 'cordova " + joinedArgs + "'";
+    this.ui.writeLine(msg);
+
+    return new BashTask({
+      command: cdvCommand,
+      options: {
+        cwd: cordovaPath(this.project)
+      }
+    }).run();
   }
 };

lib/commands/cordova.js

@@ -1,7 +1,6 @@
 'use strict';
 
 var LinkTask        = require('../tasks/link-environment');
-
 var path            = require('path');
 
 module.exports = {

lib/commands/link.js

@@ -1,7 +1,8 @@
 'use strict';
 
-var BuildTask   = require('../tasks/build');
-var BashTask    = require('../tasks/bash');
+var EmberBuildTask  = require('../tasks/ember-build');
+var CdvBuildTask    = require('../tasks/cordova-build');
+var BashTask        = require('../tasks/bash');
 
 module.exports = {
   name: 'cordova:serve',
@@ -32,16 +33,16 @@ module.exports = {
     platform = options.platform || config.platform || "ios";
     address = options.reloadUrl || config.reloadUrl || "http://localhost:4200";
 
-    //A little loopy, but will make later automation easier
-
     var buildOptions ="EMBER_CORDOVA=true" +
       " CORDOVA_RELOAD_ADDRESS=" + address +
       " CORDOVA_PLATFORM=" + platform + " ";
 
-    var build = new BuildTask({
-      env: options.env,
-      platform: platform,
-      buildOptions: buildOptions,
+    var emberBuild = new EmberBuildTask({
+      project: this.project,
+      ui: this.ui
+    });
+
+    var cdvBuild = new CdvBuildTask({
       project: this.project,
       ui: this.ui
     });
@@ -55,6 +56,8 @@ module.exports = {
       }
     });
 
-    return build.run().then(serve.run());
+    return emberBuild.run(options.env, buildOptions)
+           .then(cdvBuild.run(platform))
+           .then(serve.run());
   }
 };

lib/commands/serve.js

@@ -1,26 +1,31 @@
 'use strict';
 
-var Task           = require('ember-cli/lib/models/task');
-var Promise        = require('ember-cli/lib/ext/promise');
+var Task            = require('ember-cli/lib/models/task');
+var Promise         = require('ember-cli/lib/ext/promise');
 
-//Sequence of tasks matters a lot
-var execSync       = require('child_process').execSync;
-var defaults       = require('lodash').defaults;
+var childProcess    = require('child_process');
+var defaults        = require('lodash').defaults;
 
-module.exports = Task.extend({
+var BashTask = Task.extend({
   run: function() {
     if (!this.options) {
       this.options = {};
     }
 
-    var _this = this;
-    return new Promise(function(resolve, reject) {
-      var options = defaults(_this.options, {
+    //TODO - unresolved promise == problem & bad form
+    return new Promise(() => {
+      var options = defaults(this.options, {
         maxBuffer: 5000 * 1024,
         stdio: 'inherit'
       });
 
-      execSync(_this.command, options);
+      this.runCommand(this.command, options);
     });
   }
 });
+
+BashTask.prototype.runCommand = function(command, options) {
+  childProcess.execSync(command, options);
+};
+
+module.exports = BashTask;

lib/tasks/bash.js

@@ -0,0 +1,24 @@
+'use strict';
+
+var Task            = require('ember-cli/lib/models/task');
+var BashTask        = require('../tasks/bash');
+var cordovaPath     = require('../utils/cordova-path');
+
+module.exports = Task.extend({
+  run: function(platform, env) {
+    var cdvCommand = 'cordova build ' + platform;
+    if (env === 'production') {
+      cdvCommand += ' --release';
+    }
+
+    var cdvBuild = new BashTask({
+      command: cdvCommand,
+      ui: this.ui,
+      options: {
+        cwd: cordovaPath(this.project)
+      }
+    });
+
+    return cdvBuild.run();
+  }
+});

lib/tasks/build.js

@@ -1,12 +1,13 @@
 'use strict';
 
-var Task        = require('ember-cli/lib/models/task');
-var BashTask    = require('../tasks/bash');
+var Task            = require('ember-cli/lib/models/task');
+var BashTask        = require('../tasks/bash');
 
-var cordovaPath = require('../utils/cordova-path');
-var path        = require('path');
-var fs          = require('fs');
-var chalk       = require('chalk');
+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');
 
 module.exports = Task.extend({
   run: function() {
@@ -16,9 +17,13 @@ module.exports = Task.extend({
       fs.mkdirSync(emberCdvPath);
     }
 
+    var id = camelize(this.id);
+    var name = camelize(this.name);
+
     var cdvPath = path.join(emberCdvPath, 'cordova');
+
     if (!fs.existsSync(cdvPath)) {
-      var command = 'cordova create cordova ' + this.id + ' ' + this.name;
+      var command = 'cordova create cordova ' + id + ' ' + name;
 
       var create = new BashTask({
         command: command,

lib/tasks/cordova-build.js

@@ -0,0 +1,25 @@
+'use strict';
+
+var Task            = require('ember-cli/lib/models/task');
+var BashTask        = require('../tasks/bash');
+
+module.exports = Task.extend({
+  run: function(env, buildOptions) {
+    var buildCommand = '';
+
+    if (buildOptions) {
+      buildCommand = buildOptions + ' ';
+    }
+    buildCommand += 'EMBER_CORDOVA=true ember build --environment ' + env;
+
+    var emberBuild = new BashTask({
+      command: buildCommand,
+      ui: this.ui,
+      options: {
+        cwd: this.project.root
+      }
+    });
+
+    return emberBuild.run();
+  }
+});

lib/tasks/cordova.js

@@ -1,21 +1,15 @@
 'use strict';
 
-var Task        = require('ember-cli/lib/models/task');
-var Promise     = require('ember-cli/lib/ext/promise');
-var DistTask    = require('./verify-dist');
-
-var cordovaPath = require('../utils/cordova-path');
-var fs          = require('fs-extra');
-var path        = require('path');
-var chalk       = require('chalk');
+var Task            = require('ember-cli/lib/models/task');
+var Promise         = require('ember-cli/lib/ext/promise');
+var DistTask        = require('./verify-dist');
 
+var cordovaPath     = require('../utils/cordova-path');
+var fs              = require('fs-extra');
+var path            = require('path');
 
 module.exports = Task.extend({
   run: function() {
-    if (!this.project) {
-      throw new Error('A project must be passed into this function');
-    }
-
     var verifyDist = new DistTask({
       project: this.project
     });