Merge branch 'master' into devel

.gitignore

@@ -1,21 +1,20 @@
+conf
 tmp
 lib-cov
 node_modules
-modules/downloaded/*
-modules/custom
-modules/community/*
-modules/site
+modules/community
 modules/private
+modules/site
+themes/downloaded
+themes/custom
+themes/community
+themes/private
+themes/site
 media/*
-themes/downloaded/*
-themes/custom/*
 conf/*.json
-docs/coverage.html
 *.pid
 *.log
 *.swp
 *.sock
 *.gz
 *.sass-cache
-themes/community/
-themes/private/

.travis.yml

@@ -1,3 +1,4 @@
 language: node_js
 node_js:
-  - 0.6
+  - 0.6.18
+  - 0.8.3

Makefile

@@ -2,19 +2,24 @@
 REPORTER = spec
 MOCHA_FLAGS = -t 5000 -s 500
 
-test:
+jscoverage: ./node_modules/jscoverage/jscoverage.node
+
+./node_modules/jscoverage/jscoverage.node:
+	npm install jscoverage
+
+test: jscoverage
 	@NODE_ENV=mocha ./node_modules/.bin/mocha \
 		--reporter $(REPORTER) $(MOCHA_FLAGS)
 
-test-debug-brk:
+test-debug-brk: jscoverage
 	@NODE_ENV=mocha ./node_modules/.bin/mocha \
 		--reporter $(REPORTER) $(MOCHA_FLAGS) --debug-brk
 
-test-debug:
+test-debug: jscoverage
 	@NODE_ENV=mocha ./node_modules/.bin/mocha \
 		--reporter $(REPORTER) $(MOCHA_FLAGS) --debug
 
-test-cov:
+test-cov: jscoverage
 	-rm -rf lib-cov
 	jscoverage --no-highlight lib lib-cov
 	-NODE_ENV=mocha CALIPSO_COV=1 ./node_modules/.bin/mocha --reporter html-cov -t 5000 -s 500 > docs/coverage.html
@@ -32,4 +37,4 @@ site:
 	&& rm -rf gh-pages \
 	&& echo "Pages Updated"
 
-.PHONY: site test test-cov test-debug test-debug-brk lib-cov
+.PHONY: site test test-cov test-debug test-debug-brk lib-cov jscoverage

README.textile

@@ -6,7 +6,7 @@ For additional details, including installation instructions, please visit the ho
 
 If you would like to contribute, please take a look at the issues list as this will have the most up to date view of work that needs to be done for the next minor release.  Otherwise, please just pm myself (cliftonc), dennis (dennishall) or dale (dtan) and we can suggest some places for you to start.
 
-!https://secure.travis-ci.org/cliftonc/calipso.png?branch=devel(Build Status)!:http://travis-ci.org/cliftonc/calipso
+!https://secure.travis-ci.org/cliftonc/calipso.png?branch=master(Build Status)!:http://travis-ci.org/cliftonc/calipso
 
 h3. Quick Install
 
@@ -88,3 +88,6 @@ h3. Contributors
  * "Jerad Bitner":https://github.com/sirkitree
  * "Martin Moen":https://github.com/botto
  * "dale tan":https://github.com/dtan
+ * "Nate Hunzaker":https://github.com/nhunzaker
+ * "Andreas Richter":https://github.com/richtera
+

package.json

@@ -22,7 +22,6 @@
   },
   "devDependencies": {
     "mocha": "*",
-    "jscoverage": "*",
     "should": "*"
   },
   "dependencies": {
@@ -31,7 +30,7 @@
     "connect": "2.2.x",
     "ejs": "0.6.x",
     "jade": "0.20.x",
-    "stylus": "0.23.x",
+    "stylus": "0.28.x",
     "underscore":"1.3.x",
     "mongoose": "2.5.x",
     "connect-mongodb": "1.1.x",

test/helpers/calipsoHelper.js

@@ -1,14 +1,19 @@
 /**
  * Setup the bare minimum required for a fully functioning 'calipso' object
  */
-var jsc = require('jscoverage'),
-	require = jsc.require(module), // rewrite require function
+if (process.env.CALIPSO_COV) {
+	var jsc = require('jscoverage'),
+	require = jsc.require(module); // rewrite require function
 	calipso = require('./require', true)('calipso'),
-	path = require('path'),
+	Config = require('./require', true)('core/Configuration');
+} else {
+	var calipso = require('./require')('calipso'),
+	Config = require('./require')('core/Configuration');
+}
+	var path = require('path'),
 	fs = require('fs'),
 	colors = require('colors'),
 	rootpath = process.cwd() + '/',
-	Config = require('./require', true)('core/Configuration'),
 	http = require('http'),
 	mochaConfig = path.join(rootpath,'tmp','mocha.json');
 

test/lib.core.helpers.js

@@ -6,8 +6,6 @@ var should = require('should'),
     rootpath = process.cwd() + '/',
     path = require('path'),
     exec = require('child_process').exec,
-    jsc = require('jscoverage'),
-    require = jsc.require(module), // rewrite require function
     Helpers = require('./helpers/require')('core/Menu');
 
 describe('Menus', function(){

test/lib.core.lib.js

@@ -6,8 +6,6 @@ var should = require('should'),
     rootpath = process.cwd() + '/',
     path = require('path'),
     exec = require('child_process').exec,
-    jsc = require('jscoverage'),
-    require = jsc.require(module), // rewrite require function
     Lib = require('./helpers/require')('core/Lib');
 
 describe('Libraries', function(){

test/lib.core.link.js

@@ -6,8 +6,6 @@ var should = require('should'),
     rootpath = process.cwd() + '/',
     path = require('path'),
     exec = require('child_process').exec,
-    jsc = require('jscoverage'),
-    require = jsc.require(module), // rewrite require function
     link = require('./helpers/require')('core/Link');
 
 describe('Links', function(){

test/lib.core.module.js

@@ -6,8 +6,6 @@ var should = require('should'),
     rootpath = process.cwd() + '/',
     path = require('path'),
     exec = require('child_process').exec,
-    jsc = require('jscoverage'),
-    require = jsc.require(module), // rewrite require function
     Module = require('./helpers/require')('core/Module');
 
 describe('Modules', function(){

test/lib.core.themes.js

@@ -6,8 +6,6 @@ var should = require('should'),
     rootpath = process.cwd() + '/',
     path = require('path'),
     exec = require('child_process').exec,
-    jsc = require('jscoverage'),
-    require = jsc.require(module), // rewrite require function
     Themes = require('./helpers/require')('core/Themes');
 
 describe('Themes', function(){

test/lib.core.utils.js

@@ -6,8 +6,6 @@ var should = require('should'),
     rootpath = process.cwd() + '/',
     path = require('path'),
     exec = require('child_process').exec,
-    jsc = require('jscoverage'),
-    require = jsc.require(module), // rewrite require function
     Utils = require('./helpers/require')('core/Utils');
 
 describe('Utils', function(){