From a77ed42e9f092be96800bb0ebbec19d3cb8dff1a Mon Sep 17 00:00:00 2001 From: Phil Kunz Date: Sun, 2 Apr 2017 15:30:43 +0200 Subject: [PATCH] now working with npmdocker and the npmts 7.x.x --- dist/dockersock.classes.dockersock.d.ts | 3 +++ dist/dockersock.classes.dockersock.js | 17 ++++++++++++----- npmextra.json | 2 +- package.json | 1 + test/test.ts | 20 +++++++++++--------- ts/dockersock.classes.dockersock.ts | 18 ++++++++++++++---- yarn.lock | 19 ++++++++++++++++++- 7 files changed, 60 insertions(+), 20 deletions(-) diff --git a/dist/dockersock.classes.dockersock.d.ts b/dist/dockersock.classes.dockersock.d.ts index e9d37a3..56f8043 100644 --- a/dist/dockersock.classes.dockersock.d.ts +++ b/dist/dockersock.classes.dockersock.d.ts @@ -23,6 +23,9 @@ export declare class Dockersock { removeContainer(containerNameArg: any): plugins.q.Promise<{}>; clean(): plugins.q.Promise<{}>; callOnChange(cb: Function): void; + /** + * gets you an observable that reports changes in the docker infrastructure + */ getChangeObservable(): Observable<{}>; request(methodArg: string, routeArg: string, queryArg?: string, dataArg?: {}): plugins.q.Promise<{}>; requestStream(methodArg: string, routeArg: string, queryArg?: string, dataArg?: {}): plugins.q.Promise<{}>; diff --git a/dist/dockersock.classes.dockersock.js b/dist/dockersock.classes.dockersock.js index 840d085..ec67099 100644 --- a/dist/dockersock.classes.dockersock.js +++ b/dist/dockersock.classes.dockersock.js @@ -132,6 +132,9 @@ class Dockersock { }); } ; + /** + * gets you an observable that reports changes in the docker infrastructure + */ getChangeObservable() { let options = { method: "GET", @@ -150,8 +153,10 @@ class Dockersock { } ; }); + let incomingMessage; requestStream.on("response", (response) => { - this.requestObjectmap.add(requestStream); + incomingMessage = response; + this.requestObjectmap.add(incomingMessage); if (response.statusCode == 200) { plugins.beautylog.ok("request returned status 200, so we are good!"); } @@ -161,7 +166,7 @@ class Dockersock { }); let changeObservable = rxjs_1.Observable.fromEvent(requestStream, "data"); requestStream.on("end", () => { - this.requestObjectmap.remove(requestStream); + this.requestObjectmap.remove(incomingMessage); }); return changeObservable; } @@ -219,8 +224,10 @@ class Dockersock { } ; }); + let incomingMessage; requestStream.on("response", (response) => { - this.requestObjectmap.add(requestStream); + incomingMessage = response; + this.requestObjectmap.add(incomingMessage); if (response.statusCode == 200) { plugins.beautylog.ok("request returned status 200, so we are good!"); } @@ -235,7 +242,7 @@ class Dockersock { plugins.beautylog.logReduced(status); }); requestStream.on("end", () => { - this.requestObjectmap.remove(requestStream); + this.requestObjectmap.remove(incomingMessage); }); return done.promise; } @@ -251,4 +258,4 @@ class Dockersock { ; } exports.Dockersock = Dockersock; -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"dockersock.classes.dockersock.js","sourceRoot":"","sources":["../ts/dockersock.classes.dockersock.ts"],"names":[],"mappings":"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"} \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"dockersock.classes.dockersock.js","sourceRoot":"","sources":["../ts/dockersock.classes.dockersock.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/npmextra.json b/npmextra.json index 8477d5e..416e1e3 100644 --- a/npmextra.json +++ b/npmextra.json @@ -5,7 +5,7 @@ }, "npmdocker":{ "baseImage":"hosttoday/ht-docker-node:npmci", - "command":"npmci command yarn global add npmts && npmci command npmts", + "command":"(npmci command yarn global add npmts) && npmts", "dockerSock":"true" }, "npmci": { diff --git a/package.json b/package.json index 5def2aa..478f057 100644 --- a/package.json +++ b/package.json @@ -35,6 +35,7 @@ "typings-global": "^1.0.14" }, "devDependencies": { + "observable-to-promise": "^0.5.0", "tapbundle": "^1.0.5" } } diff --git a/test/test.ts b/test/test.ts index 060e56f..da0f6ca 100644 --- a/test/test.ts +++ b/test/test.ts @@ -1,6 +1,6 @@ import "typings-global"; import { expect, tap } from 'tapbundle' - +import * as observableToPromise from 'observable-to-promise' import { Dockersock } from "../dist/index"; let testDockersock: Dockersock; @@ -8,27 +8,29 @@ let testDockersock: Dockersock; tap.test("should create a new Dockersock instance", async () => { testDockersock = new Dockersock(); return expect(testDockersock).to.be.instanceof(Dockersock); -}); +}).catch(tap.threw); tap.test("should list containers", async () => { await testDockersock.listContainers() .then(async (dataArg) => { console.log(dataArg); }); -}); +}).catch(tap.threw); tap.test("should list detailed containers", async () => { await testDockersock.listContainersDetailed() .then(async (dataArg) => { console.log(dataArg); }); -}); +}).catch(tap.threw); tap.test("should pull an image from imagetag", async () => { - await testDockersock.pullImage("hosttoday/ht-docker-dbase") -}); + await testDockersock.pullImage("hosttoday/ht-docker-node:npmci") +}).catch(tap.threw); -tap.test("should return a change Objservable", async () => { - testDockersock.getChangeObservable(); +/*tap.test("should return a change Objservable", async () => { + let myObservable = testDockersock.getChangeObservable(); testDockersock.endRequests(); -}) \ No newline at end of file + let testPromise = observableToPromise(myObservable) + return await expect(testPromise).to.eventually.be.fulfilled +}).catch(tap.threw);*/ \ No newline at end of file diff --git a/ts/dockersock.classes.dockersock.ts b/ts/dockersock.classes.dockersock.ts index e0ec3a9..e8d6c6f 100644 --- a/ts/dockersock.classes.dockersock.ts +++ b/ts/dockersock.classes.dockersock.ts @@ -124,6 +124,10 @@ export class Dockersock { }); }; + + /** + * gets you an observable that reports changes in the docker infrastructure + */ getChangeObservable() { let options = { method: "GET", @@ -140,8 +144,10 @@ export class Dockersock { console.log(res); }; }); + let incomingMessage requestStream.on("response", (response) => { - this.requestObjectmap.add(requestStream); + incomingMessage = response + this.requestObjectmap.add(incomingMessage); if (response.statusCode == 200) { plugins.beautylog.ok("request returned status 200, so we are good!"); } else { @@ -150,7 +156,7 @@ export class Dockersock { }); let changeObservable = Observable.fromEvent(requestStream, "data"); requestStream.on("end", () => { - this.requestObjectmap.remove(requestStream); + this.requestObjectmap.remove(incomingMessage); }); return changeObservable; } @@ -203,8 +209,10 @@ export class Dockersock { done.reject(err); }; }); + let incomingMessage requestStream.on("response", (response) => { - this.requestObjectmap.add(requestStream); + incomingMessage = response + this.requestObjectmap.add(incomingMessage); if (response.statusCode == 200) { plugins.beautylog.ok("request returned status 200, so we are good!"); } else { @@ -218,10 +226,12 @@ export class Dockersock { plugins.beautylog.logReduced(status); }); requestStream.on("end", () => { - this.requestObjectmap.remove(requestStream); + this.requestObjectmap.remove(incomingMessage); }); return done.promise; }; + + endRequests() { setTimeout(() => { this.requestObjectmap.forEach((itemArg: plugins.request.Request) => { diff --git a/yarn.lock b/yarn.lock index e1cbf3a..70c18a5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -848,6 +848,12 @@ is-number@^2.0.2, is-number@^2.1.0: dependencies: kind-of "^3.0.2" +is-observable@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/is-observable/-/is-observable-0.2.0.tgz#b361311d83c6e5d726cabf5e250b0237106f5ae2" + dependencies: + symbol-observable "^0.2.2" + is-posix-bracket@^0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4" @@ -1211,6 +1217,13 @@ object.omit@^2.0.0: for-own "^0.1.4" is-extendable "^0.1.1" +observable-to-promise@^0.5.0: + version "0.5.0" + resolved "https://registry.yarnpkg.com/observable-to-promise/-/observable-to-promise-0.5.0.tgz#c828f0f0dc47e9f86af8a4977c5d55076ce7a91f" + dependencies: + is-observable "^0.2.0" + symbol-observable "^1.0.4" + once@^1.3.0: version "1.4.0" resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" @@ -1692,7 +1705,11 @@ supports-color@^3.1.2: dependencies: has-flag "^1.0.0" -symbol-observable@^1.0.1: +symbol-observable@^0.2.2: + version "0.2.4" + resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-0.2.4.tgz#95a83db26186d6af7e7a18dbd9760a2f86d08f40" + +symbol-observable@^1.0.1, symbol-observable@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.4.tgz#29bf615d4aa7121bdd898b22d4b3f9bc4e2aa03d"