Merge branch 'master' into feature/contribution_owner

README.md

@@ -64,6 +64,11 @@ Ethereum RPC port.
 
 **Step 2-4 is also summarized in `npm run bootstrap`**
 
+If you want to reset your local setup:
+
+        $ npm run reset // deploys a new kit and a new DAO
+        $ npm run reset:hard // deploys all apps and does reset
+
 ## Contract architecture
 
 Contracts are organized in independent apps (see `/apps`) and are developed 
@@ -87,6 +92,8 @@ CLI. _At some point these should be moved into a real nice CLI._
 To run these scripts use `truffle exec`. For example: `truffle exec
 scripts/add-proposal.js`.
 
+Some scripts are also defined as npm script, see package.json.
+
 ### cli.js
 
 Call any function on any contract:

package.json

@@ -11,11 +11,12 @@
     "repl": "truffle exec scripts/repl.js",
     "seeds": "truffle exec scripts/seeds.js",
     "compile-contracts": "aragon contracts compile --all",
-    "bootstrap": "npm run reset && truffle exec scripts/seeds.js",
-    "reset": "npm run deploy:apps && npm run deploy:kit && npm run deploy:dao",
-    "deploy:kit": "npm run compile-contracts && ENS=0x5f6f7e8cc7346a11ca2def8f827b7a0b612c56a1 aragon contracts exec scripts/deploy-kit.js",
+    "bootstrap": "./scripts/every-app \"npm install \" && npm run reset:hard && npm run seeds",
+    "reset": "npm run deploy:kit && npm run deploy:dao",
+    "reset:hard": "npm run deploy:apps && npm run reset",
+    "deploy:kit": "npm run compile-contracts && aragon contracts exec scripts/deploy-kit.js",
     "deploy:dao": "aragon contracts exec scripts/new-dao.js",
-    "deploy:apps": "./scripts/deploy-apps.sh",
+    "deploy:apps": "./scripts/every-app.sh \"aragon apm publish major\"",
     "devchain": "aragon devchain --port 7545",
     "dao:address": "truffle exec scripts/current-address.js",
     "test": "echo \"Error: no test specified\" && exit 1"

scripts/deploy-apps.sh

@@ -10,13 +10,7 @@ echo "Setting up each aragon app in ./apps"
 echo "a new app version will be deployed"
 echo "----"
 
-for dir in ./apps/*/; do
-  set -x
-  cd $dir
-  npm install
-  aragon apm publish major 
-  cd $rootDir
-  set +x
-done
+./scripts/every-app.sh "npm install"
+./scripts/every-app.sh "aragon apm publish major"
 
 echo "Done, new versions of all apps deployed"

scripts/every-app.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+set -e
+
+rootDir=`pwd`
+
+for dir in ./apps/*/; do
+  set -x
+  cd $dir
+  eval $1
+  cd $rootDir
+  set +x
+done
+

scripts/upgrade.sh

@@ -0,0 +1,23 @@
+#!/bin/bash
+
+set -e
+
+rootDir=`pwd`
+
+app=$1
+daoAddress=$2
+if [ -z "$VAR" ]; then
+  daoAddress=$KREDITS_DAO_ADDRESS
+fi
+
+echo "## Deploying $app for $daoAddress"
+
+set -x
+cd "apps/$app"
+aragon apm publish major
+cd $rootDir
+aragon dao upgrade $daoAddress kredits-$app
+npm run build-json
+set +x
+
+echo "Done"