feat: abstract DB Adapter

src/utils/key.js

@@ -0,0 +1,9 @@
+const SEPARATOR = '!';
+
+/**
+ * Creates string key from passed arguments
+ * @return {String}
+ */
+module.exports = function combineKey(...args) {
+  return args.join(SEPARATOR);
+};

test/config.js

@@ -99,9 +99,9 @@ function startService() {
 }
 
 function clearRedis() {
-  const nodes = this.users._redis.masterNodes;
+  const nodes = this.users.redis.nodes('master');
   return Promise
-  .map(Object.keys(nodes), nodeKey => nodes[nodeKey].flushdb())
+  .map(nodes, node => node.flushdb())
   .finally(() => this.users.close())
   .finally(() => {
     this.users = null;

test/docker-compose.yml

@@ -55,4 +55,4 @@ tester:
   environment:
     NODE_ENV: "docker"
     SKIP_REBUILD: ${SKIP_REBUILD}
-  command: 'true'
+  command: tail -f /dev/null

test/docker.sh

@@ -10,42 +10,44 @@ MOCHA=$BIN/_mocha
 COVER="$BIN/isparta cover"
 NODE=$BIN/babel-node
 TESTS=${TESTS:-test/suites/*.js}
-
-if [ -z "$NODE_VER" ]; then
-  NODE_VER="6.2.0"
-fi
+NODE_VER=${NODE_VER:-6.2.1}
+COMPOSE_VER=${COMPOSE_VER:-1.7.1}
 
 if ! [ -x "$COMPOSE" ]; then
   mkdir $DIR/.bin
-  curl -L https://github.com/docker/compose/releases/download/1.5.2/docker-compose-`uname -s`-`uname -m` > $DIR/.bin/docker-compose
+  curl -L https://github.com/docker/compose/releases/download/${COMPOSE_VER}/docker-compose-`uname -s`-`uname -m` > $DIR/.bin/docker-compose
   chmod +x $DIR/.bin/docker-compose
-  COMPOSE=$(which docker-compose)
+#  COMPOSE=$(which docker-compose)
+  COMPOSE="c:/dev/docker/docker-compose.exe"
 fi
 
 function finish {
-  "$COMPOSE" -f $DC stop
-  "$COMPOSE" -f $DC rm -f
+  $COMPOSE -f $DC stop
+  $COMPOSE -f $DC rm -f
 }
 trap finish EXIT
 
-export IMAGE=makeomatic/alpine-node:$NODE_VER
-"$COMPOSE" -f $DC up -d
+export IMAGE=makeomatic/node:$NODE_VER
+$COMPOSE -f $DC up -d
+
+# add glibc
+$COMPOSE -f $DC exec tester /bin/sh -c "apk --no-cache add build-base python" || exit 1
 
 if [[ "$SKIP_REBUILD" != "1" ]]; then
   echo "rebuilding native dependencies..."
-  "$COMPOSE" -f $DC run --rm tester npm rebuild
+  $COMPOSE -f $DC exec tester npm rebuild
 fi
 
 echo "cleaning old coverage"
 rm -rf ./coverage
 
 echo "running tests"
 for fn in $TESTS; do
-  "$COMPOSE" -f $DC run --rm tester /bin/sh -c "$NODE $COVER --dir ./coverage/${fn##*/} $MOCHA -- $fn" || exit 1
+  $COMPOSE -f $DC exec tester /bin/sh -c "$NODE $COVER --dir ./coverage/${fn##*/} $MOCHA -- $fn" || exit 1
 done
 
 echo "started generating combined coverage"
-"$COMPOSE" -f $DC run --rm tester node ./test/aggregate-report.js
+$COMPOSE -f $DC exec tester node ./test/aggregate-report.js
 
 echo "uploading coverage report from ./coverage/lcov.info"
 if [[ "$CI" == "true" ]]; then