Add testing protocol.

src/main/nim/strawboss.nim

@@ -3,8 +3,7 @@ import cliutils, docopt, os, sequtils, strutils, tempfile, uuids
 import strawbosspkg/configuration
 import strawbosspkg/core
 import strawbosspkg/server
-
-let SB_VER = "0.5.0"
+import strawbosspkg/version
 
 proc logProcOutput*(outMsg, errMsg: TaintedString, cmd: string) =
   let prefix = if cmd.len > 0: cmd & ": " else: ""
@@ -26,7 +25,7 @@ Options
                               (strawboss.config.json).
 """
 
-  let args = docopt(doc, version = "strawboss v" & SB_VER)
+  let args = docopt(doc, version = "strawboss v" & SB_VERSION)
 
   let cfgFile = if args["--config-file"]: $args["--config-file"]
                 else: "strawboss.config.json"

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,

src/main/nim/strawbosspkg/server.nim

@@ -7,7 +7,7 @@ from asyncnet import send
 from re import re, find
 from timeutils import trimNanoSec
 
-import ./configuration, ./core
+import ./configuration, ./core, ./version
 
 type
   Session = object
@@ -161,13 +161,13 @@ proc start*(cfg: StrawBossConfig): void =
   var workers: seq[Worker] = @[]
 
   settings:
-    port = Port(8180)
+    port = Port(cfg.port)
     appName = "/api"
 
   routes:
 
-    get "/ping":
-      resp($(%"pong"), JSON)
+    get "/version":
+      resp($(%("strawboss v" & SB_VERSION)), JSON)
 
     post "/auth-token":
       var uname, pwd: string
@@ -180,7 +180,9 @@ proc start*(cfg: StrawBossConfig): void =
       try:
         let authToken = makeAuthToken(cfg, uname, pwd)
         resp($(%authToken), JSON)
-      except: jsonResp(Http401, getCurrentExceptionMsg())
+      except:
+        jsonResp(Http401, getCurrentExceptionMsg())
+        if ctx.cfg.debug: echo getStackTrace()
 
     get "/verify-auth":
       checkAuth()
@@ -266,17 +268,16 @@ proc start*(cfg: StrawBossConfig): void =
 
       checkAuth()
 
+      var details = ""
       try:
         let activeRuns = workers
           .filterIt(it.process.running and it.projectName == @"projectName")
-          .mapIt(cfg.getRun(@"projecName", $it.runId));
+          .mapIt(cfg.getRun(@"projectName", $it.runId));
         resp($(%activeRuns), JSON)
+      except NotFoundException:
+        jsonResp(Http404, getCurrentExceptionMsg())
       except:
-        try: raise getCurrentException()
-        except NotFoundException:
-          jsonResp(Http404, getCurrentExceptionMsg())
-        except:
-          json500Resp(getCurrentException(), "problem loading active runs")
+        json500Resp(getCurrentException(), "problem loading active runs")
 
     get "/project/@projectName/run/@runId":
       ## Details for a specific run
@@ -446,7 +447,7 @@ proc start*(cfg: StrawBossConfig): void =
 
 
     get re".*":
-      jsonResp(Http404)
+      jsonResp(Http404, "URL [" & request.path & "] is not present on this server.")
 
     post re".*":
       jsonResp(Http404)

src/main/nim/strawbosspkg/version.nim

@@ -0,0 +1,2 @@
+const SB_VERSION* = "0.5.1"
+

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",

src/test/nim/functional/tserver.nim

@@ -2,6 +2,7 @@ import cliutils, httpclient, json, os, osproc, sequtils, strutils, tempfile,
   times, unittest, untar, uuids
 
 from langutils import sameContents
+from algorithm import sorted
 
 import ../testutil
 import ../../../main/nim/strawbosspkg/configuration
@@ -205,9 +206,40 @@ suite "strawboss server":
     # Run the "build" step
     # Kick off a build that depends on "build" (which was run in the last test)
 
-  # TODO
-  #test "kick off multiple runs and check the list of active runs via the API":
-  #  check false
+  test "kick off multiple runs and check the list of active runs via the API":
+    let http = newAuthenticatedHttpClient(apiBase, "bob@builder.com", "password")
+
+    # Kick off multiple runs of the "long-running" job
+    let queuedRuns = toSeq((1..3)).map(proc (idx: int): Run =
+      let resp = http.post(apiBase & "/project/" & testProjName & "/step/long-running/run/0.3.1")
+      check resp.status.startsWith("200")
+
+      return parseRun(parseJson(resp.body)))
+
+    # Collect run ids.
+    let runIds = queuedRuns.mapIt($(it.id)).sorted(cmpIgnoreCase)
+
+    # Check on the runs
+    let getActiveResp = http.get(apiBase & "/project/" & testProjName & "/runs/active")
+    check getActiveResp.status.startsWith("200")
+
+    let activeRuns = parseJson(getActiveResp.body).getElems().mapIt(parseRun(it))
+    let activeRunIds = activeRuns.mapIt($(it.id)).sorted(cmpIgnoreCase)
+
+    # Make sure we see all runs in the active state. 
+    check runIds == activeRunIds
+
+    let completedRuns = runIds.map(proc (runId: string): Run =
+      return http.waitForBuild(apiBase, testProjName, runId))
+
+    # Make sure all are completed and all are accounted for
+    check completedRuns.allIt(it.status.state == BuildState.complete)
+    check completedRuns.mapIt($(it.id)).sorted(cmpIgnoreCase) == runIds;
+
+    # Check that there are no more active runs
+    let getActiveResp2 = http.get(apiBase & "/project/" & testProjName & "/runs/active")
+    let remainingActiveRuns = parseJson(getActiveResp2.body).getElems().mapIt(parseRun(it))
+    check remainingActiveRuns.len == 0
 
   # Last-chance catch to kill the server in case some test err'ed and didn't
   # reach it's teardown handler

src/test/nim/unit/tserver.nim

@@ -6,6 +6,7 @@ from langutils import sameContents
 import ../testutil
 import ../../../main/nim/strawbosspkg/configuration
 import ../../../main/nim/strawbosspkg/server
+import ../../../main/nim/strawbosspkg/version
 
 let apiBase = "http://localhost:8180/api"
 let cfgFilePath = "src/test/json/strawboss.config.json"
@@ -40,11 +41,11 @@ suite "strawboss server":
     let tok = toJWT(cfg, session)
     check fromJWT(cfg, tok) == session
 
-  test "ping":
-    let resp = http.get(apiBase & "/ping")
+  test "version":
+    let resp = http.get(apiBase & "/version")
     check:
       resp.status.startsWith("200")
-      resp.body == "\"pong\""
+      resp.body == "\"strawboss v" & SB_VERSION & "\""
 
   test "fail auth":
     let resp = http.post(apiBase & "/auth-token",

src/test/test-project

@@ -1 +1 @@
-Subproject commit 127be8f66fcc6d4d223acf56668d42ff9c37bfb0
+Subproject commit ab883bd9602a1373347a23c8bee4ed28dd475aec

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 example.json dist/."

strawboss.projectdef.json

@@ -1,24 +1,25 @@
 {
   "name": "strawboss",
+  "containerImage": "nimlang/nim:0.19.0",
   "steps": {
     "compile": {
       "artifacts": ["strawboss"],
-      "stepCmd": "docker run -v `pwd`:/usr/src/strawboss -w /usr/src/strawboss jdbernard/nim:0.17.2 nimble install"
+      "stepCmd": "nimble build"
     },
     "unittest": {
       "depends": ["compile"],
-      "stepCmd": "docker run -v `pwd`:/usr/src/strawboss -v $compile_DIR:/usr/build/strawboss -w /usr/src/strawboss -i jdbernard/nim:0.17.2 /bin/bash",
+      "stepCmd": "/bin/bash",
       "cmdInput": [
-        "cp /usr/build/strawboss/strawboss .",
+        "cp $compile_DIR/strawboss .",
         "nimble install --depsOnly",
         "nim c -r src/test/nim/run_unit_tests"
       ]
     },
     "functest": {
       "depends": ["compile"],
-      "stepCmd": "docker run -v `pwd`:/usr/src/strawboss -v $compile_DIR:/usr/build/strawboss -w /usr/src/strawboss -i jdbernard/nim:0.17.2 /bin/bash",
+      "stepCmd": "/bin/bash",
       "cmdInput": [
-        "cp /usr/build/strawboss/strawboss .",
+        "cp $compile_DIR/strawboss .",
         "nimble install --depsOnly",
         "nim c -r src/test/nim/run_functional_tests"
       ]
@@ -26,9 +27,9 @@
     "build": {
       "artifacts": ["strawboss-$VERSION.zip"],
       "depends": ["compile", "unittest", "functest"],
-      "stepCmd": "docker run -v `pwd`:/usr/src/strawboss -v $compile_DIR:/usr/build/strawboss -w /usr/src/strawboss -i jdbernard/nim:0.17.2 /bin/bash",
+      "stepCmd": "/bin/bash",
       "cmdInput": [
-        "cp /usr/build/strawboss/strawboss .",
+        "cp $compile_DIR/strawboss .",
         "zip strawboss-$VERSION.zip strawboss strawboss.config.json example.json src/main/systemd/strawboss.service"
       ]
     }

test-spec.txt

@@ -0,0 +1,11 @@
+Run a build. Look for:
+- Run request archived
+- Output logs archived with the run request
+- Artifacts archived in the build-data directory.
+- Configuration for that version archived in configurations directory.
+- Status for that version archived in the status directory
+
+Run the build again for the same project and build ref:
+- Build should be skipped.
+- Run request should be archived.
+