Merge branch 'develop' of github.com:iurimatias/embark-framework into develop

boilerplate/package.json

@@ -9,7 +9,7 @@
   "license": "ISC",
   "homepage": "",
   "devDependencies": {
-    "embark": "^2.4.0",
+    "embark": "^2.4.3",
     "mocha": "^2.2.5"
   }
 }

demo/package.json

@@ -10,7 +10,7 @@
   "license": "ISC",
   "homepage": "",
   "devDependencies": {
-    "embark": "^2.4.1",
+    "embark": "^2.4.3",
     "mocha": "^2.2.5"
   }
 }

docs/conf.py

@@ -60,7 +60,7 @@ author = u'Iuri Matias'
 # The short X.Y version.
 version = u'2.4'
 # The full version, including alpha/beta/rc tags.
-release = u'2.4.0'
+release = u'2.4.3'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

lib/cmds/blockchain/blockchain.js

@@ -65,7 +65,7 @@ Blockchain.prototype.initChainAndGetAddress = function() {
 
   // check if an account already exists, create one if not, return address
   result = this.runCommand(this.client.listAccountsCommand());
-  if (result.output === undefined || result.output === '' || result.output.indexOf("Fatal") >= 0) {
+  if (result.output === undefined || result.output.match(/{(\w+)}/) === null || result.output.indexOf("Fatal") >= 0) {
     console.log("no accounts found".green);
     if (this.config.genesisBlock) {
       console.log("initializing genesis block".green);

lib/contracts/compiler.js

@@ -85,8 +85,15 @@ class Compiler {
 
         let compiled_object = {};
 
-        for (let className in json) {
+        for (let contractName in json) {
-          let contract = json[className];
+          let contract = json[contractName];
+
+          // Pull out filename:classname
+          // [0] filename:classname
+          // [1] filename
+          // [2] classname
+          const regex = /(.*):(.*)/;
+          const className = contractName.match(regex)[2];
 
           compiled_object[className] = {};
           compiled_object[className].code = contract.bytecode;

lib/core/logger.js

@@ -12,35 +12,35 @@ class Logger {
 }
 
 Logger.prototype.error = function (txt) {
-  if (!(this.shouldLog('error'))) {
+  if (!txt || !(this.shouldLog('error'))) {
     return;
   }
   this.logFunction(txt.red);
 };
 
 Logger.prototype.warn = function (txt) {
-  if (!(this.shouldLog('warn'))) {
+  if (!txt || !(this.shouldLog('warn'))) {
     return;
   }
   this.logFunction(txt.yellow);
 };
 
 Logger.prototype.info = function (txt) {
-  if (!(this.shouldLog('info'))) {
+  if (!txt || !(this.shouldLog('info'))) {
     return;
   }
   this.logFunction(txt.green);
 };
 
 Logger.prototype.debug = function (txt) {
-  if (!(this.shouldLog('debug'))) {
+  if (!txt || !(this.shouldLog('debug'))) {
     return;
   }
   this.logFunction(txt);
 };
 
 Logger.prototype.trace = function (txt) {
-  if (!(this.shouldLog('trace'))) {
+  if (!txt || !(this.shouldLog('trace'))) {
     return;
   }
   this.logFunction(txt);

package.json

@@ -1,6 +1,6 @@
 {
   "name": "embark",
-  "version": "2.4.0",
+  "version": "2.4.3",
   "description": "Embark is a framework that allows you to easily develop and deploy DApps",
   "scripts": {
     "test": "grunt jshint && mocha test/ --no-timeouts"
@@ -29,7 +29,7 @@
     "promptly": "^2.1.0",
     "serve-static": "^1.11.1",
     "shelljs": "^0.5.0",
-    "solc": "0.4.8",
+    "solc": "0.4.11",
     "toposort": "^1.0.0",
     "underscore": "^1.8.3",
     "underscore.string": "^3.3.4",