Browse files

Updated build and meta files

  • Loading branch information...
1 parent 1e2fba8 commit effc5b48b6829e8793d3f0a5eaa8c9b018a23793 @balupton balupton committed Nov 7, 2013
Showing with 13 additions and 12 deletions.
  1. +2 −1 .gitignore
  2. +1 −6 .npmignore
  3. +2 −3 .travis.yml
  4. +8 −2 Cakefile
  5. 0 LICENSE.md
View
3 .gitignore 100755 → 100644
@@ -1,4 +1,4 @@
-# v1.3.0 October 26, 2013
+# v1.3.5 October 31, 2013
# https://github.com/bevry/base
# Temp Files
@@ -11,6 +11,7 @@ bower_components/
node_modules/
out/
+
# =====================================
# PROJECT SPECIFIC FILES
View
7 .npmignore 100755 → 100644
@@ -23,9 +23,4 @@ HISTORY.md
# Other Package Definitions
template.js
component.json
-bower.json
-
-# =====================================
-# PROJECT SPECIFIC FILES
-
-test/render-out/
+bower.json
View
5 .travis.yml 100755 → 100644
@@ -1,7 +1,7 @@
-# v1.3.2 October 26, 2013
+# v1.3.8 November 7, 2013
# https://github.com/bevry/base
language: node_js
-install: "npm install"
+install: "npm install; ./node_modules/.bin/cake install"
before_script: "./node_modules/.bin/cake compile"
script: "npm test"
node_js:
@@ -10,7 +10,6 @@ node_js:
notifications:
irc:
- "irc.freenode.org#bevry-dev"
- - "irc.freenode.org#docpad-dev"
email:
recipients:
- travisci@bevry.me
View
10 Cakefile
@@ -1,4 +1,4 @@
-# v1.3.4 October 30, 2013
+# v1.3.8 November 7, 2013
# https://github.com/bevry/base
@@ -25,6 +25,7 @@ SRC_DIR = pathUtil.join(APP_DIR, "src")
OUT_DIR = pathUtil.join(APP_DIR, "out")
TEST_DIR = pathUtil.join(APP_DIR, "test")
MODULES_DIR = pathUtil.join(APP_DIR, "node_modules")
+DOCPAD_DIR = pathUtil.join(MODULES_DIR, "docpad")
BIN_DIR = pathUtil.join(MODULES_DIR, ".bin")
GIT = "git"
CAKE = pathUtil.join(BIN_DIR, "cake#{EXT}")
@@ -87,7 +88,12 @@ actions =
fsUtil.exists TEST_DIR, (exists) ->
return next() unless exists
# npm install (for test)
- spawn(NPM, ['install'], {stdio:'inherit', cwd:TEST_DIR}).on('close', safe next)
+ spawn(NPM, ['install'], {stdio:'inherit', cwd:TEST_DIR}).on('close', safe next, step3)
+ step3 = ->
+ fsUtil.exists DOCPAD_DIR, (exists) ->
+ return next() unless exists
+ # npm install (for test)
+ spawn(NPM, ['install'], {stdio:'inherit', cwd:DOCPAD_DIR}).on('close', safe next)
step1()
compile: (opts,next) ->
View
0 LICENSE.md 100755 → 100644
File mode changed.

0 comments on commit effc5b4

Please sign in to comment.