rebase

backup.sh

@@ -25,7 +25,7 @@ while getopts "hp:c:U:P:H:D:" opt; do
             ;;
 
         p)
-            BACKUP_PATH="$OPTARG"
+            BACKUP_PATH_PREFIX="$OPTARG"
             ;;
 
         c)
@@ -78,11 +78,10 @@ if [ -z "$HOST" ]; then
     HOST="localhost:27017"
 fi
 
-echo $BACKUP_PATH
-
-if [ -z "$BACKUP_PATH" ]; then
-    BACKUP_PATH="backup"
+if [ -z "$BACKUP_PATH_PREFIX" ]; then
+	BACKUP_PATH_PREFIX=$(date +%Y_%m_%d_%H_%M_%S)
 fi
+BACKUP_PATH="backup/""$BACKUP_PATH_PREFIX"
 
 
 ARGS=""
@@ -111,7 +110,7 @@ if [ "$ACTION" = "export" ]; then
 	pushd $BACKUP_PATH 2>/dev/null
 
 	for collection in $DATABASE_COLLECTIONS; do
-		mongoexport --host $HOST $ARGS --db $DB --collection $collection --pretty --out $collection.json >/dev/null
+		mongoexport --host $HOST $ARGS --db $DB --collection $collection --pretty --jsonArray --out $collection.json >/dev/null
 	done
 
 elif [ "$ACTION" = "import" ]; then
@@ -121,7 +120,7 @@ elif [ "$ACTION" = "import" ]; then
 	for path in *.json; do
 	 	collection=${path%.json}
 		echo "Importing $DB/$collection from $path"
-		mongoimport --host $HOST $ARGS --db $DB --collection $collection $path --drop
+		mongoimport --host $HOST $ARGS --db $DB --collection $collection $path --jsonArray --drop
 	done
 
 else

package.json

@@ -18,6 +18,8 @@
   "scripts": {
     "lint": "eslint ./src ./test --ext .js",
     "test": "npm run lint && npm run coverage",
+	"backup": "./backup.sh export",
+	"setup": "./backup.sh -p setup/ import",
     "start": "node src/",
     "startd": "nodemon src/",
     "coverage": "NODE_ENV=test istanbul cover node_modules/.bin/_mocha -- -- -u exports -R spec test/**/*.test.js",

src/app.js

@@ -13,7 +13,6 @@ const bodyParser = require('body-parser');
 const socketio = require('feathers-socketio');
 const middleware = require('./middleware');
 const services = require('./services');
-const setupEnvironment = require('./setupEnvironment');
 const winston = require('winston');
 const defaultHeaders = require('./middleware/defaultHeaders');
 const setupSwagger = require('./swagger');
@@ -42,6 +41,5 @@ app.use(compress())
 winston.cli();	// optimize for cli, like using colors
 winston.level = 'debug';
 winston.info('test');
-setupEnvironment(app).setup();
 
 module.exports = app;