From 24081cd0cf54560445d36cd669ee887ccfe7e2e1 Mon Sep 17 00:00:00 2001 From: Ryan Petschek Date: Thu, 19 Jan 2017 17:19:55 -0500 Subject: [PATCH 1/4] Parse Git hash without requiring git to be installed --- server/app.ts | 2 +- server/package.json | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/server/app.ts b/server/app.ts index 549adb1..2c740c0 100644 --- a/server/app.ts +++ b/server/app.ts @@ -42,7 +42,7 @@ const UNIQUE_APP_ID = process.env.UNIQUE_APP_ID || 'ultimate-checkin'; const STATIC_ROOT = "../client"; const VERSION_NUMBER = JSON.parse(fs.readFileSync(path.join(__dirname, "package.json"), "utf8")).version; -const VERSION_HASH = require("child_process").execSync("git rev-parse --short HEAD").toString().trim(); +const VERSION_HASH = process.env.VERSION_HASH || require("git-rev-sync").short(); let app = express(); app.use(compression()); diff --git a/server/package.json b/server/package.json index 03f8ee3..6fe6022 100644 --- a/server/package.json +++ b/server/package.json @@ -15,6 +15,7 @@ "cookie-parser": "^1.4.3", "csv-parse": "^1.1.9", "express": "^4.14.0", + "git-rev-sync": "^1.8.0", "material-components-web": "^0.2.0", "mongoose": "^4.7.6", "multer": "^1.2.1", From c82c3325b4d8853aae8ab2d802af431be7926495 Mon Sep 17 00:00:00 2001 From: Ryan Petschek Date: Thu, 19 Jan 2017 17:20:23 -0500 Subject: [PATCH 2/4] Fix invalid MongoDB URL when testing --- server/app.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/app.ts b/server/app.ts index 2c740c0..d0d4c80 100644 --- a/server/app.ts +++ b/server/app.ts @@ -37,8 +37,8 @@ import * as WebSocket from "ws"; import * as cheerio from "cheerio"; const PORT = parseInt(process.env.PORT) || 3000; -const MONGO_URL = process.env.MONGO_URL || 'mongodb://localhost/'; -const UNIQUE_APP_ID = process.env.UNIQUE_APP_ID || 'ultimate-checkin'; +const MONGO_URL = process.env.MONGO_URL || "mongodb://localhost"; +const UNIQUE_APP_ID = process.env.UNIQUE_APP_ID || "ultimate-checkin"; const STATIC_ROOT = "../client"; const VERSION_NUMBER = JSON.parse(fs.readFileSync(path.join(__dirname, "package.json"), "utf8")).version; From 96706389bd6fb5ce6255dcdbd1f16a73a2abaeb0 Mon Sep 17 00:00:00 2001 From: Ryan Petschek Date: Thu, 19 Jan 2017 17:25:08 -0500 Subject: [PATCH 3/4] Use the URL library to resolve MongoDB URL --- server/app.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/server/app.ts b/server/app.ts index d0d4c80..9840a1b 100644 --- a/server/app.ts +++ b/server/app.ts @@ -1,5 +1,6 @@ import * as fs from "fs"; import * as path from "path"; +import * as url from "url"; import * as os from "os"; import * as crypto from "crypto"; import * as http from "http"; @@ -37,7 +38,7 @@ import * as WebSocket from "ws"; import * as cheerio from "cheerio"; const PORT = parseInt(process.env.PORT) || 3000; -const MONGO_URL = process.env.MONGO_URL || "mongodb://localhost"; +const MONGO_URL = process.env.MONGO_URL || "mongodb://localhost/"; const UNIQUE_APP_ID = process.env.UNIQUE_APP_ID || "ultimate-checkin"; const STATIC_ROOT = "../client"; @@ -55,7 +56,7 @@ let cookieParserInstance = cookieParser(undefined, { app.use(cookieParserInstance); (mongoose).Promise = global.Promise; -mongoose.connect(`${MONGO_URL}/${UNIQUE_APP_ID}`); +mongoose.connect(url.resolve(MONGO_URL, UNIQUE_APP_ID)); interface IUser { username: string; From d06d19fcc86e1b872768ff71f606f203dc425336 Mon Sep 17 00:00:00 2001 From: Ryan Petschek Date: Thu, 19 Jan 2017 17:30:50 -0500 Subject: [PATCH 4/4] Bump version --- server/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/package.json b/server/package.json index 6fe6022..bc7943b 100644 --- a/server/package.json +++ b/server/package.json @@ -1,6 +1,6 @@ { "name": "check-in", - "version": "1.0.0", + "version": "1.0.1", "description": "Check in for HackGT events", "main": "app.js", "scripts": {