0.6.0

Author: shnhrrsn

.babelrc

@@ -1,8 +1,6 @@
 {
-	"presets": [ "es2016-node5", "stage-1" ],
+	"presets": [ "grind" ],
 	"plugins": [
-		"babel-plugin-import-auto-name",
-		"babel-plugin-transform-isnil",
 		[
 			"babel-plugin-module-alias", [
 				{ "src": "./app", "expose": "App" },

.travis.yml

@@ -1,7 +1,6 @@
 language: node_js
 node_js:
-  - "5"
   - "6"
+  - "7"
 sudo: false
-install: "npm install"
 script: "bin/lint"

README.markdown

@@ -15,14 +15,14 @@ bin/cli db:seed
 ```bash
 # Use `watch` to automatically restart the server on file changes
 # Watch is recommended for development
-bin/watch
+bin/cli watch
 
 # Use `serve --cluster` to launch a cluster of workers
 # Cluster is recommended for production
-bin/serve --cluster
+bin/cli serve --cluster
 
 # Use `serve` to launch a single worker
-bin/serve
+bin/cli serve
 ```
 
 You should now be able to go to [localhost:3000/states](http://localhost:3000/states).

bin/.init

@@ -7,11 +7,9 @@ cd "`dirname "$BASH_SOURCE"`"
 
 WORKING_DIR=`pwd`
 
-if [ -d "$WORKING_DIR/../node_modules" ];
-then
+if [ -d "$WORKING_DIR/../node_modules" ]; then
 	NODE_ROOT="$WORKING_DIR/../node_modules"
-elif [ -d "$WORKING_DIR/../node_modules" ];
-then
+elif [ -d "$WORKING_DIR/../../node_modules" ]; then
 	NODE_ROOT="$WORKING_DIR/../../node_modules"
 else
 	NODE_ROOT=`npm root`

bin/build

@@ -4,23 +4,29 @@ source ${0%/*}/.init
 
 strip_babel() {
 	cp "$1" "$1-tmp"
-	cat "$1-tmp" | sed 's/babel-node/node \-\-es_staging/g' > "$1"
+
+	if [ $(node -e 'console.log(Number.parseFloat(process.version.substring(1)) >= 7)') == "true" ]; then
+		cat "$1-tmp" | sed 's/babel-node/node/g' | sed 's/FLAGS=.*$/FLAGS="--harmony-async-await"/g' > "$1"
+	else
+		cat "$1-tmp" | sed 's/babel-node/node/g' | sed 's/FLAGS=.*$/FLAGS=""/g' > "$1"
+	fi
+
 	rm "$1-tmp"
 }
 
 echo "Cleaning up old build"
 rm -fr build
 
 echo "Building"
+
 mkdir build build/app build/boot
 babel -s inline -d build/app/ app/
 babel -s inline -d build/boot/ boot/
 
 echo "Setting up bins"
 cp -R bin build/bin
-rm build/bin/build build/bin/lint build/bin/watch
+rm build/bin/build build/bin/lint
 
-strip_babel build/bin/serve
 strip_babel build/bin/cli
 chmod +x build/bin/* build/bin/.init
 

bin/cli

@@ -6,4 +6,19 @@ popd > /dev/null
 
 source ${0%/*}/.init
 
-IN_CLI=true CLI_BIN="$CLI_BIN" exec babel-node boot/Cli.js "$@"
+COMMAND=$1
+
+if [[ "$@" == *"--help"* ]]; then
+    COMMAND="$COMMAND-help"
+fi
+
+FLAGS=$(node -e 'console.log(Number.parseFloat(process.version.substring(1)) >= 7 ? "--harmony-async-await" : "")')
+
+case $COMMAND in
+	watch) exec babel-node $FLAGS boot/Http.js --watch=app,config $@
+		;;
+	serve) exec babel-node $FLAGS boot/Http.js $@
+		;;
+	*) IN_CLI=true CLI_BIN="$CLI_BIN" exec babel-node $FLAGS boot/Cli.js "$@"
+		;;
+esac

bin/serve

@@ -1,7 +1,10 @@
-import {CliProvider} from 'grind-cli'
+import { CliProvider } from 'grind-cli'
 import 'App/Providers/CommandsProvider'
 
 const app = require('App/Bootstrap')
 app.providers.push(CliProvider, CommandsProvider)
 
-app.boot().then(() => app.cli.run())
+app.boot().then(() => app.cli.run()).catch(err => {
+	Log.error('Boot Error', err)
+	process.exit(1)
+})

bin/watch

@@ -1,3 +1,6 @@
-import {HttpServer} from 'grind-framework'
+import { HttpServer } from 'grind-framework'
 
-(new HttpServer(() => require('App/Bootstrap'))).start()
+(new HttpServer(() => require('App/Bootstrap'))).start().catch(err => {
+	Log.error('Boot Error', err)
+	process.exit(1)
+})