Merge branch 'dev'

shstefanov · Jan 30, 2017 · 6af2a96 · 6af2a96
2 parents 939477b + 74634fe
commit 6af2a96
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/init.js b/init.js
@@ -32,14 +32,19 @@ module.exports = function(env, cb){
     if(structureConfig.path){
       var stagePath = path.join(env.config.rootDir, Array.isArray(structureConfig.path)?structureConfig.path[0]:structureConfig.path);
       if(fs.existsSync(stagePath)) {
-        env.i[name] = bulk(stagePath, Array.isArray(structureConfig.path)?structureConfig.path[1]:["**/*.js", "**/*.coffee"]);
+        try{
+          env.i[name] = bulk(stagePath, Array.isArray(structureConfig.path)?structureConfig.path[1]:["**/*.js", "**/*.coffee"]);
+        }
+        catch(err){
+          return cb(err);
+        }
       }
       else{
-        env.i[name] = {};        
+        env.i[name] = {};
       }
     }
     else{
-      env.i[name] = {};        
+      env.i[name] = {};
     }
 
 

diff --git a/init/process/master.js b/init/process/master.js
@@ -86,7 +86,7 @@ module.exports = function(env, cb){
         var i = env.i;
         // Listen for messages
         worker.on("message", function(data){
-          if(!data.address) return;
+          if(!data || !data.address) return;
           var target_name  = data.address.split(".")[0];
           var target = i[target_name];
           if(data.cb && !Array.isArray(data.cb) ) data.cb = [ name, data.cb ];

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "infrastructure",
-  "version": "1.4.2",
+  "version": "1.4.3",
   "private": false,
   "author": {
     "name": "Stefan Stefanov",

diff --git a/test/Class/Class.js b/test/Class/Class.js
@@ -7,12 +7,7 @@ describe('Class' + currentFileMark, function(){
 
   it("The name of the class", function(){
     var Child = Class.extend("ChildClassName", {}, {});
-    console.log("Child: ", Child.__className);
     assert.equal(Child.__className, "Class_ChildClassName");
-
-  })
-
-  // console.log(Class);
-
+  });
 
 });