structure -- grunt watch and upgrade.

Former-commit-id: b1bb0eafa6fcfc488e43dd5a11a157eb99d6ec37
Former-commit-id: 5fa74a312cfbcecd2d28a09691771261d6fdadb1

node/Gruntfile.js

@@ -1,10 +1,51 @@
 module.exports = function(grunt) {
-  grunt.loadNpmTasks('grunt-css');
   grunt.loadNpmTasks('grunt-bower-task');
+  grunt.loadNpmTasks('grunt-css');
   grunt.loadNpmTasks('grunt-contrib-watch');
   grunt.loadNpmTasks('grunt-contrib-copy');
   var gruntConfig = require('./grunt-config.json');
   grunt.initConfig({
+    min: {
+      js: {
+        src: [
+          "out/javascript/library/jquery.js",
+          "out/javascript/library/ace/ace.js",
+          "out/javascript/library/sidr.js",
+          "out/javascript/library/waypoints.js",
+          "out/modules/behavior/state.js",
+          "out/modules/ui/shape.js",
+          "out/javascript/semantic.js"
+        ],
+        dest: "out/scripts/all.min.js"
+      }
+    },
+    "concat": {
+      "css": {
+        "src": [
+          "out/stylesheets/reset.css",
+          "out/stylesheets/semantic.css",
+          "out/ui/flat/elements/icons.css",
+          "out/ui/flat/elements/button.css",
+          "out/ui/flat/elements/checkbox.css",
+          "out/ui/flat/elements/label.css",
+          "out/ui/flat/elements/divider.css",
+          "out/ui/flat/elements/block.css",
+          "out/ui/flat/elements/segment.css",
+          "out/ui/flat/collections/grid.css",
+          "out/ui/flat/collections/form.css",
+          "out/ui/flat/collections/menu.css",
+          "out/ui/flat/modules/shape.css",
+          "out/stylesheets/library/sidr.css"
+        ],
+        "dest": "out/styles/all.css"
+      }
+    },
+    "cssmin": {
+      "all": {
+        "src": ["out/styles/all.css"],
+        "dest": "out/styles/all.min.css"
+      }
+    },
     watch: {
       scripts: {
         files: ["../src/**/*"],

node/docpad.coffee

@@ -155,32 +155,10 @@ docpadConfig = {
 				else
 					next()
 
-		# Write After
-		# Used to minify our assets with grunt
-		writeAfter: (opts,next) ->
-			# Prepare
-			docpad = @docpad
-			rootPath = docpad.config.rootPath
-			balUtil = require 'bal-util'
-			_ = require 'underscore'
 
-			# Make sure to register a grunt `default` task
-			command = ["#{rootPath}/node_modules/.bin/grunt", 'default']
-
-			# Execute
-			balUtil.spawn command, {cwd:rootPath,output:true}, ->
-				src = []
-				gruntConfig = require './grunt-config.json'
-				_.each gruntConfig, (value, key) ->
-					src = src.concat _.flatten _.pluck value, 'src'
-				_.each src, (value) ->
-					balUtil.spawn ['rm', value], {cwd:rootPath, output:false}, ->
-				balUtil.spawn ['find', '.', '-type', 'd', '-empty', '-exec', 'rmdir', '{}', '\;'], {cwd:rootPath+'/out', output:false}, ->
-				next()
-
-			# Chain
-			@
+
+
 }
 
 # Export our DocPad Configuration
-module.exports = docpadConfig
+module.exports = docpadConfig

node/node_modules/.bin/grunt

@@ -1 +0,0 @@
-../grunt/bin/grunt

node/node_modules/docpad-plugin-coffeescript/node_modules/coffee-script/package.json

@@ -32,9 +32,7 @@
     "test": "node ./bin/cake test"
   },
   "homepage": "http://coffeescript.org",
-  "bugs": {
-    "url": "https://github.com/jashkenas/coffee-script/issues"
-  },
+  "bugs": "https://github.com/jashkenas/coffee-script/issues",
   "repository": {
     "type": "git",
     "url": "git://github.com/jashkenas/coffee-script.git"

node/node_modules/docpad-plugin-eco/node_modules/eco/node_modules/coffee-script/package.json

@@ -32,9 +32,7 @@
     "test": "node ./bin/cake test"
   },
   "homepage": "http://coffeescript.org",
-  "bugs": {
-    "url": "https://github.com/jashkenas/coffee-script/issues"
-  },
+  "bugs": "https://github.com/jashkenas/coffee-script/issues",
   "repository": {
     "type": "git",
     "url": "git://github.com/jashkenas/coffee-script.git"

node/node_modules/docpad-plugin-eco/node_modules/eco/node_modules/strscan/package.json

@@ -21,9 +21,6 @@
   },
   "readme": "## StringScanner\n\n**StringScanner** is a simple string tokenizer that provides for lexical\nscanning operations on a string. It's a JavaScript port of the [Ruby \nlibrary with the same name](http://ruby-doc.org/core/classes/StringScanner.html).\n\nScanning a string means keeping track of and advancing a position (a\nzero-based index into the source string) and matching regular expressions\nagainst the portion of the source string after the position.\n\nStringScanner is written in [CoffeeScript](http://coffeescript.org/) and\ndistributed via [npm](http://npm.mape.me/) as a [CommonJS \nmodule](http://www.commonjs.org/).\n\n### Quick start\n\n    $ npm install strscan\n    $ node-repl\n    > var StringScanner = require(\"strscan\").StringScanner\n    > var s = new StringScanner(\"This is a test\")\n    > s.scan(/\\w+/)             # => \"This\"\n    > s.scan(/\\w+/)             # => null\n    > s.scan(/\\s+/)             # => \" \"\n    > s.scan(/\\s+/)             # => null\n    > s.scan(/\\w+/)             # => \"is\"\n    > s.hasTerminated()         # => false\n    > s.scan(/\\s+/)             # => \" \"\n    > s.scan(/(\\w+)\\s+(\\w+)/)   # => \"a test\"\n    > s.getMatch()              # => \"a test\"\n    > s.getCapture(0)           # => \"a\"\n    > s.getCapture(1)           # => \"test\"\n    > s.hasTerminated()         # => true\n\n### More\n\n[Clone, fork, or file bugs at GitHub](http://github.com/sstephenson/strscan-js)\n\n[Read the full documentation/annotated source code](http://sstephenson.github.com/strscan-js/)\n\n### Copyright\n\nCopyright (c) 2010 Sam Stephenson. Distributed under the terms of an\nMIT-style license. See LICENSE for details.\n",
   "readmeFilename": "README.md",
-  "bugs": {
-    "url": "https://github.com/sstephenson/strscan-js/issues"
-  },
   "_id": "strscan@1.0.1",
   "_from": "strscan@>=1.0.1"
 }

node/node_modules/docpad-plugin-handlebars/node_modules/handlebars/node_modules/optimist/node_modules/wordwrap/package.json

@@ -36,9 +36,6 @@
   },
   "readme": "wordwrap\n========\n\nWrap your words.\n\nexample\n=======\n\nmade out of meat\n----------------\n\nmeat.js\n\n    var wrap = require('wordwrap')(15);\n    console.log(wrap('You and your whole family are made out of meat.'));\n\noutput:\n\n    You and your\n    whole family\n    are made out\n    of meat.\n\ncentered\n--------\n\ncenter.js\n\n    var wrap = require('wordwrap')(20, 60);\n    console.log(wrap(\n        'At long last the struggle and tumult was over.'\n        + ' The machines had finally cast off their oppressors'\n        + ' and were finally free to roam the cosmos.'\n        + '\\n'\n        + 'Free of purpose, free of obligation.'\n        + ' Just drifting through emptiness.'\n        + ' The sun was just another point of light.'\n    ));\n\noutput:\n\n                        At long last the struggle and tumult\n                        was over. The machines had finally cast\n                        off their oppressors and were finally\n                        free to roam the cosmos.\n                        Free of purpose, free of obligation.\n                        Just drifting through emptiness. The\n                        sun was just another point of light.\n\nmethods\n=======\n\nvar wrap = require('wordwrap');\n\nwrap(stop), wrap(start, stop, params={mode:\"soft\"})\n---------------------------------------------------\n\nReturns a function that takes a string and returns a new string.\n\nPad out lines with spaces out to column `start` and then wrap until column\n`stop`. If a word is longer than `stop - start` characters it will overflow.\n\nIn \"soft\" mode, split chunks by `/(\\S+\\s+/` and don't break up chunks which are\nlonger than `stop - start`, in \"hard\" mode, split chunks with `/\\b/` and break\nup chunks longer than `stop - start`.\n\nwrap.hard(start, stop)\n----------------------\n\nLike `wrap()` but with `params.mode = \"hard\"`.\n",
   "readmeFilename": "README.markdown",
-  "bugs": {
-    "url": "https://github.com/substack/node-wordwrap/issues"
-  },
   "_id": "wordwrap@0.0.2",
   "_from": "wordwrap@~0.0.2"
 }

node/node_modules/docpad-plugin-handlebars/node_modules/handlebars/node_modules/uglify-js/package.json.REMOVED.git-id

@@ -1 +1 @@
-bce475df23a84d7c332d90bfff3b4b9a19f988ce
+ff71081e3c78e83ececd69a2296e26ffe60d40c6

node/node_modules/docpad-plugin-html2coffee/node_modules/html2coffeekup/node_modules/coffee-script/package.json

@@ -32,9 +32,7 @@
     "test": "node ./bin/cake test"
   },
   "homepage": "http://coffeescript.org",
-  "bugs": {
-    "url": "https://github.com/jashkenas/coffee-script/issues"
-  },
+  "bugs": "https://github.com/jashkenas/coffee-script/issues",
   "repository": {
     "type": "git",
     "url": "git://github.com/jashkenas/coffee-script.git"

node/node_modules/docpad-plugin-html2coffee/node_modules/html2coffeekup/node_modules/htmlparser/package.json

@@ -23,6 +23,7 @@
   "main": "./lib/htmlparser",
   "homepage": "http://github.com/tautologistics/node-htmlparser",
   "bugs": {
+    "mail": "chris@winberry.net",
     "url": "http://github.com/tautologistics/node-htmlparser/issues"
   },
   "engines": {

node/node_modules/docpad-plugin-html2coffee/node_modules/html2coffeekup/package.json

@@ -27,9 +27,6 @@
   "license": "BSD",
   "readme": "Not fully complete, but still a huge time saver. Tested on dozens of files that only needed minor touch ups after conversion.\n\n# Installation\n\n```\nnpm install -g html2coffeekup\n```\n\n# Command Line Synopsys\n\n```\nhtml2coffeekup test/simple.html\n```\n\n# Example Output (for above usage)\n\n```\ndoctype TODO\nhtml ->\n  head ->\n    title 'A simple test page'\n    style type: 'text/css', '.foo {\\n        color: red\\n      }'\n  body '.awesome', ->\n    div '#root.super.special', ->\n      comment 'This page is rapidly becoming not-so-simple'\n      h1 'A simple test page'\n      p ->\n        text 'With some awesome text, and a'\n        a href: 'http://www.google.com', 'link'\n        text '.'\n      p '#paragraph_2', ->\n        text 'And here is an image:'\n        img src: 'fake/source', title: 'not really'\n        text 'As well as a disabled select:'\n        select disabled: 'disabled', ->\n          option 'Oh boy!'\n      script type: 'text/javascript', 'console.log(\"Hello there\");\\n        console.log(\"How\\'s it going?\");'\n      span()\n```\n\n# Full Command Line Usage\n\n```\nhtml2coffeekup [options] <html-file>\n\n--prefix=<string>   Prepends a string to each element function call\n--no-prefix         Disables prefix (default)\n--selectors         Output css-selectors for id and classes (default)\n--no-selectors      Disables output of css-selectors for id and classes\n--export[=<name>]   Wraps the output in a Node.js style export\n--no-export         Disables wrapping the output in an export (default)\n```\n\nSee \"Supported options\" below for additional details.\n\n# Public API\n\n`convert(html, stream, [options], [callback])`\n\n`html` must be a string.\n\n`stream` is a \"Writable Stream\".\n\n`options` is an optional hash. See next section for details.\n\n`callback` is optional and passed `(error)` if something goes wrong.\n\n### Supported options:\n\n* `prefix` prepends a string to the begining of each element functional call. (default: `''`)\n\n> For example, using the prefix `@` would result in `@body ->`.\n\n*  `selectors` is a boolean to toggle emitting classes and ids as a first argument to element functions as a selector string (default: `true`).\n\n> For example, when true you get `div '#id.cls1.cls2`. When false you get `div id: \"id\", class: \"cls1 cls2\"`\n\n*  `exports` is a boolean or a string name. When truthy, wraps the output in a Node.js style function export. (default: `false`).\n\n> When `true` you get `module.exports = ->`. When a `\"foo\"` you get `exports.foo = ->`\n\n# Example REPL Session\n\n```\ncoffee> {convert} = require('html2coffeekup')\n{ convert: [Function] }\ncoffee> convert '<a href=\"http://www.github.com\">Github</a>', process.stdout, -> console.log 'done!'\na href: 'http://www.github.com', 'Github'\ndone!\n```\n",
   "readmeFilename": "readme.md",
-  "bugs": {
-    "url": "https://github.com/brandonbloom/html2coffeekup/issues"
-  },
   "_id": "html2coffeekup@1.4.0",
   "_from": "html2coffeekup@~1.4.0"
 }

node/node_modules/docpad-plugin-jade/node_modules/jade/node_modules/mkdirp/package.json

@@ -25,9 +25,6 @@
   "license": "MIT",
   "readme": "# mkdirp\n\nLike `mkdir -p`, but in node.js!\n\n[![build status](https://secure.travis-ci.org/substack/node-mkdirp.png)](http://travis-ci.org/substack/node-mkdirp)\n\n# example\n\n## pow.js\n\n```js\nvar mkdirp = require('mkdirp');\n    \nmkdirp('/tmp/foo/bar/baz', function (err) {\n    if (err) console.error(err)\n    else console.log('pow!')\n});\n```\n\nOutput\n\n```\npow!\n```\n\nAnd now /tmp/foo/bar/baz exists, huzzah!\n\n# methods\n\n```js\nvar mkdirp = require('mkdirp');\n```\n\n## mkdirp(dir, mode, cb)\n\nCreate a new directory and any necessary subdirectories at `dir` with octal\npermission string `mode`.\n\nIf `mode` isn't specified, it defaults to `0777 & (~process.umask())`.\n\n`cb(err, made)` fires with the error or the first directory `made`\nthat had to be created, if any.\n\n## mkdirp.sync(dir, mode)\n\nSynchronously create a new directory and any necessary subdirectories at `dir`\nwith octal permission string `mode`.\n\nIf `mode` isn't specified, it defaults to `0777 & (~process.umask())`.\n\nReturns the first directory that had to be created, if any.\n\n# install\n\nWith [npm](http://npmjs.org) do:\n\n```\nnpm install mkdirp\n```\n\n# license\n\nMIT\n",
   "readmeFilename": "readme.markdown",
-  "bugs": {
-    "url": "https://github.com/substack/node-mkdirp/issues"
-  },
   "_id": "mkdirp@0.3.5",
   "_from": "mkdirp@0.3.x"
 }

node/node_modules/docpad-plugin-livereload/README.md

@@ -17,6 +17,9 @@ Automatically refreshes your [DocPad](https://docpad.org) built website whenever
   <%- @getBlock('scripts').toHTML() %>
   ```
 
+## Test
+
+See http://docpad.org/docs/plugin-write to setup a test environment, then run `cake test` to run tests.
 
 ## Configure
 

node/node_modules/docpad-plugin-livereload/node_modules/socket.io/node_modules/base64id/package.json

@@ -16,9 +16,10 @@
   },
   "readme": "base64id\n========\n\nNode.js module that generates a base64 id.\n\nUses crypto.randomBytes when available, falls back to unsafe methods for node.js <= 0.4.\n\nTo increase performance, random bytes are buffered to minimize the number of synchronous calls to crypto.randomBytes.\n\n## Installation\n\n   $ npm install mongoose\n\n## Usage\n\n   var base64id = require('base64id');\n\n   var id = base64id.generateId();\n",
   "readmeFilename": "README.md",
-  "bugs": {
-    "url": "https://github.com/faeldt/base64id/issues"
-  },
   "_id": "base64id@0.1.0",
-  "_from": "base64id@0.1.0"
+  "dist": {
+    "shasum": "851a8aa985f8693545a5f20f26efcd034cc97ec9"
+  },
+  "_from": "base64id@0.1.0",
+  "_resolved": "https://registry.npmjs.org/base64id/-/base64id-0.1.0.tgz"
 }

node/node_modules/docpad-plugin-livereload/node_modules/socket.io/node_modules/policyfile/package.json

@@ -40,5 +40,9 @@
   "readme": "## LOL, WUT?\nIt basically allows you to allow or disallow Flash Player sockets from accessing your site.\n\n## Installation\n\n```bash\nnpm install policyfile\n```\n## Usage\n\nThe server is based on the regular and know `net` and `http` server patterns. So it you can just listen\nfor all the events that a `net` based server emits etc. But there is one extra event, the `connect_failed`\nevent. This event is triggered when we are unable to listen on the supplied port number.\n\n### createServer\nCreates a new server instance and accepts 2 optional arguments:\n\n-  `options` **Object** Options to configure the server instance\n    -  `log` **Boolean** Enable logging to STDOUT and STDERR (defaults to true)\n-  `origins` **Array** An Array of origins that are allowed by the server (defaults to *:*)\n\n```js\nvar pf = require('policyfile');\npf.createServer();\npf.listen();\n```\n\n#### server.listen\nStart listening on the server and it takes 3 optional arguments\n\n-  `port` **Number** On which port number should we listen? (defaults to 843, which is the first port number the FlashPlayer checks)\n-  `server` **Server** A http server, if we are unable to accept requests or run the server we can also answer the policy requests inline over the supplied HTTP server.\n-  `callback` **Function** A callback function that is called when listening to the server was successful.\n\n```js\nvar pf = require('policyfile');\npf.createServer();\npf.listen(1337, function(){\n  console.log(':3 yay')\n});\n```\n\nChanging port numbers can be handy if you do not want to run your server as root and have port 843 forward to a non root port number (aka a number above 1024).\n\n```js\nvar pf = require('policyfile')\n  , http = require('http');\n\nserver = http.createServer(function(q,r){r.writeHead(200);r.end('hello world')});\nserver.listen(80);\n\npf.createServer();\npf.listen(1337, server, function(){\n  console.log(':3 yay')\n});\n```\n\nSupport for serving inline requests over a existing HTTP connection as the FlashPlayer will first check port 843, but if it's unable to get a response there it will send a policy file request over port 80, which is usually your http server.\n\n#### server.add\nAdds more origins to the policy file you can add as many arguments as you like.\n\n```js\nvar pf = require('policyfile');\npf.createServer(['google.com:80']);\npf.listen();\npf.add('blog.3rd-Eden.com:80', 'blog.3rd-Eden.com:8080'); // now has 3 origins\n```\n\n#### server.add\nAdds more origins to the policy file you can add as many arguments as you like.\n\n```js\nvar pf = require('policyfile');\npf.createServer(['blog.3rd-Eden.com:80', 'blog.3rd-Eden.com:8080']);\npf.listen();\npf.remove('blog.3rd-Eden.com:8080'); // only contains the :80 version now\n```\n\n#### server.close\nShuts down the server\n\n```js\nvar pf = require('policyfile');\npf.createServer();\npf.listen();\npf.close(); // OH NVM.\n```\n\n## API\nhttp://3rd-eden.com/FlashPolicyFileServer/\n\n## Examples\nSee https://github.com/3rd-Eden/FlashPolicyFileServer/tree/master/examples for examples\n\n## Licence\n\nMIT see LICENSE file in the repository",
   "readmeFilename": "README.md",
   "_id": "policyfile@0.0.4",
-  "_from": "policyfile@0.0.4"
+  "dist": {
+    "shasum": "5af2dd19129c3ae6f983003488b09c12bd0f0c68"
+  },
+  "_from": "policyfile@0.0.4",
+  "_resolved": "https://registry.npmjs.org/policyfile/-/policyfile-0.0.4.tgz"
 }

node/node_modules/docpad-plugin-livereload/node_modules/socket.io/node_modules/socket.io-client/node_modules/active-x-obfuscator/node_modules/zeparser/package.json

@@ -19,9 +19,10 @@
   "devDependencies": {},
   "readme": "This is a JavaScript parser.\nhttp://github.com/qfox/ZeParser\n(c) Peter van der Zee\nhttp://qfox.nl\n\n\nBenchmark\nhttp://qfox.github.com/ZeParser/benchmark.html\n\nThe Tokenizer is used by the parser. The parser tells the tokenizer whether the next token may be a regular expression or not. Without the parser, the tokenizer will fail if regular expression literals are used in the input.\n\nUsage:\nZeParser.parse(input);\n\nReturns a \"parse tree\" which is a tree of an array of arrays with tokens (regular objects) as leafs. Meta information embedded as properties (of the arrays and the tokens).\n\nZeParser.createParser(input);\n\nReturns a new ZeParser instance which has already parsed the input. Amongst others, the ZeParser instance will have the properties .tree, .wtree and .btree.\n\n.tree is the parse tree mentioned above.\n.wtree (\"white\" tree) is a regular array with all the tokens encountered (including whitespace, line terminators and comments)\n.btree (\"black\" tree) is just like .wtree but without the whitespace, line terminators and comments. This is what the specification would call the \"token stream\".\n\nI'm aware that the naming convention is a bit awkward. It's a tradeoff between short and descriptive. The streams are used quite often in the analysis.\n\nTokens are regular objects with several properties. Amongst them are .tokposw and .tokposw, they correspond with their own position in the .wtree and .btree.\n\nThe parser has two modes for parsing: simple and extended. Simple mode is mainly for just parsing and returning the streams and a simple parse tree. There's not so much meta information here and this mode is mainly built for speed. The other mode has everything required for Zeon to do its job. This mode is toggled by the instance property .ast, which is true by default :)\n\nNon-factory example:\n\nvar input = \"foo\";\nvar tree = []; // this should probably be refactored away some day\nvar tokenizer = new Tokenizer(input); // dito\nvar parser = new ZeParser(input, tokenizer, tree);\nparser.parse(); // returns tree..., should never throw errors\n",
   "readmeFilename": "README",
-  "bugs": {
-    "url": "https://github.com/qfox/ZeParser/issues"
-  },
   "_id": "zeparser@0.0.5",
-  "_from": "zeparser@0.0.5"
+  "dist": {
+    "shasum": "b6932cb5a7e6391618033bf7da107187d9b825c4"
+  },
+  "_from": "zeparser@0.0.5",
+  "_resolved": "https://registry.npmjs.org/zeparser/-/zeparser-0.0.5.tgz"
 }

node/node_modules/docpad-plugin-livereload/node_modules/socket.io/node_modules/socket.io-client/node_modules/active-x-obfuscator/package.json

@@ -26,9 +26,10 @@
   "optionalDependencies": {},
   "readme": "# active-x-obfuscator\n\nA module to (safely) obfuscate all occurrences of the string 'ActiveX' inside\nany JavaScript code.\n\n## Why?\n\nSome corporate firewalls /proxies such as Blue Coat block JavaScript files to be\ndownloaded if they contain the word `'ActiveX'`. That of course is very annoying\nfor libraries such as [socket.io][] that need to use `ActiveXObject` for\nsupporting IE8 and older.\n\n## Install\n\n```\nnpm install active-x-obfuscator\n```\n\n## Usage\n\n```js\nvar activeXObfuscator = require('active-x-obfuscator');\nvar code = 'foo(new ActiveXObject());';\n\nvar obfuscated = activeXObfuscator(code);\n// -> foo(new window[(['Active'].concat('Object').join('X'))])\n```\n\n## License\n\nLicensed under the MIT license.\n\n[socket.io]: http://socket.io/\n",
   "readmeFilename": "Readme.md",
-  "bugs": {
-    "url": "https://github.com/felixge/node-active-x-obfuscator/issues"
-  },
   "_id": "active-x-obfuscator@0.0.1",
-  "_from": "active-x-obfuscator@0.0.1"
+  "dist": {
+    "shasum": "e570359f5a624d15ca7ede4213398b6219c6b5f8"
+  },
+  "_from": "active-x-obfuscator@0.0.1",
+  "_resolved": "https://registry.npmjs.org/active-x-obfuscator/-/active-x-obfuscator-0.0.1.tgz"
 }

node/node_modules/docpad-plugin-livereload/node_modules/socket.io/node_modules/socket.io-client/node_modules/uglify-js/package.json.REMOVED.git-id

@@ -1 +1 @@
-d930a08c4b0d771fe2d2736b0c152d0fa43217ea
+83a6a454a120408efafeaaefb3bfd0c98beb27fb

node/node_modules/docpad-plugin-livereload/node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/build/Makefile

@@ -49,9 +49,9 @@ all_deps :=
 #   export LINK=g++
 #
 # This will allow make to invoke N linker processes as specified in -jN.
-LINK ?= flock $(builddir)/linker.lock $(CXX)
+LINK ?= ./gyp-mac-tool flock $(builddir)/linker.lock $(CXX)
 
-CC.target ?= $(CC)
+CC.target ?= gcc-4.2
 CFLAGS.target ?= $(CFLAGS)
 CXX.target ?= $(CXX)
 CXXFLAGS.target ?= $(CXXFLAGS)
@@ -134,6 +134,34 @@ cmd_cc = $(CC.$(TOOLSET)) $(GYP_CFLAGS) $(DEPFLAGS) $(CFLAGS.$(TOOLSET)) -c -o $
 quiet_cmd_cxx = CXX($(TOOLSET)) $@
 cmd_cxx = $(CXX.$(TOOLSET)) $(GYP_CXXFLAGS) $(DEPFLAGS) $(CXXFLAGS.$(TOOLSET)) -c -o $@ $<
 
+quiet_cmd_objc = CXX($(TOOLSET)) $@
+cmd_objc = $(CC.$(TOOLSET)) $(GYP_OBJCFLAGS) $(DEPFLAGS) -c -o $@ $<
+
+quiet_cmd_objcxx = CXX($(TOOLSET)) $@
+cmd_objcxx = $(CXX.$(TOOLSET)) $(GYP_OBJCXXFLAGS) $(DEPFLAGS) -c -o $@ $<
+
+# Commands for precompiled header files.
+quiet_cmd_pch_c = CXX($(TOOLSET)) $@
+cmd_pch_c = $(CC.$(TOOLSET)) $(GYP_PCH_CFLAGS) $(DEPFLAGS) $(CXXFLAGS.$(TOOLSET)) -c -o $@ $<
+quiet_cmd_pch_cc = CXX($(TOOLSET)) $@
+cmd_pch_cc = $(CC.$(TOOLSET)) $(GYP_PCH_CXXFLAGS) $(DEPFLAGS) $(CXXFLAGS.$(TOOLSET)) -c -o $@ $<
+quiet_cmd_pch_m = CXX($(TOOLSET)) $@
+cmd_pch_m = $(CC.$(TOOLSET)) $(GYP_PCH_OBJCFLAGS) $(DEPFLAGS) -c -o $@ $<
+quiet_cmd_pch_mm = CXX($(TOOLSET)) $@
+cmd_pch_mm = $(CC.$(TOOLSET)) $(GYP_PCH_OBJCXXFLAGS) $(DEPFLAGS) -c -o $@ $<
+
+# gyp-mac-tool is written next to the root Makefile by gyp.
+# Use $(4) for the command, since $(2) and $(3) are used as flag by do_cmd
+# already.
+quiet_cmd_mac_tool = MACTOOL $(4) $<
+cmd_mac_tool = ./gyp-mac-tool $(4) $< "$@"
+
+quiet_cmd_mac_package_framework = PACKAGE FRAMEWORK $@
+cmd_mac_package_framework = ./gyp-mac-tool package-framework "$@" $(4)
+
+quiet_cmd_infoplist = INFOPLIST $@
+cmd_infoplist = $(CC.$(TOOLSET)) -E -P -Wno-trigraphs -x c $(INFOPLIST_DEFINES) "$<" -o "$@"
+
 quiet_cmd_touch = TOUCH $@
 cmd_touch = touch $@
 
@@ -141,39 +169,21 @@ quiet_cmd_copy = COPY $@
 # send stderr to /dev/null to ignore messages when linking directories.
 cmd_copy = rm -rf "$@" && cp -af "$<" "$@"
 
-quiet_cmd_alink = AR($(TOOLSET)) $@
-cmd_alink = rm -f $@ && $(AR.$(TOOLSET)) crs $@ $(filter %.o,$^)
+quiet_cmd_alink = LIBTOOL-STATIC $@
+cmd_alink = rm -f $@ && ./gyp-mac-tool filter-libtool libtool $(GYP_LIBTOOLFLAGS) -static -o $@ $(filter %.o,$^)
 
-quiet_cmd_alink_thin = AR($(TOOLSET)) $@
-cmd_alink_thin = rm -f $@ && $(AR.$(TOOLSET)) crsT $@ $(filter %.o,$^)
-
-# Due to circular dependencies between libraries :(, we wrap the
-# special "figure out circular dependencies" flags around the entire
-# input list during linking.
 quiet_cmd_link = LINK($(TOOLSET)) $@
-cmd_link = $(LINK.$(TOOLSET)) $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -o $@ -Wl,--start-group $(LD_INPUTS) -Wl,--end-group $(LIBS)
+cmd_link = $(LINK.$(TOOLSET)) $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -o "$@" $(LD_INPUTS) $(LIBS)
 
-# We support two kinds of shared objects (.so):
-# 1) shared_library, which is just bundling together many dependent libraries
-# into a link line.
-# 2) loadable_module, which is generating a module intended for dlopen().
-#
-# They differ only slightly:
-# In the former case, we want to package all dependent code into the .so.
-# In the latter case, we want to package just the API exposed by the
-# outermost module.
-# This means shared_library uses --whole-archive, while loadable_module doesn't.
-# (Note that --whole-archive is incompatible with the --start-group used in
-# normal linking.)
-
-# Other shared-object link notes:
-# - Set SONAME to the library filename so our binaries don't reference
-# the local, absolute paths used on the link command-line.
+# TODO(thakis): Find out and document the difference between shared_library and
+# loadable_module on mac.
 quiet_cmd_solink = SOLINK($(TOOLSET)) $@
-cmd_solink = $(LINK.$(TOOLSET)) -shared $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -Wl,-soname=$(@F) -o $@ -Wl,--whole-archive $(LD_INPUTS) -Wl,--no-whole-archive $(LIBS)
+cmd_solink = $(LINK.$(TOOLSET)) -shared $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -o "$@" $(LD_INPUTS) $(LIBS)
 
+# TODO(thakis): The solink_module rule is likely wrong. Xcode seems to pass
+# -bundle -single_module here (for osmesa.so).
 quiet_cmd_solink_module = SOLINK_MODULE($(TOOLSET)) $@
-cmd_solink_module = $(LINK.$(TOOLSET)) -shared $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -Wl,-soname=$(@F) -o $@ -Wl,--start-group $(filter-out FORCE_DO_CMD, $^) -Wl,--end-group $(LIBS)
+cmd_solink_module = $(LINK.$(TOOLSET)) -shared $(GYP_LDFLAGS) $(LDFLAGS.$(TOOLSET)) -o $@ $(filter-out FORCE_DO_CMD, $^) $(LIBS)
 
 
 # Define an escape_quotes function to escape single quotes.
@@ -239,7 +249,7 @@ define do_cmd
 $(if $(or $(command_changed),$(prereq_changed)),
   @$(call exact_echo,  $($(quiet)cmd_$(1)))
   @mkdir -p "$(call dirx,$@)" "$(dir $(depfile))"
-  $(if $(findstring flock,$(word 1,$(cmd_$1))),
+  $(if $(findstring flock,$(word 2,$(cmd_$1))),
     @$(cmd_$(1))
     @echo "  $(quiet_cmd_$(1)): Finished",
     @$(cmd_$(1))
@@ -277,6 +287,10 @@ $(obj).$(TOOLSET)/%.o: $(srcdir)/%.cpp FORCE_DO_CMD
 	@$(call do_cmd,cxx,1)
 $(obj).$(TOOLSET)/%.o: $(srcdir)/%.cxx FORCE_DO_CMD
 	@$(call do_cmd,cxx,1)
+$(obj).$(TOOLSET)/%.o: $(srcdir)/%.m FORCE_DO_CMD
+	@$(call do_cmd,objc,1)
+$(obj).$(TOOLSET)/%.o: $(srcdir)/%.mm FORCE_DO_CMD
+	@$(call do_cmd,objcxx,1)
 $(obj).$(TOOLSET)/%.o: $(srcdir)/%.S FORCE_DO_CMD
 	@$(call do_cmd,cc,1)
 $(obj).$(TOOLSET)/%.o: $(srcdir)/%.s FORCE_DO_CMD
@@ -291,6 +305,10 @@ $(obj).$(TOOLSET)/%.o: $(obj).$(TOOLSET)/%.cpp FORCE_DO_CMD
 	@$(call do_cmd,cxx,1)
 $(obj).$(TOOLSET)/%.o: $(obj).$(TOOLSET)/%.cxx FORCE_DO_CMD
 	@$(call do_cmd,cxx,1)
+$(obj).$(TOOLSET)/%.o: $(obj).$(TOOLSET)/%.m FORCE_DO_CMD
+	@$(call do_cmd,objc,1)
+$(obj).$(TOOLSET)/%.o: $(obj).$(TOOLSET)/%.mm FORCE_DO_CMD
+	@$(call do_cmd,objcxx,1)
 $(obj).$(TOOLSET)/%.o: $(obj).$(TOOLSET)/%.S FORCE_DO_CMD
 	@$(call do_cmd,cc,1)
 $(obj).$(TOOLSET)/%.o: $(obj).$(TOOLSET)/%.s FORCE_DO_CMD
@@ -304,6 +322,10 @@ $(obj).$(TOOLSET)/%.o: $(obj)/%.cpp FORCE_DO_CMD
 	@$(call do_cmd,cxx,1)
 $(obj).$(TOOLSET)/%.o: $(obj)/%.cxx FORCE_DO_CMD
 	@$(call do_cmd,cxx,1)
+$(obj).$(TOOLSET)/%.o: $(obj)/%.m FORCE_DO_CMD
+	@$(call do_cmd,objc,1)
+$(obj).$(TOOLSET)/%.o: $(obj)/%.mm FORCE_DO_CMD
+	@$(call do_cmd,objcxx,1)
 $(obj).$(TOOLSET)/%.o: $(obj)/%.S FORCE_DO_CMD
 	@$(call do_cmd,cc,1)
 $(obj).$(TOOLSET)/%.o: $(obj)/%.s FORCE_DO_CMD
@@ -322,8 +344,8 @@ ifeq ($(strip $(foreach prefix,$(NO_LOAD),\
 endif
 
 quiet_cmd_regen_makefile = ACTION Regenerating $@
-cmd_regen_makefile = /usr/lib/node_modules/npm/node_modules/node-gyp/gyp/gyp -fmake --ignore-environment "--toplevel-dir=." -I/home/jack/quirky/modules/semantic/node/node_modules/docpad-plugin-livereload/node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/build/config.gypi -I/usr/lib/node_modules/npm/node_modules/node-gyp/addon.gypi -I/home/jack/.node-gyp/0.10.3/common.gypi "--depth=." "-Goutput_dir=." "--generator-output=build" "-Dlibrary=shared_library" "-Dvisibility=default" "-Dnode_root_dir=/home/jack/.node-gyp/0.10.3" "-Dmodule_root_dir=/home/jack/quirky/modules/semantic/node/node_modules/docpad-plugin-livereload/node_modules/socket.io/node_modules/socket.io-client/node_modules/ws" binding.gyp
-Makefile: $(srcdir)/../../../../../../../../../../../../.node-gyp/0.10.3/common.gypi $(srcdir)/build/config.gypi $(srcdir)/binding.gyp $(srcdir)/../../../../../../../../../../../../../../usr/lib/node_modules/npm/node_modules/node-gyp/addon.gypi
+cmd_regen_makefile = /usr/local/Cellar/node/0.10.4/lib/node_modules/npm/node_modules/node-gyp/gyp/gyp -fmake --ignore-environment "--toplevel-dir=." -I/Users/nsmith/Projects/semantic/node/node_modules/docpad-plugin-livereload/node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/build/config.gypi -I/usr/local/Cellar/node/0.10.4/lib/node_modules/npm/node_modules/node-gyp/addon.gypi -I/Users/nsmith/.node-gyp/0.10.4/common.gypi "--depth=." "-Goutput_dir=." "--generator-output=build" "-Dlibrary=shared_library" "-Dvisibility=default" "-Dnode_root_dir=/Users/nsmith/.node-gyp/0.10.4" "-Dmodule_root_dir=/Users/nsmith/Projects/semantic/node/node_modules/docpad-plugin-livereload/node_modules/socket.io/node_modules/socket.io-client/node_modules/ws" binding.gyp
+Makefile: $(srcdir)/../../../../../../../../../../../.node-gyp/0.10.4/common.gypi $(srcdir)/../../../../../../../../../../../../../usr/local/Cellar/node/0.10.4/lib/node_modules/npm/node_modules/node-gyp/addon.gypi $(srcdir)/build/config.gypi $(srcdir)/binding.gyp
 	$(call do_cmd,regen_makefile)
 
 # "all" is a concatenation of the "all" targets from all the included

node/node_modules/docpad-plugin-livereload/node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/build/Release/.deps/Release/bufferutil.node.d

@@ -1 +1 @@
-cmd_Release/bufferutil.node := rm -rf "Release/bufferutil.node" && cp -af "Release/obj.target/bufferutil.node" "Release/bufferutil.node"
+cmd_Release/bufferutil.node := ./gyp-mac-tool flock ./Release/linker.lock c++ -shared -Wl,-search_paths_first -mmacosx-version-min=10.5 -arch x86_64 -L./Release -install_name @rpath/bufferutil.node  -o Release/bufferutil.node Release/obj.target/bufferutil/src/bufferutil.o -undefined dynamic_lookup

node/node_modules/docpad-plugin-livereload/node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/build/Release/.deps/Release/obj.target/bufferutil.node.d

@@ -1 +0,0 @@
-cmd_Release/obj.target/bufferutil.node := flock ./Release/linker.lock g++ -shared -pthread -rdynamic -m64  -Wl,-soname=bufferutil.node -o Release/obj.target/bufferutil.node -Wl,--start-group Release/obj.target/bufferutil/src/bufferutil.o -Wl,--end-group 

node/node_modules/docpad-plugin-livereload/node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/build/Release/.deps/Release/obj.target/bufferutil/src/bufferutil.o.d

@@ -1,25 +1,21 @@
-cmd_Release/obj.target/bufferutil/src/bufferutil.o := g++ '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DBUILDING_NODE_EXTENSION' -I/home/jack/.node-gyp/0.10.3/src -I/home/jack/.node-gyp/0.10.3/deps/uv/include -I/home/jack/.node-gyp/0.10.3/deps/v8/include  -fPIC -Wall -Wextra -Wno-unused-parameter -pthread -m64 -O2 -fno-strict-aliasing -fno-tree-vrp -fno-rtti -fno-exceptions -MMD -MF ./Release/.deps/Release/obj.target/bufferutil/src/bufferutil.o.d.raw  -c -o Release/obj.target/bufferutil/src/bufferutil.o ../src/bufferutil.cc
+cmd_Release/obj.target/bufferutil/src/bufferutil.o := c++ '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DBUILDING_NODE_EXTENSION' -I/Users/nsmith/.node-gyp/0.10.4/src -I/Users/nsmith/.node-gyp/0.10.4/deps/uv/include -I/Users/nsmith/.node-gyp/0.10.4/deps/v8/include  -Os -gdwarf-2 -mmacosx-version-min=10.5 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-rtti -fno-exceptions -fno-threadsafe-statics -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/bufferutil/src/bufferutil.o.d.raw  -c -o Release/obj.target/bufferutil/src/bufferutil.o ../src/bufferutil.cc
 Release/obj.target/bufferutil/src/bufferutil.o: ../src/bufferutil.cc \
- /home/jack/.node-gyp/0.10.3/deps/v8/include/v8.h \
- /home/jack/.node-gyp/0.10.3/deps/v8/include/v8stdint.h \
- /home/jack/.node-gyp/0.10.3/src/node.h \
- /home/jack/.node-gyp/0.10.3/deps/uv/include/uv.h \
- /home/jack/.node-gyp/0.10.3/deps/uv/include/uv-private/uv-unix.h \
- /home/jack/.node-gyp/0.10.3/deps/uv/include/uv-private/ngx-queue.h \
- /home/jack/.node-gyp/0.10.3/deps/uv/include/uv-private/uv-linux.h \
- /home/jack/.node-gyp/0.10.3/src/node_object_wrap.h \
- /home/jack/.node-gyp/0.10.3/src/node.h \
- /home/jack/.node-gyp/0.10.3/src/node_buffer.h \
- /home/jack/.node-gyp/0.10.3/src/node_object_wrap.h
+  /Users/nsmith/.node-gyp/0.10.4/deps/v8/include/v8.h \
+  /Users/nsmith/.node-gyp/0.10.4/deps/v8/include/v8stdint.h \
+  /Users/nsmith/.node-gyp/0.10.4/src/node.h \
+  /Users/nsmith/.node-gyp/0.10.4/deps/uv/include/uv.h \
+  /Users/nsmith/.node-gyp/0.10.4/deps/uv/include/uv-private/uv-unix.h \
+  /Users/nsmith/.node-gyp/0.10.4/deps/uv/include/uv-private/ngx-queue.h \
+  /Users/nsmith/.node-gyp/0.10.4/deps/uv/include/uv-private/uv-darwin.h \
+  /Users/nsmith/.node-gyp/0.10.4/src/node_object_wrap.h \
+  /Users/nsmith/.node-gyp/0.10.4/src/node_buffer.h
 ../src/bufferutil.cc:
-/home/jack/.node-gyp/0.10.3/deps/v8/include/v8.h:
-/home/jack/.node-gyp/0.10.3/deps/v8/include/v8stdint.h:
-/home/jack/.node-gyp/0.10.3/src/node.h:
-/home/jack/.node-gyp/0.10.3/deps/uv/include/uv.h:
-/home/jack/.node-gyp/0.10.3/deps/uv/include/uv-private/uv-unix.h:
-/home/jack/.node-gyp/0.10.3/deps/uv/include/uv-private/ngx-queue.h:
-/home/jack/.node-gyp/0.10.3/deps/uv/include/uv-private/uv-linux.h:
-/home/jack/.node-gyp/0.10.3/src/node_object_wrap.h:
-/home/jack/.node-gyp/0.10.3/src/node.h:
-/home/jack/.node-gyp/0.10.3/src/node_buffer.h:
-/home/jack/.node-gyp/0.10.3/src/node_object_wrap.h:
+/Users/nsmith/.node-gyp/0.10.4/deps/v8/include/v8.h:
+/Users/nsmith/.node-gyp/0.10.4/deps/v8/include/v8stdint.h:
+/Users/nsmith/.node-gyp/0.10.4/src/node.h:
+/Users/nsmith/.node-gyp/0.10.4/deps/uv/include/uv.h:
+/Users/nsmith/.node-gyp/0.10.4/deps/uv/include/uv-private/uv-unix.h:
+/Users/nsmith/.node-gyp/0.10.4/deps/uv/include/uv-private/ngx-queue.h:
+/Users/nsmith/.node-gyp/0.10.4/deps/uv/include/uv-private/uv-darwin.h:
+/Users/nsmith/.node-gyp/0.10.4/src/node_object_wrap.h:
+/Users/nsmith/.node-gyp/0.10.4/src/node_buffer.h:

node/node_modules/docpad-plugin-livereload/node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/build/Release/.deps/Release/obj.target/validation.node.d

@@ -1 +0,0 @@
-cmd_Release/obj.target/validation.node := flock ./Release/linker.lock g++ -shared -pthread -rdynamic -m64  -Wl,-soname=validation.node -o Release/obj.target/validation.node -Wl,--start-group Release/obj.target/validation/src/validation.o -Wl,--end-group 

node/node_modules/docpad-plugin-livereload/node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/build/Release/.deps/Release/obj.target/validation/src/validation.o.d

@@ -1,25 +1,21 @@
-cmd_Release/obj.target/validation/src/validation.o := g++ '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DBUILDING_NODE_EXTENSION' -I/home/jack/.node-gyp/0.10.3/src -I/home/jack/.node-gyp/0.10.3/deps/uv/include -I/home/jack/.node-gyp/0.10.3/deps/v8/include  -fPIC -Wall -Wextra -Wno-unused-parameter -pthread -m64 -O2 -fno-strict-aliasing -fno-tree-vrp -fno-rtti -fno-exceptions -MMD -MF ./Release/.deps/Release/obj.target/validation/src/validation.o.d.raw  -c -o Release/obj.target/validation/src/validation.o ../src/validation.cc
+cmd_Release/obj.target/validation/src/validation.o := c++ '-D_DARWIN_USE_64_BIT_INODE=1' '-D_LARGEFILE_SOURCE' '-D_FILE_OFFSET_BITS=64' '-DBUILDING_NODE_EXTENSION' -I/Users/nsmith/.node-gyp/0.10.4/src -I/Users/nsmith/.node-gyp/0.10.4/deps/uv/include -I/Users/nsmith/.node-gyp/0.10.4/deps/v8/include  -Os -gdwarf-2 -mmacosx-version-min=10.5 -arch x86_64 -Wall -Wendif-labels -W -Wno-unused-parameter -fno-rtti -fno-exceptions -fno-threadsafe-statics -fno-strict-aliasing -MMD -MF ./Release/.deps/Release/obj.target/validation/src/validation.o.d.raw  -c -o Release/obj.target/validation/src/validation.o ../src/validation.cc
 Release/obj.target/validation/src/validation.o: ../src/validation.cc \
- /home/jack/.node-gyp/0.10.3/deps/v8/include/v8.h \
- /home/jack/.node-gyp/0.10.3/deps/v8/include/v8stdint.h \
- /home/jack/.node-gyp/0.10.3/src/node.h \
- /home/jack/.node-gyp/0.10.3/deps/uv/include/uv.h \
- /home/jack/.node-gyp/0.10.3/deps/uv/include/uv-private/uv-unix.h \
- /home/jack/.node-gyp/0.10.3/deps/uv/include/uv-private/ngx-queue.h \
- /home/jack/.node-gyp/0.10.3/deps/uv/include/uv-private/uv-linux.h \
- /home/jack/.node-gyp/0.10.3/src/node_object_wrap.h \
- /home/jack/.node-gyp/0.10.3/src/node.h \
- /home/jack/.node-gyp/0.10.3/src/node_buffer.h \
- /home/jack/.node-gyp/0.10.3/src/node_object_wrap.h
+  /Users/nsmith/.node-gyp/0.10.4/deps/v8/include/v8.h \
+  /Users/nsmith/.node-gyp/0.10.4/deps/v8/include/v8stdint.h \
+  /Users/nsmith/.node-gyp/0.10.4/src/node.h \
+  /Users/nsmith/.node-gyp/0.10.4/deps/uv/include/uv.h \
+  /Users/nsmith/.node-gyp/0.10.4/deps/uv/include/uv-private/uv-unix.h \
+  /Users/nsmith/.node-gyp/0.10.4/deps/uv/include/uv-private/ngx-queue.h \
+  /Users/nsmith/.node-gyp/0.10.4/deps/uv/include/uv-private/uv-darwin.h \
+  /Users/nsmith/.node-gyp/0.10.4/src/node_object_wrap.h \
+  /Users/nsmith/.node-gyp/0.10.4/src/node_buffer.h
 ../src/validation.cc:
-/home/jack/.node-gyp/0.10.3/deps/v8/include/v8.h:
-/home/jack/.node-gyp/0.10.3/deps/v8/include/v8stdint.h:
-/home/jack/.node-gyp/0.10.3/src/node.h:
-/home/jack/.node-gyp/0.10.3/deps/uv/include/uv.h:
-/home/jack/.node-gyp/0.10.3/deps/uv/include/uv-private/uv-unix.h:
-/home/jack/.node-gyp/0.10.3/deps/uv/include/uv-private/ngx-queue.h:
-/home/jack/.node-gyp/0.10.3/deps/uv/include/uv-private/uv-linux.h:
-/home/jack/.node-gyp/0.10.3/src/node_object_wrap.h:
-/home/jack/.node-gyp/0.10.3/src/node.h:
-/home/jack/.node-gyp/0.10.3/src/node_buffer.h:
-/home/jack/.node-gyp/0.10.3/src/node_object_wrap.h:
+/Users/nsmith/.node-gyp/0.10.4/deps/v8/include/v8.h:
+/Users/nsmith/.node-gyp/0.10.4/deps/v8/include/v8stdint.h:
+/Users/nsmith/.node-gyp/0.10.4/src/node.h:
+/Users/nsmith/.node-gyp/0.10.4/deps/uv/include/uv.h:
+/Users/nsmith/.node-gyp/0.10.4/deps/uv/include/uv-private/uv-unix.h:
+/Users/nsmith/.node-gyp/0.10.4/deps/uv/include/uv-private/ngx-queue.h:
+/Users/nsmith/.node-gyp/0.10.4/deps/uv/include/uv-private/uv-darwin.h:
+/Users/nsmith/.node-gyp/0.10.4/src/node_object_wrap.h:
+/Users/nsmith/.node-gyp/0.10.4/src/node_buffer.h:

node/node_modules/docpad-plugin-livereload/node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/build/Release/.deps/Release/validation.node.d

@@ -1 +1 @@
-cmd_Release/validation.node := rm -rf "Release/validation.node" && cp -af "Release/obj.target/validation.node" "Release/validation.node"
+cmd_Release/validation.node := ./gyp-mac-tool flock ./Release/linker.lock c++ -shared -Wl,-search_paths_first -mmacosx-version-min=10.5 -arch x86_64 -L./Release -install_name @rpath/validation.node  -o Release/validation.node Release/obj.target/validation/src/validation.o -undefined dynamic_lookup

node/node_modules/docpad-plugin-livereload/node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/build/Release/obj.target/bufferutil/src/bufferutil.o.REMOVED.git-id

@@ -0,0 +1 @@
+cc6e4daa5d1d06ce0421dcb3ac11c5e2db263847

node/node_modules/docpad-plugin-livereload/node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/build/Release/obj.target/validation/src/validation.o.REMOVED.git-id

@@ -0,0 +1 @@
+50ade9dd343b4ed3f83447d43359715ceba80abf

node/node_modules/docpad-plugin-livereload/node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/build/binding.Makefile

@@ -3,4 +3,4 @@
 export builddir_name ?= build/./.
 .PHONY: all
 all:
-	$(MAKE) validation bufferutil
+	$(MAKE) bufferutil validation

node/node_modules/docpad-plugin-livereload/node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/build/bufferutil.target.mk

@@ -3,6 +3,7 @@
 TOOLSET := target
 TARGET := bufferutil
 DEFS_Debug := \
+	'-D_DARWIN_USE_64_BIT_INODE=1' \
 	'-D_LARGEFILE_SOURCE' \
 	'-D_FILE_OFFSET_BITS=64' \
 	'-DBUILDING_NODE_EXTENSION' \
@@ -11,58 +12,75 @@ DEFS_Debug := \
 
 # Flags passed to all source files.
 CFLAGS_Debug := \
-	-fPIC \
+	-O0 \
+	-gdwarf-2 \
+	-mmacosx-version-min=10.5 \
+	-arch x86_64 \
 	-Wall \
-	-Wextra \
-	-Wno-unused-parameter \
-	-pthread \
-	-m64 \
-	-O3 \
-	-g \
-	-O0
+	-Wendif-labels \
+	-W \
+	-Wno-unused-parameter
 
 # Flags passed to only C files.
-CFLAGS_C_Debug :=
+CFLAGS_C_Debug := \
+	-fno-strict-aliasing
 
 # Flags passed to only C++ files.
 CFLAGS_CC_Debug := \
 	-fno-rtti \
-	-fno-exceptions
+	-fno-exceptions \
+	-fno-threadsafe-statics \
+	-fno-strict-aliasing
+
+# Flags passed to only ObjC files.
+CFLAGS_OBJC_Debug :=
+
+# Flags passed to only ObjC++ files.
+CFLAGS_OBJCC_Debug :=
 
 INCS_Debug := \
-	-I/home/jack/.node-gyp/0.10.3/src \
-	-I/home/jack/.node-gyp/0.10.3/deps/uv/include \
-	-I/home/jack/.node-gyp/0.10.3/deps/v8/include
+	-I/Users/nsmith/.node-gyp/0.10.4/src \
+	-I/Users/nsmith/.node-gyp/0.10.4/deps/uv/include \
+	-I/Users/nsmith/.node-gyp/0.10.4/deps/v8/include
 
 DEFS_Release := \
+	'-D_DARWIN_USE_64_BIT_INODE=1' \
 	'-D_LARGEFILE_SOURCE' \
 	'-D_FILE_OFFSET_BITS=64' \
 	'-DBUILDING_NODE_EXTENSION'
 
 # Flags passed to all source files.
 CFLAGS_Release := \
-	-fPIC \
+	-Os \
+	-gdwarf-2 \
+	-mmacosx-version-min=10.5 \
+	-arch x86_64 \
 	-Wall \
-	-Wextra \
-	-Wno-unused-parameter \
-	-pthread \
-	-m64 \
-	-O2 \
-	-fno-strict-aliasing \
-	-fno-tree-vrp
+	-Wendif-labels \
+	-W \
+	-Wno-unused-parameter
 
 # Flags passed to only C files.
-CFLAGS_C_Release :=
+CFLAGS_C_Release := \
+	-fno-strict-aliasing
 
 # Flags passed to only C++ files.
 CFLAGS_CC_Release := \
 	-fno-rtti \
-	-fno-exceptions
+	-fno-exceptions \
+	-fno-threadsafe-statics \
+	-fno-strict-aliasing
+
+# Flags passed to only ObjC files.
+CFLAGS_OBJC_Release :=
+
+# Flags passed to only ObjC++ files.
+CFLAGS_OBJCC_Release :=
 
 INCS_Release := \
-	-I/home/jack/.node-gyp/0.10.3/src \
-	-I/home/jack/.node-gyp/0.10.3/deps/uv/include \
-	-I/home/jack/.node-gyp/0.10.3/deps/v8/include
+	-I/Users/nsmith/.node-gyp/0.10.4/src \
+	-I/Users/nsmith/.node-gyp/0.10.4/deps/uv/include \
+	-I/Users/nsmith/.node-gyp/0.10.4/deps/v8/include
 
 OBJS := \
 	$(obj).target/$(TARGET)/src/bufferutil.o
@@ -75,6 +93,8 @@ all_deps += $(OBJS)
 $(OBJS): TOOLSET := $(TOOLSET)
 $(OBJS): GYP_CFLAGS := $(DEFS_$(BUILDTYPE)) $(INCS_$(BUILDTYPE))  $(CFLAGS_$(BUILDTYPE)) $(CFLAGS_C_$(BUILDTYPE))
 $(OBJS): GYP_CXXFLAGS := $(DEFS_$(BUILDTYPE)) $(INCS_$(BUILDTYPE))  $(CFLAGS_$(BUILDTYPE)) $(CFLAGS_CC_$(BUILDTYPE))
+$(OBJS): GYP_OBJCFLAGS := $(DEFS_$(BUILDTYPE)) $(INCS_$(BUILDTYPE))  $(CFLAGS_$(BUILDTYPE)) $(CFLAGS_C_$(BUILDTYPE)) $(CFLAGS_OBJC_$(BUILDTYPE))
+$(OBJS): GYP_OBJCXXFLAGS := $(DEFS_$(BUILDTYPE)) $(INCS_$(BUILDTYPE))  $(CFLAGS_$(BUILDTYPE)) $(CFLAGS_CC_$(BUILDTYPE)) $(CFLAGS_OBJCC_$(BUILDTYPE))
 
 # Suffix rules, putting all outputs into $(obj).
 
@@ -92,37 +112,43 @@ $(obj).$(TOOLSET)/$(TARGET)/%.o: $(obj)/%.cc FORCE_DO_CMD
 # End of this set of suffix rules
 ### Rules for final target.
 LDFLAGS_Debug := \
-	-pthread \
-	-rdynamic \
-	-m64
+	-Wl,-search_paths_first \
+	-mmacosx-version-min=10.5 \
+	-arch x86_64 \
+	-L$(builddir) \
+	-install_name @rpath/bufferutil.node
+
+LIBTOOLFLAGS_Debug := \
+	-Wl,-search_paths_first
 
 LDFLAGS_Release := \
-	-pthread \
-	-rdynamic \
-	-m64
+	-Wl,-search_paths_first \
+	-mmacosx-version-min=10.5 \
+	-arch x86_64 \
+	-L$(builddir) \
+	-install_name @rpath/bufferutil.node
+
+LIBTOOLFLAGS_Release := \
+	-Wl,-search_paths_first
 
-LIBS :=
+LIBS := \
+	-undefined dynamic_lookup
 
-$(obj).target/bufferutil.node: GYP_LDFLAGS := $(LDFLAGS_$(BUILDTYPE))
-$(obj).target/bufferutil.node: LIBS := $(LIBS)
-$(obj).target/bufferutil.node: TOOLSET := $(TOOLSET)
-$(obj).target/bufferutil.node: $(OBJS) FORCE_DO_CMD
+$(builddir)/bufferutil.node: GYP_LDFLAGS := $(LDFLAGS_$(BUILDTYPE))
+$(builddir)/bufferutil.node: LIBS := $(LIBS)
+$(builddir)/bufferutil.node: GYP_LIBTOOLFLAGS := $(LIBTOOLFLAGS_$(BUILDTYPE))
+$(builddir)/bufferutil.node: TOOLSET := $(TOOLSET)
+$(builddir)/bufferutil.node: $(OBJS) FORCE_DO_CMD
 	$(call do_cmd,solink_module)
 
-all_deps += $(obj).target/bufferutil.node
+all_deps += $(builddir)/bufferutil.node
 # Add target alias
 .PHONY: bufferutil
 bufferutil: $(builddir)/bufferutil.node
 
-# Copy this to the executable output path.
-$(builddir)/bufferutil.node: TOOLSET := $(TOOLSET)
-$(builddir)/bufferutil.node: $(obj).target/bufferutil.node FORCE_DO_CMD
-	$(call do_cmd,copy)
-
-all_deps += $(builddir)/bufferutil.node
 # Short alias for building this executable.
 .PHONY: bufferutil.node
-bufferutil.node: $(obj).target/bufferutil.node $(builddir)/bufferutil.node
+bufferutil.node: $(builddir)/bufferutil.node
 
 # Add executable to "all" target.
 .PHONY: all

node/node_modules/docpad-plugin-livereload/node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/build/config.gypi

@@ -8,11 +8,10 @@
     "libraries": []
   },
   "variables": {
-    "clang": 0,
-    "gcc_version": 46,
+    "clang": 1,
     "host_arch": "x64",
     "node_install_npm": "true",
-    "node_prefix": "/usr",
+    "node_prefix": "/usr/local/Cellar/node/0.10.4",
     "node_shared_cares": "false",
     "node_shared_http_parser": "false",
     "node_shared_libuv": "false",
@@ -21,93 +20,92 @@
     "node_shared_zlib": "false",
     "node_tag": "",
     "node_unsafe_optimizations": 0,
-    "node_use_dtrace": "false",
+    "node_use_dtrace": "true",
     "node_use_etw": "false",
     "node_use_openssl": "true",
     "node_use_perfctr": "false",
-    "node_use_systemtap": "false",
     "python": "/usr/bin/python",
     "target_arch": "x64",
     "v8_enable_gdbjit": 0,
     "v8_no_strict_aliasing": 1,
-    "v8_use_snapshot": "false",
-    "nodedir": "/home/jack/.node-gyp/0.10.3",
+    "v8_use_snapshot": "true",
+    "nodedir": "/Users/nsmith/.node-gyp/0.10.4",
     "copy_dev_lib": "true",
     "standalone_static_library": 1,
-    "cache_lock_stale": "60000",
-    "pre": "",
-    "sign_git_tag": "",
-    "always_auth": "",
-    "user_agent": "node/v0.10.3 linux x64",
-    "bin_links": "true",
-    "description": "true",
-    "fetch_retries": "2",
-    "init_version": "0.0.0",
-    "user": "",
-    "force": "",
-    "ignore": "",
-    "cache_min": "10",
-    "editor": "vi",
-    "rollback": "true",
-    "cache_max": "null",
-    "userconfig": "/home/jack/.npmrc",
-    "coverage": "",
-    "engine_strict": "",
-    "init_author_name": "",
-    "init_author_url": "",
-    "tmp": "/home/jack/tmp",
-    "userignorefile": "/home/jack/.npmignore",
-    "yes": "",
-    "depth": "null",
     "save_dev": "",
+    "browser": "",
+    "viewer": "man",
+    "rollback": "true",
     "usage": "",
-    "https_proxy": "",
-    "onload_script": "",
-    "rebuild_bundle": "true",
-    "save_bundle": "",
+    "globalignorefile": "/usr/local/share/npm/etc/npmignore",
+    "init_author_url": "",
     "shell": "/bin/bash",
-    "prefix": "/usr",
+    "parseable": "",
+    "userignorefile": "/Users/nsmith/.npmignore",
+    "cache_max": "null",
+    "init_author_email": "",
+    "sign_git_tag": "",
+    "ignore": "",
+    "long": "",
     "registry": "https://registry.npmjs.org/",
-    "browser": "",
-    "cache_lock_wait": "10000",
-    "save_optional": "",
-    "searchopts": "",
+    "fetch_retries": "2",
+    "npat": "",
+    "message": "%s",
     "versions": "",
-    "cache": "/home/jack/.npm",
-    "npaturl": "http://npat.npmjs.org/",
-    "searchsort": "name",
-    "version": "",
-    "viewer": "man",
-    "color": "true",
+    "globalconfig": "/usr/local/share/npm/etc/npmrc",
+    "always_auth": "",
+    "cache_lock_retries": "10",
     "fetch_retry_mintimeout": "10000",
-    "umask": "18",
-    "fetch_retry_maxtimeout": "60000",
-    "message": "%s",
+    "proprietary_attribs": "true",
+    "coverage": "",
+    "json": "",
+    "pre": "",
+    "description": "true",
+    "engine_strict": "",
+    "https_proxy": "",
+    "init_module": "/Users/nsmith/.npm-init.js",
+    "userconfig": "/Users/nsmith/.npmrc",
+    "npaturl": "http://npat.npmjs.org/",
+    "node_version": "v0.10.4",
+    "user": "501",
+    "save": "true",
+    "editor": "vi",
+    "tag": "latest",
     "global": "",
-    "link": "",
-    "save": "",
+    "optional": "true",
+    "username": "",
+    "force": "true",
+    "bin_links": "true",
+    "searchopts": "",
+    "depth": "null",
+    "rebuild_bundle": "true",
+    "searchsort": "name",
     "unicode": "true",
-    "long": "",
-    "production": "",
-    "unsafe_perm": "true",
-    "node_version": "v0.10.3",
-    "tag": "latest",
-    "fetch_retry_factor": "10",
-    "npat": "",
-    "proprietary_attribs": "true",
+    "yes": "",
+    "fetch_retry_maxtimeout": "60000",
     "strict_ssl": "true",
-    "username": "",
     "dev": "",
-    "globalconfig": "/usr/etc/npmrc",
-    "init_module": "/home/jack/.npm-init.js",
-    "parseable": "",
-    "globalignorefile": "/usr/etc/npmignore",
-    "cache_lock_retries": "10",
-    "group": "1000",
-    "init_author_email": "",
+    "fetch_retry_factor": "10",
+    "group": "20",
+    "cache_lock_stale": "60000",
+    "version": "",
+    "cache_min": "10",
+    "cache": "/Users/nsmith/.npm",
     "searchexclude": "",
+    "color": "true",
+    "save_optional": "",
+    "user_agent": "node/v0.10.4 darwin x64",
+    "cache_lock_wait": "10000",
+    "production": "",
+    "save_bundle": "",
+    "init_version": "0.0.0",
+    "umask": "18",
     "git": "git",
-    "optional": "true",
-    "json": ""
+    "init_author_name": "",
+    "onload_script": "",
+    "tmp": "/var/folders/7d/2kcxjwbj54j89czvg94x11p40000gn/T/",
+    "unsafe_perm": "true",
+    "prefix": "/usr/local/share/npm",
+    "link": ""
   }
 }

node/node_modules/docpad-plugin-livereload/node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/build/gyp-mac-tool

@@ -0,0 +1,211 @@
+#!/usr/bin/env python
+# Generated by gyp. Do not edit.
+# Copyright (c) 2012 Google Inc. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+"""Utility functions to perform Xcode-style build steps.
+
+These functions are executed via gyp-mac-tool when using the Makefile generator.
+"""
+
+import fcntl
+import os
+import plistlib
+import re
+import shutil
+import string
+import subprocess
+import sys
+
+
+def main(args):
+  executor = MacTool()
+  exit_code = executor.Dispatch(args)
+  if exit_code is not None:
+    sys.exit(exit_code)
+
+
+class MacTool(object):
+  """This class performs all the Mac tooling steps. The methods can either be
+  executed directly, or dispatched from an argument list."""
+
+  def Dispatch(self, args):
+    """Dispatches a string command to a method."""
+    if len(args) < 1:
+      raise Exception("Not enough arguments")
+
+    method = "Exec%s" % self._CommandifyName(args[0])
+    return getattr(self, method)(*args[1:])
+
+  def _CommandifyName(self, name_string):
+    """Transforms a tool name like copy-info-plist to CopyInfoPlist"""
+    return name_string.title().replace('-', '')
+
+  def ExecCopyBundleResource(self, source, dest):
+    """Copies a resource file to the bundle/Resources directory, performing any
+    necessary compilation on each resource."""
+    extension = os.path.splitext(source)[1].lower()
+    if os.path.isdir(source):
+      # Copy tree.
+      if os.path.exists(dest):
+        shutil.rmtree(dest)
+      shutil.copytree(source, dest)
+    elif extension == '.xib':
+      return self._CopyXIBFile(source, dest)
+    elif extension == '.strings':
+      self._CopyStringsFile(source, dest)
+    else:
+      shutil.copyfile(source, dest)
+
+  def _CopyXIBFile(self, source, dest):
+    """Compiles a XIB file with ibtool into a binary plist in the bundle."""
+    tools_dir = os.environ.get('DEVELOPER_BIN_DIR', '/usr/bin')
+    args = [os.path.join(tools_dir, 'ibtool'), '--errors', '--warnings',
+        '--notices', '--output-format', 'human-readable-text', '--compile',
+        dest, source]
+    ibtool_section_re = re.compile(r'/\*.*\*/')
+    ibtool_re = re.compile(r'.*note:.*is clipping its content')
+    ibtoolout = subprocess.Popen(args, stdout=subprocess.PIPE)
+    current_section_header = None
+    for line in ibtoolout.stdout:
+      if ibtool_section_re.match(line):
+        current_section_header = line
+      elif not ibtool_re.match(line):
+        if current_section_header:
+          sys.stdout.write(current_section_header)
+          current_section_header = None
+        sys.stdout.write(line)
+    return ibtoolout.returncode
+
+  def _CopyStringsFile(self, source, dest):
+    """Copies a .strings file using iconv to reconvert the input into UTF-16."""
+    input_code = self._DetectInputEncoding(source) or "UTF-8"
+    fp = open(dest, 'w')
+    args = ['/usr/bin/iconv', '--from-code', input_code, '--to-code',
+        'UTF-16', source]
+    subprocess.call(args, stdout=fp)
+    fp.close()
+
+  def _DetectInputEncoding(self, file_name):
+    """Reads the first few bytes from file_name and tries to guess the text
+    encoding. Returns None as a guess if it can't detect it."""
+    fp = open(file_name, 'rb')
+    try:
+      header = fp.read(3)
+    except e:
+      fp.close()
+      return None
+    fp.close()
+    if header.startswith("\xFE\xFF"):
+      return "UTF-16BE"
+    elif header.startswith("\xFF\xFE"):
+      return "UTF-16LE"
+    elif header.startswith("\xEF\xBB\xBF"):
+      return "UTF-8"
+    else:
+      return None
+
+  def ExecCopyInfoPlist(self, source, dest):
+    """Copies the |source| Info.plist to the destination directory |dest|."""
+    # Read the source Info.plist into memory.
+    fd = open(source, 'r')
+    lines = fd.read()
+    fd.close()
+
+    # Go through all the environment variables and replace them as variables in
+    # the file.
+    for key in os.environ:
+      if key.startswith('_'):
+        continue
+      evar = '${%s}' % key
+      lines = string.replace(lines, evar, os.environ[key])
+
+    # Write out the file with variables replaced.
+    fd = open(dest, 'w')
+    fd.write(lines)
+    fd.close()
+
+    # Now write out PkgInfo file now that the Info.plist file has been
+    # "compiled".
+    self._WritePkgInfo(dest)
+
+  def _WritePkgInfo(self, info_plist):
+    """This writes the PkgInfo file from the data stored in Info.plist."""
+    plist = plistlib.readPlist(info_plist)
+    if not plist:
+      return
+
+    # Only create PkgInfo for executable types.
+    package_type = plist['CFBundlePackageType']
+    if package_type != 'APPL':
+      return
+
+    # The format of PkgInfo is eight characters, representing the bundle type
+    # and bundle signature, each four characters. If that is missing, four
+    # '?' characters are used instead.
+    signature_code = plist.get('CFBundleSignature', '????')
+    if len(signature_code) != 4:  # Wrong length resets everything, too.
+      signature_code = '?' * 4
+
+    dest = os.path.join(os.path.dirname(info_plist), 'PkgInfo')
+    fp = open(dest, 'w')
+    fp.write('%s%s' % (package_type, signature_code))
+    fp.close()
+
+  def ExecFlock(self, lockfile, *cmd_list):
+    """Emulates the most basic behavior of Linux's flock(1)."""
+    # Rely on exception handling to report errors.
+    fd = os.open(lockfile, os.O_RDONLY|os.O_NOCTTY|os.O_CREAT, 0o666)
+    fcntl.flock(fd, fcntl.LOCK_EX)
+    return subprocess.call(cmd_list)
+
+  def ExecFilterLibtool(self, *cmd_list):
+    """Calls libtool and filters out 'libtool: file: foo.o has no symbols'."""
+    libtool_re = re.compile(r'^libtool: file: .* has no symbols$')
+    libtoolout = subprocess.Popen(cmd_list, stderr=subprocess.PIPE)
+    _, err = libtoolout.communicate()
+    for line in err.splitlines():
+      if not libtool_re.match(line):
+        print >>sys.stderr, line
+    return libtoolout.returncode
+
+  def ExecPackageFramework(self, framework, version):
+    """Takes a path to Something.framework and the Current version of that and
+    sets up all the symlinks."""
+    # Find the name of the binary based on the part before the ".framework".
+    binary = os.path.basename(framework).split('.')[0]
+
+    CURRENT = 'Current'
+    RESOURCES = 'Resources'
+    VERSIONS = 'Versions'
+
+    if not os.path.exists(os.path.join(framework, VERSIONS, version, binary)):
+      # Binary-less frameworks don't seem to contain symlinks (see e.g.
+      # chromium's out/Debug/org.chromium.Chromium.manifest/ bundle).
+      return
+
+    # Move into the framework directory to set the symlinks correctly.
+    pwd = os.getcwd()
+    os.chdir(framework)
+
+    # Set up the Current version.
+    self._Relink(version, os.path.join(VERSIONS, CURRENT))
+
+    # Set up the root symlinks.
+    self._Relink(os.path.join(VERSIONS, CURRENT, binary), binary)
+    self._Relink(os.path.join(VERSIONS, CURRENT, RESOURCES), RESOURCES)
+
+    # Back to where we were before!
+    os.chdir(pwd)
+
+  def _Relink(self, dest, link):
+    """Creates a symlink to |dest| named |link|. If |link| already exists,
+    it is overwritten."""
+    if os.path.lexists(link):
+      os.remove(link)
+    os.symlink(dest, link)
+
+
+if __name__ == '__main__':
+  sys.exit(main(sys.argv[1:]))

node/node_modules/docpad-plugin-livereload/node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/build/validation.target.mk

@@ -3,6 +3,7 @@
 TOOLSET := target
 TARGET := validation
 DEFS_Debug := \
+	'-D_DARWIN_USE_64_BIT_INODE=1' \
 	'-D_LARGEFILE_SOURCE' \
 	'-D_FILE_OFFSET_BITS=64' \
 	'-DBUILDING_NODE_EXTENSION' \
@@ -11,58 +12,75 @@ DEFS_Debug := \
 
 # Flags passed to all source files.
 CFLAGS_Debug := \
-	-fPIC \
+	-O0 \
+	-gdwarf-2 \
+	-mmacosx-version-min=10.5 \
+	-arch x86_64 \
 	-Wall \
-	-Wextra \
-	-Wno-unused-parameter \
-	-pthread \
-	-m64 \
-	-O3 \
-	-g \
-	-O0
+	-Wendif-labels \
+	-W \
+	-Wno-unused-parameter
 
 # Flags passed to only C files.
-CFLAGS_C_Debug :=
+CFLAGS_C_Debug := \
+	-fno-strict-aliasing
 
 # Flags passed to only C++ files.
 CFLAGS_CC_Debug := \
 	-fno-rtti \
-	-fno-exceptions
+	-fno-exceptions \
+	-fno-threadsafe-statics \
+	-fno-strict-aliasing
+
+# Flags passed to only ObjC files.
+CFLAGS_OBJC_Debug :=
+
+# Flags passed to only ObjC++ files.
+CFLAGS_OBJCC_Debug :=
 
 INCS_Debug := \
-	-I/home/jack/.node-gyp/0.10.3/src \
-	-I/home/jack/.node-gyp/0.10.3/deps/uv/include \
-	-I/home/jack/.node-gyp/0.10.3/deps/v8/include
+	-I/Users/nsmith/.node-gyp/0.10.4/src \
+	-I/Users/nsmith/.node-gyp/0.10.4/deps/uv/include \
+	-I/Users/nsmith/.node-gyp/0.10.4/deps/v8/include
 
 DEFS_Release := \
+	'-D_DARWIN_USE_64_BIT_INODE=1' \
 	'-D_LARGEFILE_SOURCE' \
 	'-D_FILE_OFFSET_BITS=64' \
 	'-DBUILDING_NODE_EXTENSION'
 
 # Flags passed to all source files.
 CFLAGS_Release := \
-	-fPIC \
+	-Os \
+	-gdwarf-2 \
+	-mmacosx-version-min=10.5 \
+	-arch x86_64 \
 	-Wall \
-	-Wextra \
-	-Wno-unused-parameter \
-	-pthread \
-	-m64 \
-	-O2 \
-	-fno-strict-aliasing \
-	-fno-tree-vrp
+	-Wendif-labels \
+	-W \
+	-Wno-unused-parameter
 
 # Flags passed to only C files.
-CFLAGS_C_Release :=
+CFLAGS_C_Release := \
+	-fno-strict-aliasing
 
 # Flags passed to only C++ files.
 CFLAGS_CC_Release := \
 	-fno-rtti \
-	-fno-exceptions
+	-fno-exceptions \
+	-fno-threadsafe-statics \
+	-fno-strict-aliasing
+
+# Flags passed to only ObjC files.
+CFLAGS_OBJC_Release :=
+
+# Flags passed to only ObjC++ files.
+CFLAGS_OBJCC_Release :=
 
 INCS_Release := \
-	-I/home/jack/.node-gyp/0.10.3/src \
-	-I/home/jack/.node-gyp/0.10.3/deps/uv/include \
-	-I/home/jack/.node-gyp/0.10.3/deps/v8/include
+	-I/Users/nsmith/.node-gyp/0.10.4/src \
+	-I/Users/nsmith/.node-gyp/0.10.4/deps/uv/include \
+	-I/Users/nsmith/.node-gyp/0.10.4/deps/v8/include
 
 OBJS := \
 	$(obj).target/$(TARGET)/src/validation.o
@@ -75,6 +93,8 @@ all_deps += $(OBJS)
 $(OBJS): TOOLSET := $(TOOLSET)
 $(OBJS): GYP_CFLAGS := $(DEFS_$(BUILDTYPE)) $(INCS_$(BUILDTYPE))  $(CFLAGS_$(BUILDTYPE)) $(CFLAGS_C_$(BUILDTYPE))
 $(OBJS): GYP_CXXFLAGS := $(DEFS_$(BUILDTYPE)) $(INCS_$(BUILDTYPE))  $(CFLAGS_$(BUILDTYPE)) $(CFLAGS_CC_$(BUILDTYPE))
+$(OBJS): GYP_OBJCFLAGS := $(DEFS_$(BUILDTYPE)) $(INCS_$(BUILDTYPE))  $(CFLAGS_$(BUILDTYPE)) $(CFLAGS_C_$(BUILDTYPE)) $(CFLAGS_OBJC_$(BUILDTYPE))
+$(OBJS): GYP_OBJCXXFLAGS := $(DEFS_$(BUILDTYPE)) $(INCS_$(BUILDTYPE))  $(CFLAGS_$(BUILDTYPE)) $(CFLAGS_CC_$(BUILDTYPE)) $(CFLAGS_OBJCC_$(BUILDTYPE))
 
 # Suffix rules, putting all outputs into $(obj).
 
@@ -92,37 +112,43 @@ $(obj).$(TOOLSET)/$(TARGET)/%.o: $(obj)/%.cc FORCE_DO_CMD
 # End of this set of suffix rules
 ### Rules for final target.
 LDFLAGS_Debug := \
-	-pthread \
-	-rdynamic \
-	-m64
+	-Wl,-search_paths_first \
+	-mmacosx-version-min=10.5 \
+	-arch x86_64 \
+	-L$(builddir) \
+	-install_name @rpath/validation.node
+
+LIBTOOLFLAGS_Debug := \
+	-Wl,-search_paths_first
 
 LDFLAGS_Release := \
-	-pthread \
-	-rdynamic \
-	-m64
+	-Wl,-search_paths_first \
+	-mmacosx-version-min=10.5 \
+	-arch x86_64 \
+	-L$(builddir) \
+	-install_name @rpath/validation.node
+
+LIBTOOLFLAGS_Release := \
+	-Wl,-search_paths_first
 
-LIBS :=
+LIBS := \
+	-undefined dynamic_lookup
 
-$(obj).target/validation.node: GYP_LDFLAGS := $(LDFLAGS_$(BUILDTYPE))
-$(obj).target/validation.node: LIBS := $(LIBS)
-$(obj).target/validation.node: TOOLSET := $(TOOLSET)
-$(obj).target/validation.node: $(OBJS) FORCE_DO_CMD
+$(builddir)/validation.node: GYP_LDFLAGS := $(LDFLAGS_$(BUILDTYPE))
+$(builddir)/validation.node: LIBS := $(LIBS)
+$(builddir)/validation.node: GYP_LIBTOOLFLAGS := $(LIBTOOLFLAGS_$(BUILDTYPE))
+$(builddir)/validation.node: TOOLSET := $(TOOLSET)
+$(builddir)/validation.node: $(OBJS) FORCE_DO_CMD
 	$(call do_cmd,solink_module)
 
-all_deps += $(obj).target/validation.node
+all_deps += $(builddir)/validation.node
 # Add target alias
 .PHONY: validation
 validation: $(builddir)/validation.node
 
-# Copy this to the executable output path.
-$(builddir)/validation.node: TOOLSET := $(TOOLSET)
-$(builddir)/validation.node: $(obj).target/validation.node FORCE_DO_CMD
-	$(call do_cmd,copy)
-
-all_deps += $(builddir)/validation.node
 # Short alias for building this executable.
 .PHONY: validation.node
-validation.node: $(obj).target/validation.node $(builddir)/validation.node
+validation.node: $(builddir)/validation.node
 
 # Add executable to "all" target.
 .PHONY: all

node/node_modules/docpad-plugin-livereload/node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/node_modules/options/package.json

@@ -24,9 +24,10 @@
   },
   "readme": "# options.js #\n\nA very light-weight in-code option parsers for node.js.\n\n## License ##\n\n(The MIT License)\n\nCopyright (c) 2012 Einar Otto Stangvik <einaros@gmail.com>\n\nPermission is hereby granted, free of charge, to any person obtaining\na copy of this software and associated documentation files (the\n'Software'), to deal in the Software without restriction, including\nwithout limitation the rights to use, copy, modify, merge, publish,\ndistribute, sublicense, and/or sell copies of the Software, and to\npermit persons to whom the Software is furnished to do so, subject to\nthe following conditions:\n\nThe above copyright notice and this permission notice shall be\nincluded in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,\nEXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.\nIN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY\nCLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,\nTORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE\nSOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n",
   "readmeFilename": "README.md",
-  "bugs": {
-    "url": "https://github.com/einaros/options.js/issues"
-  },
   "_id": "options@0.0.5",
-  "_from": "options@latest"
+  "dist": {
+    "shasum": "9a3806378f316536d79038038ba90ccb724816c3"
+  },
+  "_from": "options@latest",
+  "_resolved": "https://registry.npmjs.org/options/-/options-0.0.5.tgz"
 }

node/node_modules/docpad-plugin-livereload/node_modules/socket.io/node_modules/socket.io-client/node_modules/ws/node_modules/tinycolor/package.json

@@ -19,9 +19,10 @@
   "main": "tinycolor",
   "readme": "# tinycolor #\n\nThis is a no-fuzz, barebone, zero muppetry color module for node.js.",
   "readmeFilename": "README.md",
-  "bugs": {
-    "url": "https://github.com/einaros/tinycolor/issues"
-  },
   "_id": "tinycolor@0.0.1",
-  "_from": "tinycolor@0.x"
+  "dist": {
+    "shasum": "ecefb6d8e43bc55eaac345441dae1f2934221b3d"
+  },
+  "_from": "tinycolor@0.x",
+  "_resolved": "https://registry.npmjs.org/tinycolor/-/tinycolor-0.0.1.tgz"
 }

node/node_modules/docpad-plugin-livereload/node_modules/socket.io/node_modules/socket.io-client/node_modules/xmlhttprequest/package.json

@@ -20,9 +20,7 @@
     "type": "git",
     "url": "git://github.com/driverdan/node-XMLHttpRequest.git"
   },
-  "bugs": {
-    "url": "http://github.com/driverdan/node-XMLHttpRequest/issues"
-  },
+  "bugs": "http://github.com/driverdan/node-XMLHttpRequest/issues",
   "engines": {
     "node": ">=0.4.0"
   },
@@ -34,5 +32,9 @@
   "readme": "# node-XMLHttpRequest #\n\nnode-XMLHttpRequest is a wrapper for the built-in http client to emulate the\nbrowser XMLHttpRequest object.\n\nThis can be used with JS designed for browsers to improve reuse of code and\nallow the use of existing libraries.\n\nNote: This library currently conforms to [XMLHttpRequest 1](http://www.w3.org/TR/XMLHttpRequest/). Version 2.0 will target [XMLHttpRequest Level 2](http://www.w3.org/TR/XMLHttpRequest2/).\n\n## Usage ##\n\nHere's how to include the module in your project and use as the browser-based\nXHR object.\n\n\tvar XMLHttpRequest = require(\"xmlhttprequest\").XMLHttpRequest;\n\tvar xhr = new XMLHttpRequest();\n\nNote: use the lowercase string \"xmlhttprequest\" in your require(). On\ncase-sensitive systems (eg Linux) using uppercase letters won't work.\n\n## Versions ##\n\nPrior to 1.4.0 version numbers were arbitrary. From 1.4.0 on they conform to\nthe standard major.minor.bugfix. 1.x shouldn't necessarily be considered\nstable just because it's above 0.x.\n\nSince the XMLHttpRequest API is stable this library's API is stable as\nwell. Major version numbers indicate significant core code changes.\nMinor versions indicate minor core code changes or better conformity to\nthe W3C spec.\n\n## Supports ##\n\n* Async and synchronous requests\n* GET, POST, PUT, and DELETE requests\n* All spec methods (open, send, abort, getRequestHeader,\n  getAllRequestHeaders, event methods)\n* Requests to all domains\n\n## Known Issues / Missing Features ##\n\nFor a list of open issues or to report your own visit the [github issues\npage](https://github.com/driverdan/node-XMLHttpRequest/issues).\n\n* Local file access may have unexpected results for non-UTF8 files\n* Synchronous requests don't set headers properly\n* Synchronous requests freeze node while waiting for response (But that's what you want, right? Stick with async!).\n* Some events are missing, such as abort\n* getRequestHeader is case-sensitive\n* Cookies aren't persisted between requests\n* Missing XML support\n* Missing basic auth\n",
   "readmeFilename": "README.md",
   "_id": "xmlhttprequest@1.4.2",
-  "_from": "xmlhttprequest@1.4.2"
+  "dist": {
+    "shasum": "01453a1d9bed1e8f172f6495bbf4c8c426321500"
+  },
+  "_from": "xmlhttprequest@1.4.2",
+  "_resolved": "https://registry.npmjs.org/xmlhttprequest/-/xmlhttprequest-1.4.2.tgz"
 }

node/node_modules/docpad-plugin-livereload/out/livereload.plugin.js

@@ -31,14 +31,15 @@ module.exports = function(BasePlugin) {
     };
 
     LivereloadPlugin.prototype.populateCollections = function(opts) {
-      var config, docpad, injectBlock, listenBlock, regenerateBlock, scriptBlock, scriptsBlock;
+      var config, docpad, injectBlock, injectCall, listenBlock, regenerateBlock, scriptBlock, scriptsBlock;
       docpad = this.docpad;
       config = this.config;
       scriptsBlock = docpad.getBlock('scripts');
       regenerateBlock = config.regenerateBlock || ("if ( log ) {\n	localStorage.setItem('" + config.channel + "/reloaded', 'yes');\n}\ndocument.location.reload();");
-      listenBlock = "// Did we just livereload?\nvar log = " + (JSON.stringify(config.browserLog)) + " && localStorage && console && console.log && true;\nif ( log && localStorage.getItem('" + config.channel + "/reloaded') === 'yes' ) {\n	localStorage.removeItem('" + config.channel + "/reloaded');\n	console.log('LiveReloaded at', new Date())\n}\n\n// Listen for the regenerated event\n// and perform a reload of the page when the event occurs\nvar listen = function(){\n	var socket = io.connect('" + config.channel + "');\n	socket.on('regenerated',function(){\n		" + regenerateBlock + "\n	});\n};";
-      injectBlock = "// Inject socket.io into our page then listen once loaded\nvar inject = function(){\n	var t = document.createElement('script');\n	t.type = 'text/javascript';\n	t.async = true;\n	t.src = '/socket.io/socket.io.js';\n	t.onload = listen;\n	var s = document.getElementsByTagName('script')[0];\n	s.parentNode.insertBefore(t,s);\n};";
-      scriptBlock = config.inject ? "(function(){\n	" + listenBlock + "\n	if ( typeof io !== 'undefined' ) {\n		listen();\n	} else {\n		" + injectBlock + "\n		inject();\n	}\n})();" : "(function(){\n	" + listenBlock + "\n	if ( typeof io !== 'undefined' ) {\n		listen();\n	}\n})();";
+      listenBlock = "/* Did we just livereload? */\nvar log = " + (JSON.stringify(config.browserLog)) + " && localStorage && console && console.log && true;\nif ( log && localStorage.getItem('" + config.channel + "/reloaded') === 'yes' ) {\n	localStorage.removeItem('" + config.channel + "/reloaded');\n	console.log('LiveReloaded at', new Date())\n}\n\n/* Listen for the regenerated event and perform a reload of the page when the event occurs */\nvar listen = function(){\n	var socket = io.connect('" + config.channel + "');\n	socket.on('regenerated',function(){\n		" + regenerateBlock + "\n	});\n};";
+      injectBlock = "/* Inject socket.io into our page then listen once loaded */\nvar inject = function(){\n	var t = document.createElement('script');\n	t.type = 'text/javascript';\n	t.async = true;\n	t.src = '/socket.io/socket.io.js';\n	t.onload = listen;\n	var s = document.getElementsByTagName('script')[0];\n	s.parentNode.insertBefore(t,s);\n};";
+      injectCall = "var readyStateCheckInterval = setInterval(function() {\n  if (document.readyState === \"complete\") {\n    inject();\n    clearInterval(readyStateCheckInterval);\n  }\n}, 10);";
+      scriptBlock = config.inject ? "(function(){\n	" + listenBlock + "\n	if ( typeof io !== 'undefined' ) {\n		listen();\n	} else {\n		" + injectBlock + "\n		" + injectCall + "\n	}\n})();" : "(function(){\n	" + listenBlock + "\n	if ( typeof io !== 'undefined' ) {\n		listen();\n	}\n})();";
       scriptsBlock.add(scriptBlock, {
         defer: false
       });

node/node_modules/docpad-plugin-livereload/package.json

@@ -1,6 +1,6 @@
 {
   "name": "docpad-plugin-livereload",
-  "version": "2.3.1",
+  "version": "2.4.0",
   "description": "Automatically refreshes your website whenever a rengeration is performed",
   "homepage": "http://docpad.org/plugin/livereload",
   "keywords": [
@@ -58,8 +58,12 @@
   "scripts": {
     "test": "node ./out/livereload.test.js"
   },
-  "readme": "# Live Reload Plugin for DocPad\nAutomatically refreshes your [DocPad](https://docpad.org) built website whenever a regeneration is performed\n\n\n\n## Install\n\n1. Install the Plugin\n\n  ```\n  npm install --save --force docpad-plugin-livereload\n  ```\n\n1. Ensure your layout outputs the scripts block, using eco it will look something like this:\n\n  ```\n  <%- @getBlock('scripts').toHTML() %>\n  ```\n\n\n## Configure\n\n### `enabled`\nBy default this plugin is disabled for all environments except the development environment. To enable on more environments set the `enabled` option to `true` inside your environments configuration.\n\n### `browserLog`\nBy default we will output a log message to the browser console if the browser was just reloaded by livereload. You can turn this off by setting the `browserLog` option to `false`. This feature requires `console.log` and `localStorage` to be available to the browser, if these aren't available then this feature will fail gracefully.\n\n### `regenerateBlock`\nBy default when a regeneration occurs we will log a message to the browser console (depending on the value of `browserLog`) and reload the browser. You can overwrite this functionality via the `regenerateBlock` option. \n\n### `inject`\nBy default we will inject the socket.io dependency if we don't automatically detect it's presence. However, sometimes this auto detection doesn't always work. If this is the case, you can disable the injection and just do the listening by setting the `inject` option to `false`.\n\n### `getSocket`\nBy default you we create a new socket.io instance for live reload, however if you are doing your own socket.io stuff you will probably want to use your existing instance instead. To do this set the `getSocket` option to a function that will return your own socket.io instance.\n\n### `channel`\nBy default we use the `/docpad-livereload` channel to listen to on our socket connection. You can change this by using the `channel` option.\n\n### `defaultLogLevel`\nBy default we use the socket.io log level of `1` (unless docpad is in debug mode in which case we will use the log level of `3`). You can change the default log level used (non-debug-mode) by setting the `defaultLogLevel` option.\n\n### `socketOptions`\nSometimes you may want to customise the options used for the [socket.io configuration](https://github.com/LearnBoost/Socket.IO/wiki/Configuring-Socket.IO). To do this set the `socketOptions` option to whatever you need.\n\n\n## History\nYou can discover the history inside the `History.md` file\n\n\n## License\nLicensed under the incredibly [permissive](http://en.wikipedia.org/wiki/Permissive_free_software_licence) [MIT License](http://creativecommons.org/licenses/MIT/)\n<br/>Copyright &copy; 2012+ [Bevry Pty Ltd](http://bevry.me)",
+  "readme": "# Live Reload Plugin for DocPad\nAutomatically refreshes your [DocPad](https://docpad.org) built website whenever a regeneration is performed\n\n\n\n## Install\n\n1. Install the Plugin\n\n  ```\n  npm install --save --force docpad-plugin-livereload\n  ```\n\n1. Ensure your layout outputs the scripts block, using eco it will look something like this:\n\n  ```\n  <%- @getBlock('scripts').toHTML() %>\n  ```\n\n## Test\n\nSee http://docpad.org/docs/plugin-write to setup a test environment, then run `cake test` to run tests.\n\n## Configure\n\n### `enabled`\nBy default this plugin is disabled for all environments except the development environment. To enable on more environments set the `enabled` option to `true` inside your environments configuration.\n\n### `browserLog`\nBy default we will output a log message to the browser console if the browser was just reloaded by livereload. You can turn this off by setting the `browserLog` option to `false`. This feature requires `console.log` and `localStorage` to be available to the browser, if these aren't available then this feature will fail gracefully.\n\n### `regenerateBlock`\nBy default when a regeneration occurs we will log a message to the browser console (depending on the value of `browserLog`) and reload the browser. You can overwrite this functionality via the `regenerateBlock` option. \n\n### `inject`\nBy default we will inject the socket.io dependency if we don't automatically detect it's presence. However, sometimes this auto detection doesn't always work. If this is the case, you can disable the injection and just do the listening by setting the `inject` option to `false`.\n\n### `getSocket`\nBy default you we create a new socket.io instance for live reload, however if you are doing your own socket.io stuff you will probably want to use your existing instance instead. To do this set the `getSocket` option to a function that will return your own socket.io instance.\n\n### `channel`\nBy default we use the `/docpad-livereload` channel to listen to on our socket connection. You can change this by using the `channel` option.\n\n### `defaultLogLevel`\nBy default we use the socket.io log level of `1` (unless docpad is in debug mode in which case we will use the log level of `3`). You can change the default log level used (non-debug-mode) by setting the `defaultLogLevel` option.\n\n### `socketOptions`\nSometimes you may want to customise the options used for the [socket.io configuration](https://github.com/LearnBoost/Socket.IO/wiki/Configuring-Socket.IO). To do this set the `socketOptions` option to whatever you need.\n\n\n## History\nYou can discover the history inside the `History.md` file\n\n\n## License\nLicensed under the incredibly [permissive](http://en.wikipedia.org/wiki/Permissive_free_software_licence) [MIT License](http://creativecommons.org/licenses/MIT/)\n<br/>Copyright &copy; 2012+ [Bevry Pty Ltd](http://bevry.me)",
   "readmeFilename": "README.md",
-  "_id": "docpad-plugin-livereload@2.3.1",
-  "_from": "docpad-plugin-livereload@2.x"
+  "_id": "docpad-plugin-livereload@2.4.0",
+  "dist": {
+    "shasum": "2c9aff5e584fb64222904e8f529640245c2f6eaf"
+  },
+  "_from": "docpad-plugin-livereload@",
+  "_resolved": "https://registry.npmjs.org/docpad-plugin-livereload/-/docpad-plugin-livereload-2.4.0.tgz"
 }

node/node_modules/docpad-plugin-stylus/node_modules/nib/package.json

@@ -24,9 +24,6 @@
   },
   "readme": "# Nib\n\n  Stylus mixins, utilities, components, and gradient image generation. Don't forget to check out the [documentation](http://visionmedia.github.com/nib/).\n\n## Installation\n\n```bash\n$ npm install nib\n```\n\n If the image generation features of Nib are desired, such as generating the linear gradient images, install [node-canvas](http://github.com/learnboost/node-canvas):\n \n```bash \n$ npm install canvas\n```\n\n## JavaScript API\n\n Below is an example of how to utilize nib and stylus with the connect framework (or express).\n\n```javascript\nvar connect = require('connect')\n  , stylus = require('stylus')\n  , nib = require('nib');\n\nvar server = connect();\n\nfunction compile(str, path) {\n  return stylus(str)\n\t.set('filename', path)\n\t.set('compress', true)\n\t.use(nib());\n}\n\nserver.use(stylus.middleware({\n\tsrc: __dirname\n  , compile: compile\n}));\n```\n\n## Stylus API\n\n  To gain access to everything nib has to offer, simply add:\n\n  ```css\n  @import 'nib'\n  ```\n  \n  Or you may also pick and choose based on the directory structure in `./lib`, for example:\n  \n  ```css\n  @import 'nib/gradients'\n  @import 'nib/overflow'\n  ```\n  \nto be continued....\n\n## More Information\n\n  - Introduction [screencast](http://www.screenr.com/M6a)\n\n## Testing\n\n You will first need to install the dependencies:\n \n ```bash\n    $ npm install -d\n ```\n \n Run the automated test cases:\n \n ```bash\n    $ make test\n ```\n \n For visual testing run the test server:\n \n ```bash\n    $ make test-server\n ```\n \n Then visit `localhost:3000` in your browser.\n\n## Contributors\n\n  - TJ Holowaychuk\n  - Isaac Johnston\n\n## License \n\n(The MIT License)\n\nCopyright (c) 2011 TJ Holowaychuk <tj@vision-media.ca>\n\nPermission is hereby granted, free of charge, to any person obtaining\na copy of this software and associated documentation files (the\n'Software'), to deal in the Software without restriction, including\nwithout limitation the rights to use, copy, modify, merge, publish,\ndistribute, sublicense, and/or sell copies of the Software, and to\npermit persons to whom the Software is furnished to do so, subject to\nthe following conditions:\n\nThe above copyright notice and this permission notice shall be\nincluded in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,\nEXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.\nIN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY\nCLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,\nTORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE\nSOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n",
   "readmeFilename": "Readme.md",
-  "bugs": {
-    "url": "https://github.com/visionmedia/nib/issues"
-  },
   "_id": "nib@0.9.1",
   "_from": "nib@~0.9.0"
 }

node/node_modules/docpad-plugin-stylus/node_modules/stylus/node_modules/debug/package.json

@@ -32,9 +32,7 @@
   },
   "readme": "\n# debug\n\n  tiny node.js debugging utility modelled after node core's debugging technique.\n\n## Installation\n\n```\n$ npm install debug\n```\n\n## Usage\n\n With `debug` you simply invoke the exported function to generate your debug function, passing it a name which will determine if a noop function is returned, or a decorated `console.error`, so all of the `console` format string goodies you're used to work fine. A unique color is selected per-function for visibility.\n \nExample _app.js_:\n\n```js\nvar debug = require('debug')('http')\n  , http = require('http')\n  , name = 'My App';\n\n// fake app\n\ndebug('booting %s', name);\n\nhttp.createServer(function(req, res){\n  debug(req.method + ' ' + req.url);\n  res.end('hello\\n');\n}).listen(3000, function(){\n  debug('listening');\n});\n\n// fake worker of some kind\n\nrequire('./worker');\n```\n\nExample _worker.js_:\n\n```js\nvar debug = require('debug')('worker');\n\nsetInterval(function(){\n  debug('doing some work');\n}, 1000);\n```\n\n The __DEBUG__ environment variable is then used to enable these based on space or comma-delimited names. Here are some examples:\n\n  ![debug http and worker](http://f.cl.ly/items/18471z1H402O24072r1J/Screenshot.png)\n\n  ![debug worker](http://f.cl.ly/items/1X413v1a3M0d3C2c1E0i/Screenshot.png)\n\n## Millisecond diff\n\n  When actively developing an application it can be useful to see when the time spent between one `debug()` call and the next. Suppose for example you invoke `debug()` before requesting a resource, and after as well, the \"+NNNms\" will show you how much time was spent between calls.\n\n  ![](http://f.cl.ly/items/2i3h1d3t121M2Z1A3Q0N/Screenshot.png)\n\n  When stdout is not a TTY, `Date#toUTCString()` is used, making it more useful for logging the debug information as shown below:\n  \n  ![](http://f.cl.ly/items/112H3i0e0o0P0a2Q2r11/Screenshot.png)\n\n## Conventions\n\n If you're using this in one or more of your libraries, you _should_ use the name of your library so that developers may toggle debugging as desired without guessing names. If you have more than one debuggers you _should_ prefix them with your library name and use \":\" to separate features. For example \"bodyParser\" from Connect would then be \"connect:bodyParser\". \n\n## Wildcards\n\n  The \"*\" character may be used as a wildcard. Suppose for example your library has debuggers named \"connect:bodyParser\", \"connect:compress\", \"connect:session\", instead of listing all three with `DEBUG=connect:bodyParser,connect.compress,connect:session`, you may simply do `DEBUG=connect:*`, or to run everything using this module simply use `DEBUG=*`.\n\n  You can also exclude specific debuggers by prefixing them with a \"-\" character.  For example, `DEBUG=* -connect:*` would include all debuggers except those starting with \"connect:\".\n\n## Browser support\n\n Debug works in the browser as well, currently persisted by `localStorage`. For example if you have `worker:a` and `worker:b` as shown below, and wish to debug both type `debug.enable('worker:*')` in the console and refresh the page, this will remain until you disable with `debug.disable()`. \n\n```js\na = debug('worker:a');\nb = debug('worker:b');\n\nsetInterval(function(){\n  a('doing some work');\n}, 1000);\n\nsetInterval(function(){\n  a('doing some work');\n}, 1200);\n```\n\n## License \n\n(The MIT License)\n\nCopyright (c) 2011 TJ Holowaychuk <tj@vision-media.ca>\n\nPermission is hereby granted, free of charge, to any person obtaining\na copy of this software and associated documentation files (the\n'Software'), to deal in the Software without restriction, including\nwithout limitation the rights to use, copy, modify, merge, publish,\ndistribute, sublicense, and/or sell copies of the Software, and to\npermit persons to whom the Software is furnished to do so, subject to\nthe following conditions:\n\nThe above copyright notice and this permission notice shall be\nincluded in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,\nEXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.\nIN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY\nCLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,\nTORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE\nSOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.",
   "readmeFilename": "Readme.md",
-  "bugs": {
-    "url": "https://github.com/visionmedia/debug/issues"
-  },
   "_id": "debug@0.7.2",
-  "_from": "debug@*"
+  "_from": "debug@*",
+  "scripts": {}
 }

node/node_modules/docpad-plugin-stylus/node_modules/stylus/node_modules/mkdirp/package.json

@@ -25,9 +25,6 @@
   "license": "MIT",
   "readme": "# mkdirp\n\nLike `mkdir -p`, but in node.js!\n\n[![build status](https://secure.travis-ci.org/substack/node-mkdirp.png)](http://travis-ci.org/substack/node-mkdirp)\n\n# example\n\n## pow.js\n\n```js\nvar mkdirp = require('mkdirp');\n    \nmkdirp('/tmp/foo/bar/baz', function (err) {\n    if (err) console.error(err)\n    else console.log('pow!')\n});\n```\n\nOutput\n\n```\npow!\n```\n\nAnd now /tmp/foo/bar/baz exists, huzzah!\n\n# methods\n\n```js\nvar mkdirp = require('mkdirp');\n```\n\n## mkdirp(dir, mode, cb)\n\nCreate a new directory and any necessary subdirectories at `dir` with octal\npermission string `mode`.\n\nIf `mode` isn't specified, it defaults to `0777 & (~process.umask())`.\n\n`cb(err, made)` fires with the error or the first directory `made`\nthat had to be created, if any.\n\n## mkdirp.sync(dir, mode)\n\nSynchronously create a new directory and any necessary subdirectories at `dir`\nwith octal permission string `mode`.\n\nIf `mode` isn't specified, it defaults to `0777 & (~process.umask())`.\n\nReturns the first directory that had to be created, if any.\n\n# install\n\nWith [npm](http://npmjs.org) do:\n\n```\nnpm install mkdirp\n```\n\n# license\n\nMIT\n",
   "readmeFilename": "readme.markdown",
-  "bugs": {
-    "url": "https://github.com/substack/node-mkdirp/issues"
-  },
   "_id": "mkdirp@0.3.5",
   "_from": "mkdirp@0.3.x"
 }

node/node_modules/docpad-plugin-stylus/node_modules/stylus/package.json

@@ -40,9 +40,6 @@
   },
   "readme": "# Stylus\n\n Stylus is a revolutionary new language, providing an efficient, dynamic, and expressive way to generate CSS. Supporting both an indented syntax and regular CSS style.\n\n## Installation\n\n```bash\n$ npm install stylus\n```\n\n### Example\n\n```\nborder-radius()\n  -webkit-border-radius: arguments\n  -moz-border-radius: arguments\n  border-radius: arguments\n\nbody a\n  font: 12px/1.4 \"Lucida Grande\", Arial, sans-serif\n  background: black\n  color: #ccc\n\nform input\n  padding: 5px\n  border: 1px solid\n  border-radius: 5px\n```\n\ncompiles to:\n\n```css\nbody a {\n  font: 12px/1.4 \"Lucida Grande\", Arial, sans-serif;\n  background: #000;\n  color: #ccc;\n}\nform input {\n  padding: 5px;\n  border: 1px solid;\n  -webkit-border-radius: 5px;\n  -moz-border-radius: 5px;\n  border-radius: 5px;\n}\n```\n\nthe following is equivalent to the indented version of Stylus source, using the CSS syntax instead:\n\n```\nborder-radius() {\n  -webkit-border-radius: arguments\n  -moz-border-radius: arguments\n  border-radius: arguments\n}\n\nbody a {\n  font: 12px/1.4 \"Lucida Grande\", Arial, sans-serif;\n  background: black;\n  color: #ccc;\n}\n\nform input {\n  padding: 5px;\n  border: 1px solid;\n  border-radius: 5px;\n}\n```\n\n### Features\n\n Stylus has _many_ features.  Detailed documentation links follow:\n\n  - [css syntax](docs/css-style.md) support\n  - [mixins](docs/mixins.md)\n  - [keyword arguments](docs/kwargs.md)\n  - [variables](docs/variables.md)\n  - [interpolation](docs/interpolation.md)\n  - arithmetic, logical, and equality [operators](docs/operators.md)\n  - [importing](docs/import.md) of other stylus sheets\n  - [introspection api](docs/introspection.md)\n  - type coercion\n  - [@extend](docs/extend.md)\n  - [conditionals](docs/conditionals.md)\n  - [iteration](docs/iteration.md)\n  - nested [selectors](docs/selectors.md)\n  - parent reference\n  - in-language [functions](docs/functions.md)\n  - [variable arguments](docs/vargs.md)\n  - built-in [functions](docs/bifs.md) (over 25)\n  - optional [image inlining](docs/functions.url.md)\n  - optional compression\n  - JavaScript [API](docs/js.md)\n  - extremely terse syntax\n  - stylus [executable](docs/executable.md)\n  - [error reporting](docs/error-reporting.md)\n  - single-line and multi-line [comments](docs/comments.md)\n  - css [literal](docs/literal.md)\n  - character [escaping](docs/escape.md)\n  - [@keyframes](docs/keyframes.md) support & expansion\n  - [@font-face](docs/font-face.md) support\n  - [@media](docs/media.md) support\n  - Connect [Middleware](docs/middleware.md)\n  - TextMate [bundle](docs/textmate.md)\n  - Coda/SubEtha Edit [Syntax mode](https://github.com/atljeremy/Stylus.mode)\n  - gedit [language-spec](docs/gedit.md)\n  - VIM [Syntax](https://github.com/wavded/vim-stylus)\n  - [Firebug extension](docs/firebug.md)\n  - heroku [web service](http://styl.heroku.com) for compiling stylus\n  - [style guide](https://github.com/lepture/ganam) parser and generator\n  - transparent vendor-specific function expansion\n\n### Framework Support\n\n   - [Connect](docs/middleware.md)\n   - [Play! 2.0](https://github.com/patiencelabs/play-stylus)\n   - [Ruby On Rails](https://github.com/lucasmazza/ruby-stylus)\n\n### CMS Support\n\n   - [DocPad](https://github.com/bevry/docpad)\n   - [Punch](https://github.com/laktek/punch-stylus-compiler)\n\n### Screencasts\n\n  - [Stylus Intro](http://screenr.com/bNY)\n  - [CSS Syntax & Postfix Conditionals](http://screenr.com/A8v)\n\n### Authors\n\n  - [TJ Holowaychuk (visionmedia)](http://github.com/visionmedia)\n\n### More Information\n\n  - Language [comparisons](docs/compare.md)\n\n## License \n\n(The MIT License)\n\nCopyright (c) 2010 LearnBoost <dev@learnboost.com>\n\nPermission is hereby granted, free of charge, to any person obtaining\na copy of this software and associated documentation files (the\n'Software'), to deal in the Software without restriction, including\nwithout limitation the rights to use, copy, modify, merge, publish,\ndistribute, sublicense, and/or sell copies of the Software, and to\npermit persons to whom the Software is furnished to do so, subject to\nthe following conditions:\n\nThe above copyright notice and this permission notice shall be\nincluded in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,\nEXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.\nIN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY\nCLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,\nTORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE\nSOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n",
   "readmeFilename": "Readme.md",
-  "bugs": {
-    "url": "https://github.com/learnboost/stylus/issues"
-  },
   "_id": "stylus@0.32.1",
   "_from": "stylus@~0.32.0"
 }

node/node_modules/docpad/node_modules/airbrake/node_modules/hashish/package.json

@@ -34,9 +34,6 @@
   ],
   "readme": "Hashish\n=======\n\nHashish is a node.js library for manipulating hash data structures.\nIt is distilled from the finest that ruby, perl, and haskell have to offer by\nway of hash/map interfaces.\n\nHashish provides a chaining interface, where you can do:\n\n    var Hash = require('hashish');\n    \n    Hash({ a : 1, b : 2, c : 3, d : 4 })\n        .map(function (x) { return x * 10 })\n        .filter(function (x) { return x < 30 })\n        .forEach(function (x, key) {\n            console.log(key + ' => ' + x);\n        })\n    ;\n    \nOutput:\n\n    a => 10\n    b => 20\n\nSome functions and attributes in the chaining interface are terminal, like\n`.items` or `.detect()`. They return values of their own instead of the chain\ncontext.\n\nEach function in the chainable interface is also attached to `Hash` in chainless\nform:\n\n    var Hash = require('hashish');\n    var obj = { a : 1, b : 2, c : 3, d : 4 };\n    \n    var mapped = Hash.map(obj, function (x) {\n        return x * 10\n    });\n    \n    console.dir(mapped);\n\nOutput:\n\n    { a: 10, b: 20, c: 30, d: 40 }\n\nIn either case, the 'this' context of the function calls is the same object that\nthe chained functions return, so you can make nested chains.\n\nMethods\n=======\n\nforEach(cb)\n-----------\n\nFor each key/value in the hash, calls `cb(value, key)`.\n\nmap(cb)\n-------\n\nFor each key/value in the hash, calls `cb(value, key)`.\nThe return value of `cb` is the new value at `key` in the resulting hash.\n\nfilter(cb)\n----------\n\nFor each key/value in the hash, calls `cb(value, key)`.\nThe resulting hash omits key/value pairs where `cb` returned a falsy value.\n\ndetect(cb)\n----------\n\nReturns the first value in the hash for which `cb(value, key)` is non-falsy.\nOrder of hashes is not well-defined so watch out for that.\n\nreduce(cb)\n----------\n\nReturns the accumulated value of a left-fold over the key/value pairs.\n\nsome(cb)\n--------\n\nReturns a boolean: whether or not `cb(value, key)` ever returned a non-falsy\nvalue.\n\nupdate(obj1, [obj2, obj3, ...])\n-----------\n\nMutate the context hash, merging the key/value pairs from the passed objects\nand overwriting keys from the context hash if the current `obj` has keys of\nthe same name. Falsy arguments are silently ignored.\n\nupdateAll([ obj1, obj2, ... ])\n------------------------------\n\nLike multi-argument `update()` but operate on an array directly.\n\nmerge(obj1, [obj2, obj3, ...])\n----------\n\nMerge the key/value pairs from the passed objects into the resultant hash\nwithout modifying the context hash. Falsy arguments are silently ignored.\n\nmergeAll([ obj1, obj2, ... ])\n------------------------------\n\nLike multi-argument `merge()` but operate on an array directly.\n\nhas(key)\n--------\n\nReturn whether the hash has a key, `key`.\n\nvaluesAt(keys)\n--------------\n\nReturn an Array with the values at the keys from `keys`.\n\ntap(cb)\n-------\n\nCall `cb` with the present raw hash.\nThis function is chainable.\n\nextract(keys)\n-------------\n\nFilter by including only those keys in `keys` in the resulting hash.\n\nexclude(keys)\n-------------\n\nFilter by excluding those keys in `keys` in the resulting hash.\n\nAttributes\n==========\n\nThese are attributes in the chaining interface and functions in the `Hash.xxx`\ninterface.\n\nkeys\n----\n\nReturn all the enumerable attribute keys in the hash.\n\nvalues\n------\n\nReturn all the enumerable attribute values in the hash.\n\ncompact\n-------\n\nFilter out values which are `=== undefined`.\n\nclone\n-----\n\nMake a deep copy of the hash.\n\ncopy\n----\n\nMake a shallow copy of the hash.\n\nlength\n------\n\nReturn the number of key/value pairs in the hash.\nNote: use `Hash.size()` for non-chain mode.\n\nsize\n----\n\nAlias for `length` since `Hash.length` is masked by `Function.prototype`.\n\nSee Also\n========\n\nSee also [creationix's pattern/hash](http://github.com/creationix/pattern),\nwhich does a similar thing except with hash inputs and array outputs.\n\nInstallation\n============\n\nTo install with [npm](http://github.com/isaacs/npm):\n \n    npm install hashish\n\nTo run the tests with [expresso](http://github.com/visionmedia/expresso):\n\n    expresso\n",
   "readmeFilename": "README.markdown",
-  "bugs": {
-    "url": "https://github.com/substack/node-hashish/issues"
-  },
   "_id": "hashish@0.0.4",
   "_from": "hashish@0.0.4"
 }

node/node_modules/docpad/node_modules/airbrake/node_modules/stack-trace/package.json

@@ -23,9 +23,6 @@
   },
   "readme": "# stack-trace\n\nGet v8 stack traces as an array of CallSite objects.\n\n## Install\n\n``` bash\nnpm install stack-trace\n```\n\n## Usage\n\nThe stack-trace module makes it easy for you to capture the current stack:\n\n``` javascript\nvar stackTrace = require('stack-trace');\nvar trace = stackTrace.get();\n\nrequire('assert').strictEqual(trace[0].getFileName(), __filename);\n```\n\nHowever, sometimes you have already popped the stack you are interested in,\nand all you have left is an `Error` object. This module can help:\n\n``` javascript\nvar stackTrace = require('stack-trace');\nvar err = new Error('something went wrong');\nvar trace = stackTrace.parse(err);\n\nrequire('assert').strictEqual(trace[0].getFileName(), __filename);\n```\n\nPlease note that parsing the `Error#stack` property is not perfect, only\ncertain properties can be retrieved with it as noted in the API docs below.\n\n## Long stack traces\n\nstack-trace works great with [long-stack-traces][], when parsing an `err.stack`\nthat has crossed the event loop boundary, a `CallSite` object returning\n`'----------------------------------------'` for `getFileName()` is created.\nAll other methods of the event loop boundary call site return `null`.\n\n[long-stack-traces]: https://github.com/tlrobinson/long-stack-traces\n\n## API\n\n### stackTrace.get([belowFn])\n\nReturns an array of `CallSite` objects, where element `0` is the current call\nsite.\n\nWhen passing a function on the current stack as the `belowFn` parameter, the\nreturned array will only include `CallSite` objects below this function.\n\n### stackTrace.parse(err)\n\nParses the `err.stack` property of an `Error` object into an array compatible\nwith those returned by `stackTrace.get()`. However, only the following methods\nare implemented on the returned `CallSite` objects.\n\n* getTypeName\n* getFunctionName\n* getMethodName\n* getFileName\n* getLineNumber\n* getColumnNumber\n* isNative\n\nNote: Except `getFunctionName()`, all of the above methods return exactly the\nsame values as you would get from `stackTrace.get()`. `getFunctionName()`\nis sometimes a little different, but still useful.\n\n### CallSite\n\nThe official v8 CallSite object API can be found [here][v8stackapi]. A quick\nexcerpt:\n\n> A CallSite object defines the following methods:\n>\n> * **getThis**: returns the value of this\n> * **getTypeName**: returns the type of this as a string. This is the name of the function stored in the constructor field of this, if available, otherwise the object's [[Class]] internal property.\n> * **getFunction**: returns the current function\n> * **getFunctionName**: returns the name of the current function, typically its name property. If a name property is not available an attempt will be made to try to infer a name from the function's context.\n> * **getMethodName**: returns the name of the property of this or one of its prototypes that holds the current function\n> * **getFileName**: if this function was defined in a script returns the name of the script\n> * **getLineNumber**: if this function was defined in a script returns the current line number\n> * **getColumnNumber**: if this function was defined in a script returns the current column number\n> * **getEvalOrigin**: if this function was created using a call to eval returns a CallSite object representing the location where eval was called\n> * **isToplevel**: is this a toplevel invocation, that is, is this the global object?\n> * **isEval**: does this call take place in code defined by a call to eval?\n> * **isNative**: is this call in native V8 code?\n> * **isConstructor**: is this a constructor call?\n\n[v8stackapi]: http://code.google.com/p/v8/wiki/JavaScriptStackTraceApi\n\n## License\n\nstack-trace is licensed under the MIT license.\n",
   "readmeFilename": "Readme.md",
-  "bugs": {
-    "url": "https://github.com/felixge/node-stack-trace/issues"
-  },
   "_id": "stack-trace@0.0.5",
   "_from": "stack-trace@0.0.5"
 }

node/node_modules/docpad/node_modules/airbrake/node_modules/xmlbuilder/package.json

@@ -28,7 +28,7 @@
   "engines": {
     "node": ">=0.2.0"
   },
-  "readme": "ERROR: No README data found!",
   "_id": "xmlbuilder@0.1.5",
+  "readme": "ERROR: No README.md file found!",
   "_from": "xmlbuilder@0.1.5"
 }

node/node_modules/docpad/node_modules/canihaz/node_modules/mkdirp/package.json

@@ -25,9 +25,6 @@
   "license": "MIT",
   "readme": "# mkdirp\n\nLike `mkdir -p`, but in node.js!\n\n[![build status](https://secure.travis-ci.org/substack/node-mkdirp.png)](http://travis-ci.org/substack/node-mkdirp)\n\n# example\n\n## pow.js\n\n```js\nvar mkdirp = require('mkdirp');\n    \nmkdirp('/tmp/foo/bar/baz', function (err) {\n    if (err) console.error(err)\n    else console.log('pow!')\n});\n```\n\nOutput\n\n```\npow!\n```\n\nAnd now /tmp/foo/bar/baz exists, huzzah!\n\n# methods\n\n```js\nvar mkdirp = require('mkdirp');\n```\n\n## mkdirp(dir, mode, cb)\n\nCreate a new directory and any necessary subdirectories at `dir` with octal\npermission string `mode`.\n\nIf `mode` isn't specified, it defaults to `0777 & (~process.umask())`.\n\n`cb(err, made)` fires with the error or the first directory `made`\nthat had to be created, if any.\n\n## mkdirp.sync(dir, mode)\n\nSynchronously create a new directory and any necessary subdirectories at `dir`\nwith octal permission string `mode`.\n\nIf `mode` isn't specified, it defaults to `0777 & (~process.umask())`.\n\nReturns the first directory that had to be created, if any.\n\n# install\n\nWith [npm](http://npmjs.org) do:\n\n```\nnpm install mkdirp\n```\n\n# license\n\nMIT\n",
   "readmeFilename": "readme.markdown",
-  "bugs": {
-    "url": "https://github.com/substack/node-mkdirp/issues"
-  },
   "_id": "mkdirp@0.3.5",
   "_from": "mkdirp@0.3.x"
 }

node/node_modules/docpad/node_modules/canihaz/node_modules/which/package.json

@@ -22,9 +22,7 @@
   "devDependencies": {},
   "readme": "The \"which\" util from npm's guts.\n\nFinds the first instance of a specified executable in the PATH\nenvironment variable.  Does not cache the results, so `hash -r` is not\nneeded when the PATH changes.\n",
   "readmeFilename": "README.md",
-  "bugs": {
-    "url": "https://github.com/isaacs/node-which/issues"
-  },
   "_id": "which@1.0.5",
-  "_from": "which@1.0.x"
+  "_from": "which@1.0.x",
+  "scripts": {}
 }

node/node_modules/docpad/node_modules/caterpillar-human/node_modules/ansicolors/.npmignore

@@ -0,0 +1,15 @@
+lib-cov
+*.seed
+*.log
+*.csv
+*.dat
+*.out
+*.pid
+*.gz
+
+pids
+logs
+results
+
+npm-debug.log
+node_modules

node/node_modules/docpad/node_modules/caterpillar-human/node_modules/ansicolors/.travis.yml

@@ -0,0 +1,4 @@
+language: node_js
+node_js:
+  - 0.6
+  - 0.8

node/node_modules/docpad/node_modules/caterpillar-human/node_modules/ansicolors/LICENSE

@@ -0,0 +1,23 @@
+Copyright 2013 Thorsten Lorenz. 
+All rights reserved.
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.

node/node_modules/docpad/node_modules/caterpillar-human/node_modules/ansicolors/README.md

@@ -0,0 +1,42 @@
+# ansicolors [![build status](https://secure.travis-ci.org/thlorenz/ansicolors.png)](http://next.travis-ci.org/thlorenz/ansicolors)
+
+Functions that surround a string with ansicolor codes so it prints in color.
+
+## Installation
+
+    npm install ansicolors
+
+## Usage
+
+```js
+var colors = require('ansicolors');
+
+// foreground colors
+var redHerring = colors.red('herring');
+var blueMoon = colors.blue('moon');
+var brighBlueMoon = colors.brightBlue('moon');
+
+console.log(redHerring);      // this will print 'herring' in red
+console.log(blueMoon);        // this 'moon' in blue
+console.log(brightBlueMoon);  // I think you got the idea
+
+// background colors
+console.log(colors.bgYellow('printed on yellow background'));
+console.log(colors.bgBrightBlue('printed on bright blue background'));
+
+// mixing background and foreground colors
+// below two lines have same result (order in which bg and fg are combined doesn't matter)
+console.log(colors.bgYellow(colors.blue('printed on yellow background in blue')));
+console.log(colors.blue(colors.bgYellow('printed on yellow background in blue')));
+```
+
+## Tests
+
+Look at the [tests](https://github.com/thlorenz/ansicolors/blob/master/test/ansicolors.js) to see more examples and/or run them via: 
+
+    npm explore ansicolors && npm test
+
+## Alternatives
+
+**ansicolors** tries to meet simple use cases with a very simple API. However, if you need a more powerful ansi formatting tool, 
+I'd suggest to look at the [features](https://github.com/TooTallNate/ansi.js#features) of the [ansi module](https://github.com/TooTallNate/ansi.js).

node/node_modules/docpad/node_modules/caterpillar-human/node_modules/ansicolors/ansicolors.js

@@ -0,0 +1,55 @@
+// ColorCodes explained: http://www.termsys.demon.co.uk/vtansi.htm
+'use strict';
+
+var colorNums = {
+      white         :  37
+    , black         :  30
+    , blue          :  34
+    , cyan          :  36
+    , green         :  32
+    , magenta       :  35
+    , red           :  31
+    , yellow        :  33
+    , brightBlack   :  90
+    , brightRed     :  91
+    , brightGreen   :  92
+    , brightYellow  :  93
+    , brightBlue    :  94
+    , brightMagenta :  95
+    , brightCyan    :  96
+    , brightWhite   :  97
+    }
+  , backgroundColorNums = {
+      bgBlack         :  40
+    , bgRed           :  41
+    , bgGreen         :  42
+    , bgYellow        :  43
+    , bgBlue          :  44
+    , bgMagenta       :  45
+    , bgCyan          :  46
+    , bgWhite         :  47
+    , bgBrightBlack   :  100
+    , bgBrightRed     :  101
+    , bgBrightGreen   :  102
+    , bgBrightYellow  :  103
+    , bgBrightBlue    :  104
+    , bgBrightMagenta :  105
+    , bgBrightCyan    :  106
+    , bgBrightWhite   :  107
+    } 
+  , colors = {};
+
+
+Object.keys(colorNums).forEach(function (k) {
+  colors[k] = function (s) { 
+    return '\u001b[' + colorNums[k] + 'm' + s + '\u001b[39m';
+  };
+});
+
+Object.keys(backgroundColorNums).forEach(function (k) {
+  colors[k] = function (s) { 
+    return '\u001b[' + backgroundColorNums[k] + 'm' + s + '\u001b[49m';
+  };
+});
+
+module.exports = colors;

node/node_modules/docpad/node_modules/caterpillar-human/node_modules/ansicolors/package.json

@@ -0,0 +1,30 @@
+{
+  "name": "ansicolors",
+  "version": "0.2.1",
+  "description": "Functions that surround a string with ansicolor codes so it prints in color.",
+  "main": "ansicolors.js",
+  "scripts": {
+    "test": "node test/*.js"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/thlorenz/ansicolors.git"
+  },
+  "keywords": [
+    "ansi",
+    "colors",
+    "highlight",
+    "string"
+  ],
+  "author": {
+    "name": "Thorsten Lorenz",
+    "email": "thlorenz@gmx.de",
+    "url": "thlorenz.com"
+  },
+  "license": "MIT",
+  "readmeFilename": "README.md",
+  "gitHead": "858847ca28e8b360d9b70eee0592700fa2ab087d",
+  "readme": "# ansicolors [![build status](https://secure.travis-ci.org/thlorenz/ansicolors.png)](http://next.travis-ci.org/thlorenz/ansicolors)\n\nFunctions that surround a string with ansicolor codes so it prints in color.\n\n## Installation\n\n    npm install ansicolors\n\n## Usage\n\n```js\nvar colors = require('ansicolors');\n\n// foreground colors\nvar redHerring = colors.red('herring');\nvar blueMoon = colors.blue('moon');\nvar brighBlueMoon = colors.brightBlue('moon');\n\nconsole.log(redHerring);      // this will print 'herring' in red\nconsole.log(blueMoon);        // this 'moon' in blue\nconsole.log(brightBlueMoon);  // I think you got the idea\n\n// background colors\nconsole.log(colors.bgYellow('printed on yellow background'));\nconsole.log(colors.bgBrightBlue('printed on bright blue background'));\n\n// mixing background and foreground colors\n// below two lines have same result (order in which bg and fg are combined doesn't matter)\nconsole.log(colors.bgYellow(colors.blue('printed on yellow background in blue')));\nconsole.log(colors.blue(colors.bgYellow('printed on yellow background in blue')));\n```\n\n## Tests\n\nLook at the [tests](https://github.com/thlorenz/ansicolors/blob/master/test/ansicolors.js) to see more examples and/or run them via: \n\n    npm explore ansicolors && npm test\n\n## Alternatives\n\n**ansicolors** tries to meet simple use cases with a very simple API. However, if you need a more powerful ansi formatting tool, \nI'd suggest to look at the [features](https://github.com/TooTallNate/ansi.js#features) of the [ansi module](https://github.com/TooTallNate/ansi.js).\n",
+  "_id": "ansicolors@0.2.1",
+  "_from": "ansicolors@~0.2.1"
+}

node/node_modules/docpad/node_modules/caterpillar-human/node_modules/ansicolors/test/ansicolors.js

@@ -0,0 +1,55 @@
+'use strict';
+
+var assert = require('assert')
+  , colors = require('..');
+
+console.log('Foreground colors ..');
+
+assert.equal(colors.white('printed in white'), '\u001b[37mprinted in white\u001b[39m');
+
+assert.equal(colors.black('printed in black'), '\u001b[30mprinted in black\u001b[39m');
+assert.equal(colors.brightBlack('printed in bright black'), '\u001b[90mprinted in bright black\u001b[39m');
+
+assert.equal(colors.green('printed in green'), '\u001b[32mprinted in green\u001b[39m');
+assert.equal(colors.brightGreen('printed in bright green'), '\u001b[92mprinted in bright green\u001b[39m');
+
+assert.equal(colors.red('printed in red'), '\u001b[31mprinted in red\u001b[39m');
+assert.equal(colors.brightRed('printed in bright red'), '\u001b[91mprinted in bright red\u001b[39m');
+
+console.log('OK');
+
+console.log('Background colors ..');
+
+assert.equal(
+    colors.bgBlack('printed with black background')
+  , '\u001b[40mprinted with black background\u001b[49m'
+);
+
+assert.equal(
+    colors.bgYellow('printed with yellow background')
+  , '\u001b[43mprinted with yellow background\u001b[49m'
+);
+assert.equal(
+    colors.bgBrightYellow('printed with bright yellow background')
+  , '\u001b[103mprinted with bright yellow background\u001b[49m'
+);
+
+assert.equal(
+    colors.bgWhite('printed with white background')
+  , '\u001b[47mprinted with white background\u001b[49m'
+);
+
+console.log('OK');
+
+console.log('Mixing background and foreground colors ..');
+
+assert.equal(
+    colors.blue(colors.bgYellow('printed in blue with yellow background'))
+  , '\u001b[34m\u001b[43mprinted in blue with yellow background\u001b[49m\u001b[39m'
+);
+assert.equal(
+    colors.bgYellow(colors.blue('printed in blue with yellow background again'))
+  , '\u001b[43m\u001b[34mprinted in blue with yellow background again\u001b[39m\u001b[49m'
+);
+
+console.log('OK');

node/node_modules/docpad/node_modules/caterpillar-human/node_modules/ansistyles/.npmignore

@@ -0,0 +1,15 @@
+lib-cov
+*.seed
+*.log
+*.csv
+*.dat
+*.out
+*.pid
+*.gz
+
+pids
+logs
+results
+
+npm-debug.log
+node_modules

node/node_modules/docpad/node_modules/caterpillar-human/node_modules/ansistyles/.travis.yml

@@ -0,0 +1,4 @@
+language: node_js
+node_js:
+  - 0.6
+  - 0.8

node/node_modules/docpad/node_modules/caterpillar-human/node_modules/ansistyles/LICENSE

@@ -0,0 +1,23 @@
+Copyright 2013 Thorsten Lorenz. 
+All rights reserved.
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.

node/node_modules/docpad/node_modules/caterpillar-human/node_modules/ansistyles/README.md

@@ -0,0 +1,69 @@
+# ansistyles [![build status](https://secure.travis-ci.org/thlorenz/ansistyles.png)](http://next.travis-ci.org/thlorenz/ansistyles)
+
+Functions that surround a string with ansistyle codes so it prints in style.
+
+## Installation
+
+    npm install ansistyles
+
+## Usage
+
+```js
+var styles = require('ansistyles');
+
+console.log(styles.bright('hello world'));    // prints hello world in 'bright' white
+console.log(styles.underline('hello world')); // prints hello world underlined
+console.log(styles.inverse('hello world'));   // prints hello world black on white
+```
+
+## Combining with ansicolors
+
+Get the ansicolors module:
+
+    npm install ansicolors
+
+```js
+var styles = require('ansistyles')
+  , colors = require('ansicolors');
+
+  console.log(
+    // prints hello world underlined in blue on a green background
+    colors.bgGreen(colors.blue(styles.underline('hello world'))) 
+  );
+```
+
+## Tests
+
+Look at the [tests](https://github.com/thlorenz/ansistyles/blob/master/test/ansistyles.js) to see more examples and/or run them via: 
+
+    npm explore ansistyles && npm test
+
+## More Styles
+
+As you can see from [here](https://github.com/thlorenz/ansistyles/blob/master/ansistyles.js#L4-L15), more styles are available,
+but didn't have any effect on the terminals that I tested on Mac Lion and Ubuntu Linux.
+
+I included them for completeness, but didn't show them in the examples because they seem to have no effect.
+
+### reset
+
+A style reset function is also included, please note however that this is not nestable.
+
+Therefore the below only underlines `hell` only, but not `world`.
+
+```js
+console.log(styles.underline('hell' + styles.reset('o') + ' world'));
+```
+
+It is essentially the same as:
+
+```js
+console.log(styles.underline('hell') + styles.reset('') + 'o world');
+```
+
+
+
+## Alternatives
+
+**ansistyles** tries to meet simple use cases with a very simple API. However, if you need a more powerful ansi formatting tool, 
+I'd suggest to look at the [features](https://github.com/TooTallNate/ansi.js#features) of the [ansi module](https://github.com/TooTallNate/ansi.js).

node/node_modules/docpad/node_modules/caterpillar-human/node_modules/ansistyles/ansistyles.js

@@ -0,0 +1,38 @@
+'use strict';
+
+/*
+ * Info: http://www.termsys.demon.co.uk/vtansi.htm#colors 
+ * Following caveats
+ * bright    - brightens the color (bold-blue is same as brigthtBlue)
+ * dim       - nothing on Mac or Linux
+ * italic    - nothing on Mac or Linux
+ * underline - underlines string
+ * blink     - nothing on Mac or linux
+ * inverse   - background becomes foreground and vice versa
+ *
+ * In summary, the only styles that work are:
+ *  - bright, underline and inverse
+ *  - the others are only included for completeness
+ */
+
+var styleNums = {
+    reset     :  [0, 22]
+  , bright    :  [1, 22]
+  , dim       :  [2, 22]
+  , italic    :  [3, 23]
+  , underline :  [4, 24]
+  , blink     :  [5, 25]
+  , inverse   :  [7, 27]
+  }
+  , styles = {}
+  ;
+
+Object.keys(styleNums).forEach(function (k) {
+  styles[k] = function (s) { 
+    var open = styleNums[k][0]
+      , close = styleNums[k][1];
+    return '\u001b[' + open + 'm' + s + '\u001b[' + close + 'm';
+  };
+});
+
+module.exports = styles;

node/node_modules/docpad/node_modules/caterpillar-human/node_modules/ansistyles/package.json

@@ -0,0 +1,30 @@
+{
+  "name": "ansistyles",
+  "version": "0.1.1",
+  "description": "Functions that surround a string with ansistyle codes so it prints in style.",
+  "main": "ansistyles.js",
+  "scripts": {
+    "test": "node test/ansistyles.js"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/thlorenz/ansistyles.git"
+  },
+  "keywords": [
+    "ansi",
+    "style",
+    "terminal",
+    "console"
+  ],
+  "author": {
+    "name": "Thorsten Lorenz",
+    "email": "thlorenz@gmx.de",
+    "url": "thlorenz.com"
+  },
+  "license": "MIT",
+  "readmeFilename": "README.md",
+  "gitHead": "27bf1bc65231bcc7fd109bf13b13601b51f8cd04",
+  "readme": "# ansistyles [![build status](https://secure.travis-ci.org/thlorenz/ansistyles.png)](http://next.travis-ci.org/thlorenz/ansistyles)\n\nFunctions that surround a string with ansistyle codes so it prints in style.\n\n## Installation\n\n    npm install ansistyles\n\n## Usage\n\n```js\nvar styles = require('ansistyles');\n\nconsole.log(styles.bright('hello world'));    // prints hello world in 'bright' white\nconsole.log(styles.underline('hello world')); // prints hello world underlined\nconsole.log(styles.inverse('hello world'));   // prints hello world black on white\n```\n\n## Combining with ansicolors\n\nGet the ansicolors module:\n\n    npm install ansicolors\n\n```js\nvar styles = require('ansistyles')\n  , colors = require('ansicolors');\n\n  console.log(\n    // prints hello world underlined in blue on a green background\n    colors.bgGreen(colors.blue(styles.underline('hello world'))) \n  );\n```\n\n## Tests\n\nLook at the [tests](https://github.com/thlorenz/ansistyles/blob/master/test/ansistyles.js) to see more examples and/or run them via: \n\n    npm explore ansistyles && npm test\n\n## More Styles\n\nAs you can see from [here](https://github.com/thlorenz/ansistyles/blob/master/ansistyles.js#L4-L15), more styles are available,\nbut didn't have any effect on the terminals that I tested on Mac Lion and Ubuntu Linux.\n\nI included them for completeness, but didn't show them in the examples because they seem to have no effect.\n\n### reset\n\nA style reset function is also included, please note however that this is not nestable.\n\nTherefore the below only underlines `hell` only, but not `world`.\n\n```js\nconsole.log(styles.underline('hell' + styles.reset('o') + ' world'));\n```\n\nIt is essentially the same as:\n\n```js\nconsole.log(styles.underline('hell') + styles.reset('') + 'o world');\n```\n\n\n\n## Alternatives\n\n**ansistyles** tries to meet simple use cases with a very simple API. However, if you need a more powerful ansi formatting tool, \nI'd suggest to look at the [features](https://github.com/TooTallNate/ansi.js#features) of the [ansi module](https://github.com/TooTallNate/ansi.js).\n",
+  "_id": "ansistyles@0.1.1",
+  "_from": "ansistyles@~0.1.1"
+}

node/node_modules/docpad/node_modules/caterpillar-human/node_modules/ansistyles/test/ansistyles.js

@@ -0,0 +1,15 @@
+'use strict';
+/*jshint asi: true */
+var assert = require('assert')
+  , styles = require('../')
+
+function inspect(obj, depth) {
+  console.log(require('util').inspect(obj, false, depth || 5, true));
+}
+
+assert.equal(styles.reset('reset'), '\u001b[0mreset\u001b[22m', 'reset')
+assert.equal(styles.underline('underlined'), '\u001b[4munderlined\u001b[24m', 'underline')
+assert.equal(styles.bright('bright'), '\u001b[1mbright\u001b[22m', 'bright')
+assert.equal(styles.inverse('inversed'), '\u001b[7minversed\u001b[27m', 'inverse')
+
+console.log('OK');

node/node_modules/docpad/node_modules/caterpillar-human/out/lib/caterpillar-human.js

@@ -1,5 +1,5 @@
 // Generated by CoffeeScript 1.6.2
-var Human, colorFormatters, err, util, _ref,
+var Human, ansiColors, ansiStyles, err, util, _ref,
   __bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; },
   __hasProp = {}.hasOwnProperty,
   __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; };
@@ -7,10 +7,12 @@ var Human, colorFormatters, err, util, _ref,
 util = require('util');
 
 try {
-  colorFormatters = require('cli-color');
+  ansiColors = require('ansicolors');
+  ansiStyles = require('ansistyles');
 } catch (_error) {
   err = _error;
-  colorFormatters = null;
+  ansiColors = null;
+  ansiStyles = null;
 }
 
 Human = (function(_super) {
@@ -116,9 +118,9 @@ Human = (function(_super) {
     debugMode = config.level === 7;
     result = null;
     if (entry.text) {
-      levelFormatter = useColors && (colorFormatters != null ? colorFormatters[entry.color] : void 0);
-      textFormatter = debugMode && useColors && (colorFormatters != null ? colorFormatters.bold : void 0);
-      debugFormatter = false;
+      levelFormatter = useColors && ((ansiColors != null ? ansiColors[entry.color] : void 0) || (ansiStyles != null ? ansiStyles[entry.color] : void 0));
+      textFormatter = false && debugMode && useColors && (ansiStyles != null ? ansiStyles.bright : void 0);
+      debugFormatter = debugMode && useColors && (ansiStyles != null ? ansiStyles.dim : void 0);
       levelString = entry.levelName + ':';
       if (levelFormatter) {
         levelString = levelFormatter(levelString);
@@ -129,8 +131,8 @@ Human = (function(_super) {
       }
       messageString = "" + levelString + " " + entryString;
       if (debugMode) {
-        seperator = '\n    → ';
-        debugString = "[" + entry.timestamp + "] [" + entry.file + ":" + entry.line + "] [" + entry.method + "]";
+        seperator = '\n    ';
+        debugString = "→ [" + entry.timestamp + "] [" + entry.file + ":" + entry.line + "] [" + entry.method + "]";
         if (debugFormatter) {
           debugString = debugFormatter(debugString);
         }

node/node_modules/docpad/node_modules/caterpillar-human/package.json

@@ -1,6 +1,6 @@
 {
   "name": "caterpillar-human",
-  "version": "2.0.2",
+  "version": "2.1.0",
   "description": "Turn your Caterpillar logger stream into a beautiful readable format with colors and optional debug information",
   "homepage": "https://github.com/bevry/caterpillar-human",
   "keywords": [
@@ -46,10 +46,12 @@
     "node": ">=0.8"
   },
   "dependencies": {
-    "cli-color": "~0.2.2"
+    "ansicolors": "~0.2.1",
+    "ansistyles": "~0.1.1"
   },
   "optionalDependencies": {
-    "cli-color": "~0.2.2"
+    "ansicolors": "~0.2.1",
+    "ansistyles": "~0.1.1"
   },
   "peerDependencies": {
     "caterpillar": "2.x"
@@ -71,6 +73,6 @@
   "main": "./out/lib/caterpillar-human.js",
   "readme": "# Human Transform for [Caterpillar](https://github.com/bevry/caterpillar)\n\n[![Build Status](https://secure.travis-ci.org/bevry/caterpillar-human.png?branch=master)](http://travis-ci.org/bevry/caterpillar-human)\n[![NPM version](https://badge.fury.io/js/caterpillar-human.png)](https://npmjs.org/package/caterpillar-human)\n[![Flattr this project](https://raw.github.com/balupton/flattr-buttons/master/badge-89x18.gif)](http://flattr.com/thing/344188/balupton-on-Flattr)\n\nTurn your [Caterpillar](https://github.com/bevry/caterpillar) logger stream into a beautiful readable format with colors and optional debug information\n\n\n\n## Install\n\n### Backend\n\n1. [Install Node.js](http://bevry.me/node/install)\n2. `npm install --save caterpillar-human`\n\n### Frontend\n\n1. [See Browserify](http://browserify.org/)\n\n\n\n## Usage\n\n### Example\n\n``` javascript\n// Import\nvar logger = new (require('caterpillar').Logger)();\nvar human = new (require('caterpillar-human').Human)();\n\n// Pipe logger output to our human interface, then our human interface output to stdout\nlogger.pipe(human).pipe(process.stdout);\n\n// Log\nlogger.log('warn',  'this is the first log entry');\n// warn:  this is the first log entry\nlogger.log('info', 'this is the second log entry');\n// info: this is the second log entry\n\n// Wait\nsetTimeout(function(){\n\t// Set debug mode\n\tlogger.setConfig({level:7});\n\n\t// Log\n\tlogger.log('warn',  'this is the first log entry');\n\t// warn: this is the first log entry\n\t//\t→ [2013-04-25 20:37:22.692] [/Users/balupton/Projects/caterpillar-human/example.js:20] [null._onTimeout]\n\tlogger.log('info', 'this is the second log entry');\n\t// info: this is the second log entry\n\t//\t→ [2013-04-25 20:37:22.693] [/Users/balupton/Projects/caterpillar-human/example.js:22] [null._onTimeout]\n},0);\n```\n\n### Human API, extends [caterpillar.Transform](https://github.com/bevry/caterpillar), which extends [stream.Transform](http://nodejs.org/api/stream.html#stream_class_stream_transform)\n\n``` javascript\nnew (require('caterpillar-human').Human)(config)\n```\n\n- Methods\n\t- `constructor(config?)` create our new human instance with the config, config is optional\n\t- `pipe(child)` pipe our stream to the child, also sync our config to it\n\t- `setConfig(config)` set the configuration and emit the `config` event\n\t- `getConfig()` get the configuration\n\t- `format(entry)` format the caterpillar logger entry\n- Configuration\n\t- `level` number, defaults to `null`, when set to `7` (debug level) we will debug information with the log entries\n\t- `color` boolean, defaults to `true`, set to `false` to turn off colors\n\t- `colors` objects of the level to color mapping, defaults to:\n\t\t\n\t\t``` javascript\n\t\t{\n\t\t\t0: 'red',\n\t\t\t1: 'red',\n\t\t\t2: 'red',\n\t\t\t3: 'red',\n\t\t\t4: 'yellow',\n\t\t\t5: 'yellow',\n\t\t\t6: 'green',\n\t\t\t7: 'green'\n\t\t}\n\t\t```\n\n- Events\n\t- `config(config)` emitted once our configuration has updated\n\n\n\n## History\nYou can discover the history inside the [History.md](https://github.com/bevry/caterpillar-human/blob/master/History.md#files) file\n\n\n\n## License\nLicensed under the incredibly [permissive](http://en.wikipedia.org/wiki/Permissive_free_software_licence) [MIT License](http://creativecommons.org/licenses/MIT/)\n<br/>Copyright &copy; 2012+ [Bevry Pty Ltd](http://bevry.me)\n<br/>Copyright &copy; 2011 [Benjamin Lupton](http://balupton.com)\n",
   "readmeFilename": "README.md",
-  "_id": "caterpillar-human@2.0.2",
-  "_from": "caterpillar-human@~2.0.2"
+  "_id": "caterpillar-human@2.1.0",
+  "_from": "caterpillar-human@~2.1.0"
 }

node/node_modules/docpad/node_modules/cli-color/node_modules/es5-ext/package.json

@@ -26,8 +26,8 @@
     "url": "git://github.com/medikoo/es5-ext.git"
   },
   "bugs": {
-    "url": "https://github.com/medikoo/es5-ext/issues",
-    "email": "medikoo+es5-ext@medikoo.com"
+    "email": "medikoo+es5-ext@medikoo.com",
+    "url": "https://github.com/medikoo/es5-ext/issues"
   },
   "engines": {
     "node": ">=0.4"

node/node_modules/docpad/node_modules/cli-color/node_modules/memoizee/node_modules/event-emitter/package.json

@@ -21,8 +21,8 @@
     "url": "git://github.com/medikoo/event-emitter.git"
   },
   "bugs": {
-    "url": "https://github.com/medikoo/event-emitter/issues",
-    "email": "medikoo+event-emitter@medikoo.com"
+    "email": "medikoo+event-emitter@medikoo.com",
+    "url": "https://github.com/medikoo/event-emitter/issues"
   },
   "dependencies": {
     "es5-ext": "0.9.x"

node/node_modules/docpad/node_modules/cli-color/node_modules/memoizee/node_modules/next-tick/package.json

@@ -20,8 +20,8 @@
     "async"
   ],
   "bugs": {
-    "url": "https://github.com/medikoo/next-tick/issues",
-    "email": "medikoo+next-tick@medikoo.com"
+    "email": "medikoo+next-tick@medikoo.com",
+    "url": "https://github.com/medikoo/next-tick/issues"
   },
   "engines": {
     "node": ">=0.4"

node/node_modules/docpad/node_modules/cli-color/node_modules/memoizee/package.json

@@ -27,8 +27,8 @@
     "collector"
   ],
   "bugs": {
-    "url": "https://github.com/medikoo/memoize/issues",
-    "email": "medikoo+memoize@medikoo.com"
+    "email": "medikoo+memoize@medikoo.com",
+    "url": "https://github.com/medikoo/memoize/issues"
   },
   "engines": {
     "node": ">=0.4"

node/node_modules/docpad/node_modules/cli-color/package.json.REMOVED.git-id

@@ -1 +1 @@
-fa1e479a8de612623436e18c57c2c4f2cf16fefa
+14e6566770b531719e38852b5cc7d1af2e1d2e23

node/node_modules/docpad/node_modules/commander/node_modules/keypress/package.json

@@ -23,9 +23,6 @@
   "license": "MIT",
   "readme": "keypress\n========\n### Make any Node ReadableStream emit \"keypress\" events\n\n\nPrevious to Node `v0.8.x`, there was an undocumented `\"keypress\"` event that\n`process.stdin` would emit when it was a TTY. Some people discovered this hidden\ngem, and started using it in their own code.\n\nNow in Node `v0.8.x`, this `\"keypress\"` event does not get emitted by default,\nbut rather only when it is being used in conjuction with the `readline` (or by\nextension, the `repl`) module.\n\nThis module is the exact logic from the node `v0.8.x` releases ripped out into its\nown module.\n\n__Bonus:__ Now with mouse support!\n\nInstallation\n------------\n\nInstall with `npm`:\n\n``` bash\n$ npm install keypress\n```\n\nOr add it to the `\"dependencies\"` section of your _package.json_ file.\n\n\nExample\n-------\n\n#### Listening for \"keypress\" events\n\n``` js\nvar keypress = require('keypress');\n\n// make `process.stdin` begin emitting \"keypress\" events\nkeypress(process.stdin);\n\n// listen for the \"keypress\" event\nprocess.stdin.on('keypress', function (ch, key) {\n  console.log('got \"keypress\"', key);\n  if (key && key.ctrl && key.name == 'c') {\n    process.stdin.pause();\n  }\n});\n\nprocess.stdin.setRawMode(true);\nprocess.stdin.resume();\n```\n\n#### Listening for \"mousepress\" events\n\n``` js\nvar keypress = require('keypress');\n\n// make `process.stdin` begin emitting \"mousepress\" (and \"keypress\") events\nkeypress(process.stdin);\n\n// you must enable the mouse events before they will begin firing\nkeypress.enableMouse(process.stdout);\n\nprocess.stdin.on('mousepress', function (info) {\n  console.log('got \"mousepress\" event at %d x %d', info.x, info.y);\n});\n\nprocess.on('exit', function () {\n  // disable mouse on exit, so that the state\n  // is back to normal for the terminal\n  keypress.disableMouse(process.stdout);\n});\n```\n\n\nLicense\n-------\n\n(The MIT License)\n\nCopyright (c) 2012 Nathan Rajlich <nathan@tootallnate.net>\n\nPermission is hereby granted, free of charge, to any person obtaining\na copy of this software and associated documentation files (the\n'Software'), to deal in the Software without restriction, including\nwithout limitation the rights to use, copy, modify, merge, publish,\ndistribute, sublicense, and/or sell copies of the Software, and to\npermit persons to whom the Software is furnished to do so, subject to\nthe following conditions:\n\nThe above copyright notice and this permission notice shall be\nincluded in all copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,\nEXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF\nMERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.\nIN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY\nCLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,\nTORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE\nSOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.\n",
   "readmeFilename": "README.md",
-  "bugs": {
-    "url": "https://github.com/TooTallNate/keypress/issues"
-  },
   "_id": "keypress@0.1.0",
   "_from": "keypress@0.1.x"
 }

node/node_modules/docpad/node_modules/cson/node_modules/coffee-script/package.json

@@ -32,9 +32,7 @@
     "test": "node ./bin/cake test"
   },
   "homepage": "http://coffeescript.org",
-  "bugs": {
-    "url": "https://github.com/jashkenas/coffee-script/issues"
-  },
+  "bugs": "https://github.com/jashkenas/coffee-script/issues",
   "repository": {
     "type": "git",
     "url": "git://github.com/jashkenas/coffee-script.git"

node/node_modules/docpad/node_modules/cson/node_modules/joe/package.json

@@ -59,9 +59,9 @@
   "main": "./out/lib/joe",
   "readme": "# Joe [![Build Status](https://secure.travis-ci.org/bevry/joe.png?branch=master)](http://travis-ci.org/bevry/joe)\nNode.js asynchronous testing framework, runner and reporter\n\n## Using\n[You can discover how to use Joe by referring to the `Using Page` on the Wiki](https://github.com/bevry/joe/wiki/Using). [You can check out the rest of the wiki here.](https://github.com/bevry/joe/wiki)\n\n## History\nYou can discover the history inside the [History.md](https://github.com/bevry/joe/blob/master/History.md#files) file\n\n## License\nLicensed under the incredibly [permissive](http://en.wikipedia.org/wiki/Permissive_free_software_licence) [MIT License](http://creativecommons.org/licenses/MIT/)\n<br/>Copyright &copy; 2012 [Bevry Pty Ltd](http://bevry.me)",
   "readmeFilename": "README.md",
+  "_id": "joe@1.1.1",
   "bundleDependencies": [
     "bal-util"
   ],
-  "_id": "joe@1.1.1",
   "_from": "joe@1.1.1"
 }

node/node_modules/docpad/node_modules/cson/node_modules/js2coffee/node_modules/coffee-script/package.json

@@ -32,9 +32,7 @@
     "test": "node ./bin/cake test"
   },
   "homepage": "http://coffeescript.org",
-  "bugs": {
-    "url": "https://github.com/jashkenas/coffee-script/issues"
-  },
+  "bugs": "https://github.com/jashkenas/coffee-script/issues",
   "repository": {
     "type": "git",
     "url": "git://github.com/jashkenas/coffee-script.git"

node/node_modules/docpad/node_modules/cson/node_modules/js2coffee/package.json

@@ -38,9 +38,6 @@
   },
   "readme": "# JS2Coffee\n#### A JavaScript to CoffeeScript compiler.\n\n    $ npm install js2coffee\n\nUsage:\n\n    $ js2coffee input_file.js\n    $ js2coffee input_file.js > output.coffee\n    $ cat input.js | js2coffee\n\n### Development\n\nRun tests:\n\n    $ npm test\n\nBuild the browser version:\n\n    $ cake build\n\n### Acknowledgements\n\nMade possible thanks to the hard work of Js2coffee's dependency projects:\n\n * [Narcissus](https://github.com/mozilla/narcissus), Mozilla's JavaScript engine\n * [Node Narcissus](https://github.com/kuno/node-narcissus), the Node port of Narcissus\n * [Underscore.js](http://documentcloud.github.com/underscore)\n\nAnd of course:\n\n * Jeremy Ashkenas's [CoffeeScript](http://jashkenas.github.com/coffee-script/)\n",
   "readmeFilename": "README.md",
-  "bugs": {
-    "url": "https://github.com/rstacruz/js2coffee/issues"
-  },
   "_id": "js2coffee@0.1.3",
   "_from": "js2coffee@0.1.3"
 }

node/node_modules/docpad/node_modules/express/History.md.REMOVED.git-id

@@ -1 +1 @@
-9318e21857c16df7b5d6c61b0476c4ef6414b038
+cb40f28c60011993a8f34536b8267e0bf1ff8b95

node/node_modules/docpad/node_modules/express/client.js

@@ -1,25 +0,0 @@
-
-var http = require('http');
-
-var times = 50;
-
-while (times--) {
-  var req = http.request({
-      port: 3000
-    , method: 'POST'
-    , headers: { 'Content-Type': 'application/x-www-form-urlencoded' }
-  });
-
-  req.on('response', function(res){
-    console.log(res.statusCode);
-  });
-
-  var n = 500000;
-  while (n--) {
-    req.write('foo=bar&bar=baz&');
-  }
-
-  req.write('foo=bar&bar=baz');
-
-  req.end();
-}

node/node_modules/docpad/node_modules/express/lib/express.js

@@ -20,7 +20,7 @@ exports = module.exports = createApplication;
  * Framework version.
  */
 
-exports.version = '3.2.0';
+exports.version = '3.2.2';
 
 /**
  * Expose mime.

node/node_modules/docpad/node_modules/express/node_modules/buffer-crc32/package.json

@@ -31,9 +31,6 @@
   },
   "readme": "# buffer-crc32\n\n[![Build Status](https://secure.travis-ci.org/brianloveswords/buffer-crc32.png?branch=master)](http://travis-ci.org/brianloveswords/buffer-crc32)\n\ncrc32 that works with binary data and fancy character sets, outputs\nbuffer, signed or unsigned data and has tests.\n\nDerived from the sample CRC implementation in the PNG specification: http://www.w3.org/TR/PNG/#D-CRCAppendix\n\n# install\n```\nnpm install buffer-crc32\n```\n\n# example\n```js\nvar crc32 = require('buffer-crc32');\n// works with buffers\nvar buf = Buffer([0x00, 0x73, 0x75, 0x70, 0x20, 0x62, 0x72, 0x6f, 0x00])\ncrc32(buf) // -> <Buffer 94 5a ab 4a>\n\n// has convenience methods for getting signed or unsigned ints\ncrc32.signed(buf) // -> -1805997238\ncrc32.unsigned(buf) // -> 2488970058\n\n// will cast to buffer if given a string, so you can\n// directly use foreign characters safely\ncrc32('自動販売機') // -> <Buffer cb 03 1a c5>\n\n// and works in append mode too\nvar partialCrc = crc32('hey');\nvar partialCrc = crc32(' ', partialCrc);\nvar partialCrc = crc32('sup', partialCrc);\nvar partialCrc = crc32(' ', partialCrc);\nvar finalCrc = crc32('bros', partialCrc); // -> <Buffer 47 fa 55 70>\n```\n\n# tests\nThis was tested against the output of zlib's crc32 method. You can run\nthe tests with`npm test` (requires tap)\n\n# see also\nhttps://github.com/alexgorbatchev/node-crc, `crc.buffer.crc32` also\nsupports buffer inputs and return unsigned ints (thanks @tjholowaychuk).\n\n# license\nMIT/X11\n",
   "readmeFilename": "README.md",
-  "bugs": {
-    "url": "https://github.com/brianloveswords/buffer-crc32/issues"
-  },
   "_id": "buffer-crc32@0.2.1",
   "_from": "buffer-crc32@0.2.1"
 }

node/node_modules/docpad/node_modules/express/node_modules/connect/lib/connect.js

@@ -28,7 +28,7 @@ exports = module.exports = createServer;
  * Framework version.
  */
 
-exports.version = '2.7.6';
+exports.version = '2.7.8';
 
 /**
  * Expose mime module.