embarklabs
/
embark
mirror of https://github.com/embarklabs/embark.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #257 from aletheia-foundation/develop 

Show error message if unable to deploy contracts. Include ethereumjs-testrpc
This commit is contained in:
Iuri Matias 2017-03-30 06:57:04 -04:00 committed by GitHub
parent 7ed493d1a2 3637b2e06e
commit fc36bccee5
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/index.js
View File

@ -104,7 +104,7 @@ var Embark = (function () {
}); });
}); });
engine.deployManager.deployContracts(function() { engine.deployManager.deployContracts(function(err) {
engine.startService("fileWatcher"); engine.startService("fileWatcher");
if (options.runWebserver) { if (options.runWebserver) {
engine.startService("webServer", { engine.startService("webServer", {
@ -112,12 +112,13 @@ var Embark = (function () {
port: options.serverPort port: options.serverPort
}); });
} }
callback(); callback(err);
}); });
} }
], function(err, result) { ], function(err, result) {
if (err) { if (err) {
engine.logger.error(err.message); engine.logger.error(err.message);
engine.logger.info(err.stack);
} else { } else {
engine.logger.setStatus("Ready".green); engine.logger.setStatus("Ready".green);
engine.logger.info("Looking for documentation? you can find it at ".cyan + "http://embark.readthedocs.io/".green.underline); engine.logger.info("Looking for documentation? you can find it at ".cyan + "http://embark.readthedocs.io/".green.underline);
@ -143,19 +144,21 @@ var Embark = (function () {
engine.logger.info("loaded plugins: " + pluginList.join(", ")); engine.logger.info("loaded plugins: " + pluginList.join(", "));
} }
engine.startService("web3");
engine.startService("pipeline"); engine.startService("pipeline");
engine.startService("abi"); engine.startService("abi");
engine.startService("deployment"); engine.startService("deployment");
callback(); callback();
}, },
function deploy(callback) { function deploy(callback) {
engine.deployManager.deployContracts(function() { engine.deployManager.deployContracts(function(err) {
callback(); callback(err);
}); });
} }
], function(err, result) { ], function(err, result) {
if (err) { if (err) {
engine.logger.error(err.message); engine.logger.error(err.message);
engine.logger.debug(err.stack)
} else { } else {
engine.logger.info("finished building".underline); engine.logger.info("finished building".underline);
} }
@ -164,9 +167,8 @@ var Embark = (function () {
}); });
} }
function initTests (options) { function initTests () {
var Test = require('./core/test.js'); return require('./core/test.js');
return new Test(options);
} }
// TODO: should deploy if it hasn't already // TODO: should deploy if it hasn't already
@ -198,4 +200,3 @@ var Embark = (function () {
})(); })();
module.exports = Embark; module.exports = Embark;

1
package.json
View File

@ -29,6 +29,7 @@
"promptly": "^2.1.0", "promptly": "^2.1.0",
"serve-static": "^1.11.1", "serve-static": "^1.11.1",
"shelljs": "^0.5.0", "shelljs": "^0.5.0",
"ethereumjs-testrpc": "^3.0.3",
"solc": "0.4.8", "solc": "0.4.8",
"toposort": "^1.0.0", "toposort": "^1.0.0",
"web3": "^0.18.2" "web3": "^0.18.2"