Merge branch 'develop' of https://github.com/HabitRPG/habitica into n…

…egue/refactor-purchase-api

.travis.yml

@@ -20,7 +20,8 @@ env:
     - DISABLE_REQUEST_LOGGING=true
   matrix:
     - TEST="lint"
-    - TEST="test:api-v3" REQUIRES_SERVER=true COVERAGE=true
+    - TEST="test:api-v3:unit" REQUIRES_SERVER=true COVERAGE=true
+    - TEST="test:api-v3:integration" REQUIRES_SERVER=true COVERAGE=true
     - TEST="test:sanity"
     - TEST="test:content" COVERAGE=true
     - TEST="test:common" COVERAGE=true

Dockerfile-Production

@@ -20,7 +20,7 @@ RUN npm install -g gulp mocha
 # Clone Habitica repo and install dependencies
 RUN mkdir -p /usr/src/habitrpg
 WORKDIR /usr/src/habitrpg
-RUN git clone --branch v4.20.3 https://github.com/HabitRPG/habitica.git /usr/src/habitrpg
+RUN git clone --branch v4.23.2 https://github.com/HabitRPG/habitica.git /usr/src/habitrpg
 RUN npm install
 RUN gulp build:prod --force
 

gulp/gulp-apidoc.js

@@ -8,7 +8,7 @@ gulp.task('apidoc:clean', (done) => {
   clean(APIDOC_DEST_PATH, done);
 });
 
-gulp.task('apidoc', ['apidoc:clean'], (done) => {
+gulp.task('apidoc', gulp.series('apidoc:clean', (done) => {
   let result = apidoc.createDoc({
     src: APIDOC_SRC_PATH,
     dest: APIDOC_DEST_PATH,
@@ -19,8 +19,8 @@ gulp.task('apidoc', ['apidoc:clean'], (done) => {
   } else {
     done();
   }
-});
+}));
 
-gulp.task('apidoc:watch', ['apidoc'], () => {
-  return gulp.watch(`${APIDOC_SRC_PATH}/**/*.js`, ['apidoc']);
-});
+gulp.task('apidoc:watch', gulp.series('apidoc', (done) => {
+  return gulp.watch(`${APIDOC_SRC_PATH}/**/*.js`, gulp.series('apidoc', done));
+}));

gulp/gulp-build.js

@@ -2,12 +2,6 @@ import gulp from 'gulp';
 import babel from 'gulp-babel';
 import webpackProductionBuild from '../webpack/build';
 
-gulp.task('build', () => {
-  if (process.env.NODE_ENV === 'production') { // eslint-disable-line no-process-env
-    gulp.start('build:prod');
-  }
-});
-
 gulp.task('build:src', () => {
   return gulp.src('website/server/**/*.js')
     .pipe(babel())
@@ -20,18 +14,30 @@ gulp.task('build:common', () => {
     .pipe(gulp.dest('website/common/transpiled-babel/'));
 });
 
-gulp.task('build:server', ['build:src', 'build:common']);
+gulp.task('build:server', gulp.series('build:src', 'build:common', done => done()));
 
 // Client Production Build
 gulp.task('build:client', (done) => {
   webpackProductionBuild((err, output) => {
     if (err) return done(err);
     console.log(output); // eslint-disable-line no-console
+    done();
   });
 });
 
-gulp.task('build:prod', [
+gulp.task('build:prod', gulp.series(
   'build:server',
   'build:client',
   'apidoc',
-]);
+  done => done()
+));
+
+let buildArgs = [];
+
+if (process.env.NODE_ENV === 'production') { // eslint-disable-line no-process-env
+  buildArgs.push('build:prod');
+}
+
+gulp.task('build', gulp.series(buildArgs, (done) => {
+  done();
+}));

gulp/gulp-console.js

@@ -1,5 +1,4 @@
 import mongoose from 'mongoose';
-import autoinc  from 'mongoose-id-autoinc';
 import logger  from '../website/server/libs/logger';
 import nconf    from 'nconf';
 import repl     from 'repl';
@@ -25,23 +24,23 @@ let improveRepl = (context) => {
 
   const isProd = nconf.get('NODE_ENV') === 'production';
   const mongooseOptions = !isProd ? {} : {
-    replset: { socketOptions: { keepAlive: 1, connectTimeoutMS: 30000 } },
-    server: { socketOptions: { keepAlive: 1, connectTimeoutMS: 30000 } },
+    keepAlive: 1,
+    connectTimeoutMS: 30000,
+    useMongoClient: true,
   };
-  autoinc.init(
-    mongoose.connect(
-      nconf.get('NODE_DB_URI'),
-      mongooseOptions,
-      (err) => {
-        if (err) throw err;
-        logger.info('Connected with Mongoose');
-      }
-    )
+  mongoose.connect(
+    nconf.get('NODE_DB_URI'),
+    mongooseOptions,
+    (err) => {
+      if (err) throw err;
+      logger.info('Connected with Mongoose');
+    }
   );
 };
 
-gulp.task('console', () => {
+gulp.task('console', (done) => {
   improveRepl(repl.start({
     prompt: 'Habitica > ',
   }).context);
+  done();
 });

gulp/gulp-sprites.js

@@ -7,6 +7,7 @@ import mergeStream from 'merge-stream';
 import {basename} from 'path';
 import {sync} from 'glob';
 import {each} from 'lodash';
+import vinylBuffer from 'vinyl-buffer';
 
 // https://github.com/Ensighten/grunt-spritesmith/issues/67#issuecomment-34786248
 const MAX_SPRITESHEET_SIZE = 1024 * 1024 * 3;
@@ -104,6 +105,7 @@ function createSpritesStream (name, src) {
       }));
 
     let imgStream = spriteData.img
+      .pipe(vinylBuffer())
       .pipe(imagemin())
       .pipe(gulp.dest(IMG_DIST_PATH));
 
@@ -117,8 +119,6 @@ function createSpritesStream (name, src) {
   return stream;
 }
 
-gulp.task('sprites:compile', ['sprites:clean', 'sprites:main', 'sprites:largeSprites', 'sprites:checkCompiledDimensions']);
-
 gulp.task('sprites:main', () => {
   let mainSrc = sync('website/raw_sprites/spritesmith/**/*.png');
   return createSpritesStream('main', mainSrc);
@@ -133,7 +133,7 @@ gulp.task('sprites:clean', (done) => {
   clean(`${IMG_DIST_PATH}spritesmith*,${CSS_DIST_PATH}spritesmith*}`, done);
 });
 
-gulp.task('sprites:checkCompiledDimensions', ['sprites:main', 'sprites:largeSprites'], () => {
+gulp.task('sprites:checkCompiledDimensions', gulp.series('sprites:main', 'sprites:largeSprites', (done) => {
   console.log('Verifiying that images do not exceed max dimensions'); // eslint-disable-line no-console
 
   let numberOfSheetsThatAreTooBig = 0;
@@ -159,4 +159,7 @@ gulp.task('sprites:checkCompiledDimensions', ['sprites:main', 'sprites:largeSpri
   } else {
     console.log('All images are within the correct dimensions'); // eslint-disable-line no-console
   }
-});
+  done();
+}));
+
+gulp.task('sprites:compile', gulp.series('sprites:clean', 'sprites:main', 'sprites:largeSprites', 'sprites:checkCompiledDimensions', done => done()));

gulp/gulp-start.js

@@ -3,7 +3,7 @@ import nodemon from 'gulp-nodemon';
 
 let pkg = require('../package.json');
 
-gulp.task('nodemon', () => {
+gulp.task('nodemon', (done) => {
   nodemon({
     script: pkg.main,
     ignore: [
@@ -12,4 +12,5 @@ gulp.task('nodemon', () => {
       'common/dist/script/content/*',
     ],
   });
+  done();
 });

gulp/gulp-tests.js

@@ -4,7 +4,6 @@ import {
 import mongoose                   from 'mongoose';
 import { exec }                   from 'child_process';
 import gulp                       from 'gulp';
-import runSequence                from 'run-sequence';
 import os                         from 'os';
 import nconf                      from 'nconf';
 
@@ -39,12 +38,11 @@ let testBin = (string, additionalEnvVariables = '') => {
   }
 };
 
-gulp.task('test:nodemon', () => {
+gulp.task('test:nodemon', gulp.series(function setupNodemon (done) {
   process.env.PORT = TEST_SERVER_PORT; // eslint-disable-line no-process-env
   process.env.NODE_DB_URI = TEST_DB_URI; // eslint-disable-line no-process-env
-
-  runSequence('nodemon');
-});
+  done();
+}, 'nodemon'));
 
 gulp.task('test:prepare:mongo', (cb) => {
   mongoose.connect(TEST_DB_URI, (err) => {
@@ -55,7 +53,7 @@ gulp.task('test:prepare:mongo', (cb) => {
   });
 });
 
-gulp.task('test:prepare:server', ['test:prepare:mongo'], () => {
+gulp.task('test:prepare:server', gulp.series('test:prepare:mongo', (done) => {
   if (!server) {
     server = exec(testBin('node ./website/server/index.js', `NODE_DB_URI=${TEST_DB_URI} PORT=${TEST_SERVER_PORT}`), (error, stdout, stderr) => {
       if (error) {
@@ -64,16 +62,18 @@ gulp.task('test:prepare:server', ['test:prepare:mongo'], () => {
       if (stderr) {
         console.error(stderr); // eslint-disable-line no-console
       }
+      done();
     });
   }
-});
+}));
 
-gulp.task('test:prepare:build', ['build']);
+gulp.task('test:prepare:build', gulp.series('build', done => done()));
 
-gulp.task('test:prepare', [
+gulp.task('test:prepare', gulp.series(
   'test:prepare:build',
   'test:prepare:mongo',
-]);
+  done => done()
+));
 
 gulp.task('test:sanity', (cb) => {
   let runner = exec(
@@ -88,7 +88,7 @@ gulp.task('test:sanity', (cb) => {
   pipe(runner);
 });
 
-gulp.task('test:common', ['test:prepare:build'], (cb) => {
+gulp.task('test:common', gulp.series('test:prepare:build', (cb) => {
   let runner = exec(
     testBin(COMMON_TEST_COMMAND),
     (err) => {
@@ -99,17 +99,17 @@ gulp.task('test:common', ['test:prepare:build'], (cb) => {
     }
   );
   pipe(runner);
-});
+}));
 
 gulp.task('test:common:clean', (cb) => {
   pipe(exec(testBin(COMMON_TEST_COMMAND), () => cb()));
 });
 
-gulp.task('test:common:watch', ['test:common:clean'], () => {
-  gulp.watch(['common/script/**/*', 'test/common/**/*'], ['test:common:clean']);
-});
+gulp.task('test:common:watch', gulp.series('test:common:clean', () => {
+  return gulp.watch(['common/script/**/*', 'test/common/**/*'], gulp.series('test:common:clean', done => done()));
+}));
 
-gulp.task('test:common:safe', ['test:prepare:build'], (cb) => {
+gulp.task('test:common:safe', gulp.series('test:prepare:build', (cb) => {
   let runner = exec(
     testBin(COMMON_TEST_COMMAND),
     (err, stdout) => { // eslint-disable-line handle-callback-err
@@ -123,9 +123,9 @@ gulp.task('test:common:safe', ['test:prepare:build'], (cb) => {
     }
   );
   pipe(runner);
-});
+}));
 
-gulp.task('test:content', ['test:prepare:build'], (cb) => {
+gulp.task('test:content', gulp.series('test:prepare:build', (cb) => {
   let runner = exec(
     testBin(CONTENT_TEST_COMMAND),
     CONTENT_OPTIONS,
@@ -137,17 +137,17 @@ gulp.task('test:content', ['test:prepare:build'], (cb) => {
     }
   );
   pipe(runner);
-});
+}));
 
 gulp.task('test:content:clean', (cb) => {
   pipe(exec(testBin(CONTENT_TEST_COMMAND), CONTENT_OPTIONS, () => cb()));
 });
 
-gulp.task('test:content:watch', ['test:content:clean'], () => {
-  gulp.watch(['common/script/content/**', 'test/**'], ['test:content:clean']);
-});
+gulp.task('test:content:watch', gulp.series('test:content:clean', () => {
+  return gulp.watch(['common/script/content/**', 'test/**'], gulp.series('test:content:clean', done => done()));
+}));
 
-gulp.task('test:content:safe', ['test:prepare:build'], (cb) => {
+gulp.task('test:content:safe', gulp.series('test:prepare:build', (cb) => {
   let runner = exec(
     testBin(CONTENT_TEST_COMMAND),
     CONTENT_OPTIONS,
@@ -162,7 +162,7 @@ gulp.task('test:content:safe', ['test:prepare:build'], (cb) => {
     }
   );
   pipe(runner);
-});
+}));
 
 gulp.task('test:api-v3:unit', (done) => {
   let runner = exec(
@@ -179,7 +179,7 @@ gulp.task('test:api-v3:unit', (done) => {
 });
 
 gulp.task('test:api-v3:unit:watch', () => {
-  gulp.watch(['website/server/libs/*', 'test/api/v3/unit/**/*', 'website/server/controllers/**/*'], ['test:api-v3:unit']);
+  return gulp.watch(['website/server/libs/*', 'test/api/v3/unit/**/*', 'website/server/controllers/**/*'], gulp.series('test:api-v3:unit', done => done()));
 });
 
 gulp.task('test:api-v3:integration', (done) => {
@@ -198,8 +198,10 @@ gulp.task('test:api-v3:integration', (done) => {
 });
 
 gulp.task('test:api-v3:integration:watch', () => {
-  gulp.watch(['website/server/controllers/api-v3/**/*', 'common/script/ops/*', 'website/server/libs/*.js',
-              'test/api/v3/integration/**/*'], ['test:api-v3:integration']);
+  return gulp.watch([
+    'website/server/controllers/api-v3/**/*', 'common/script/ops/*', 'website/server/libs/*.js',
+    'test/api/v3/integration/**/*',
+  ], gulp.series('test:api-v3:integration', done => done()));
 });
 
 gulp.task('test:api-v3:integration:separate-server', (done) => {
@@ -212,21 +214,17 @@ gulp.task('test:api-v3:integration:separate-server', (done) => {
   pipe(runner);
 });
 
-gulp.task('test', (done) => {
-  runSequence(
-    'test:sanity',
-    'test:content',
-    'test:common',
-    'test:api-v3:unit',
-    'test:api-v3:integration',
-    done
-  );
-});
-
-gulp.task('test:api-v3', (done) => {
-  runSequence(
-    'test:api-v3:unit',
-    'test:api-v3:integration',
-    done
-  );
-});
+gulp.task('test', gulp.series(
+  'test:sanity',
+  'test:content',
+  'test:common',
+  'test:api-v3:unit',
+  'test:api-v3:integration',
+  done => done()
+));
+
+gulp.task('test:api-v3', gulp.series(
+  'test:api-v3:unit',
+  'test:api-v3:integration',
+  done => done()
+));