Use default options from .ember-cli file

lib/cli.js

@@ -9,6 +9,10 @@ var merge = require('lodash-node/modern/objects/merge');
 var path = require('path');
 var pkg = require('../package.json');
 var ui = require('./ui');
+var fs = require('fs');
+var denodeify = RSVP.denodeify;
+var readFile = denodeify(fs.readFile);
+var sequence = require('./utilities/sequence');
 
 RSVP.on('error', function(error) {
   ui.write(chalk.red(String(error)) + '\n');
@@ -53,32 +57,41 @@ function loadInsight() {
   });
 }
 
+function readDefaults() {
+  var defaultsPath = path.join(process.cwd(), '.ember-cli');
+  return readFile(defaultsPath).then(function(content) {
+    return content.toString().split(' ');
+  }).catch(function() { });
+}
+
+
 Cli.run = function run (argv, ui, insight) {
   var commands = require('../lib/commands/commands');
-  var permission;
 
   ui = ui || require('./ui');
   insight = insight || loadInsight();
 
   var cli = new Cli(argv, commands, ui, insight);
+  var permission = insight.askPermission();
 
-  permission = insight.askPermission();
-
-  return permission.then(function() {
-    return cli.run();
-  });
+  return sequence([
+    permission,
+    readDefaults,
+    cli.run.bind(cli)
+  ]);
 };
 
 function collectArgs(args, options) {
   return JSON.stringify(args.concat([options]));
 }
+
 function setupEnvironment(command, options) {
   if (typeof command.getEnv === 'function') {
     process.env.BROCCOLI_ENV = command.getEnv(options) || 'development';
   }
 }
 
-Cli.prototype.runCurrentCommand = function() {
+Cli.prototype.runCurrentCommand = function(defaults) {
   var cmd = this.cmd;
   cmd = commandAliases[cmd] ? commandAliases[cmd] : cmd;
   var action = this.commands[cmd];
@@ -94,9 +107,16 @@ Cli.prototype.runCurrentCommand = function() {
     action = this.commands.help;
   }
 
-  var opts = nopt(action.types, action.shorthands, this.argv);
+  var parseOpts = nopt.bind(null, action.types, action.shorthands);
+  var opts = parseOpts(this.argv);
+
+  if(defaults !== undefined) {
+    defaults = nopt(action.types, action.shorthands, defaults, 0);
+  } else {
+    defaults = {};
+  }
 
-  var options = merge({}, opts, {
+  var options = merge({}, opts, defaults, {
     appRoot: process.cwd(),
     cliRoot: path.resolve(path.join(__dirname, '..'))
   });
@@ -116,7 +136,7 @@ Cli.prototype.runCurrentCommand = function() {
 
 };
 
-Cli.prototype.run = function() {
+Cli.prototype.run = function(defaults) {
   var opts = this.opts;
   var cli = this;
 
@@ -128,10 +148,10 @@ Cli.prototype.run = function() {
   }
 
   return new Promise(function(resolve) {
-    resolve(cli.runCurrentCommand());
+    resolve(cli.runCurrentCommand(defaults));
   }).catch(function(err) {
-      // Log it if it's just a string. Else if it's a real error, throw.
-      if (typeof err === 'string') { cli.ui.write(err); }
-      else { throw err; }
-    });
+    // Log it if it's just a string. Else if it's a real error, throw.
+    if (typeof err === 'string') { cli.ui.write(err); }
+    else { throw err; }
+  });
 };

tests/unit/cli-test.js

@@ -14,7 +14,7 @@ var commands;
 var insight;
 var argv;
 // helper to similate running the CLI
-function ember(args) {
+function ember(args, defaults) {
   var argv;
 
   if (args) {
@@ -23,7 +23,7 @@ function ember(args) {
     argv = baseArgs;
   }
 
-  return new Cli(argv, commands, ui, insight).run();
+  return new Cli(argv, commands, ui, insight).run(defaults);
 }
 
 function stubCommand(name) {
@@ -310,6 +310,18 @@ describe('Unit: CLI', function(){
     assert.equal(help.called, 0, 'expected the help command to be run');
   });
 
+  describe('default options config file', function() {
+    it('reads default options from .ember-cli file', function() {
+      var defaults = ['--output', process.cwd()];
+      var build = stubCommand('build');
+
+      ember(['build'], defaults);
+
+      var options = build.calledWith[0][0].options;
+      assert.equal(options.output, process.cwd());
+    });
+  });
+
   describe('analytics tracking', function() {
 
     var track;