1.0.20

.gitignore

@@ -1,3 +1,4 @@
-docs/
-coverage/
+.yarn/
 node_modules/
+coverage/
+public/

.gitlab-ci.yml

@@ -1,38 +1,31 @@
-image: hosttoday/ht-docker-dbase:npmts
+image: hosttoday/ht-docker-dbase:npmci
 services:
   - docker:dind
 
+cache:
+  paths:
+  - .yarn/
+  key: "$CI_BUILD_STAGE"
+
 stages:
-  - build
   - test
   - release
   - trigger
+  - pages
 
 before_script:
   - npmci prepare docker-gitlab
 
-
-build:
-  stage: build
-  script:
-    - npm install
-    - npm test
-    - npmci build docker
-  tags:
-    - lossless
-    - priv
-  
-
 test:
   stage: test
   script:
-    - npmci test docker
+    - npmci test stable
   tags:
     - lossless
     - priv
 
 release:
-  image: hosttoday/ht-docker-node:npmts
+  image: hosttoday/ht-docker-node:npmci
   stage: release
   script:
     - npmci publish npm
@@ -43,7 +36,7 @@ release:
     - priv
 
 trigger:
-  image: hosttoday/ht-docker-node:npmts
+  image: hosttoday/ht-docker-node:npmci
   stage: trigger
   script:
     - npmci trigger
@@ -51,4 +44,19 @@ trigger:
     - tags
   tags:
     - lossless
-    - priv
+    - priv
+
+pages:
+  image: hosttoday/ht-docker-node:npmci
+  stage: pages
+  script:
+    - npmci command yarn global add npmpage
+    - npmci command npmpage --publish gitlab
+  tags:
+    - docker
+  only:
+    - tags
+  artifacts:
+    expire_in: 1 week
+    paths:
+    - public

README.md

@@ -1,11 +1,25 @@
 # dockersock
 easy communication with docker remote api from node, TypeScript ready
 
-## Status
-[![build status](https://gitlab.com/pushrocks/dockersock/badges/master/build.svg)](https://gitlab.com/pushrocks/dockersock/commits/master)
+## Availabililty
+[![npm](https://mojoio.gitlab.io/assets/repo-button-npm.svg)](https://www.npmjs.com/package/dockersock)
+[![git](https://mojoio.gitlab.io/assets/repo-button-git.svg)](https://GitLab.com/mojoio/dockersock)
+[![git](https://mojoio.gitlab.io/assets/repo-button-mirror.svg)](https://github.com/mojoio/dockersock)
+[![docs](https://mojoio.gitlab.io/assets/repo-button-docs.svg)](https://mojoio.gitlab.io/dockersock/)
+
+## Status for master
+[![build status](https://GitLab.com/mojoio/dockersock/badges/master/build.svg)](https://GitLab.com/mojoio/dockersock/commits/master)
+[![coverage report](https://GitLab.com/mojoio/dockersock/badges/master/coverage.svg)](https://GitLab.com/mojoio/dockersock/commits/master)
+[![npm downloads per month](https://img.shields.io/npm/dm/dockersock.svg)](https://www.npmjs.com/package/dockersock)
+[![Dependency Status](https://david-dm.org/mojoio/dockersock.svg)](https://david-dm.org/mojoio/dockersock)
+[![bitHound Dependencies](https://www.bithound.io/github/mojoio/dockersock/badges/dependencies.svg)](https://www.bithound.io/github/mojoio/dockersock/master/dependencies/npm)
+[![bitHound Code](https://www.bithound.io/github/mojoio/dockersock/badges/code.svg)](https://www.bithound.io/github/mojoio/dockersock)
+[![TypeScript](https://img.shields.io/badge/TypeScript-2.x-blue.svg)](https://nodejs.org/dist/latest-v6.x/docs/api/)
+[![node](https://img.shields.io/badge/node->=%206.x.x-blue.svg)](https://nodejs.org/dist/latest-v6.x/docs/api/)
+[![JavaScript Style Guide](https://img.shields.io/badge/code%20style-standard-brightgreen.svg)](http://standardjs.com/)
 
 ## Usage
-We recommend the use of TypeScript for best Intellisense.
+Use TypeScript for best in class instellisense.
 
 ```TypeScript
 import {Dockersock} from "dockersock"; // require Dockersock class
@@ -25,4 +39,11 @@ myDockersock.newContainer({ // start new Container, equals "docker run" shell co
     image: "someimagetag"
 })
 
-```
+```
+
+For further information read the linked docs at the top of this README.
+
+> MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)
+| By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy.html)
+
+[![repo-footer](https://mojoio.gitlab.io/assets/repo-footer.svg)](https://mojo.io)

dist/dockersock.classes.dockersock.d.ts

@@ -1,10 +1,12 @@
+/// <reference types="request" />
 /// <reference types="q" />
 import "typings-global";
 import * as plugins from "./dockersock.plugins";
 import { Observable } from "rxjs";
+import { Objectmap } from 'lik';
 export declare class Dockersock {
     sockPath: string;
-    requestObjectmap: plugins.lik.Objectmap;
+    requestObjectmap: Objectmap<plugins.request.Request>;
     constructor(pathArg?: string);
     auth(userArg: string, passArg: string): plugins.q.Promise<{}>;
     listContainers(): plugins.q.Promise<{}>;
@@ -21,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<{}>;

dist/dockersock.plugins.js

@@ -1,8 +1,9 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 require("typings-global");
 exports.beautylog = require("beautylog");
 exports.lik = require("lik");
 exports.q = require("q");
 exports.request = require("request");
 exports.rxjs = require("rxjs");
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZG9ja2Vyc29jay5wbHVnaW5zLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvZG9ja2Vyc29jay5wbHVnaW5zLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSxRQUFPLGdCQUFnQixDQUFDLENBQUE7QUFDVixpQkFBUyxXQUFXLFdBQVcsQ0FBQyxDQUFDO0FBQ2pDLFdBQUcsV0FBVyxLQUFLLENBQUMsQ0FBQztBQUNyQixTQUFDLFdBQVcsR0FBRyxDQUFDLENBQUM7QUFDakIsZUFBTyxXQUFXLFNBQVMsQ0FBQyxDQUFDO0FBQzdCLFlBQUksV0FBVyxNQUFNLENBQUMsQ0FBQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZG9ja2Vyc29jay5wbHVnaW5zLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvZG9ja2Vyc29jay5wbHVnaW5zLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsMEJBQXdCO0FBQ3hCLHlDQUErQztBQUMvQyw2QkFBbUM7QUFDbkMseUJBQStCO0FBQy9CLHFDQUEyQztBQUMzQywrQkFBcUMifQ==

dist/index.js

@@ -1,5 +1,6 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
 require("typings-global");
 var dockersock_classes_dockersock_1 = require("./dockersock.classes.dockersock");
 exports.Dockersock = dockersock_classes_dockersock_1.Dockersock;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsUUFBTyxnQkFBZ0IsQ0FBQyxDQUFBO0FBQ3hCLDhDQUEyQixpQ0FBaUMsQ0FBQztBQUFwRCxnRUFBb0QifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLDBCQUF3QjtBQUN4QixpRkFBNkQ7QUFBcEQscURBQUEsVUFBVSxDQUFBIn0=

docs/README.md

@@ -0,0 +1,49 @@
+# dockersock
+easy communication with docker remote api from node, TypeScript ready
+
+## Availabililty
+[![npm](https://mojoio.gitlab.io/assets/repo-button-npm.svg)](https://www.npmjs.com/package/dockersock)
+[![git](https://mojoio.gitlab.io/assets/repo-button-git.svg)](https://GitLab.com/mojoio/dockersock)
+[![git](https://mojoio.gitlab.io/assets/repo-button-mirror.svg)](https://github.com/mojoio/dockersock)
+[![docs](https://mojoio.gitlab.io/assets/repo-button-docs.svg)](https://mojoio.gitlab.io/dockersock/)
+
+## Status for master
+[![build status](https://GitLab.com/mojoio/dockersock/badges/master/build.svg)](https://GitLab.com/mojoio/dockersock/commits/master)
+[![coverage report](https://GitLab.com/mojoio/dockersock/badges/master/coverage.svg)](https://GitLab.com/mojoio/dockersock/commits/master)
+[![npm downloads per month](https://img.shields.io/npm/dm/dockersock.svg)](https://www.npmjs.com/package/dockersock)
+[![Dependency Status](https://david-dm.org/mojoio/dockersock.svg)](https://david-dm.org/mojoio/dockersock)
+[![bitHound Dependencies](https://www.bithound.io/github/mojoio/dockersock/badges/dependencies.svg)](https://www.bithound.io/github/mojoio/dockersock/master/dependencies/npm)
+[![bitHound Code](https://www.bithound.io/github/mojoio/dockersock/badges/code.svg)](https://www.bithound.io/github/mojoio/dockersock)
+[![TypeScript](https://img.shields.io/badge/TypeScript-2.x-blue.svg)](https://nodejs.org/dist/latest-v6.x/docs/api/)
+[![node](https://img.shields.io/badge/node->=%206.x.x-blue.svg)](https://nodejs.org/dist/latest-v6.x/docs/api/)
+[![JavaScript Style Guide](https://img.shields.io/badge/code%20style-standard-brightgreen.svg)](http://standardjs.com/)
+
+## Usage
+Use TypeScript for best in class instellisense.
+
+```TypeScript
+import {Dockersock} from "dockersock"; // require Dockersock class
+
+let myDockersock = new Dockersock(); // optional: you can pass a domain to the contructor, defaults to  /var/run/docker.sock
+
+myDockersock.listContainers() // promise, resolve gets container data
+myDockersock.listContainersDetailed() // promise, resolve gets more detailed container data (by combining several requests internally)
+myDockersock.listContainersRunning() // promise, resolve gets container data for currently running containers
+myDockersock.listContainersStopped() // promise, resolve gets container data for stopped containers
+
+myDockersock.startContainer({ // starts a already present container
+    name: "somecontainername"
+})
+
+myDockersock.newContainer({ // start new Container, equals "docker run" shell command
+    image: "someimagetag"
+})
+
+```
+
+For further information read the linked docs at the top of this README.
+
+> MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)
+| By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy.html)
+
+[![repo-footer](https://mojoio.gitlab.io/assets/repo-footer.svg)](https://mojo.io)

npmextra.json

@@ -4,8 +4,14 @@
         "coverageTreshold":10
     },
     "npmdocker":{
-        "baseImage":"hosttoday/ht-docker-node:npmts",
-        "command":"npmts",
+        "baseImage":"hosttoday/ht-docker-node:npmci",
+        "command":"(npmci command yarn global add npmts) && npmts",
         "dockerSock":"true"
+    },
+    "npmci": {
+        "globalNpmTools": [
+            "npmts",
+            "npmdocker"
+        ]
     }
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "dockersock",
-  "version": "1.0.19",
+  "version": "1.0.20",
   "description": "easy communication with docker remote api from node, TypeScript ready",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -25,18 +25,17 @@
   },
   "homepage": "https://gitlab.com/pushrocks/dockersock#README",
   "dependencies": {
-    "@types/q": "0.x.x",
+    "@types/q": "1.x.x",
     "@types/request": "0.x.x",
-    "beautylog": "^5.0.20",
-    "lik": "^1.0.9",
-    "q": "^1.4.1",
-    "request": "^2.74.0",
-    "rxjs": "^5.0.0-beta.10",
-    "typings-global": "^1.0.6"
+    "beautylog": "^6.1.5",
+    "lik": "^1.0.27",
+    "q": "^1.5.0",
+    "request": "^2.81.0",
+    "rxjs": "^5.2.0",
+    "typings-global": "^1.0.14"
   },
   "devDependencies": {
-    "npmts-g": "^5.2.8",
-    "should": "^10.0.0",
-    "typings-test": "^1.0.1"
+    "observable-to-promise": "^0.5.0",
+    "tapbundle": "^1.0.5"
   }
 }

test/test.d.ts

@@ -1,2 +0,0 @@
-import "typings-test";
-import "should";

test/test.js

@@ -1,42 +0,0 @@
-"use strict";
-require("typings-test");
-require("should");
-const index_1 = require("../dist/index");
-describe("dockersock", function () {
-    describe(".Dockersock()", function () {
-        let testDockersock;
-        it("should create a new Dockersock instance", function () {
-            testDockersock = new index_1.Dockersock();
-            testDockersock.should.be.instanceof(index_1.Dockersock);
-        });
-        it("should list containers", function (done) {
-            testDockersock.listContainers()
-                .then((dataArg) => {
-                console.log(dataArg);
-                done();
-            });
-        });
-        it("should list detailed containers", function (done) {
-            this.timeout(5000);
-            testDockersock.listContainersDetailed()
-                .then((dataArg) => {
-                console.log(dataArg);
-                done();
-            });
-        });
-        it("should pull an image from imagetag", function (done) {
-            this.timeout(60000);
-            testDockersock.pullImage("hosttoday/ht-docker-dbase")
-                .then((dataArg) => {
-                done();
-            });
-        });
-        it("should return a change Objservable", function (done) {
-            this.timeout(10000);
-            testDockersock.getChangeObservable();
-            testDockersock.endRequests();
-            done();
-        });
-    });
-});
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidGVzdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbInRlc3QudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLFFBQU8sY0FBYyxDQUFDLENBQUE7QUFDdEIsUUFBTyxRQUFRLENBQUMsQ0FBQTtBQUVoQix3QkFBMkIsZUFBZSxDQUFDLENBQUE7QUFFM0MsUUFBUSxDQUFDLFlBQVksRUFBRTtJQUNuQixRQUFRLENBQUMsZUFBZSxFQUFFO1FBQ3RCLElBQUksY0FBMEIsQ0FBQztRQUMvQixFQUFFLENBQUMseUNBQXlDLEVBQUU7WUFDMUMsY0FBYyxHQUFHLElBQUksa0JBQVUsRUFBRSxDQUFDO1lBQ2xDLGNBQWMsQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFDLFVBQVUsQ0FBQyxrQkFBVSxDQUFDLENBQUM7UUFDcEQsQ0FBQyxDQUFDLENBQUM7UUFDSCxFQUFFLENBQUMsd0JBQXdCLEVBQUUsVUFBVSxJQUFJO1lBQ3ZDLGNBQWMsQ0FBQyxjQUFjLEVBQUU7aUJBQzFCLElBQUksQ0FBQyxDQUFDLE9BQU87Z0JBQ1YsT0FBTyxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsQ0FBQztnQkFDckIsSUFBSSxFQUFFLENBQUM7WUFDWCxDQUFDLENBQUMsQ0FBQztRQUNYLENBQUMsQ0FBQyxDQUFDO1FBQ0gsRUFBRSxDQUFDLGlDQUFpQyxFQUFFLFVBQVUsSUFBSTtZQUNoRCxJQUFJLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDO1lBQ25CLGNBQWMsQ0FBQyxzQkFBc0IsRUFBRTtpQkFDbEMsSUFBSSxDQUFDLENBQUMsT0FBTztnQkFDVixPQUFPLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxDQUFDO2dCQUNyQixJQUFJLEVBQUUsQ0FBQztZQUNYLENBQUMsQ0FBQyxDQUFDO1FBQ1gsQ0FBQyxDQUFDLENBQUM7UUFDSCxFQUFFLENBQUMsb0NBQW9DLEVBQUUsVUFBVSxJQUFJO1lBQ25ELElBQUksQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLENBQUM7WUFDcEIsY0FBYyxDQUFDLFNBQVMsQ0FBQywyQkFBMkIsQ0FBQztpQkFDaEQsSUFBSSxDQUFDLENBQUMsT0FBTztnQkFDVixJQUFJLEVBQUUsQ0FBQztZQUNYLENBQUMsQ0FBQyxDQUFDO1FBQ1gsQ0FBQyxDQUFDLENBQUM7UUFDSCxFQUFFLENBQUMsb0NBQW9DLEVBQUUsVUFBVSxJQUFJO1lBQ25ELElBQUksQ0FBQyxPQUFPLENBQUMsS0FBSyxDQUFDLENBQUM7WUFDcEIsY0FBYyxDQUFDLG1CQUFtQixFQUFFLENBQUM7WUFDckMsY0FBYyxDQUFDLFdBQVcsRUFBRSxDQUFDO1lBQzdCLElBQUksRUFBRSxDQUFDO1FBQ1gsQ0FBQyxDQUFDLENBQUE7SUFDTixDQUFDLENBQUMsQ0FBQztBQUNQLENBQUMsQ0FBQyxDQUFDIn0=

test/test.ts

@@ -1,42 +1,36 @@
-import "typings-test";
-import "should";
-
+import "typings-global";
+import { expect, tap } from 'tapbundle'
+import * as observableToPromise from 'observable-to-promise'
 import { Dockersock } from "../dist/index";
 
-describe("dockersock", function () {
-    describe(".Dockersock()", function () {
-        let testDockersock: Dockersock;
-        it("should create a new Dockersock instance", function () {
-            testDockersock = new Dockersock();
-            testDockersock.should.be.instanceof(Dockersock);
+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);
         });
-        it("should list containers", function (done) {
-            testDockersock.listContainers()
-                .then((dataArg) => {
-                    console.log(dataArg);
-                    done();
-                });
+}).catch(tap.threw);
+
+tap.test("should list detailed containers", async () => {
+    await testDockersock.listContainersDetailed()
+        .then(async (dataArg) => {
+            console.log(dataArg);
         });
-        it("should list detailed containers", function (done) {
-            this.timeout(5000);
-            testDockersock.listContainersDetailed()
-                .then((dataArg) => {
-                    console.log(dataArg);
-                    done();
-                });
-        });
-        it("should pull an image from imagetag", function (done) {
-            this.timeout(60000);
-            testDockersock.pullImage("hosttoday/ht-docker-dbase")
-                .then((dataArg) => {
-                    done();
-                });
-        });
-        it("should return a change Objservable", function (done) {
-            this.timeout(10000);
-            testDockersock.getChangeObservable();
-            testDockersock.endRequests();
-            done();
-        })
-    });
-});
+}).catch(tap.threw);
+
+tap.test("should pull an image from imagetag", async () => {
+    await testDockersock.pullImage("hosttoday/ht-docker-node:npmci")
+}).catch(tap.threw);
+
+/*tap.test("should return a change Objservable", async () => {
+    let myObservable = testDockersock.getChangeObservable();
+    testDockersock.endRequests();
+    let testPromise = observableToPromise(myObservable)
+    return await expect(testPromise).to.eventually.be.fulfilled
+}).catch(tap.threw);*/

ts/dockersock.classes.dockersock.ts

@@ -2,9 +2,12 @@ import "typings-global"
 import * as plugins from "./dockersock.plugins";
 import { Observable } from "rxjs";
 
+// interfaces
+import  { Objectmap } from 'lik'
+
 export class Dockersock {
     sockPath: string;
-    requestObjectmap: plugins.lik.Objectmap = new plugins.lik.Objectmap();
+    requestObjectmap = new plugins.lik.Objectmap<plugins.request.Request>();
     constructor(pathArg: string = "http://unix:/var/run/docker.sock:") {
         this.sockPath = pathArg;
     }
@@ -121,6 +124,10 @@ export class Dockersock {
 
         });
     };
+
+    /**
+     * gets you an observable that reports changes in the docker infrastructure
+     */
     getChangeObservable() {
         let options = {
             method: "GET",
@@ -137,8 +144,10 @@ export class Dockersock {
                 console.log(res);
             };
         });
+        let incomingMessage
         requestStream.on("response", (response) => {
-            this.requestObjectmap.add(response);
+            incomingMessage = response
+            this.requestObjectmap.add(incomingMessage);
             if (response.statusCode == 200) {
                 plugins.beautylog.ok("request returned status 200, so we are good!");
             } else {
@@ -147,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;
     }
@@ -200,8 +209,10 @@ export class Dockersock {
                 done.reject(err);
             };
         });
+        let incomingMessage
         requestStream.on("response", (response) => {
-            this.requestObjectmap.add(response);
+            incomingMessage = response
+            this.requestObjectmap.add(incomingMessage);
             if (response.statusCode == 200) {
                 plugins.beautylog.ok("request returned status 200, so we are good!");
             } else {
@@ -215,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) => {