From ee1147a1a5c55ba4260d1bde5e20d3f4e61bddbe Mon Sep 17 00:00:00 2001
From: Jonathan Bernard <jdb@jdb-labs.com>
Date: Sun, 23 Dec 2018 17:57:38 -0600
Subject: [PATCH] Add configurability of the server port.

---
 src/main/nim/strawbosspkg/configuration.nim | 4 ++++
 src/main/nim/strawbosspkg/server.nim        | 2 +-
 src/main/nim/strawbosspkg/version.nim       | 2 +-
 src/test/json/strawboss.config.json         | 1 +
 strawboss.nimble                            | 7 ++++++-
 5 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/main/nim/strawbosspkg/configuration.nim b/src/main/nim/strawbosspkg/configuration.nim
index 185158c..7f90632 100644
--- a/src/main/nim/strawbosspkg/configuration.nim
+++ b/src/main/nim/strawbosspkg/configuration.nim
@@ -58,6 +58,7 @@ type
     debug*: bool
     logLevel*: Level
     pathToExe*: string
+    port*: int
     projects*: seq[ProjectDef]
     pwdCost*: int8
     users*: seq[UserRef]
@@ -83,6 +84,7 @@ proc `==`*(a, b: StrawBossConfig): bool =
     a.buildDataDir == b.buildDataDir and
     a.authSecret == b.authSecret and
     a.pwdCost == b.pwdCost and
+    a.port == b.port and
     a.maintenancePeriod == b.maintenancePeriod and
     a.logLevel == b.logLevel and
     sameContents(a.users, b.users) and
@@ -144,6 +146,7 @@ proc parseStrawBossConfig*(jsonCfg: JsonNode): StrawBossConfig =
     buildDataDir: jsonCfg.getIfExists("buildDataDir").getStr("build-data"),
     authSecret: jsonCfg.getOrFail("authSecret", "strawboss config").getStr,
     debug: jsonCfg.getIfExists("debug").getBool(false),
+    port: int(jsonCfg.getIfExists("port").getInt(8180)),
     pwdCost: int8(jsonCfg.getOrFail("pwdCost", "strawboss config").getInt),
     projects: jsonCfg.getIfExists("projects").getElems.mapIt(parseProjectDef(it)),
     maintenancePeriod: int(jsonCfg.getIfExists("maintenancePeriod").getInt(10000)),
@@ -296,6 +299,7 @@ proc `%`*(cfg: StrawBossConfig): JsonNode =
     "buildDataDir": cfg.buildDataDir,
     "authSecret": cfg.authSecret,
     "debug": cfg.debug,
+    "port": cfg.port,
     "projects": %cfg.projects,
     "pwdCost": cfg.pwdCost,
     "maintenancePeriod": cfg.maintenancePeriod,
diff --git a/src/main/nim/strawbosspkg/server.nim b/src/main/nim/strawbosspkg/server.nim
index 60993c1..c64635a 100644
--- a/src/main/nim/strawbosspkg/server.nim
+++ b/src/main/nim/strawbosspkg/server.nim
@@ -161,7 +161,7 @@ proc start*(cfg: StrawBossConfig): void =
   var workers: seq[Worker] = @[]
 
   settings:
-    port = Port(8180)
+    port = Port(cfg.port)
     appName = "/api"
 
   routes:
diff --git a/src/main/nim/strawbosspkg/version.nim b/src/main/nim/strawbosspkg/version.nim
index e9037a8..c2bfac7 100644
--- a/src/main/nim/strawbosspkg/version.nim
+++ b/src/main/nim/strawbosspkg/version.nim
@@ -1,2 +1,2 @@
-const SB_VERSION* = "0.5.0"
+const SB_VERSION* = "0.5.1"
 
diff --git a/src/test/json/strawboss.config.json b/src/test/json/strawboss.config.json
index 700d5da..bd7182b 100644
--- a/src/test/json/strawboss.config.json
+++ b/src/test/json/strawboss.config.json
@@ -6,6 +6,7 @@
     { "name": "bob@builder.com", "hashedPwd": "$2a$11$lVZ9U4optQMhzPh0E9A7Yu6XndXblUF3gCa.zmEvJy4F.4C4718b." },
     { "name": "sam@sousa.com", "hashedPwd": "testvalue" }
   ],
+  "port": 8180,
   "pwdCost": 11,
   "projects": [
     { "name": "dummy-project",
diff --git a/strawboss.nimble b/strawboss.nimble
index f16dc22..2f0f820 100644
--- a/strawboss.nimble
+++ b/strawboss.nimble
@@ -1,7 +1,7 @@
 # Package
 
 bin           = @["strawboss"]
-version       = "0.5.0"
+version       = "0.5.1"
 author        = "Jonathan Bernard"
 description   = "My personal continious integration worker."
 license       = "MIT"
@@ -44,3 +44,8 @@ task test, "Runs both the unit and functional test suites.":
   echo "\nRunning functional tests."
   echo "-------------------------"
   exec "src/test/nim/run_functional_tests"
+
+task dist, "Creates distributable package.":
+  exec "nimble build"
+  mkdir "dist"
+  exec "cp strawboss strawboss.config.json dist/."