Permalink
Browse files

Changes mostly around dependencies and coffeescript requires

- Improved Makefile
- skeletonNonexistant now tells us where it checked
- Updated dependencies
  - CoffeeScript from 1.3.x to 1.4.x
  - CSON from 1.2.x to 1.4.x
  - Joe from 1.0.x to 1.1.x
  - Underscore from 1.3.x to 1.4.x
  - Chai from 1.1.x to 1.3.x
- Removed ability to require uncompiled plugins
  • Loading branch information...
1 parent 2ba4938 commit 0a393daaa5cf9df5889f47409af6e64d41ad0533 @balupton balupton committed Oct 24, 2012
Showing with 18 additions and 22 deletions.
  1. +8 −6 Makefile
  2. +1 −1 locale/en.cson
  3. +6 −7 package.json
  4. +1 −1 src/lib/docpad.coffee
  5. +0 −3 src/lib/plugin-loader.coffee
  6. +0 −1 src/test/actions.test.coffee
  7. +2 −3 test/docpad.coffee
View
@@ -7,6 +7,8 @@
BIN=node_modules/.bin/
COFFEE=$(BIN)coffee
+OUT=out
+SRC=src
# -----------------
@@ -24,15 +26,15 @@ COFFEE=$(BIN)coffee
# Watch and recompile our files
dev:
- $(COFFEE) -cbwo out src
+ $(COFFEE) -cbwo $(OUT) $(SRC)
# Compile our files
compile:
- $(COFFEE) -cbo out src
+ $(COFFEE) -cbo $(OUT) $(SRC)
# Clean up
clean:
- rm -Rf out node_modules npm-debug.log
+ rm -Rf $(OUT) node_modules *.log
# Install dependencies
install:
@@ -42,12 +44,12 @@ install:
reset:
make clean
make install
+ make compile
# Ensure everything is ready for our tests (used by things like travis)
test-prepare:
- rm -Rf test/node_modules test/out test/npm-debug.log
- make install
- make compile
+ make reset
+ rm -Rf test/node_modules test/*out test/*.log
cd test; npm install
# Run our tests
View
@@ -22,7 +22,7 @@
skeletonInstalled: "Installed the skeleton succesfully"
skeletonExists: "Didn't place the skeleton as the desired structure already exists"
skeletonNonexistant: """
- We couldn't find an existing DocPad project inside your current directory.
+ We couldn't find an existing DocPad project inside your current directory. Looked at: %s
If you're wanting to use a pre-made skeleton for the basis of your new project, then run DocPad again inside an empty directory.
If you're wanting to start your new project from scratch, then refer to the Getting Started guide here:
https://docpad.org/get-started
View
@@ -1,6 +1,6 @@
{
"name": "docpad",
- "version": "6.8.3",
+ "version": "6.9.0",
"description": "DocPad is a language agnostic document management system. This means you write your website as documents, in whatever language you wish, and DocPad will handle the compiling, templates and layouts for you. For static documents it will generate static files, for dynamic documents it'll re-render them on each request. You can utilise DocPad by itself, or use it as a module your own custom system. It's pretty cool, and well worth checking out. We love it.",
"homepage": "https://github.com/bevry/docpad",
"keywords": [
@@ -61,16 +61,15 @@
"airbrake": "0.2.x",
"bal-util": ">=1.13.8 <1.14",
"caterpillar": "1.1.x",
- "coffee-script": "1.3.x",
"commander": "1.0.x",
- "cson": "1.2.x",
+ "cson": "1.4.x",
"express": "3.0.x",
"growl": "1.4.x",
"mime": "1.2.x",
"query-engine": ">=1.2.3 <1.3",
"semver": "1.0.x",
"request": "2.11.x",
- "underscore": "1.3.x",
+ "underscore": "1.4.x",
"watchr": ">=2.1.5 <2.2",
"yaml": "0.2.1"
},
@@ -79,9 +78,9 @@
"growl": "1.4.x"
},
"devDependencies": {
- "chai": "1.1.x",
- "joe": "1.0.x",
- "request": "2.9.x"
+ "coffee-script": "1.4.x",
+ "chai": "1.3.x",
+ "joe": "1.1.x"
},
"directories": {
"lib": "./out/lib"
@@ -2645,7 +2645,7 @@ class DocPad extends EventEmitterEnhanced
# Check if our directory is empty
if files.length
# It isn't empty, display a warning
- docpad.log 'warn', "\n#{locale.skeletonNonexistant}"
+ docpad.log 'warn', "\n"+util.format(locale.skeletonNonexistant, destinationPath)
return next()
else
docpad.skeleton opts, (err) ->
@@ -3,7 +3,6 @@ pathUtil = require('path')
semver = require('semver')
balUtil = require('bal-util')
util = require('util')
-coffee = null
# Define Plugin Loader
class PluginLoader
@@ -175,8 +174,6 @@ class PluginLoader
# Load
try
- # Ensure we have coffee-script loaded if we are including a coffee-script file
- coffee = require('coffee-script') if !coffee and /\.coffee$/.test(@pluginPath)
# Load in our plugin
@pluginClass = require(@pluginPath)(@BasePlugin)
@pluginClass::version ?= @pluginVersion
@@ -128,7 +128,6 @@ joe.suite 'docpad-actions', (suite,test) ->
done(err)
test 'served generated documents', (done) ->
- console.log("#{baseUrl}/html.html")
request "#{baseUrl}/html.html", (err,response,actual) ->
return done(err) if err
balUtil.readFile "#{outExpectedPath}/html.html", (err,expected) ->
View
@@ -1,4 +1,4 @@
-module.exports = {
+module.exports =
environments:
development:
a: 'websiteConfig'
@@ -20,5 +20,4 @@ module.exports = {
renderDocument: (opts) ->
src = "testing the docpad configuration renderDocument event"
out = src.toUpperCase()
- opts.content = opts.content.replace(src,out)
-}
+ opts.content = opts.content.replace(src,out)

0 comments on commit 0a393da

Please sign in to comment.