fix on contract add

Author: jrainville

lib/constants.json

@@ -13,6 +13,6 @@
     "any": "any"
   },
   "events": {
-    "contextChange": "contextChange"
+    "contractFilesChanged": "contractFilesChanged"
   }
 }

lib/contracts/contracts.js

@@ -3,6 +3,7 @@ let async = require('async');
 
 let Compiler = require('./compiler.js');
 let utils = require('../utils/utils.js');
+const constants = require('../constants');
 
 // TODO: create a contract object
 
@@ -16,6 +17,11 @@ class ContractsManager {
     this.contractDependencies = {};
     this.gasLimit = options.gasLimit;
     this.deployOnlyOnConfig = false;
+    this.events = options.events;
+
+    this.events.on(constants.events.contractFilesChanged, (newContracts) => {
+      this.contractFiles = newContracts;
+    });
   }
 
   build(done) {

lib/core/config.js

@@ -3,6 +3,7 @@ const File = require('./file.js');
 const Plugins = require('./plugins.js');
 const utils = require('../utils/utils.js');
 const path = require('path');
+const deepEqual = require('deep-equal');
 const constants = require('../constants');
 
 var Config = function(options) {
@@ -217,8 +218,12 @@ Config.prototype.loadWebServerConfigFile = function() {
 };
 
 Config.prototype.loadEmbarkConfigFile = function() {
-  var contracts = this.embarkConfig.contracts;
-  this.contractsFiles = this.loadFiles(contracts);
+  const contracts = this.embarkConfig.contracts;
+  const newContractsFiles = this.loadFiles(contracts);
+  if (newContractsFiles.length !== this.contractFiles || deepEqual(newContractsFiles, this.contractFiles)) {
+    this.events.emit(constants.events.contractFilesChanged, newContractsFiles);
+    this.contractsFiles = newContractsFiles;
+  }
   // determine contract 'root' directories
   this.contractDirectories = contracts.map((dir) => {
     return dir.split("**")[0];

lib/core/engine.js

@@ -197,7 +197,8 @@ class Engine {
       contractsConfig: this.config.contractsConfig,
       logger: this.logger,
       plugins: this.plugins,
-      gasLimit: false
+      gasLimit: false,
+      events: this.events
     });
 
     this.deployManager = new DeployManager({
@@ -211,7 +212,7 @@ class Engine {
       onlyCompile: options.onlyCompile
     });
 
-    this.events.on('file-event', function (fileType, _path) {
+    this.events.on('file-event', function (fileType) {
       // TODO: for now need to deploy on asset chanes as well
       // because the contractsManager config is corrupted after a deploy
       if (fileType === 'contract' || fileType === 'config') {

package-lock.json

@@ -34,6 +34,7 @@
     "colors": "^1.1.2",
     "commander": "^2.15.1",
     "css-loader": "^0.28.11",
+    "deep-equal": "^1.0.1",
     "ejs": "^2.5.8",
     "ethereumjs-testrpc": "^6.0.3",
     "file-loader": "^1.1.5",

package.json

@@ -3,6 +3,7 @@ let ContractsManager = require('../lib/contracts/contracts.js');
 let Logger = require('../lib/core/logger.js');
 let File = require('../lib/core/file.js');
 let TestLogger = require('../lib/tests/test_logger.js');
+let Events = require('../lib/core/events');
 let assert = require('assert');
 
 //let SolidityCompiler = require('../lib/modules/solidity');
@@ -55,7 +56,8 @@ describe('embark.Contracts', function() {
           }
         }
       },
-      logger: new Logger({})
+      logger: new Logger({}),
+      events: new Events()
     });
 
     describe('#build', function() {
@@ -146,7 +148,8 @@ describe('embark.Contracts', function() {
           }
         }
       },
-      logger: new Logger({})
+      logger: new Logger({}),
+      events: new Events()
     });
 
     describe('#build', function() {