Implement JSON config file support

Supporting JSON is nice for people who are familiar with it. It's also nice if you want to pass in JavaScript objects as options
testem · Jul 5, 2012 · 05a0d13 · 05a0d13
1 parent e6bc272
commit 05a0d13
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 6 deletions.
diff --git a/examples/custom_adapter/testem.json b/examples/custom_adapter/testem.json
@@ -0,0 +1,3 @@
+{
+    "framework": "custom"
+}
diff --git a/examples/custom_adapter/testem.yml b/examples/custom_adapter/testem.yml
diff --git a/examples/mocha_simple/testem.json b/examples/mocha_simple/testem.json
@@ -0,0 +1,3 @@
+{
+    "framework": "mocha"
+}
diff --git a/examples/mocha_simple/testem.yml b/examples/mocha_simple/testem.yml
diff --git a/lib/config.js b/lib/config.js
@@ -18,11 +18,20 @@ function Config(progOptions){
 Config.prototype.read = function(callback){
     var configFile = this.progOptions.file
       , self = this
-    fs.readFile(configFile, function(err, data){
-        if (!err){
-            var cfg = yaml.load(String(data))
-            self.config = cfg
+      , jsonConfigFile = configFile.replace(/\.yml$/, ".json")
+
+    fs.readFile(configFile, function (err, data) {
+        if (err) {
+            return fs.readFile(jsonConfigFile, function (err, data) {
+                if (!err) {
+                    var cfg = JSON.parse(data.toString())
+                    self.config = cfg   
+                }
+                if (callback) callback.call(self)
+            })
         }
+        var cfg = yaml.load(String(data))
+        self.config = cfg
         if (callback) callback.call(self)
     })
 }