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

README.md

@@ -1,5 +1,7 @@
 What is embark
 ======
+
+[![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)
 Embark is a framework that allows you to easily develop and deploy DApps. Embark automatically deploys your contracts and makes them available in your JS code. Embark watches for changes, and if you update a contract, Embark will automatically redeploy the contracts (if needed) and the dapp.
 
 Installation

boilerplate/Gruntfile.coffee

@@ -1,6 +1,9 @@
 module.exports = (grunt) ->
 
-  grunt.config.merge
+  grunt.loadNpmTasks "embark-framework"
+
+  grunt.initConfig(
+    @initEmbarkConfig(
       files:
         js:
           src: [
@@ -45,8 +48,8 @@ module.exports = (grunt) ->
       deploy:
         contracts: '<%= files.contracts.src %>'
         dest: 'generated/tmp/abi.js'
-
-  grunt.loadNpmTasks "embark-framework"
+    )
+  )
 
   # loading external tasks (aka: plugins)
   # Loads all plugins that match "grunt-", in this case all of our current plugins

boilerplate/package.json

@@ -27,6 +27,7 @@
     "shelljs": "^0.4.0",
     "string": "^3.1.1",
     "web3": "^0.4.3",
-    "wrench": "^1.5.8"
+    "wrench": "^1.5.8",
+    "hashmerge": "^1.0.2"
   }
 }

package.json

@@ -25,7 +25,8 @@
     "read-yaml": "^1.0.0",
     "shelljs": "^0.5.0",
     "web3": "^0.5.0",
-    "wrench": "^1.5.8"
+    "wrench": "^1.5.8",
+    "hashmerge": "^1.0.2"
   },
   "author": "Iuri Matias <iuri.matias@gmail.com>",
   "contributors": [],

tasks/_gruntfile.coffee

@@ -1,6 +1,6 @@
 module.exports = (grunt) ->
 
-  grunt.initConfig
+  @embarkConfig =
     files:
       web3:
         "node_modules/embark-framework/js/web3.js"
@@ -96,3 +96,7 @@ module.exports = (grunt) ->
       contracts: '<%= files.contracts.src %>'
       dest: 'generated/tmp/abi.js'
 
+  @initEmbarkConfig = (userConfig) =>
+    hashmerge = require('hashmerge')
+    hashmerge(@embarkConfig, userConfig)
+