From a100d307ff0be8521f13cd108f91da170eefaae6 Mon Sep 17 00:00:00 2001
From: Nicolas Iglesias <webpolis@users.noreply.github.com>
Date: Sun, 27 Nov 2016 13:59:54 -0300
Subject: [PATCH 1/2] Add missing argument

---
 lib/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/index.js b/lib/index.js
index b99b5a54..9cbc2e90 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -227,8 +227,8 @@ var Embark = {
     var self = this;
     async.waterfall([
       function buildAndDeploy(callback) {
-        Embark.buildAndDeploy(function(contractsManager) {
-          callback(null, contractsManager);
+        Embark.buildAndDeploy(function(err, contractsManager) {
+          callback(err, contractsManager);
         });
       },
       function generateABI(contractsManager, callback) {

From cae39d85be1088915d4ba93beafe4ee12209a846 Mon Sep 17 00:00:00 2001
From: Nicolas Iglesias <webpolis@users.noreply.github.com>
Date: Mon, 28 Nov 2016 17:14:39 -0300
Subject: [PATCH 2/2] embark build wasn't deploying assets

---
 lib/index.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/index.js b/lib/index.js
index b99b5a54..59bf0ce7 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -151,7 +151,13 @@ var Embark = {
         });
       },
       function buildPipeline(abi, callback) {
-        var pipeline = new Pipeline({});
+        self.logger.trace("Building Assets");
+        var pipeline = new Pipeline({
+          buildDir: self.config.buildDir,
+          contractsFiles: self.config.contractsFiles,
+          assetFiles: self.config.assetFiles,
+          logger: self.logger
+        });
         pipeline.build(abi);
         callback();
       }