Skip to content
This repository has been archived by the owner on Jan 14, 2020. It is now read-only.

Commit

Permalink
Update server task, make lint task.
Browse files Browse the repository at this point in the history
Use `up` for serving so we can get that auto-reload goodness.
Use `jshint` for linting, because what else would we use?
Use `tap` for testing, though I haven't written any yet.
  • Loading branch information
brianloveswords committed Oct 9, 2012
1 parent cc167c3 commit 3eb0cbd
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 8 deletions.
13 changes: 13 additions & 0 deletions .jshintrc
Original file line number Original file line Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"node": true,
"indent": 2,
"trailing": true,
"sub": true,
"white": true,
"laxbreak": true,
"noarg": true,
"undef": true,
"lastsemic": true,
"strict": false,
"es5": true
}
10 changes: 8 additions & 2 deletions Makefile
Original file line number Original file line Diff line number Diff line change
@@ -1,4 +1,10 @@
server: server:
@node server.js @up -t 0 -n 1 -w -p 3000 server.js


.PHONY: server lint:
@jshint *.js lib/*.js

test:
@tap test/*.test.js

.PHONY: server test lint
7 changes: 2 additions & 5 deletions app.js
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -13,13 +13,11 @@ var app = express();
var logger = app.logger = require('./lib/logger'); var logger = app.logger = require('./lib/logger');
var env = app.env = require('./lib/environment'); var env = app.env = require('./lib/environment');


logger.info('Environment: \n' + util.inspect(env.all()));

(new nunjucks.Environment( (new nunjucks.Environment(
new nunjucks.FileSystemLoader('views') new nunjucks.FileSystemLoader('views')
)).express(app); )).express(app);


app.configure(function() { app.configure(function () {
app.set('port', process.env.PORT || 3000); app.set('port', process.env.PORT || 3000);
app.use(express.favicon()); app.use(express.favicon());
app.use(express.logger('dev')); app.use(express.logger('dev'));
Expand All @@ -35,7 +33,7 @@ app.configure(function() {
app.use(app.router); app.use(app.router);
}); });


app.configure('development', function() { app.configure('development', function () {
app.use(express.errorHandler()); app.use(express.errorHandler());
}); });


Expand All @@ -53,5 +51,4 @@ app.put('/behavior/:name', behavior.update);
app.patch('/behavior/:name', behavior.update); app.patch('/behavior/:name', behavior.update);
app.delete('/behavior/:name', behavior.destroy); app.delete('/behavior/:name', behavior.destroy);



module.exports = app; module.exports = app;
4 changes: 3 additions & 1 deletion server.js
Original file line number Original file line Diff line number Diff line change
@@ -1,9 +1,11 @@
var http = require('http'); var http = require('http');
var app = require('./app'); var app = require('./app');
var util = require('util');
var server = module.exports = http.createServer(app); var server = module.exports = http.createServer(app);


console.log('Environment: \n' + util.inspect(app.env.all()));
if (!module.parent) { if (!module.parent) {
server.listen(app.get('port'), function() { server.listen(app.get('port'), function () {
app.logger.info("Express server listening on port " + app.get('port')); app.logger.info("Express server listening on port " + app.get('port'));
}); });
} }

0 comments on commit 3eb0cbd

Please sign in to comment.