Merge branch 'develop'

Author: iurimatias

.codeclimate.yml

@@ -0,0 +1,19 @@
+engines:
+  eslint:
+        enabled: true
+        checks:
+                no-eval:
+                          enabled: false
+                no-process-exit:
+                          enabled: false
+                global-require:
+                          enabled: false
+ratings:
+    paths:
+    - "lib/**/*"
+exclude_paths:
+- "tests/"
+- "old_test/"
+- "boilerplate/"
+- "demo/"
+- "js/"

.nycrc

@@ -0,0 +1,9 @@
+{
+  "reporter": [
+    "lcov",
+    "text-summary"
+  ],
+  "include": [
+    "lib/**/*.js"
+  ]
+}

.travis.yml

@@ -3,3 +3,6 @@ node_js:
     - "6"
     - "5"
     - "4"
+addons:
+    code_climate:
+        repo_token: 7454b1a666015e244c384d19f48c34e35d1ae58c3aa428ec542f10bbcb848358

README.md

@@ -2,6 +2,7 @@
 [![Join the chat at https://gitter.im/iurimatias/embark-framework](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/iurimatias/embark-framework?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![Build
 Status](https://travis-ci.org/iurimatias/embark-framework.svg?branch=develop)](https://travis-ci.org/iurimatias/embark-framework)
+[![Code Climate](https://codeclimate.com/github/iurimatias/embark-framework/badges/gpa.svg)](https://codeclimate.com/github/iurimatias/embark-framework)
 
 What is Embark
 ======
@@ -23,6 +24,7 @@ Table of Contents
 * [Usage Demo](#usage---demo)
 * [Dashboard](#dashboard)
 * [Creating a new DApp](#creating-a-new-dapp)
+* [Libraries and APIs available](#libraries-and-languages-available)
 * [Using and Configuring Contracts](#dapp-structure)
 * [EmbarkJS](#embarkjs)
 * [EmbarkJS - Storage (IPFS)](#embarkjs---storage)
@@ -75,7 +77,7 @@ Alternatively, to use an ethereum rpc simulator simply run:
 $ embark simulator
 ```
 
-By default embark blockchain will mine a minimum amount of ether and will only mine when new transactions come in. This is quite usefull to keep a low CPU. The option can be configured at config/blockchain.json
+By default embark blockchain will mine a minimum amount of ether and will only mine when new transactions come in. This is quite usefull to keep a low CPU. The option can be configured at ```config/blockchain.json```. Note that running a real node requires at least 2GB of free ram, please take this into account if running it in a VM.
 
 Then, in another command line:
 
@@ -131,6 +133,16 @@ DApp Structure
 
 Solidity/Serpent files in the contracts directory will automatically be deployed with embark run. Changes in any files will automatically be reflected in app, changes to contracts will result in a redeployment and update of their JS Bindings
 
+Libraries and languages available
+======
+
+Embark can build and deploy contracts coded in Solidity or Serpent. It will make them available on the client side using EmbarkJS and Web3.js.
+
+Further documentation for these can be found below:
+
+* Smart Contracts: [Solidity](https://solidity.readthedocs.io/en/develop/) and [Serpent](https://github.com/ethereum/wiki/wiki/Serpent)
+* Client Side: [Web3.js](https://github.com/ethereum/wiki/wiki/JavaScript-API) and [EmbarkJS](#embarkjs)
+
 Using Contracts
 ======
 Embark will automatically take care of deployment for you and set all needed JS bindings. For example, the contract below:

boilerplate/chain.json renamed to boilerplate/chains.json

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

boilerplate/package.json

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

demo/package.json

@@ -76,7 +76,7 @@ var EmbarkJS =
 	  var self = this;
 	  var contractParams;
 
-	  contractParams = args;
+	  contractParams = args || [];
 
 	  contractParams.push({
 	    from: this.web3.eth.accounts[0],
@@ -5907,83 +5907,14 @@ var EmbarkJS =
 /***/ function(module, exports) {
 
 	// shim for using process in browser
-	var process = module.exports = {};
-
-	// cached from whatever global is present so that test runners that stub it
-	// don't break things.  But we need to wrap it in a try catch in case it is
-	// wrapped in strict mode code which doesn't define any globals.  It's inside a
-	// function because try/catches deoptimize in certain engines.
 
-	var cachedSetTimeout;
-	var cachedClearTimeout;
-
-	(function () {
-	    try {
-	        cachedSetTimeout = setTimeout;
-	    } catch (e) {
-	        cachedSetTimeout = function () {
-	            throw new Error('setTimeout is not defined');
-	        }
-	    }
-	    try {
-	        cachedClearTimeout = clearTimeout;
-	    } catch (e) {
-	        cachedClearTimeout = function () {
-	            throw new Error('clearTimeout is not defined');
-	        }
-	    }
-	} ())
-	function runTimeout(fun) {
-	    if (cachedSetTimeout === setTimeout) {
-	        //normal enviroments in sane situations
-	        return setTimeout(fun, 0);
-	    }
-	    try {
-	        // when when somebody has screwed with setTimeout but no I.E. maddness
-	        return cachedSetTimeout(fun, 0);
-	    } catch(e){
-	        try {
-	            // When we are in I.E. but the script has been evaled so I.E. doesn't trust the global object when called normally
-	            return cachedSetTimeout.call(null, fun, 0);
-	        } catch(e){
-	            // same as above but when it's a version of I.E. that must have the global object for 'this', hopfully our context correct otherwise it will throw a global error
-	            return cachedSetTimeout.call(this, fun, 0);
-	        }
-	    }
-
-
-	}
-	function runClearTimeout(marker) {
-	    if (cachedClearTimeout === clearTimeout) {
-	        //normal enviroments in sane situations
-	        return clearTimeout(marker);
-	    }
-	    try {
-	        // when when somebody has screwed with setTimeout but no I.E. maddness
-	        return cachedClearTimeout(marker);
-	    } catch (e){
-	        try {
-	            // When we are in I.E. but the script has been evaled so I.E. doesn't  trust the global object when called normally
-	            return cachedClearTimeout.call(null, marker);
-	        } catch (e){
-	            // same as above but when it's a version of I.E. that must have the global object for 'this', hopfully our context correct otherwise it will throw a global error.
-	            // Some versions of I.E. have different rules for clearTimeout vs setTimeout
-	            return cachedClearTimeout.call(this, marker);
-	        }
-	    }
-
-
-
-	}
+	var process = module.exports = {};
 	var queue = [];
 	var draining = false;
 	var currentQueue;
 	var queueIndex = -1;
 
 	function cleanUpNextTick() {
-	    if (!draining || !currentQueue) {
-	        return;
-	    }
 	    draining = false;
 	    if (currentQueue.length) {
 	        queue = currentQueue.concat(queue);
@@ -5999,7 +5930,7 @@ var EmbarkJS =
 	    if (draining) {
 	        return;
 	    }
-	    var timeout = runTimeout(cleanUpNextTick);
+	    var timeout = setTimeout(cleanUpNextTick);
 	    draining = true;
 
 	    var len = queue.length;
@@ -6016,7 +5947,7 @@ var EmbarkJS =
 	    }
 	    currentQueue = null;
 	    draining = false;
-	    runClearTimeout(timeout);
+	    clearTimeout(timeout);
 	}
 
 	process.nextTick = function (fun) {
@@ -6028,7 +5959,7 @@ var EmbarkJS =
 	    }
 	    queue.push(new Item(fun, args));
 	    if (queue.length === 1 && !draining) {
-	        runTimeout(drainQueue);
+	        setTimeout(drainQueue, 0);
 	    }
 	};
 

js/build/embark.bundle.js

@@ -29,7 +29,7 @@ EmbarkJS.Contract.prototype.deploy = function(args) {
   var self = this;
   var contractParams;
 
-  contractParams = args;
+  contractParams = args || [];
 
   contractParams.push({
     from: this.web3.eth.accounts[0],

js/embark.js

@@ -3,7 +3,7 @@ var colors = require('colors');
 
 var Cmd = function(Embark) {
   this.Embark = Embark;
-  program.version('2.0.1');
+  program.version('2.1.2');
 };
 
 Cmd.prototype.process = function(args) {
@@ -62,12 +62,13 @@ Cmd.prototype.run = function() {
   var self = this;
   program
   .command('run [environment]')
+  .option('-p, --port [port]', 'port to run the dev webserver')
   .description('run dapp (default: development)')
   .action(function(env, options) {
     self.Embark.initConfig(env || 'development', {
         embarkConfig: 'embark.json'
     });
-    self.Embark.run(env || 'development');
+    self.Embark.run({env: env || 'development', serverPort: options.port});
   });
 };