From 411379cb8db7fcc5ff7fc1fd9c7afef89b7aac3a Mon Sep 17 00:00:00 2001
From: Jonathan Bernard <jdb@jdb-labs.com>
Date: Mon, 8 May 2017 12:33:47 -0500
Subject: [PATCH] StrawBossConfig object (de)serialization and tests.

---
 src/main/nim/strawbosspkg/configuration.nim | 22 +++++++++++++++------
 src/test/nim/tconfiguration.nim             |  7 ++++---
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/src/main/nim/strawbosspkg/configuration.nim b/src/main/nim/strawbosspkg/configuration.nim
index 072f929..f01d5e8 100644
--- a/src/main/nim/strawbosspkg/configuration.nim
+++ b/src/main/nim/strawbosspkg/configuration.nim
@@ -57,6 +57,14 @@ proc `==`*(a, b: ProjectDef): bool =
     a.defaultBranch == b.defaultBranch and
     a.repo == b.repo
 
+proc `==`*(a, b: StrawBossConfig): bool =
+  result =
+    a.artifactsRepo == b.artifactsRepo and
+    a.authSecret == b.authSecret and
+    a.pwdCost == b.pwdCost and
+    sameContents(a.users, b.users) and
+    sameContents(a.projects, b.projects)
+
 # Util methods on custom types
 proc findProject*(cfg: StrawBossConfig, projectName: string): ProjectDef =
   let candidates = cfg.projects.filterIt(it.name == projectName)
@@ -92,12 +100,7 @@ proc parseProjectDef*(pJson: JsonNode): ProjectDef =
     envVars: envVars,
     repo: pJson.getOrFail("repo", "project definition").getStr)
 
-proc loadStrawBossConfig*(cfgFile: string): StrawBossConfig =
-  if not existsFile(cfgFile):
-    raiseEx "strawboss config file not found: " & cfgFile
-
-  let jsonCfg = parseFile(cfgFile)
-
+proc parseStrawBossConfig*(jsonCfg: JsonNode): StrawBossConfig =
   var users: seq[UserRef] = @[]
 
   for uJson in jsonCfg.getIfExists("users").getElems:
@@ -113,6 +116,13 @@ proc loadStrawBossConfig*(cfgFile: string): StrawBossConfig =
     projects: jsonCfg.getIfExists("projects").getElems.mapIt(parseProjectDef(it)),
     users: users)
 
+
+proc loadStrawBossConfig*(cfgFile: string): StrawBossConfig =
+  if not existsFile(cfgFile):
+    raiseEx "strawboss config file not found: " & cfgFile
+
+  result = parseStrawBossConfig(parseFile(cfgFile))
+
 proc loadProjectConfig*(cfgFile: string): ProjectConfig =
   if not existsFile(cfgFile):
     raiseEx "project config file not found: " & cfgFile
diff --git a/src/test/nim/tconfiguration.nim b/src/test/nim/tconfiguration.nim
index 38ead77..33a7721 100644
--- a/src/test/nim/tconfiguration.nim
+++ b/src/test/nim/tconfiguration.nim
@@ -107,9 +107,10 @@ suite "load and save configuration objects":
       sameContents(pc.steps["test"].expectedEnv, @[])
       sameContents(pc.steps["test"].cmdInput, @[])
 
-  test "StrawBossConfig to string":
-    # TODO
-    check false
+  test "serialze StrawBossConfig to/from string":
+    let cfg = loadStrawBossConfig("src/test/json/strawboss.config.json")
+    let cfgStr = $cfg
+    check cfg == parseStrawBossConfig(parseJson(cfgStr))
 
   test "loadBuildStatus":
     let st = loadBuildStatus("src/test/json/test-status.json")