Merge branch 'develop'

Author: iurimatias

bin/embark

@@ -14,7 +14,7 @@ var run = function(cmd) {
   }
 }
 
-var deploy = function(embarkConfig) {
+var deploy = function(env, embarkConfig) {
   contractFiles = grunt.file.expand(embarkConfig.contracts);
   destFile = embarkConfig.output
   Embark.init()
@@ -25,7 +25,7 @@ var deploy = function(embarkConfig) {
 }
 
 program
-  .version('0.6.1')
+  .version('0.7.0')
 
 program.command('new [name]').description('New application').action(function(name) {
   if (name === undefined) {
@@ -49,7 +49,7 @@ program.command('deploy [env]').description('deploy contracts').action(function(
     run("grunt deploy_contracts:" + env);
   }
   else {
-    deploy();
+    deploy(env, embarkConfig);
   }
 });
 
@@ -63,7 +63,7 @@ program.command('build [env]').description('build dapp').action(function(env_) {
     run('grunt build:' + env);
   }
   else if (embarkConfig.type === "meteor") {
-    deploy();
+    deploy(env, embarkConfig);
     run("meteor-build-client ./build -p ''");
   }
 });
@@ -79,7 +79,7 @@ program.command('ipfs [env]').description('build dapp and make it available in i
     run('grunt ipfs:' + env)
   }
   else if (embarkConfig.type === "meteor") {
-    deploy();
+    deploy(env, embarkConfig);
     run("meteor-build-client ./build -p ''");
     Embark.release.ipfs("build/")
   }
@@ -97,7 +97,7 @@ program.command('run [env]').description('run dapp').action(function(env_) {
   }
   else {
     console.log("command not available in meteor or manual mode yet");
-    console.log("try instead embark run");
+    console.log("try instead embark deploy; if using meteor then follow that with 'meteor'");
   }
 });
 
@@ -126,7 +126,7 @@ program.command('blockchain [env]').description('run blockchain').action(functio
     Embark.contractsConfig.loadConfigFile(embarkConfig.contractsConfig)
 
     //TODO: better with --exec, but need to fix console bug first
-    wrench.copyDirSyncRecursive(__dirname + "/../js", "/tmp", {forceDelete: true});
+    wrench.copyDirSyncRecursive(__dirname + "/../js", "/tmp/js", {forceDelete: true});
 
     Embark.startBlockchain(env, true);
   }

boilerplate/Gruntfile.coffee

@@ -1,6 +1,7 @@
 module.exports = (grunt) ->
 
   grunt.loadNpmTasks "grunt-embark"
+  grunt.loadTasks "tasks"
 
   grunt.initConfig(
     files:
@@ -103,3 +104,6 @@ module.exports = (grunt) ->
   # Loads all plugins that match "grunt-", in this case all of our current plugins
   require('matchdep').filterAll('grunt-*').forEach(grunt.loadNpmTasks)
 
+  grunt.registerTask "deploy", ["coffee", "deploy_contracts", "concat", "copy", "server", "watch"]
+  grunt.registerTask "build", ["clean", "deploy_contracts", "coffee", "concat", "uglify", "copy"]
+

boilerplate/config/blockchain.yml

@@ -21,3 +21,13 @@ staging:
   account:
     init: false
     address: 
+production:
+  rpc_host: localhost
+  rpc_port: 8101
+  rpc_whitelist: "*"
+  datadir: default
+  network_id: 1
+  console: true
+  account:
+    init: false
+    address: 

boilerplate/package.json

@@ -10,8 +10,8 @@
   "license": "ISC",
   "homepage": "",
   "devDependencies": {
-    "embark-framework": "^0.6.1",
-    "grunt-embark": "0.1.0",
+    "embark-framework": "^0.7.0",
+    "grunt-embark": "^0.2.0",
     "grunt-contrib-clean": "^0.6.0",
     "grunt-contrib-coffee": "^0.13.0",
     "grunt-contrib-concat": "^0.5.1",
@@ -20,6 +20,9 @@
     "grunt-contrib-watch": "^0.6.1",
     "grunt": "^0.4.5",
     "grunt-cli": "^0.1.13",
-    "matchdep": "^0.3.0"
+    "matchdep": "^0.3.0",
+    "express": "^4.12.3",
+    "read-yaml": "^1.0.0",
+    "compression": "^1.4.3"
   }
 }

boilerplate/tasks/server.coffee

@@ -0,0 +1,22 @@
+module.exports = (grunt) ->
+  express = require('express')
+  compression = require('compression')
+  readYaml = require('read-yaml')
+
+  grunt.registerTask "server", "static file development server", =>
+    serverConfig = readYaml.sync("config/server.yml")
+
+    webPort = serverConfig.port || 8000
+    webHost = serverConfig.host || 'localhost'
+    webRoot = "generated/dapp"
+
+    app = express()
+    app.use(compression())
+    app.use(express.static("" + (process.cwd()) + "/" + webRoot))
+    app.listen(webPort, webHost)
+
+    grunt.log.writeln("Running web server on port http://#{webHost}:#{webPort}")
+
+    return app
+
+

demo/config/blockchain.yml

@@ -21,3 +21,13 @@ staging:
   account:
     init: false
     address: 
+production:
+  rpc_host: localhost
+  rpc_port: 8101
+  rpc_whitelist: "*"
+  datadir: default
+  network_id: 1
+  console: true
+  account:
+    init: false
+    address: