Skip to content

Commit

Permalink
Merge pull request #3 from KenPowers/open
Browse files Browse the repository at this point in the history
Add --open (-o) option.
  • Loading branch information
tommy351 committed Jan 24, 2015
2 parents 5779842 + 857cc44 commit 7e86f4e
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 4 deletions.
5 changes: 3 additions & 2 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ hexo.extend.console.register('server', 'Start the server.', {
{name: '-i, --ip', desc: 'Override the default server IP. Bind to all IP address by default.'},
{name: '-p, --port', desc: 'Override the default port.'},
{name: '-s, --static', desc: 'Only serve static files.'},
{name: '-l, --log [format]', desc: 'Enable logger. Override the logger format.'}
{name: '-l, --log [format]', desc: 'Enable logger. Override the logger format.'},
{name: '-o, --open', desc: 'Immediately open the server url in your default web browser.'}
]
}, require('./lib/server'));

Expand All @@ -21,4 +22,4 @@ hexo.extend.filter.register('server_middleware', require('./lib/middlewares/head
hexo.extend.filter.register('server_middleware', require('./lib/middlewares/route'));
hexo.extend.filter.register('server_middleware', require('./lib/middlewares/static'));
hexo.extend.filter.register('server_middleware', require('./lib/middlewares/redirect'));
hexo.extend.filter.register('server_middleware', require('./lib/middlewares/gzip'));
hexo.extend.filter.register('server_middleware', require('./lib/middlewares/gzip'));
11 changes: 9 additions & 2 deletions lib/server.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ var connect = require('connect');
var http = require('http');
var chalk = require('chalk');
var Promise = require('bluebird');
var format = require('util').format;
var open = require('open');

function server(args){
var app = connect();
Expand All @@ -24,9 +26,14 @@ function server(args){
}).then(function(){
return startServer(http.createServer(app), port, ip);
}).then(function(server){
self.log.info('Hexo is running at ' + chalk.underline('http://%s:%d%s') + '. Press Ctrl+C to stop.', ip, port, root);
var addr = format('http://%s:%d%s', ip, port, root);
self.log.info('Hexo is running at %s. Press Ctrl+C to stop.', chalk.underline(addr));
self.emit('server');

if (args.o || args.open) {
open(addr);
}

return server;
}, function(err){
switch (err.code){
Expand All @@ -53,4 +60,4 @@ function startServer(server, port, ip){
});
}

module.exports = server;
module.exports = server;
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
"connect": "3.x",
"mime": "^1.2.11",
"morgan": "^1.5.0",
"open": "0.0.5",
"serve-static": "^1.7.1",
"utils-merge": "^1.0.0"
},
Expand Down

0 comments on commit 7e86f4e

Please sign in to comment.