Merge pull request #38 from nselvidge/master

Added better error handling for missing json files

Author: axs89

lib/commands/host.js

@@ -4,6 +4,7 @@
 var express = require("express");
 var path = require('path');
 var fs = require('fs');
+var logger = require('../logger');
 
 var readConfig = require("../read-config");
 var LocalController = require('../server/controller');
@@ -37,7 +38,12 @@ module.exports = function(varPath, port, program) {
   }
 
   //local controller for the requests
-  localController = new LocalController(variation, port);
+  try {
+    localController = new LocalController(variation, port);
+  } catch(error) {
+    logger.log("error", error.message);
+    return;
+  }
 
   //set the routes
   app.get("/", localController.installUserScript.bind(localController)); 

lib/commands/push-variation.js

@@ -26,8 +26,10 @@ module.exports = function(folder, program) {
         //find the experiment
         this.experiment = new Experiment({}, path.normalize(variation.baseDir +
           "/.."));
-        this.experiment.loadFromFile();
-        if (!experiment.attributes.id) {
+        if(!this.experiment.loadFromFile()){
+          logger.log("error", "no experiment.json found.");
+          return;
+        } else if (!this.experiment.attributes.id) {
           logger.log("error",
             "no id found for experiment. Please run push-experiment first"
           );

lib/experiment.js

@@ -35,7 +35,7 @@ Experiment.locateAndLoad = function(identifier) {
   if (fs.existsSync(identifier) && fs.lstatSync(identifier).isDirectory()) {
     //it's a directory
     experiment = new Experiment({}, identifier);
-    experiment.loadFromFile();
+    if(!experiment.loadFromFile()) return false;
   } else {
     var attrs = {};
     glob.sync("**/" + Experiment.JSON_FILE_NAME).forEach(function(jsonFile) {
@@ -50,6 +50,7 @@ Experiment.locateAndLoad = function(identifier) {
         }
       } catch (e) {
         logger.log("warn", "could not parse " + jsonFile);
+        return false;
       }
     })
   }

lib/file-util.js

@@ -21,18 +21,27 @@ module.exports = {
   },
   loadConfigItem: function(fileName) {
     var configItem;
-    configItem = JSON.parse(
-      fs.readFileSync(fileName, {
-        encoding: "utf-8"
-      }));
-    return configItem;
+    if (fs.existsSync(fileName)){
+      configItem = JSON.parse(
+        fs.readFileSync(fileName, {
+          encoding: "utf-8"
+        }));
+      return configItem;
+    } else {
+      return false;
+    }
+    
   },
   loadFile: function(fileName) {
     var theFile;
-    theFile = fs.readFileSync(fileName, {
-        encoding: "utf-8"
-      });
-    return theFile;
+    if (fs.existsSync(fileName)){
+      theFile = fs.readFileSync(fileName, {
+          encoding: "utf-8"
+        });
+      return theFile;
+    } else {
+      return false;
+    }
   }
 }
 

lib/optcli-base.js

@@ -27,8 +27,11 @@ OptCLIBase.prototype.getJSONPath = function() {
 }
 
 OptCLIBase.prototype.loadFromFile = function() {
-  this.attributes = fileUtil.loadConfigItem(this.getJSONPath()) || {};
-  return this.attributes;
+  if (this.JSONFileExists()){
+    this.attributes = fileUtil.loadConfigItem(this.getJSONPath()) || {};
+    return this.attributes;
+  } else return false;
+  
 }
 
 OptCLIBase.prototype.JSONFileExists = function() {

lib/project.js

@@ -15,8 +15,9 @@ util.inherits(Project, OptCLIBase);
 
 Project.createFromFile = function() {
   var project = new Project({}, "./");
-  project.loadFromFile();
+  if(!project.loadFromFile()) return false;
   return project;
+  
 }
 
 Project.prototype.save = function() {

lib/server/controller.js

@@ -16,9 +16,13 @@ function LocalController(variation, port) {
   //assume the directory above the variation
   //maybe move this to Experiment?
   this.experiment = new Experiment({}, path.normalize(variation.baseDir + "/.."));
-  this.experiment.loadFromFile();
+  if(!this.experiment.loadFromFile()) {
+    throw new Error("no experiment.json found");
+  }
   this.project = new Project({}, "./");
-  this.project.loadFromFile();
+  if(!this.project.loadFromFile()) {
+    throw new Error("no project.json found");
+  }
   //assume assets are in experiment.baseDir
   this.assets = new Assets({}, this.experiment.baseDir);
   if (this.assets.JSONFileExists()) {