Fix tests and add prepare script

package.json

@@ -41,6 +41,7 @@
     "test": "./vowsrunner.js --spec test/*.coffee test/*.litcoffee",
     "testrule": "npm run compile && ./vowsrunner.js --spec",
     "posttest": "npm run lint",
+    "prepare": "npm run prepublish",
     "prepublish": "cake prepublish",
     "postpublish": "cake postpublish",
     "publish": "cake publish",

src/configfinder.coffee

@@ -35,7 +35,7 @@ loadJSON = (filename, attr = null) ->
     try
         config = JSON.parse(stripComments(fs.readFileSync(filename).toString()))
         config = config[attr] if attr
-        config.__location__ = filename
+        config?.__location__ = filename
         return config
     catch e
         process.stderr.write "Could not load JSON file '#{filename}': #{e}"
@@ -92,8 +92,10 @@ expandModuleNames = (dir, config) ->
 extendConfig = (dir, config) ->
     unless config.extends
         return config
-
-    parentConfig = require resolve config.extends, basedir: dir
+    try
+        parentConfig = require config.extends
+    catch
+        parentConfig = require resolve config.extends, basedir: dir
     extendedConfig = {}
 
     for ruleName, rule of config
@@ -111,7 +113,6 @@ exports.getConfig = (filename = null) ->
         dir = process.cwd()
 
     config = getConfig(dir)
-
     dir = path.dirname(config.__location__)
     if config
         config = extendConfig(dir, config)

test/fixtures/find_extended_test/package/.coffeelintrc

@@ -0,0 +1,6 @@
+module.exports = {
+    "indentation": {
+        "level" : "error",
+        "value" : 6
+    }
+}

test/fixtures/find_extended_test/package/package.json

@@ -0,0 +1,6 @@
+{
+  "name": "test",
+  "coffeelintConfig": {
+    "extends" : "./.coffeelintrc"
+  }
+}

test/fixtures/find_extended_test/package/sixspaces.coffee

@@ -0,0 +1,2 @@
+f = ->
+      null

test/test_commandline.coffee

@@ -105,7 +105,7 @@ vows.describe('commandline').addBatch({
         'works': (error, stdout, stderr) ->
             assert.isNull(error)
 
-    'with findconfig and local coffeelint.json and extended config':
+    'with findconfig and local coffeelint.json and extended config (module)':
         topic: () ->
             args = [
                 'fixtures/find_extended_test/invalid.coffee'
@@ -116,6 +116,17 @@ vows.describe('commandline').addBatch({
         'works': (error, stdout, stderr) ->
             assert.isNull(error)
 
+    'with findconfig and local package.json and extended config (relative)':
+        topic: () ->
+            args = [
+                'fixtures/find_extended_test/package/sixspaces.coffee'
+            ]
+            commandline args, this.callback
+            return undefined
+
+        'works': (error, stdout, stderr) ->
+            assert.isNull(error)
+
     'with custom configuration':
         topic: () ->
             args = [
@@ -200,7 +211,6 @@ vows.describe('commandline').addBatch({
             return undefined
 
         'works': (config, error, stdout, stderr) ->
-            assert.isNotNull(config)
             # This will throw an exception if it doesn't parse.
             JSON.parse config
             assert.isNotNull(stdout)