Jadelint now walks up the tree

bin/jadelint

@@ -13,14 +13,8 @@ var filenames = process.argv
         }
     });
 
-try {
-    var jadelintrc = JSON.parse(fs.readFileSync(process.cwd() + '/.jadelintrc'));
-} catch (e) {
-    var jadelintrc = {};
-}
-
 vinyl.src(filenames)
-.pipe(jadelint(jadelintrc, undefined, function(reporter) {
+.pipe(jadelint(undefined, undefined, function(reporter) {
     var exitCode = reporter.report();
     console.log(reporter.log);
     if (exitCode !== 0) {

src/jadelint.coffee

@@ -20,10 +20,19 @@ rules = require './rules'
 #         exitCode = reporter.report()
 #         console.log reporter.log
 jadelint = (conf, reporter = new Reporter, callback = ->) ->
-    dir = process.cwd()
-    conf ?= try require "#{dir}/.jadelintrc"
-    conf ?= (try require "#{dir}/.jadelintrc") while (dir += '/..'; '/' isnt fs.realpathSync dir)
-    conf ?= {}
+    getDefaultConf = () ->
+        def = {}
+        dir = process.cwd()
+        while '/' isnt fs.realpathSync dir
+            try
+                for prop, val of JSON.parse fs.readFileSync "#{dir}/.jadelintrc"
+                    def[prop] ?= val
+
+            dir += '/..'
+
+        def
+
+    conf ?= getDefaultConf()
 
     through2.obj (file, _, cb) ->
         linter = new Linter file, undefined, conf