Skip to content

Commit

Permalink
Added dir option for runServer command
Browse files Browse the repository at this point in the history
  • Loading branch information
andrewblond committed Feb 5, 2015
1 parent 74f21d0 commit 7b98221
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
6 changes: 4 additions & 2 deletions lib/api/run-server.js
Original file line number Diff line number Diff line change
@@ -1,26 +1,28 @@
var path = require('path');
var vow = require('vow');
var cdir = process.cwd();
var Server = require('../server/server');

/**
* Запускает разрабочичий сервер.
*
* @param {Object} [options]
* @param {String} [options.mode=development] Режим сборки.
* @param {String} [options.dir=process.cwd()] Корень проекта.
* @param {Number} [options.port=8080] Номер порта.
* @param {String} [options.host=0.0.0.0] Имя хоста.
* @param {String} [options.socket] Путь к сокету.
* @returns {Promise}
*/
module.exports = function (options) {
var server = new Server();
var root = path.resolve(options.dir);
var opts = {
port: options.port || 8080,
host: options.host || '0.0.0.0',
socket: options.socket
};

return vow.when(server.init(cdir, opts))
return vow.when(server.init(root, opts))
.then(function () {
return server.run();
});
Expand Down
2 changes: 1 addition & 1 deletion lib/cli/make.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ module.exports = function (program) {
program.command('make')
.option('-n, --no-cache', 'drop cache before running make')
.option('-m, --mode <mode>', 'mode of assembly [development]')
.option('-d, --dir <dir>', 'custom project root', process.cwd())
.option('-d, --dir <dir>', 'custom project root')
.option('-h, --hide-warnings', 'hides warnings')
.option('--graph', 'draws build graph')
.description('build specified targets')
Expand Down
1 change: 1 addition & 0 deletions lib/cli/server.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ program
.command('server')
.description('run development server')
.option('-m, --mode <mode>', 'mode of assembly [development]')
.option('-d, --dir <dir>', 'custom project root')
.option('-p, --port <port>', 'socket port [8080]')
.option('-h, --host <host>', 'socket host [0.0.0.0]')
.option('-s, --socket <socket>', 'unix socket path')
Expand Down

0 comments on commit 7b98221

Please sign in to comment.