Merge pull request #40 from nodkz/fix-server-kill

Fix server kill, add mint support

Author: nodkz

.flowconfig

@@ -40,4 +40,3 @@
 [options]
 esproposal.class_instance_fields=enable
 suppress_comment= \\(.\\|\n\\)*\\$FlowFixMe
-unsafe.enable_getters_and_setters=true

.travis.yml

@@ -8,6 +8,7 @@ cache:
 notifications:
   email: true
 node_js:
+  - "9"
   - "8"
   - "6"
 before_install: yarn global add greenkeeper-lockfile@1

package.json

@@ -24,33 +24,33 @@
   "homepage": "https://github.com/nodkz/mongodb-memory-server",
   "devDependencies": {
     "babel-cli": "^6.26.0",
-    "babel-eslint": "^8.0.2",
-    "babel-jest": "^21.2.0",
+    "babel-eslint": "^8.2.1",
+    "babel-jest": "^22.0.6",
     "babel-plugin-transform-class-properties": "^6.24.1",
     "babel-plugin-transform-flow-strip-types": "^6.22.0",
     "babel-plugin-transform-object-rest-spread": "^6.26.0",
     "babel-plugin-transform-runtime": "^6.23.0",
     "babel-preset-env": "^1.6.1",
     "cz-conventional-changelog": "^2.1.0",
-    "eslint": "^4.10.0",
+    "eslint": "^4.15.0",
     "eslint-config-airbnb-base": "^12.1.0",
-    "eslint-config-prettier": "^2.7.0",
-    "eslint-plugin-flowtype": "^2.39.1",
+    "eslint-config-prettier": "^2.9.0",
+    "eslint-plugin-flowtype": "^2.41.0",
     "eslint-plugin-import": "^2.8.0",
-    "eslint-plugin-prettier": "^2.3.1",
-    "flow-bin": "^0.58.0",
-    "jest": "^21.2.1",
+    "eslint-plugin-prettier": "^2.4.0",
+    "flow-bin": "^0.63.1",
+    "jest": "^22.0.6",
     "mongodb": "^2.2.33",
-    "npm-run-all": "^4.1.1",
-    "prettier": "^1.8.0",
+    "npm-run-all": "^4.1.2",
+    "prettier": "^1.10.2",
     "rimraf": "^2.6.2",
-    "semantic-release": "^8.2.0"
+    "semantic-release": "^11.0.2"
   },
   "dependencies": {
     "babel-runtime": "^6.26.0",
     "debug": "^3.1.0",
     "decompress": "^4.2.0",
-    "fs-extra": "^4.0.2",
+    "fs-extra": "^5.0.0",
     "get-port": "^3.2.0",
     "getos": "^3.1.0",
     "lockfile": "^1.0.3",

src/index.js

@@ -1,3 +1,5 @@
+/* @flow */
+
 import MongoMemoryServer from './MongoMemoryServer';
 import MongoInstance from './util/MongoInstance';
 import MongoBinary from './util/MongoBinary';

src/util/MongoBinaryDownloadUrl.js

@@ -4,8 +4,8 @@
 import getos from 'getos';
 
 type OS = {
-  release: string,
   dist: string,
+  release?: string,
 };
 
 const DOWNLOAD_URI = 'https://downloads.mongodb.org';
@@ -79,6 +79,8 @@ export default class MongoBinaryDownloadUrl {
       return this.getFedoraVersionString(os);
     } else if (/debian/i.test(os.dist)) {
       return this.getDebianVersionString(os);
+    } else if (/mint/i.test(os.dist)) {
+      return this.getMintVersionString(os);
     }
     throw new Error(`Cannot determine version string for ${JSON.stringify(os)}`);
   }
@@ -109,12 +111,15 @@ export default class MongoBinaryDownloadUrl {
 
   getRhelVersionString(os: OS): string {
     let name: string = 'rhel';
-    if (/^7/.test(os.release)) {
-      name += '70';
-    } else if (/^6/.test(os.release)) {
-      name += '62';
-    } else if (/^5/.test(os.release)) {
-      name += '55';
+    const { release } = os;
+    if (release) {
+      if (/^7/.test(release)) {
+        name += '70';
+      } else if (/^6/.test(release)) {
+        name += '62';
+      } else if (/^5/.test(release)) {
+        name += '55';
+      }
     }
     return name;
   }
@@ -124,6 +129,12 @@ export default class MongoBinaryDownloadUrl {
     return 'ubuntu1404';
   }
 
+  // eslint-disable-next-line no-unused-vars
+  getMintVersionString(os: OS): string {
+    // unfortunately getos doesn't return version for Mint
+    return 'ubuntu1404';
+  }
+
   getSuseVersionString(os: any): string {
     const [release]: [string | null] = os.release.match(/(^11|^12)/) || [null];
 

src/util/__tests__/MongoBinaryDownloadUrl-test.js

@@ -142,4 +142,16 @@ describe('MongoBinaryDownloadUrl', () => {
       ).toBe('debian81');
     });
   });
+
+  describe('getMintVersionString', () => {
+    const downloadUrl = new MongoBinaryDownloadUrl({
+      platform: 'linux',
+      arch: 'x64',
+      version: '3.4.4',
+    });
+
+    it('should return an archive name for Linux Mint', () => {
+      expect(downloadUrl.getMintVersionString({ dist: 'Linux Mint' })).toBe('ubuntu1404');
+    });
+  });
 });