From 0298f3aad841b791feef4d6681cef97ffeb85c9a Mon Sep 17 00:00:00 2001
From: dsc <david.schoonover@gmail.com>
Date: Sat, 10 Dec 2011 18:00:24 -0800
Subject: [PATCH] Updates dependencies.

---
 .gitignore   |  3 ++-
 TODO.md      | 20 +++++++++++++-------
 compiler.co  | 10 +++++-----
 package.co   | 14 +++++++-------
 package.json | 12 ++++++------
 5 files changed, 33 insertions(+), 26 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6afa823..fb1c5ef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 settings.md
-node_modules
+node_modules/
+!node_modules/seq
diff --git a/TODO.md b/TODO.md
index 370fd6c..c108956 100644
--- a/TODO.md
+++ b/TODO.md
@@ -1,15 +1,21 @@
 # todo
 
-- **Bug:** compiler errors sometimes propagate to node?! well shit son, somebody needs tests.
+
+## to ship
+
+- Validate compiler module exists on startup
+- Restructure middleware responder to use events to trigger compiler phases, remove `seq` due to need of `@die`. (State machine?)
+- Allow nested `enabled` list for a more sane `cascade`
+    - Rename `enabled` to `compilers`
+    - Allow entries in `compilers` to be an identifier or a options/config object
+- Add post-`write()` cleanup/finally event (which fires whether successful or not).
+
 - Remove `yaml-python`, `CommonJS` compilers and create a `connect-compiler-extras` package for myself.
 
+
 ## later
-- Make `setup()` a simple proxy to `CompilerMiddleware` class.
-- Restructure middleware responder to use events to trigger compiler phases, remove `seq`. State machine?
-- Add post-`write()` cleanup/finally event (which fires whether successful or not).
-- Config: `on` for attaching event handlers to compiler phases
-- Replace `#token` in config Strings.
-- Allow nested `enabled` list for a more sane `cascade`
+- Compile `./src` (coco) -> `./lib` (js)
+- Move compilers to `lib/compilers.co`
 
 
 ## docs
diff --git a/compiler.co b/compiler.co
index aaf7a5e..1881f77 100644
--- a/compiler.co
+++ b/compiler.co
@@ -149,7 +149,7 @@ class exports.CompilerMiddleware extends EventEmitter
         log_prefix = ">>>>    [compiler]"
         console.log "#log_prefix Looking up compilers for '#{request.path}'..." if settings.log_level <= LOG.DEBUG
         
-        try do
+        try
             Seq(settings.enabled)
                 .seqEach (id, i) ->
                     C = compilers[id]
@@ -260,7 +260,7 @@ class exports.Compiler extends EventEmitter
                 file += '\t'
             # file += '\t' if file.length < 8
             
-            console.log "\t#level_name\t#compiler\t#file\t", ...msgs
+            console.log "#level_name\t#compiler\t#file\t", ...msgs
         true
     
     
@@ -643,8 +643,7 @@ class exports.YamlCompiler extends ExternalCompiler
 
 # Register Compilers
 
-cs = 
-    CoffeeScriptCompiler
+[   CoffeeScriptCompiler
     CocoCompiler
     UglifyCompiler
     JadeCompiler
@@ -655,8 +654,9 @@ cs =
     CommonJSCompiler
     SassRubyCompiler
     YamlCompiler
+].map register
+
 
-for c of cs then register c
 
 
 
diff --git a/package.co b/package.co
index e454a5a..1bab1c7 100644
--- a/package.co
+++ b/package.co
@@ -2,22 +2,22 @@ name                : 'connect-compiler'
 version             : '0.1.0'
 description         : 'Dynamically recompile stale assets'
 homepage            : 'http://dsc.github.com/connect-compiler'
-keywords            : [ 'connect', 'middleware', 'compiler', 'development', 'coffee-script', 'coco', 'jade', 'stylus', 'less', 'css', 'minify' ]
+keywords            : <[ connect middleware compiler development coffee-script coco jade stylus less css minify ]>
 author              : 'David Schoonover (dsc@less.ly) <http://less.ly>'
 
-main                : 'compiler'
+main                : './compiler'
 dependencies :
-    'seq'             : '>= 0.3.4'
+    'seq'           : '>= 0.3.4'
 devDependencies :
+    'express'       : '>= 2.5.1'
     'coco'          : '>= 0.6.7'
-    'expresso'      : '>= 0.7.x'
-    'express'       : '2.4.3'
-    'coffee-script' : '>= 1.1.1'
-    'jade'          : '>= 0.16.2'
+    'coffee-script' : '>= 1.1.3'
+    'jade'          : '>= 0.19.0'
     'stylus'        : '>= 0.19.0'
     'nib'           : '>= 0.2.0'
     'less'          : '>= 1.1.4'
     'jison'         : '>= 0.2.11'
+    'expresso'      : '>= 0.7.x'
 scripts             : test:'expresso'
 
 repository          : type:'git', url:'git://github.com/dsc/connect-compiler.git'
diff --git a/package.json b/package.json
index 8804f35..5302369 100644
--- a/package.json
+++ b/package.json
@@ -17,20 +17,20 @@
     "minify"
   ],
   "author": "David Schoonover (dsc@less.ly) <http://less.ly>",
-  "main": "compiler",
+  "main": "./compiler",
   "dependencies": {
     "seq": ">= 0.3.4"
   },
   "devDependencies": {
+    "express": ">= 2.5.1",
     "coco": ">= 0.6.7",
-    "expresso": ">= 0.7.x",
-    "express": "2.4.3",
-    "coffee-script": ">= 1.1.1",
-    "jade": ">= 0.16.2",
+    "coffee-script": ">= 1.1.3",
+    "jade": ">= 0.19.0",
     "stylus": ">= 0.19.0",
     "nib": ">= 0.2.0",
     "less": ">= 1.1.4",
-    "jison": ">= 0.2.11"
+    "jison": ">= 0.2.11",
+    "expresso": ">= 0.7.x"
   },
   "scripts": {
     "test": "expresso"