presidium 0.16.28 → 0.17.0

package/DockerService.js

@@ -107,35 +107,39 @@ const DockerService = function (options) {
   if (this == null || this.constructor != DockerService) {
     return new DockerService(options)
   }
+  this.serviceOptions = pick(dockerServiceOptions)(options)
   this.name = options.name
   this.docker = new Docker()
   this.version = null
   this.spec = null
   this.replicas = options.replicas
-
-  this.ready = this.docker.inspectService(this.name).then(pipe([
-    switchCase([
-      eq(404, get('status')),
-      pipe([
-        () => this.docker.createService(
-          this.name,
-          pick(dockerServiceOptions)(options)),
-        tap(async response => {
-          if (!response.ok) {
-            throw new Error(await response.text())
-          }
-        }),
-      ]),
-      pipe([
-        tap(() => this.synchronize()),
-        () => this.update(pick(dockerServiceOptions)(options)),
-      ]),
-    ]),
-    tap(() => this.synchronize()),
-  ]))
   return this
 }
 
+/**
+ * @name DockerService.prototype.deploy
+ *
+ * @synopsis
+ * ```coffeescript [specscript]
+ * DockerService(...).deploy()
+ * ```
+ */
+DockerService.prototype.deploy = async function deploy() {
+  const { status } = await this.docker.inspectService(this.name)
+
+  if (status == 404) {
+    const { name, serviceOptions } = this
+    const response = await this.docker.createService(name, serviceOptions)
+    if (!response.ok) {
+      throw new Error(await response.text())
+    }
+  } else {
+    await this.synchronize()
+    await this.update(this.serviceOptions)
+  }
+  await this.synchronize()
+}
+
 // new DockerService().synchronize() -> Promise<>
 DockerService.prototype.synchronize = function dockerServiceSynchronize() {
   return this.docker.inspectService(this.name).then(pipe([

package/DockerService.test.js

@@ -21,6 +21,8 @@ const test = new Test('DockerService', DockerService)
   image: 'nginx:1.19',
   replicas: 1,
 }, async function (myService) {
+  await myService.deploy()
+
   {
     const info = await myService.inspect()
     this.serviceId = info.ID
@@ -106,7 +108,7 @@ const test = new Test('DockerService', DockerService)
   image: 'nginx:1.19',
   replicas: 2,
 }, async function (myService) {
-  await myService.ready
+  await myService.deploy()
   // TODO test for update on construction assert.deepEqual(myService.spec, this.myServiceSpec)
 })
 
@@ -116,8 +118,8 @@ const test = new Test('DockerService', DockerService)
   replicas: 2,
   restart: 'always', // coulda fooled me
 }, async function (errorService) {
-  assert.rejects(
-    always(errorService.ready),
+  await assert.rejects(
+    errorService.deploy(),
     new Error('{"message":"invalid RestartCondition: \\"always\\""}\n'))
 })
 

package/Password.test.js

@@ -5,6 +5,10 @@ const Password = require('./Password')
 const test = new Test('Password', async function () {
   const plaintext = 'MyPassword!123'
   const hashed = await Password.hash(plaintext)
+  await assert.rejects(
+    Password.verify('incorrect', hashed),
+    new Error('Invalid password'),
+  )
   await Password.verify(plaintext, hashed) // should not throw
 }).case()
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "presidium",
-  "version": "0.16.28",
+  "version": "0.17.0",
   "description": "A library for creating web services",
   "author": "Richard Tong",
   "license": "MIT",