remove grunt; use grunt plugin

Author: iurimatias

bin/embark

@@ -15,7 +15,7 @@ var run = function(cmd) {
 }
 
 program
-  .version('0.5.0')
+  .version('0.6.0')
 
 program.command('new [name]').description('New application').action(function(name) {
   if (name === undefined) {

boilerplate/Gruntfile.coffee

@@ -1,54 +1,102 @@
 module.exports = (grunt) ->
 
-  grunt.loadNpmTasks "embark-framework"
+  grunt.loadNpmTasks "grunt-embark"
 
   grunt.initConfig(
-    @initEmbarkConfig(
-      files:
-        js:
-          src: [
-            "app/js/**/*.js"
-          ]
-
-        css:
-          src: [
-            "app/css/**/*.css"
-          ]
-
-        html:
-          src: [
-            "app/html/**/*.html"
-          ]
-
-        contracts:
-          src: [
-            "app/contracts/**/*.sol"
-          ]
-
-      concat:
-        app:
-          src: ["<%= files.web3 %>", 'generated/tmp/abi.js', "<%= files.js.src %>", "<%= files.coffee.compiled %>"]
-          dest: "generated/dapp/js/app.min.js"
-        css:
-          src: "<%= files.css.src %>"
-          dest: "generated/dapp/css/app.min.css"
-
-      copy:
-        html:
-          files:
-            "generated/dapp/index.html" : "<%= files.html.src %>"
-            "dist/dapp/index.html"      : "<%= files.html.src %>"
-        css:
-          files:
-            "dist/dapp/css/app.min.css" : "<%= files.css.src %>"
-        contracts:
-          files:
-            "dist/contracts/": '<%= files.contracts.src %>'
-
-      deploy:
-        contracts: '<%= files.contracts.src %>'
-        dest: 'generated/tmp/abi.js'
-    )
+    files:
+      web3:
+        "node_modules/embark-framework/js/web3.js"
+
+      js:
+        src: [
+          "app/js/**/*.js"
+        ]
+
+      css:
+        src: [
+          "app/css/**/*.css"
+        ]
+
+      html:
+        src: [
+          "app/html/**/*.html"
+        ]
+
+      coffee:
+        dest: "generated/dapp/compiled-coffee"
+        compiled: [
+          "generated/dapp/compiled-coffee/app.coffee"
+          "generated/dapp/compiled-coffee/**/*.js"
+        ]
+
+      contracts:
+        src: [
+          "app/contracts/**/*.sol"
+        ]
+
+    coffee:
+      compile:
+        expand: true
+        cwd: 'coffee'
+        src: '**/*.coffee'
+        dest: '<%= files.coffee.dest %>'
+        ext: '.js'
+
+    concat:
+      app:
+        src: ["<%= files.web3 %>", 'generated/tmp/abi.js', "<%= files.js.src %>", "<%= files.coffee.compiled %>"]
+        dest: "generated/dapp/js/app.min.js"
+      css:
+        src: "<%= files.css.src %>"
+        dest: "generated/dapp/css/app.min.css"
+
+    watch:
+      options:
+        livereload: true
+
+      html:
+        files: ["<%= files.html.src %>"]
+        tasks: ["copy"]
+
+      js:
+        files: ["<%= files.js.src %>"]
+        tasks: ["concat"]
+
+      css:
+        files: ["<%= concat.css.src %>"]
+        tasks: ["concat"]
+
+      coffee:
+        files: ["coffee/**/*.coffee"]
+        tasks: ["coffee", "concat"]
+
+      contracts:
+        files: ["<%= files.contracts.src %>"]
+        tasks: ["deploy", "concat", "copy"]
+
+    copy:
+      html:
+        files:
+          "generated/dapp/index.html" : "<%= files.html.src %>"
+          "dist/dapp/index.html"      : "<%= files.html.src %>"
+      css:
+        files:
+          "dist/dapp/css/app.min.css" : "<%= files.css.src %>"
+      contracts:
+        files:
+          "dist/contracts/": '<%= files.contracts.src %>'
+
+    uglify:
+      dist:
+        src: "<%= concat.app.dest %>" # input from the concat process
+        dest: "dist/dapp/js/app.min.js"
+
+    clean:
+      workspaces: ["dist", "generated"]
+
+    deploy:
+      contracts: '<%= files.contracts.src %>'
+      dest: 'generated/tmp/abi.js'
   )
 
   # loading external tasks (aka: plugins)

boilerplate/package.json

@@ -10,7 +10,8 @@
   "license": "ISC",
   "homepage": "",
   "devDependencies": {
-    "embark-framework": "iurimatias/embark-framework#develop",
+    "embark-framework": "/Users/iurimatias/Projects/embark-framework",
+    "grunt-embark": "/Users/iurimatias/Projects/grunt-embark",
     "grunt-contrib-clean": "^0.6.0",
     "grunt-contrib-coffee": "^0.13.0",
     "grunt-contrib-concat": "^0.5.1",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "embark-framework",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "description": "",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"