Skip to content

Commit

Permalink
updated base files
Browse files Browse the repository at this point in the history
  • Loading branch information
balupton committed Dec 12, 2014
1 parent bae3ff9 commit 551dd9e
Show file tree
Hide file tree
Showing 8 changed files with 183 additions and 44 deletions.
5 changes: 5 additions & 0 deletions .gitignore
Expand Up @@ -12,6 +12,11 @@ bower_components/
node_modules/
out/

# Private Files
.env
.idea


# =====================================
# CUSTOM MODIFICATIONS

Expand Down
9 changes: 8 additions & 1 deletion .npmignore
@@ -1,4 +1,4 @@
# v1.3.10 December 10, 2013
# v1.3.23 October 11, 2014
# https://github.com/bevry/base

# Temp Files
Expand All @@ -11,7 +11,14 @@ components/
bower_components/
node_modules/

# Private Files
.env

# Development Files
.editorconfig
.eslintrc
.jshintrc
coffeelint.json
.travis*
Cakefile
Makefile
Expand Down
9 changes: 7 additions & 2 deletions .travis.yml
@@ -1,7 +1,12 @@
# v1.3.14 February 6, 2014
# v1.3.23 October 11, 2014
# https://github.com/bevry/base
language: node_js
install: "npm install; ./node_modules/.bin/cake install"
# ensure npm@1 is the latest 0.8 compatible version (needed to ensure modules are installed correctly)
# ensure coffee-script is installed (needed for cake commands)
# ensure dev dependencies are installed (handled via npm install)
# ensure test dependencies are installed (handled via cake install)
install: "npm install -g npm@1 && npm install coffee-script && npm install && ./node_modules/.bin/cake install"
# ensure our application is compiled before we run our tests
before_script: "./node_modules/.bin/cake compile"
script: "npm test"
node_js:
Expand Down
8 changes: 4 additions & 4 deletions CONTRIBUTING.md
@@ -1,5 +1,5 @@
<!--
v1.3.10 December 10, 2013
v1.3.22 June 23, 2013
https://github.com/bevry/base
-->

Expand All @@ -9,9 +9,9 @@ https://github.com/bevry/base

## Resources

- [Coding Standards](http://bevry.me/bevry/coding-standards)
- [Documentation Guidelines](http://bevry.me/bevry/documentation-guidelines)
- [Support Guidelines](http://bevry.me/bevry/support-guidelines)
- [Coding Standards](http://learn.bevry.me/community/coding-standards)
- [Documentation Guidelines](http://learn.bevry.me/community/documentation-guidelines)
- [Support Guidelines](http://learn.bevry.me/community/support-guidelines)


## Development
Expand Down
48 changes: 27 additions & 21 deletions Cakefile
@@ -1,4 +1,4 @@
# v1.3.15 May 16, 2014
# v1.3.20 June 16, 2014
# https://github.com/bevry/base


Expand All @@ -18,27 +18,29 @@ NPM = (if WINDOWS then process.execPath.replace('node.exe', 'npm.cm
EXT = (if WINDOWS then '.cmd' else '')
GIT = "git"

APP_PATH = process.cwd()
APP_PATH = process.cwd()
PACKAGE_PATH = pathUtil.join(APP_PATH, "package.json")
PACKAGE_DATA = require(PACKAGE_PATH)

MODULES_PATH = pathUtil.join(APP_PATH, "node_modules")
DOCPAD_PATH = pathUtil.join(MODULES_PATH, "docpad")
BIN_PATH = pathUtil.join(MODULES_PATH, ".bin")
CAKE = pathUtil.join(BIN_PATH, "cake" + EXT)
COFFEE = pathUtil.join(BIN_PATH, "coffee" + EXT)
PROJECTZ = pathUtil.join(BIN_PATH, "projectz" + EXT)
DOCCO = pathUtil.join(BIN_PATH, "docco" + EXT)
DOCPAD = pathUtil.join(BIN_PATH, "docpad" + EXT)
CAKE = pathUtil.join(MODULES_PATH, "coffee-script/bin/cake")
COFFEE = pathUtil.join(MODULES_PATH, "coffee-script/bin/coffee")
PROJECTZ = pathUtil.join(MODULES_PATH, "projectz/bin/projectz")
DOCCO = pathUtil.join(MODULES_PATH, "docco/bin/docco")
DOCPAD = pathUtil.join(MODULES_PATH, "docpad/bin/docpad")
BISCOTTO = pathUtil.join(MODULES_PATH, "biscotto/bin/biscotto")

config = {}
config.TEST_PATH = "test"
config.DOCCO_SRC_PATH = null
config.DOCCO_OUT_PATH = "docs"
config.COFFEE_SRC_PATH = null
config.COFFEE_OUT_PATH = "out"
config.DOCPAD_SRC_PATH = null
config.DOCPAD_OUT_PATH = "out"
config.TEST_PATH = "test"
config.DOCCO_SRC_PATH = null
config.DOCCO_OUT_PATH = "docs"
config.BISCOTTO_SRC_PATH = null
config.BISCOTTO_OUT_PATH = "docs"
config.COFFEE_SRC_PATH = null
config.COFFEE_OUT_PATH = "out"
config.DOCPAD_SRC_PATH = null
config.DOCPAD_OUT_PATH = "out"

for own key,value of (PACKAGE_DATA.cakeConfiguration or {})
config[key] = value
Expand Down Expand Up @@ -133,11 +135,11 @@ actions =
step2 = ->
return step3() if !config.COFFEE_SRC_PATH or !fsUtil.existsSync(COFFEE)
console.log('coffee compile')
spawn(COFFEE, ['-co', config.COFFEE_OUT_PATH, config.COFFEE_SRC_PATH], {stdio:'inherit', cwd:APP_PATH}).on('close', safe next, step3)
spawn(NODE, [COFFEE, '-co', config.COFFEE_OUT_PATH, config.COFFEE_SRC_PATH], {stdio:'inherit', cwd:APP_PATH}).on('close', safe next, step3)
step3 = ->
return step4() if !config.DOCPAD_SRC_PATH or !fsUtil.existsSync(DOCPAD)
console.log('docpad generate')
spawn(DOCPAD, ['generate'], {stdio:'inherit', cwd:APP_PATH}).on('close', safe next, step4)
spawn(NODE, [DOCPAD, 'generate'], {stdio:'inherit', cwd:APP_PATH}).on('close', safe next, step4)
step4 = next

# Start
Expand All @@ -154,12 +156,12 @@ actions =
step2 = ->
return step3() if !config.COFFEE_SRC_PATH or !fsUtil.existsSync(COFFEE)
console.log('coffee watch')
spawn(COFFEE, ['-wco', config.COFFEE_OUT_PATH, config.COFFEE_SRC_PATH], {stdio:'inherit', cwd:APP_PATH}).on('close', safe) # background
spawn(NODE, [COFFEE, '-wco', config.COFFEE_OUT_PATH, config.COFFEE_SRC_PATH], {stdio:'inherit', cwd:APP_PATH}).on('close', safe) # background
step3() # continue while coffee runs in background
step3 = ->
return step4() if !config.DOCPAD_SRC_PATH or !fsUtil.existsSync(DOCPAD)
console.log('docpad run')
spawn(DOCPAD, ['run'], {stdio:'inherit', cwd:APP_PATH}).on('close', safe) # background
spawn(NODE, [DOCPAD, 'run'], {stdio:'inherit', cwd:APP_PATH}).on('close', safe) # background
step4() # continue while docpad runs in background
step4 = next

Expand Down Expand Up @@ -193,12 +195,16 @@ actions =
step2 = ->
return step3() if !fsUtil.existsSync(PROJECTZ)
console.log('projectz compile')
spawn(PROJECTZ, ['compile'], {stdio:'inherit', cwd:APP_PATH}).on('close', safe next, step3)
spawn(NODE, [PROJECTZ, 'compile'], {stdio:'inherit', cwd:APP_PATH}).on('close', safe next, step3)
step3 = ->
return step4() if !config.DOCCO_SRC_PATH or !fsUtil.existsSync(DOCCO)
console.log('docco compile')
exec("#{DOCCO} -o #{config.DOCCO_OUT_PATH} #{config.DOCCO_SRC_PATH}", {stdio:'inherit', cwd:APP_PATH}, safe next, step4)
exec("#{NODE} #{DOCCO} -o #{config.DOCCO_OUT_PATH} #{config.DOCCO_SRC_PATH}", {stdio:'inherit', cwd:APP_PATH}, safe next, step4)
step4 = ->
return step5() if !config.BISCOTTO_SRC_PATH or !fsUtil.existsSync(BISCOTTO)
console.log('biscotto compile')
exec("""#{BISCOTTO} --name #{PACKAGE_DATA.title or PACKAGE_DATA.name} --title "#{PACKAGE_DATA.title or PACKAGE_DATA.name} API Documentation" --readme README.md --output-dir #{config.BISCOTTO_OUT_PATH} #{config.BISCOTTO_SRC_PATH} - LICENSE.md HISTORY.md""", {stdio:'inherit', cwd:APP_PATH}, safe next, step5)
step5 = ->
console.log('cake test')
actions.test(opts, safe next, step5)
step5 = next
Expand Down
29 changes: 15 additions & 14 deletions README.md
Expand Up @@ -2,15 +2,16 @@

<!-- BADGES/ -->

[![Build Status](http://img.shields.io/travis-ci/docpad/docpad-plugin-html2coffee.png?branch=master)](http://travis-ci.org/docpad/docpad-plugin-html2coffee "Check this project's build status on TravisCI")
[![NPM version](http://badge.fury.io/js/docpad-plugin-html2coffee.png)](https://npmjs.org/package/docpad-plugin-html2coffee "View this project on NPM")
[![Dependency Status](https://david-dm.org/docpad/docpad-plugin-html2coffee.png?theme=shields.io)](https://david-dm.org/docpad/docpad-plugin-html2coffee)
[![Development Dependency Status](https://david-dm.org/docpad/docpad-plugin-html2coffee/dev-status.png?theme=shields.io)](https://david-dm.org/docpad/docpad-plugin-html2coffee#info=devDependencies)<br/>
[![Gittip donate button](http://img.shields.io/gittip/docpad.png)](https://www.gittip.com/docpad/ "Donate weekly to this project using Gittip")
[![Flattr donate button](http://img.shields.io/flattr/donate.png?color=yellow)](http://flattr.com/thing/344188/balupton-on-Flattr "Donate monthly to this project using Flattr")
[![PayPayl donate button](http://img.shields.io/paypal/donate.png?color=yellow)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=QB8GQPZAH84N6 "Donate once-off to this project using Paypal")
[![BitCoin donate button](http://img.shields.io/bitcoin/donate.png?color=yellow)](https://coinbase.com/checkouts/9ef59f5479eec1d97d63382c9ebcb93a "Donate once-off to this project using BitCoin")
[![Wishlist browse button](http://img.shields.io/wishlist/browse.png?color=yellow)](http://amzn.com/w/2F8TXKSNAFG4V "Buy an item on our wishlist for us")
[![Build Status](https://img.shields.io/travis/docpad/docpad-plugin-html2coffee/master.svg)](http://travis-ci.org/docpad/docpad-plugin-html2coffee "Check this project's build status on TravisCI")
[![NPM version](https://img.shields.io/npm/v/docpad-plugin-html2coffee.svg)](https://npmjs.org/package/docpad-plugin-html2coffee "View this project on NPM")
[![NPM downloads](https://img.shields.io/npm/dm/docpad-plugin-html2coffee.svg)](https://npmjs.org/package/docpad-plugin-html2coffee "View this project on NPM")
[![Dependency Status](https://img.shields.io/david/docpad/docpad-plugin-html2coffee.svg)](https://david-dm.org/docpad/docpad-plugin-html2coffee)
[![Dev Dependency Status](https://img.shields.io/david/dev/docpad/docpad-plugin-html2coffee.svg)](https://david-dm.org/docpad/docpad-plugin-html2coffee#info=devDependencies)<br/>
[![Gratipay donate button](https://img.shields.io/gratipay/docpad.svg)](https://www.gratipay.com/docpad/ "Donate weekly to this project using Gratipay")
[![Flattr donate button](https://img.shields.io/badge/flattr-donate-yellow.svg)](http://flattr.com/thing/344188/balupton-on-Flattr "Donate monthly to this project using Flattr")
[![PayPayl donate button](https://img.shields.io/badge/paypal-donate-yellow.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=QB8GQPZAH84N6 "Donate once-off to this project using Paypal")
[![BitCoin donate button](https://img.shields.io/badge/bitcoin-donate-yellow.svg)](https://coinbase.com/checkouts/9ef59f5479eec1d97d63382c9ebcb93a "Donate once-off to this project using BitCoin")
[![Wishlist browse button](https://img.shields.io/badge/wishlist-donate-yellow.svg)](http://amzn.com/w/2F8TXKSNAFG4V "Buy an item on our wishlist for us")

<!-- /BADGES -->

Expand Down Expand Up @@ -58,11 +59,11 @@ These amazing people are maintaining this project:

No sponsors yet! Will you be the first?

[![Gittip donate button](http://img.shields.io/gittip/docpad.png)](https://www.gittip.com/docpad/ "Donate weekly to this project using Gittip")
[![Flattr donate button](http://img.shields.io/flattr/donate.png?color=yellow)](http://flattr.com/thing/344188/balupton-on-Flattr "Donate monthly to this project using Flattr")
[![PayPayl donate button](http://img.shields.io/paypal/donate.png?color=yellow)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=QB8GQPZAH84N6 "Donate once-off to this project using Paypal")
[![BitCoin donate button](http://img.shields.io/bitcoin/donate.png?color=yellow)](https://coinbase.com/checkouts/9ef59f5479eec1d97d63382c9ebcb93a "Donate once-off to this project using BitCoin")
[![Wishlist browse button](http://img.shields.io/wishlist/browse.png?color=yellow)](http://amzn.com/w/2F8TXKSNAFG4V "Buy an item on our wishlist for us")
[![Gratipay donate button](https://img.shields.io/gratipay/docpad.svg)](https://www.gratipay.com/docpad/ "Donate weekly to this project using Gratipay")
[![Flattr donate button](https://img.shields.io/badge/flattr-donate-yellow.svg)](http://flattr.com/thing/344188/balupton-on-Flattr "Donate monthly to this project using Flattr")
[![PayPayl donate button](https://img.shields.io/badge/paypal-donate-yellow.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=QB8GQPZAH84N6 "Donate once-off to this project using Paypal")
[![BitCoin donate button](https://img.shields.io/badge/bitcoin-donate-yellow.svg)](https://coinbase.com/checkouts/9ef59f5479eec1d97d63382c9ebcb93a "Donate once-off to this project using BitCoin")
[![Wishlist browse button](https://img.shields.io/badge/wishlist-donate-yellow.svg)](http://amzn.com/w/2F8TXKSNAFG4V "Buy an item on our wishlist for us")

### Contributors

Expand Down
114 changes: 114 additions & 0 deletions coffeelint.json
@@ -0,0 +1,114 @@
{
"coffeescript_error": {
"level": "error"
},
"arrow_spacing": {
"name": "arrow_spacing",
"level": "error"
},
"no_tabs": {
"name": "no_tabs",
"level": "ignore"
},
"no_trailing_whitespace": {
"name": "no_trailing_whitespace",
"level": "error",
"allowed_in_comments": false,
"allowed_in_empty_lines": true
},
"max_line_length": {
"name": "max_line_length",
"value": 80,
"level": "ignore",
"limitComments": true
},
"line_endings": {
"name": "line_endings",
"level": "error",
"value": "unix"
},
"no_trailing_semicolons": {
"name": "no_trailing_semicolons",
"level": "error"
},
"indentation": {
"name": "indentation",
"value": 1,
"level": "error"
},
"camel_case_classes": {
"name": "camel_case_classes",
"level": "error"
},
"colon_assignment_spacing": {
"name": "colon_assignment_spacing",
"level": "ignore",
"spacing": {
"left": 0,
"right": 0
}
},
"no_implicit_braces": {
"name": "no_implicit_braces",
"level": "ignore",
"strict": true
},
"no_plusplus": {
"name": "no_plusplus",
"level": "ignore"
},
"no_throwing_strings": {
"name": "no_throwing_strings",
"level": "error"
},
"no_backticks": {
"name": "no_backticks",
"level": "ignore"
},
"no_implicit_parens": {
"name": "no_implicit_parens",
"level": "ignore"
},
"no_empty_param_list": {
"name": "no_empty_param_list",
"level": "error"
},
"no_stand_alone_at": {
"name": "no_stand_alone_at",
"level": "ignore"
},
"space_operators": {
"name": "space_operators",
"level": "ignore"
},
"duplicate_key": {
"name": "duplicate_key",
"level": "error"
},
"empty_constructor_needs_parens": {
"name": "empty_constructor_needs_parens",
"level": "ignore"
},
"cyclomatic_complexity": {
"name": "cyclomatic_complexity",
"value": 10,
"level": "ignore"
},
"newlines_after_classes": {
"name": "newlines_after_classes",
"value": 3,
"level": "ignore"
},
"no_unnecessary_fat_arrows": {
"name": "no_unnecessary_fat_arrows",
"level": "warn"
},
"missing_fat_arrows": {
"name": "missing_fat_arrows",
"level": "ignore"
},
"non_empty_constructor_needs_parens": {
"name": "non_empty_constructor_needs_parens",
"level": "ignore"
}
}
5 changes: 3 additions & 2 deletions package.json
Expand Up @@ -36,7 +36,7 @@
"devDependencies": {
"coffee-script": "~1.6.2",
"docpad": "6",
"projectz": "~0.3.13"
"projectz": "~0.3.17"
},
"main": "./out/html2coffee.plugin.js",
"scripts": {
Expand All @@ -48,9 +48,10 @@
"badges": {
"travis": true,
"npm": true,
"npmdownloads": true,
"david": true,
"daviddev": true,
"gittip": "docpad",
"gratipay": "docpad",
"flattr": "344188/balupton-on-Flattr",
"paypal": "QB8GQPZAH84N6",
"bitcoin": "https://coinbase.com/checkouts/9ef59f5479eec1d97d63382c9ebcb93a",
Expand Down

0 comments on commit 551dd9e

Please sign in to comment.