upgraded to express 3.x, converted jade templates, and worked out array notation for articles/exercises

test/node_modules/express/Makefile

@@ -1,29 +1,33 @@
 
-DOCS = $(shell find docs/*.md)
-HTMLDOCS = $(DOCS:.md=.html)
-TESTS = $(shell find test/*.test.js)
+MOCHA_OPTS=
+REPORTER = dot
 
-test:
-	@NODE_ENV=test ./node_modules/.bin/expresso $(TESTS)
+check: test
 
-docs: $(HTMLDOCS)
-	@ echo "... generating TOC"
-	@./support/toc.js docs/guide.html
+test: test-unit test-acceptance
 
-%.html: %.md
-	@echo "... $< -> $@"
-	@markdown $< \
-	  | cat docs/layout/head.html - docs/layout/foot.html \
-	  > $@
+test-unit:
+	@NODE_ENV=test ./node_modules/.bin/mocha \
+		--reporter $(REPORTER) \
+		$(MOCHA_OPTS)
 
-site:
-	rm -fr /tmp/docs \
-	  && cp -fr docs /tmp/docs \
-	  && git checkout gh-pages \
-  	&& cp -fr /tmp/docs/* . \
-		&& echo "done"
+test-acceptance:
+	@NODE_ENV=test ./node_modules/.bin/mocha \
+		--reporter $(REPORTER) \
+		--bail \
+		test/acceptance/*.js
 
-docclean:
-	rm -f docs/*.{1,html}
+test-cov: lib-cov
+	@EXPRESS_COV=1 $(MAKE) test REPORTER=html-cov > coverage.html
 
-.PHONY: site test docs docclean
+lib-cov:
+	@jscoverage lib lib-cov
+
+benchmark:
+	@./support/bench
+
+clean:
+	rm -f coverage.html
+	rm -fr lib-cov
+
+.PHONY: test test-unit test-acceptance benchmark clean