1.0.7

.gitlab-ci.yml

@@ -1,4 +1,4 @@
-image: hosttoday/ht-docker-node:latest
+image: hosttoday/ht-docker-node:npmts
 
 stages:
 - test
@@ -11,6 +11,7 @@ testLTS:
     - npmci test lts
   tags:
     - docker
+    - lossless
     
 testSTABLE:
   stage: test
@@ -18,6 +19,13 @@ testSTABLE:
     - npmci test stable
   tags:
     - docker
+    - lossless
+
+testLEGACY:
+  stage: test
+  script:
+    - npmci test legacy
+  allow_failure: true
 
 release:
   stage: release
@@ -27,17 +35,4 @@ release:
     - tags
   tags:
     - docker
-    
-pages:
-  stage: page
-  script:
-  - npmci test lts
-  - mkdir .public
-  - cp -r test/assets/docs/ .public
-  - cp -r test/assets/coverage/ .public
-  - mv .public public
-  artifacts:
-    paths:
-    - public
-  only:
-  - master
+    - lossless

dist/index.d.ts

@@ -1,5 +1,5 @@
 import "typings-global";
-export { Ssh } from "./smartssh.classes.ssh";
+export { SshInstance } from "./smartssh.classes.sshinstance";
 export { SshKey } from "./smartssh.classes.sshkey";
 export { SshDir } from "./smartssh.classes.sshdir";
 export { SshConfig } from "./smartssh.classes.sshconfig";

dist/index.js

@@ -1,7 +1,7 @@
 "use strict";
 require("typings-global");
-var smartssh_classes_ssh_1 = require("./smartssh.classes.ssh");
-exports.Ssh = smartssh_classes_ssh_1.Ssh;
+var smartssh_classes_sshinstance_1 = require("./smartssh.classes.sshinstance");
+exports.SshInstance = smartssh_classes_sshinstance_1.SshInstance;
 var smartssh_classes_sshkey_1 = require("./smartssh.classes.sshkey");
 exports.SshKey = smartssh_classes_sshkey_1.SshKey;
 var smartssh_classes_sshdir_1 = require("./smartssh.classes.sshdir");
@@ -9,4 +9,4 @@ exports.SshDir = smartssh_classes_sshdir_1.SshDir;
 var smartssh_classes_sshconfig_1 = require("./smartssh.classes.sshconfig");
 exports.SshConfig = smartssh_classes_sshconfig_1.SshConfig;
 
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImluZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSxRQUFPLGdCQUNQLENBQUMsQ0FEc0I7QUFHdkIscUNBQWtCLHdCQUF3QixDQUFDO0FBQW5DLHlDQUFtQztBQUMzQyx3Q0FBcUIsMkJBQTJCLENBQUM7QUFBekMsa0RBQXlDO0FBQ2pELHdDQUFxQiwyQkFBMkIsQ0FBQztBQUF6QyxrREFBeUM7QUFDakQsMkNBQXdCLDhCQUE4QixDQUFDO0FBQS9DLDJEQUErQyIsImZpbGUiOiJpbmRleC5qcyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBcInR5cGluZ3MtZ2xvYmFsXCJcclxuaW1wb3J0ICogYXMgcGx1Z2lucyBmcm9tIFwiLi9zbWFydHNzaC5wbHVnaW5zXCI7XHJcblxyXG5leHBvcnQge1NzaH0gZnJvbSBcIi4vc21hcnRzc2guY2xhc3Nlcy5zc2hcIjtcclxuZXhwb3J0IHtTc2hLZXl9IGZyb20gXCIuL3NtYXJ0c3NoLmNsYXNzZXMuc3Noa2V5XCI7XHJcbmV4cG9ydCB7U3NoRGlyfSBmcm9tIFwiLi9zbWFydHNzaC5jbGFzc2VzLnNzaGRpclwiO1xyXG5leHBvcnQge1NzaENvbmZpZ30gZnJvbSBcIi4vc21hcnRzc2guY2xhc3Nlcy5zc2hjb25maWdcIjsiXX0=
+//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImluZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSxRQUFPLGdCQUNQLENBQUMsQ0FEc0I7QUFHdkIsNkNBQTBCLGdDQUFnQyxDQUFDO0FBQW5ELGlFQUFtRDtBQUMzRCx3Q0FBcUIsMkJBQTJCLENBQUM7QUFBekMsa0RBQXlDO0FBQ2pELHdDQUFxQiwyQkFBMkIsQ0FBQztBQUF6QyxrREFBeUM7QUFDakQsMkNBQXdCLDhCQUE4QixDQUFDO0FBQS9DLDJEQUErQyIsImZpbGUiOiJpbmRleC5qcyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBcInR5cGluZ3MtZ2xvYmFsXCJcbmltcG9ydCAqIGFzIHBsdWdpbnMgZnJvbSBcIi4vc21hcnRzc2gucGx1Z2luc1wiO1xuXG5leHBvcnQge1NzaEluc3RhbmNlfSBmcm9tIFwiLi9zbWFydHNzaC5jbGFzc2VzLnNzaGluc3RhbmNlXCI7XG5leHBvcnQge1NzaEtleX0gZnJvbSBcIi4vc21hcnRzc2guY2xhc3Nlcy5zc2hrZXlcIjtcbmV4cG9ydCB7U3NoRGlyfSBmcm9tIFwiLi9zbWFydHNzaC5jbGFzc2VzLnNzaGRpclwiO1xuZXhwb3J0IHtTc2hDb25maWd9IGZyb20gXCIuL3NtYXJ0c3NoLmNsYXNzZXMuc3NoY29uZmlnXCI7Il19

dist/smartssh.classes.helpers.d.ts

@@ -1,4 +1,3 @@
 import "typings-global";
 import { SshKey } from "./smartssh.classes.sshkey";
 export declare let sshKeyArrayFromDir: (dirArg: string) => SshKey[];
-export declare let getKeyIndex: (hostArg: string) => number;

dist/smartssh.classes.helpers.js

@@ -4,8 +4,5 @@ exports.sshKeyArrayFromDir = function (dirArg) {
     var sshKeyArray = []; //TODO
     return sshKeyArray;
 };
-exports.getKeyIndex = function (hostArg) {
-    return 0; //TODO 
-};
 
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInNtYXJ0c3NoLmNsYXNzZXMuaGVscGVycy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsUUFBTyxnQkFDUCxDQUFDLENBRHNCO0FBSVosMEJBQWtCLEdBQUcsVUFBUyxNQUFhO0lBQ2xELElBQUksV0FBVyxHQUFHLEVBQUUsQ0FBQyxDQUFDLE1BQU07SUFDNUIsTUFBTSxDQUFDLFdBQVcsQ0FBQztBQUN2QixDQUFDLENBQUE7QUFFVSxtQkFBVyxHQUFHLFVBQVMsT0FBYztJQUM1QyxNQUFNLENBQUMsQ0FBQyxDQUFDLENBQUMsT0FBTztBQUNyQixDQUFDLENBQUEiLCJmaWxlIjoic21hcnRzc2guY2xhc3Nlcy5oZWxwZXJzLmpzIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IFwidHlwaW5ncy1nbG9iYWxcIlxyXG5pbXBvcnQgKiBhcyBwbHVnaW5zIGZyb20gXCIuL3NtYXJ0c3NoLnBsdWdpbnNcIjtcclxuaW1wb3J0IHtTc2hLZXl9IGZyb20gXCIuL3NtYXJ0c3NoLmNsYXNzZXMuc3Noa2V5XCI7XHJcblxyXG5leHBvcnQgbGV0IHNzaEtleUFycmF5RnJvbURpciA9IGZ1bmN0aW9uKGRpckFyZzpzdHJpbmcpOlNzaEtleVtde1xyXG4gICAgbGV0IHNzaEtleUFycmF5ID0gW107IC8vVE9ET1xyXG4gICAgcmV0dXJuIHNzaEtleUFycmF5O1xyXG59XHJcblxyXG5leHBvcnQgbGV0IGdldEtleUluZGV4ID0gZnVuY3Rpb24oaG9zdEFyZzpzdHJpbmcpe1xyXG4gICAgcmV0dXJuIDA7IC8vVE9ETyBcclxufSJdfQ==
+//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInNtYXJ0c3NoLmNsYXNzZXMuaGVscGVycy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsUUFBTyxnQkFDUCxDQUFDLENBRHNCO0FBSVosMEJBQWtCLEdBQUcsVUFBUyxNQUFhO0lBQ2xELElBQUksV0FBVyxHQUFHLEVBQUUsQ0FBQyxDQUFDLE1BQU07SUFDNUIsTUFBTSxDQUFDLFdBQVcsQ0FBQztBQUN2QixDQUFDLENBQUEiLCJmaWxlIjoic21hcnRzc2guY2xhc3Nlcy5oZWxwZXJzLmpzIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IFwidHlwaW5ncy1nbG9iYWxcIlxuaW1wb3J0ICogYXMgcGx1Z2lucyBmcm9tIFwiLi9zbWFydHNzaC5wbHVnaW5zXCI7XG5pbXBvcnQge1NzaEtleX0gZnJvbSBcIi4vc21hcnRzc2guY2xhc3Nlcy5zc2hrZXlcIjtcblxuZXhwb3J0IGxldCBzc2hLZXlBcnJheUZyb21EaXIgPSBmdW5jdGlvbihkaXJBcmc6c3RyaW5nKTpTc2hLZXlbXXtcbiAgICBsZXQgc3NoS2V5QXJyYXkgPSBbXTsgLy9UT0RPXG4gICAgcmV0dXJuIHNzaEtleUFycmF5O1xufSJdfQ==

dist/smartssh.classes.ssh.d.ts

@@ -1,17 +0,0 @@
-import "typings-global";
-import { SshKey } from "./smartssh.classes.sshkey";
-export declare class Ssh {
-    private sshConfig;
-    private sshDir;
-    private sshKeys;
-    private sshSync;
-    constructor(optionsArg?: {
-        sshDir?: string;
-        sshSync?: boolean;
-    });
-    addKey(sshKeyArg: SshKey): void;
-    getKey(hostArg: string): SshKey;
-    removeKey(sshKeyArg: SshKey): void;
-    replaceKey(sshKeyOldArg: SshKey, sshKeyNewArg: SshKey): void;
-    sync(): void;
-}

dist/smartssh.classes.ssh.js

@@ -1,52 +0,0 @@
-"use strict";
-require("typings-global");
-var helpers = require("./smartssh.classes.helpers");
-var smartssh_classes_sshdir_1 = require("./smartssh.classes.sshdir");
-var Ssh = (function () {
-    function Ssh(optionsArg) {
-        if (optionsArg === void 0) { optionsArg = {}; }
-        this.sshDir = new smartssh_classes_sshdir_1.SshDir(optionsArg.sshDir);
-        this.sshKeys = this.sshDir.getKeys();
-        this.sshSync = optionsArg.sshSync;
-    }
-    ;
-    Ssh.prototype.addKey = function (sshKeyArg) {
-        this.sshKeys.push(sshKeyArg);
-        this.sync();
-    };
-    ;
-    Ssh.prototype.getKey = function (hostArg) {
-        var filteredArray = this.sshKeys.filter(function (keyArg) {
-            return (keyArg.host == hostArg);
-        });
-        if (filteredArray.length > 0) {
-            return filteredArray[0];
-        }
-        else {
-            return undefined;
-        }
-    };
-    ;
-    Ssh.prototype.removeKey = function (sshKeyArg) {
-        var keyIndex = helpers.getKeyIndex(sshKeyArg.host);
-        this.sshKeys.splice(keyIndex, 1);
-        this.sync();
-    };
-    ;
-    Ssh.prototype.replaceKey = function (sshKeyOldArg, sshKeyNewArg) {
-        var keyIndex = helpers.getKeyIndex(sshKeyOldArg.host);
-        this.sshKeys.splice(keyIndex, 1, sshKeyNewArg);
-        this.sync();
-    };
-    ;
-    Ssh.prototype.sync = function () {
-        if (this.sshSync) {
-            this.sshDir.sync(this.sshConfig, this.sshKeys); // call sync method of sshDir class;
-        }
-    };
-    ;
-    return Ssh;
-}());
-exports.Ssh = Ssh;
-
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInNtYXJ0c3NoLmNsYXNzZXMuc3NoLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSxRQUFPLGdCQUNQLENBQUMsQ0FEc0I7QUFFdkIsSUFBWSxPQUFPLFdBQU0sNEJBQTRCLENBQUMsQ0FBQTtBQUV0RCx3Q0FBcUIsMkJBQTJCLENBQUMsQ0FBQTtBQUlqRDtJQUtJLGFBQVksVUFBK0M7UUFBL0MsMEJBQStDLEdBQS9DLGVBQStDO1FBQ3ZELElBQUksQ0FBQyxNQUFNLEdBQUcsSUFBSSxnQ0FBTSxDQUFDLFVBQVUsQ0FBQyxNQUFNLENBQUMsQ0FBQztRQUM1QyxJQUFJLENBQUMsT0FBTyxHQUFHLElBQUksQ0FBQyxNQUFNLENBQUMsT0FBTyxFQUFFLENBQUM7UUFDckMsSUFBSSxDQUFDLE9BQU8sR0FBRyxVQUFVLENBQUMsT0FBTyxDQUFDO0lBQ3RDLENBQUM7O0lBQ0Qsb0JBQU0sR0FBTixVQUFPLFNBQWdCO1FBQ25CLElBQUksQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxDQUFDO1FBQzdCLElBQUksQ0FBQyxJQUFJLEVBQUUsQ0FBQztJQUNoQixDQUFDOztJQUNELG9CQUFNLEdBQU4sVUFBTyxPQUFjO1FBQ2pCLElBQUksYUFBYSxHQUFHLElBQUksQ0FBQyxPQUFPLENBQUMsTUFBTSxDQUFDLFVBQVMsTUFBTTtZQUNuRCxNQUFNLENBQUMsQ0FBQyxNQUFNLENBQUMsSUFBSSxJQUFJLE9BQU8sQ0FBQyxDQUFDO1FBQ3BDLENBQUMsQ0FBQyxDQUFDO1FBQ0gsRUFBRSxDQUFBLENBQUMsYUFBYSxDQUFDLE1BQU0sR0FBRyxDQUFDLENBQUMsQ0FBQSxDQUFDO1lBQ3pCLE1BQU0sQ0FBQyxhQUFhLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDNUIsQ0FBQztRQUFDLElBQUksQ0FBQyxDQUFDO1lBQ0osTUFBTSxDQUFDLFNBQVMsQ0FBQztRQUNyQixDQUFDO0lBQ0wsQ0FBQzs7SUFDRCx1QkFBUyxHQUFULFVBQVUsU0FBZ0I7UUFDdEIsSUFBSSxRQUFRLEdBQUcsT0FBTyxDQUFDLFdBQVcsQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDbkQsSUFBSSxDQUFDLE9BQU8sQ0FBQyxNQUFNLENBQUMsUUFBUSxFQUFDLENBQUMsQ0FBQyxDQUFDO1FBQ2hDLElBQUksQ0FBQyxJQUFJLEVBQUUsQ0FBQztJQUNoQixDQUFDOztJQUNELHdCQUFVLEdBQVYsVUFBVyxZQUFtQixFQUFDLFlBQW1CO1FBQzlDLElBQUksUUFBUSxHQUFHLE9BQU8sQ0FBQyxXQUFXLENBQUMsWUFBWSxDQUFDLElBQUksQ0FBQyxDQUFDO1FBQ3RELElBQUksQ0FBQyxPQUFPLENBQUMsTUFBTSxDQUFDLFFBQVEsRUFBQyxDQUFDLEVBQUMsWUFBWSxDQUFDLENBQUM7UUFDN0MsSUFBSSxDQUFDLElBQUksRUFBRSxDQUFDO0lBQ2hCLENBQUM7O0lBQ0Qsa0JBQUksR0FBSjtRQUNJLEVBQUUsQ0FBQSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsQ0FBQSxDQUFDO1lBQ2IsSUFBSSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLFNBQVMsRUFBQyxJQUFJLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxvQ0FBb0M7UUFDdkYsQ0FBQztJQUNMLENBQUM7O0lBQ0wsVUFBQztBQUFELENBdkNBLEFBdUNDLElBQUE7QUF2Q1ksV0FBRyxNQXVDZixDQUFBIiwiZmlsZSI6InNtYXJ0c3NoLmNsYXNzZXMuc3NoLmpzIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IFwidHlwaW5ncy1nbG9iYWxcIlxyXG5pbXBvcnQgKiBhcyBwbHVnaW5zIGZyb20gXCIuL3NtYXJ0c3NoLnBsdWdpbnNcIjtcclxuaW1wb3J0ICogYXMgaGVscGVycyBmcm9tIFwiLi9zbWFydHNzaC5jbGFzc2VzLmhlbHBlcnNcIjtcclxuXHJcbmltcG9ydCB7U3NoRGlyfSBmcm9tIFwiLi9zbWFydHNzaC5jbGFzc2VzLnNzaGRpclwiO1xyXG5pbXBvcnQge1NzaENvbmZpZ30gZnJvbSBcIi4vc21hcnRzc2guY2xhc3Nlcy5zc2hjb25maWdcIjtcclxuaW1wb3J0IHtTc2hLZXl9IGZyb20gXCIuL3NtYXJ0c3NoLmNsYXNzZXMuc3Noa2V5XCI7XHJcblxyXG5leHBvcnQgY2xhc3MgU3NoIHtcclxuICAgIHByaXZhdGUgc3NoQ29uZmlnOlNzaENvbmZpZzsgLy8gcG9pbnRzIHRvIHNzaENvbmZpZyBjbGFzcyBpbnN0YW5jZVxyXG4gICAgcHJpdmF0ZSBzc2hEaXI6U3NoRGlyOyAvLyBwb2ludHMgdG8gc3NoRGlyIGNsYXNzIGluc3RhbmNlLlxyXG4gICAgcHJpdmF0ZSBzc2hLZXlzOlNzaEtleVtdOyAvL2hvbGRzIGFsbCBzc2gga2V5c1xyXG4gICAgcHJpdmF0ZSBzc2hTeW5jOmJvb2xlYW47IC8vIGlmIHNldCB0byB0cnVlLCB0aGUgc3NoIGRpciB3aWxsIGJlIGtlcHQgaW4gc3luYyBhdXRvbWF0aWNhbGx5XHJcbiAgICBjb25zdHJ1Y3RvcihvcHRpb25zQXJnOntzc2hEaXI/OnN0cmluZyxzc2hTeW5jPzpib29sZWFufT17fSl7XHJcbiAgICAgICAgdGhpcy5zc2hEaXIgPSBuZXcgU3NoRGlyKG9wdGlvbnNBcmcuc3NoRGlyKTtcclxuICAgICAgICB0aGlzLnNzaEtleXMgPSB0aGlzLnNzaERpci5nZXRLZXlzKCk7XHJcbiAgICAgICAgdGhpcy5zc2hTeW5jID0gb3B0aW9uc0FyZy5zc2hTeW5jO1xyXG4gICAgfTtcclxuICAgIGFkZEtleShzc2hLZXlBcmc6U3NoS2V5KXtcclxuICAgICAgICB0aGlzLnNzaEtleXMucHVzaChzc2hLZXlBcmcpO1xyXG4gICAgICAgIHRoaXMuc3luYygpO1xyXG4gICAgfTtcclxuICAgIGdldEtleShob3N0QXJnOnN0cmluZyl7XHJcbiAgICAgICAgbGV0IGZpbHRlcmVkQXJyYXkgPSB0aGlzLnNzaEtleXMuZmlsdGVyKGZ1bmN0aW9uKGtleUFyZyl7XHJcbiAgICAgICAgICAgIHJldHVybiAoa2V5QXJnLmhvc3QgPT0gaG9zdEFyZyk7XHJcbiAgICAgICAgfSk7XHJcbiAgICAgICAgaWYoZmlsdGVyZWRBcnJheS5sZW5ndGggPiAwKXtcclxuICAgICAgICAgICAgcmV0dXJuIGZpbHRlcmVkQXJyYXlbMF07XHJcbiAgICAgICAgfSBlbHNlIHtcclxuICAgICAgICAgICAgcmV0dXJuIHVuZGVmaW5lZDtcclxuICAgICAgICB9XHJcbiAgICB9O1xyXG4gICAgcmVtb3ZlS2V5KHNzaEtleUFyZzpTc2hLZXkpe1xyXG4gICAgICAgIGxldCBrZXlJbmRleCA9IGhlbHBlcnMuZ2V0S2V5SW5kZXgoc3NoS2V5QXJnLmhvc3QpO1xyXG4gICAgICAgIHRoaXMuc3NoS2V5cy5zcGxpY2Uoa2V5SW5kZXgsMSk7XHJcbiAgICAgICAgdGhpcy5zeW5jKCk7XHJcbiAgICB9O1xyXG4gICAgcmVwbGFjZUtleShzc2hLZXlPbGRBcmc6U3NoS2V5LHNzaEtleU5ld0FyZzpTc2hLZXkpe1xyXG4gICAgICAgIGxldCBrZXlJbmRleCA9IGhlbHBlcnMuZ2V0S2V5SW5kZXgoc3NoS2V5T2xkQXJnLmhvc3QpO1xyXG4gICAgICAgIHRoaXMuc3NoS2V5cy5zcGxpY2Uoa2V5SW5kZXgsMSxzc2hLZXlOZXdBcmcpO1xyXG4gICAgICAgIHRoaXMuc3luYygpO1xyXG4gICAgfTtcclxuICAgIHN5bmMoKXtcclxuICAgICAgICBpZih0aGlzLnNzaFN5bmMpe1xyXG4gICAgICAgICAgICB0aGlzLnNzaERpci5zeW5jKHRoaXMuc3NoQ29uZmlnLHRoaXMuc3NoS2V5cyk7IC8vIGNhbGwgc3luYyBtZXRob2Qgb2Ygc3NoRGlyIGNsYXNzO1xyXG4gICAgICAgIH1cclxuICAgIH07XHJcbn1cclxuXHJcblxyXG4iXX0=

dist/smartssh.classes.sshconfig.js

@@ -7,4 +7,4 @@ var SshConfig = (function () {
 }());
 exports.SshConfig = SshConfig;
 
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInNtYXJ0c3NoLmNsYXNzZXMuc3NoY29uZmlnLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSxRQUFPLGdCQUFnQixDQUFDLENBQUE7QUFHeEI7SUFDSTtJQUVBLENBQUM7SUFDTCxnQkFBQztBQUFELENBSkEsQUFJQyxJQUFBO0FBSlksaUJBQVMsWUFJckIsQ0FBQSIsImZpbGUiOiJzbWFydHNzaC5jbGFzc2VzLnNzaGNvbmZpZy5qcyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBcInR5cGluZ3MtZ2xvYmFsXCI7XHJcbmltcG9ydCAqIGFzIHBsdWdpbnMgZnJvbSBcIi4vc21hcnRzc2gucGx1Z2luc1wiO1xyXG5pbXBvcnQgKiBhcyBoZWxwZXJzIGZyb20gXCIuL3NtYXJ0c3NoLmNsYXNzZXMuaGVscGVyc1wiO1xyXG5leHBvcnQgY2xhc3MgU3NoQ29uZmlnIHtcclxuICAgIGNvbnN0cnVjdG9yKCl7XHJcbiAgICAgICAgXHJcbiAgICB9XHJcbn0iXX0=
+//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInNtYXJ0c3NoLmNsYXNzZXMuc3NoY29uZmlnLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSxRQUFPLGdCQUFnQixDQUFDLENBQUE7QUFHeEI7SUFDSTtJQUVBLENBQUM7SUFDTCxnQkFBQztBQUFELENBSkEsQUFJQyxJQUFBO0FBSlksaUJBQVMsWUFJckIsQ0FBQSIsImZpbGUiOiJzbWFydHNzaC5jbGFzc2VzLnNzaGNvbmZpZy5qcyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBcInR5cGluZ3MtZ2xvYmFsXCI7XG5pbXBvcnQgKiBhcyBwbHVnaW5zIGZyb20gXCIuL3NtYXJ0c3NoLnBsdWdpbnNcIjtcbmltcG9ydCAqIGFzIGhlbHBlcnMgZnJvbSBcIi4vc21hcnRzc2guY2xhc3Nlcy5oZWxwZXJzXCI7XG5leHBvcnQgY2xhc3MgU3NoQ29uZmlnIHtcbiAgICBjb25zdHJ1Y3Rvcigpe1xuICAgICAgICBcbiAgICB9XG59Il19

dist/smartssh.classes.sshdir.d.ts

@@ -1,9 +1,11 @@
 import "typings-global";
+import { SshInstance } from "./smartssh.classes.sshinstance";
 import { SshKey } from "./smartssh.classes.sshkey";
-import { SshConfig } from "./smartssh.classes.sshconfig";
 export declare class SshDir {
     path: string;
-    constructor(sshDirPathArg: string);
-    sync(sshConfigArg: SshConfig, sshKeysArg: SshKey[]): void;
+    sshInstance: SshInstance;
+    constructor(sshInstanceArg: SshInstance, sshDirPathArg?: string);
+    writeToDir(): void;
+    readFromDir(): void;
     getKeys(): SshKey[];
 }

dist/smartssh.classes.sshdir.js

@@ -1,13 +1,23 @@
 "use strict";
 require("typings-global");
+var plugins = require("./smartssh.plugins");
 var helpers = require("./smartssh.classes.helpers");
 var SshDir = (function () {
-    function SshDir(sshDirPathArg) {
-        this.path = sshDirPathArg;
+    function SshDir(sshInstanceArg, sshDirPathArg) {
+        var sshDirPath;
+        if (sshDirPathArg) {
+            sshDirPath = sshDirPathArg;
+        }
+        else {
+            sshDirPath = plugins.smartpath.get.home();
+        }
+        this.path = sshDirPath;
     }
-    SshDir.prototype.sync = function (sshConfigArg, sshKeysArg) {
+    SshDir.prototype.writeToDir = function () {
     };
     ;
+    SshDir.prototype.readFromDir = function () {
+    };
     SshDir.prototype.getKeys = function () {
         return helpers.sshKeyArrayFromDir(this.path);
     };
@@ -15,4 +25,4 @@ var SshDir = (function () {
 }());
 exports.SshDir = SshDir;
 
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInNtYXJ0c3NoLmNsYXNzZXMuc3NoZGlyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSxRQUFPLGdCQUFnQixDQUFDLENBQUE7QUFFeEIsSUFBWSxPQUFPLFdBQU0sNEJBQTRCLENBQUMsQ0FBQTtBQUd0RDtJQUVJLGdCQUFZLGFBQW9CO1FBQzVCLElBQUksQ0FBQyxJQUFJLEdBQUcsYUFBYSxDQUFDO0lBQzlCLENBQUM7SUFDRCxxQkFBSSxHQUFKLFVBQUssWUFBc0IsRUFBQyxVQUFtQjtJQUUvQyxDQUFDOztJQUNELHdCQUFPLEdBQVA7UUFDSSxNQUFNLENBQUMsT0FBTyxDQUFDLGtCQUFrQixDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUNqRCxDQUFDO0lBQ0wsYUFBQztBQUFELENBWEEsQUFXQyxJQUFBO0FBWFksY0FBTSxTQVdsQixDQUFBIiwiZmlsZSI6InNtYXJ0c3NoLmNsYXNzZXMuc3NoZGlyLmpzIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IFwidHlwaW5ncy1nbG9iYWxcIjtcclxuaW1wb3J0ICogYXMgcGx1Z2lucyBmcm9tIFwiLi9zbWFydHNzaC5wbHVnaW5zXCI7XHJcbmltcG9ydCAqIGFzIGhlbHBlcnMgZnJvbSBcIi4vc21hcnRzc2guY2xhc3Nlcy5oZWxwZXJzXCI7XHJcbmltcG9ydCB7U3NoS2V5fSBmcm9tIFwiLi9zbWFydHNzaC5jbGFzc2VzLnNzaGtleVwiO1xyXG5pbXBvcnQge1NzaENvbmZpZ30gZnJvbSBcIi4vc21hcnRzc2guY2xhc3Nlcy5zc2hjb25maWdcIjtcclxuZXhwb3J0IGNsYXNzIFNzaERpciB7IC8vIHNzaERpciBjbGFzcyAtPiBOT1QgRVhQT1JURUQsIE9OTFkgRk9SIElOVEVSTkFMIFVTRVxyXG4gICAgcGF0aDpzdHJpbmc7XHJcbiAgICBjb25zdHJ1Y3Rvcihzc2hEaXJQYXRoQXJnOnN0cmluZyl7XHJcbiAgICAgICAgdGhpcy5wYXRoID0gc3NoRGlyUGF0aEFyZztcclxuICAgIH1cclxuICAgIHN5bmMoc3NoQ29uZmlnQXJnOlNzaENvbmZpZyxzc2hLZXlzQXJnOlNzaEtleVtdKXtcclxuICAgICAgICBcclxuICAgIH07XHJcbiAgICBnZXRLZXlzKCl7XHJcbiAgICAgICAgcmV0dXJuIGhlbHBlcnMuc3NoS2V5QXJyYXlGcm9tRGlyKHRoaXMucGF0aCk7XHJcbiAgICB9XHJcbn0iXX0=
+//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInNtYXJ0c3NoLmNsYXNzZXMuc3NoZGlyLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSxRQUFPLGdCQUFnQixDQUFDLENBQUE7QUFDeEIsSUFBWSxPQUFPLFdBQU0sb0JBQW9CLENBQUMsQ0FBQTtBQUM5QyxJQUFZLE9BQU8sV0FBTSw0QkFBNEIsQ0FBQyxDQUFBO0FBSXREO0lBR0ksZ0JBQVksY0FBMEIsRUFBQyxhQUFxQjtRQUN4RCxJQUFJLFVBQWlCLENBQUM7UUFDdEIsRUFBRSxDQUFBLENBQUMsYUFBYSxDQUFDLENBQUEsQ0FBQztZQUNkLFVBQVUsR0FBRyxhQUFhLENBQUM7UUFDL0IsQ0FBQztRQUFDLElBQUksQ0FBQyxDQUFDO1lBQ0osVUFBVSxHQUFHLE9BQU8sQ0FBQyxTQUFTLENBQUMsR0FBRyxDQUFDLElBQUksRUFBRSxDQUFDO1FBQzlDLENBQUM7UUFDRCxJQUFJLENBQUMsSUFBSSxHQUFHLFVBQVUsQ0FBQztJQUMzQixDQUFDO0lBQ0QsMkJBQVUsR0FBVjtJQUVBLENBQUM7O0lBQ0QsNEJBQVcsR0FBWDtJQUVBLENBQUM7SUFDRCx3QkFBTyxHQUFQO1FBQ0ksTUFBTSxDQUFDLE9BQU8sQ0FBQyxrQkFBa0IsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDakQsQ0FBQztJQUNMLGFBQUM7QUFBRCxDQXJCQSxBQXFCQyxJQUFBO0FBckJZLGNBQU0sU0FxQmxCLENBQUEiLCJmaWxlIjoic21hcnRzc2guY2xhc3Nlcy5zc2hkaXIuanMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgXCJ0eXBpbmdzLWdsb2JhbFwiO1xuaW1wb3J0ICogYXMgcGx1Z2lucyBmcm9tIFwiLi9zbWFydHNzaC5wbHVnaW5zXCI7XG5pbXBvcnQgKiBhcyBoZWxwZXJzIGZyb20gXCIuL3NtYXJ0c3NoLmNsYXNzZXMuaGVscGVyc1wiO1xuaW1wb3J0IHtTc2hJbnN0YW5jZX0gZnJvbSBcIi4vc21hcnRzc2guY2xhc3Nlcy5zc2hpbnN0YW5jZVwiO1xuaW1wb3J0IHtTc2hLZXl9IGZyb20gXCIuL3NtYXJ0c3NoLmNsYXNzZXMuc3Noa2V5XCI7XG5pbXBvcnQge1NzaENvbmZpZ30gZnJvbSBcIi4vc21hcnRzc2guY2xhc3Nlcy5zc2hjb25maWdcIjtcbmV4cG9ydCBjbGFzcyBTc2hEaXIgeyAvLyBzc2hEaXIgY2xhc3MgLT4gTk9UIEVYUE9SVEVELCBPTkxZIEZPUiBJTlRFUk5BTCBVU0VcbiAgICBwYXRoOnN0cmluZzsgLy8gdGhlIHBhdGggb2YgdGhlIHNzaCBkaXJlY3RvcnlcbiAgICBzc2hJbnN0YW5jZTpTc2hJbnN0YW5jZTtcbiAgICBjb25zdHJ1Y3Rvcihzc2hJbnN0YW5jZUFyZzpTc2hJbnN0YW5jZSxzc2hEaXJQYXRoQXJnPzpzdHJpbmcpe1xuICAgICAgICBsZXQgc3NoRGlyUGF0aDpzdHJpbmc7XG4gICAgICAgIGlmKHNzaERpclBhdGhBcmcpe1xuICAgICAgICAgICAgc3NoRGlyUGF0aCA9IHNzaERpclBhdGhBcmc7XG4gICAgICAgIH0gZWxzZSB7XG4gICAgICAgICAgICBzc2hEaXJQYXRoID0gcGx1Z2lucy5zbWFydHBhdGguZ2V0LmhvbWUoKTtcbiAgICAgICAgfVxuICAgICAgICB0aGlzLnBhdGggPSBzc2hEaXJQYXRoO1xuICAgIH1cbiAgICB3cml0ZVRvRGlyKCl7IC8vIHN5bmNzIHNzaEluc3RhbmNlIHRvIGRpcmVjdG9yeVxuICAgICAgICBcbiAgICB9O1xuICAgIHJlYWRGcm9tRGlyKCl7IC8vIHN5bmNzIHNzaEluc3RhbmNlIGZyb20gZGlyZWN0b3J5XG4gICAgICAgIFxuICAgIH1cbiAgICBnZXRLZXlzKCl7XG4gICAgICAgIHJldHVybiBoZWxwZXJzLnNzaEtleUFycmF5RnJvbURpcih0aGlzLnBhdGgpO1xuICAgIH1cbn0iXX0=

dist/smartssh.classes.sshinstance.d.ts

@@ -0,0 +1,34 @@
+import "typings-global";
+import { SshDir } from "./smartssh.classes.sshdir";
+import { SshKey } from "./smartssh.classes.sshkey";
+export declare class SshInstance {
+    private _sshConfig;
+    sshDir: SshDir;
+    protected sshKeyArray: SshKey[];
+    private _sshSync;
+    constructor(optionsArg?: {
+        sshDirPath?: string;
+        sshSync?: boolean;
+    });
+    addKey(sshKeyArg: SshKey): void;
+    removeKey(sshKeyArg: SshKey): void;
+    replaceKey(sshKeyOldArg: SshKey, sshKeyNewArg: SshKey): void;
+    getKey(hostArg: string): SshKey;
+    sshKeys: SshKey[];
+    /**
+     * write SshInstance to disk
+     */
+    writeToDisk(): void;
+    /**
+     * read ab SshInstance from disk
+     */
+    readFromDisk(): void;
+    /**
+     * method to invoke SshInstance _sync automatically when sshSync is true
+     */
+    private _syncAuto(directionArg);
+    /**
+     * private method to sync SshInstance
+     */
+    private _sync(directionArg);
+}

dist/smartssh.classes.sshkey.d.ts

@@ -10,9 +10,9 @@ export declare class SshKey {
     });
     host: string;
     privateKey: string;
-    privateKeyBase64: any;
+    privateKeyBase64: string;
     publicKey: string;
-    publicKeyBase64: any;
+    publicKeyBase64: string;
     type: string;
     store(filePathArg?: string): void;
 }

dist/smartssh.plugins.d.ts

@@ -1,6 +1,8 @@
 import "typings-global";
-export declare let beautylog: any;
+export import beautylog = require("beautylog");
 export declare let base64: any;
 export declare let fs: any;
-export declare let path: any;
-export declare let smartfile: any;
+export declare let minimatch: any;
+export import path = require("path");
+export import smartfile = require("smartfile");
+export import smartpath = require("smartpath");

dist/smartssh.plugins.js

@@ -3,7 +3,9 @@ require("typings-global");
 exports.beautylog = require("beautylog");
 exports.base64 = require("js-base64").Base64;
 exports.fs = require("fs-extra");
+exports.minimatch = require("minimatch");
 exports.path = require("path");
 exports.smartfile = require("smartfile");
+exports.smartpath = require("smartpath");
 
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInNtYXJ0c3NoLnBsdWdpbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLFFBQU8sZ0JBQ1AsQ0FBQyxDQURzQjtBQUNaLGlCQUFTLEdBQUcsT0FBTyxDQUFDLFdBQVcsQ0FBQyxDQUFDO0FBQ2pDLGNBQU0sR0FBRyxPQUFPLENBQUMsV0FBVyxDQUFDLENBQUMsTUFBTSxDQUFDO0FBQ3JDLFVBQUUsR0FBRyxPQUFPLENBQUMsVUFBVSxDQUFDLENBQUM7QUFDekIsWUFBSSxHQUFHLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FBQztBQUN2QixpQkFBUyxHQUFHLE9BQU8sQ0FBQyxXQUFXLENBQUMsQ0FBQyIsImZpbGUiOiJzbWFydHNzaC5wbHVnaW5zLmpzIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IFwidHlwaW5ncy1nbG9iYWxcIlxyXG5leHBvcnQgbGV0IGJlYXV0eWxvZyA9IHJlcXVpcmUoXCJiZWF1dHlsb2dcIik7XHJcbmV4cG9ydCBsZXQgYmFzZTY0ID0gcmVxdWlyZShcImpzLWJhc2U2NFwiKS5CYXNlNjQ7XHJcbmV4cG9ydCBsZXQgZnMgPSByZXF1aXJlKFwiZnMtZXh0cmFcIik7XHJcbmV4cG9ydCBsZXQgcGF0aCA9IHJlcXVpcmUoXCJwYXRoXCIpO1xyXG5leHBvcnQgbGV0IHNtYXJ0ZmlsZSA9IHJlcXVpcmUoXCJzbWFydGZpbGVcIik7Il19
+//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInNtYXJ0c3NoLnBsdWdpbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLFFBQU8sZ0JBQ1AsQ0FBQyxDQURzQjtBQUNULGlCQUFTLFdBQVcsV0FBVyxDQUFDLENBQUM7QUFDcEMsY0FBTSxHQUFHLE9BQU8sQ0FBQyxXQUFXLENBQUMsQ0FBQyxNQUFNLENBQUM7QUFDckMsVUFBRSxHQUFHLE9BQU8sQ0FBQyxVQUFVLENBQUMsQ0FBQztBQUN6QixpQkFBUyxHQUFHLE9BQU8sQ0FBQyxXQUFXLENBQUMsQ0FBQztBQUM5QixZQUFJLFdBQVcsTUFBTSxDQUFDLENBQUM7QUFDdkIsaUJBQVMsV0FBVyxXQUFXLENBQUMsQ0FBQztBQUNqQyxpQkFBUyxXQUFXLFdBQVcsQ0FBQyxDQUFDIiwiZmlsZSI6InNtYXJ0c3NoLnBsdWdpbnMuanMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgXCJ0eXBpbmdzLWdsb2JhbFwiXG5leHBvcnQgaW1wb3J0IGJlYXV0eWxvZyA9IHJlcXVpcmUoXCJiZWF1dHlsb2dcIik7XG5leHBvcnQgbGV0IGJhc2U2NCA9IHJlcXVpcmUoXCJqcy1iYXNlNjRcIikuQmFzZTY0O1xuZXhwb3J0IGxldCBmcyA9IHJlcXVpcmUoXCJmcy1leHRyYVwiKTtcbmV4cG9ydCBsZXQgbWluaW1hdGNoID0gcmVxdWlyZShcIm1pbmltYXRjaFwiKTtcbmV4cG9ydCBpbXBvcnQgcGF0aCA9IHJlcXVpcmUoXCJwYXRoXCIpO1xuZXhwb3J0IGltcG9ydCBzbWFydGZpbGUgPSByZXF1aXJlKFwic21hcnRmaWxlXCIpO1xuZXhwb3J0IGltcG9ydCBzbWFydHBhdGggPSByZXF1aXJlKFwic21hcnRwYXRoXCIpOyJdfQ==

npmts.json

@@ -1,4 +1,3 @@
 {
-    "mode":"default",
-    "coverageTreshold":50
+    "mode":"default"
 }

package.json

@@ -1,14 +1,15 @@
 {
   "name": "smartssh",
-  "version": "1.0.2",
+  "version": "1.0.7",
   "description": "setups SSH quickly and in a painless manner",
   "main": "dist/index.js",
+  "typings": "dist/index.d.ts",
   "scripts": {
     "test": "(npmts)"
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/pushrocks/smartssh.git"
+    "url": "git+https://gitlab.com/pushrocks/smartssh.git"
   },
   "keywords": [
     "SSH",
@@ -18,19 +19,21 @@
   "author": "Lossless GmbH",
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/pushrocks/smartssh/issues"
+    "url": "https://gitlab.com/pushrocks/smartssh/issues"
   },
-  "homepage": "https://github.com/pushrocks/smartssh#readme",
+  "homepage": "https://gitlab.com/pushrocks/smartssh#readme",
   "dependencies": {
-    "beautylog": "^5.0.8",
+    "beautylog": "^5.0.12",
     "fs-extra": "^0.30.0",
     "js-base64": "^2.1.9",
-    "smartfile": "^3.0.10",
+    "minimatch": "^3.0.2",
+    "smartfile": "^4.0.4",
+    "smartpath": "^3.2.2",
     "typings-global": "^1.0.3",
     "typings-test": "^1.0.1"
   },
   "devDependencies": {
-    "npmts": "^5.1.19",
-    "should": "^9.0.0"
+    "npmts-g": "^5.2.6",
+    "should": "^9.0.2"
   }
 }

test/test.d.ts

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

test/test.ts

@@ -1,3 +1,66 @@
 import "typings-test"
-let should = require("should");
-let smartssh = require("../dist/index.js");
+import "should";
+import smartssh = require("../dist/index");
+describe("smartssh",function(){
+    let testSshInstance:smartssh.SshInstance;
+    let testSshKey:smartssh.SshKey;
+    describe(".SshKey",function(){
+        it("'new' keyword should create a valid SshKey object",function(){
+            testSshKey = new smartssh.SshKey({
+                host:"example.com",
+                private:"someExamplePrivateKey",
+                public:"someExamplePublicKey"
+            });
+            testSshKey.should.be.instanceof(smartssh.SshKey);
+        });
+        it(".type should be a valid type",function(){
+            testSshKey.type.should.equal("duplex");
+        });
+        it(".publicKey should be public key",function(){
+            testSshKey.publicKey.should.equal("someExamplePublicKey");
+        });
+        it(".privateKey should be private key",function(){
+            testSshKey.privateKey.should.equal("someExamplePrivateKey");
+        });
+        it(".publicKeyBase64 should be public key base 64 encoded",function(){
+            testSshKey.publicKeyBase64;
+        })
+    });
+    describe(".SshInstance",function(){
+        it("'new' keyword should create a new SshInstance object from class",function(){
+            testSshInstance = new smartssh.SshInstance();
+            testSshInstance.should.be.instanceof(smartssh.SshInstance);
+        });
+        it(".addKey() should accept a new SshKey object",function(){
+            testSshInstance.addKey(new smartssh.SshKey({
+                public:"somePublicKey",
+                private:"somePrivateKey",
+                host:"gitlab.com"
+            }));
+            testSshInstance.addKey(new smartssh.SshKey({
+                public:"somePublicKey",
+                private:"somePrivateKey",
+                host:"bitbucket.org"
+            }));
+            testSshInstance.addKey(new smartssh.SshKey({
+                public:"someGitHubPublicKey",
+                private:"someGitHubPrivateKey",
+                host:"github.com"
+            }));
+        });
+        it(".sshKeys should point to an array of sshKeys",function(){
+            let sshKeyArray = testSshInstance.sshKeys;
+            sshKeyArray.should.be.Array();
+            sshKeyArray[0].host.should.equal("gitlab.com");
+            sshKeyArray[1].host.should.equal("bitbucket.org");
+            sshKeyArray[2].host.should.equal("github.com");
+        });
+        it(".getKey() should get a specific key selected by host",function(){
+            testSshInstance.getKey("github.com").publicKey.should.equal("someGitHubPublicKey");
+        })
+        it(".removeKey() should remove a key",function(){
+            testSshInstance.removeKey(testSshInstance.getKey("bitbucket.org"));
+            testSshInstance.sshKeys[1].host.should.equal("github.com");
+        })
+    });
+})

ts/index.ts

@@ -1,7 +1,7 @@
 import "typings-global"
 import * as plugins from "./smartssh.plugins";
 
-export {Ssh} from "./smartssh.classes.ssh";
+export {SshInstance} from "./smartssh.classes.sshinstance";
 export {SshKey} from "./smartssh.classes.sshkey";
 export {SshDir} from "./smartssh.classes.sshdir";
 export {SshConfig} from "./smartssh.classes.sshconfig";

ts/smartssh.classes.helpers.ts

@@ -5,8 +5,4 @@ import {SshKey} from "./smartssh.classes.sshkey";
 export let sshKeyArrayFromDir = function(dirArg:string):SshKey[]{
     let sshKeyArray = []; //TODO
     return sshKeyArray;
-}
-
-export let getKeyIndex = function(hostArg:string){
-    return 0; //TODO 
 }

ts/smartssh.classes.ssh.ts

@@ -1,50 +0,0 @@
-import "typings-global"
-import * as plugins from "./smartssh.plugins";
-import * as helpers from "./smartssh.classes.helpers";
-
-import {SshDir} from "./smartssh.classes.sshdir";
-import {SshConfig} from "./smartssh.classes.sshconfig";
-import {SshKey} from "./smartssh.classes.sshkey";
-
-export class Ssh {
-    private sshConfig:SshConfig; // points to sshConfig class instance
-    private sshDir:SshDir; // points to sshDir class instance.
-    private sshKeys:SshKey[]; //holds all ssh keys
-    private sshSync:boolean; // if set to true, the ssh dir will be kept in sync automatically
-    constructor(optionsArg:{sshDir?:string,sshSync?:boolean}={}){
-        this.sshDir = new SshDir(optionsArg.sshDir);
-        this.sshKeys = this.sshDir.getKeys();
-        this.sshSync = optionsArg.sshSync;
-    };
-    addKey(sshKeyArg:SshKey){
-        this.sshKeys.push(sshKeyArg);
-        this.sync();
-    };
-    getKey(hostArg:string){
-        let filteredArray = this.sshKeys.filter(function(keyArg){
-            return (keyArg.host == hostArg);
-        });
-        if(filteredArray.length > 0){
-            return filteredArray[0];
-        } else {
-            return undefined;
-        }
-    };
-    removeKey(sshKeyArg:SshKey){
-        let keyIndex = helpers.getKeyIndex(sshKeyArg.host);
-        this.sshKeys.splice(keyIndex,1);
-        this.sync();
-    };
-    replaceKey(sshKeyOldArg:SshKey,sshKeyNewArg:SshKey){
-        let keyIndex = helpers.getKeyIndex(sshKeyOldArg.host);
-        this.sshKeys.splice(keyIndex,1,sshKeyNewArg);
-        this.sync();
-    };
-    sync(){
-        if(this.sshSync){
-            this.sshDir.sync(this.sshConfig,this.sshKeys); // call sync method of sshDir class;
-        }
-    };
-}
-
-

ts/smartssh.classes.sshdir.ts

@@ -1,16 +1,27 @@
 import "typings-global";
 import * as plugins from "./smartssh.plugins";
 import * as helpers from "./smartssh.classes.helpers";
+import {SshInstance} from "./smartssh.classes.sshinstance";
 import {SshKey} from "./smartssh.classes.sshkey";
 import {SshConfig} from "./smartssh.classes.sshconfig";
 export class SshDir { // sshDir class -> NOT EXPORTED, ONLY FOR INTERNAL USE
-    path:string;
-    constructor(sshDirPathArg:string){
-        this.path = sshDirPathArg;
+    path:string; // the path of the ssh directory
+    sshInstance:SshInstance;
+    constructor(sshInstanceArg:SshInstance,sshDirPathArg?:string){
+        let sshDirPath:string;
+        if(sshDirPathArg){
+            sshDirPath = sshDirPathArg;
+        } else {
+            sshDirPath = plugins.smartpath.get.home();
+        }
+        this.path = sshDirPath;
     }
-    sync(sshConfigArg:SshConfig,sshKeysArg:SshKey[]){
+    writeToDir(){ // syncs sshInstance to directory
         
     };
+    readFromDir(){ // syncs sshInstance from directory
+        
+    }
     getKeys(){
         return helpers.sshKeyArrayFromDir(this.path);
     }

ts/smartssh.classes.sshinstance.ts

@@ -0,0 +1,96 @@
+import "typings-global"
+import * as plugins from "./smartssh.plugins";
+import * as helpers from "./smartssh.classes.helpers";
+
+import {SshDir} from "./smartssh.classes.sshdir";
+import {SshConfig} from "./smartssh.classes.sshconfig";
+import {SshKey} from "./smartssh.classes.sshkey";
+
+export class SshInstance {
+    private _sshConfig:SshConfig; // sshConfig (e.g. represents ~/.ssh/config)
+    sshDir:SshDir; // points to sshDir class instance.
+    protected sshKeyArray:SshKey[]; //holds all ssh keys
+    private _sshSync:boolean; // if set to true, the ssh dir will be kept in sync automatically
+    constructor(optionsArg:{sshDirPath?:string,sshSync?:boolean}={}){
+        optionsArg ? void(0) : optionsArg = {};
+        this.sshKeyArray = [];
+        this._sshSync = optionsArg.sshSync;
+        this.sshDir = new SshDir(this,optionsArg.sshDirPath);
+    };
+    
+    //altering methods
+    addKey(sshKeyArg:SshKey){
+        this._syncAuto("from");
+        this.sshKeyArray.push(sshKeyArg);
+        this._syncAuto("to");
+    };
+    removeKey(sshKeyArg:SshKey){
+        this._syncAuto("from");
+        let filteredArray = this.sshKeyArray.filter((sshKeyArg2:SshKey) => {
+            return (sshKeyArg != sshKeyArg2);
+        });
+        this.sshKeyArray = filteredArray;
+        this._syncAuto("to");
+    };
+    replaceKey(sshKeyOldArg:SshKey,sshKeyNewArg:SshKey){
+        this._syncAuto("from");
+        this.removeKey(sshKeyOldArg);
+        this.addKey(sshKeyNewArg);
+        this._syncAuto("to");
+    };
+    
+    //
+    getKey(hostArg:string):SshKey{
+        this._syncAuto("from");
+        let filteredArray = this.sshKeyArray.filter(function(keyArg){
+            return (keyArg.host == hostArg);
+        });
+        if(filteredArray.length > 0){
+            return filteredArray[0];
+        } else {
+            return undefined;
+        }
+    };
+    get sshKeys():SshKey[] {
+        this._syncAuto("from");
+        return this.sshKeyArray;
+    };
+
+    //FS methods
+
+    /**
+     * write SshInstance to disk
+     */
+    writeToDisk(){
+        this._sync("to");
+    }
+
+    /**
+     * read ab SshInstance from disk
+     */
+    readFromDisk(){
+        this._sync("from");
+    }
+
+    /**
+     * method to invoke SshInstance _sync automatically when sshSync is true
+     */
+    private _syncAuto(directionArg){
+        if(this._sshSync) this._sync(directionArg);
+    }
+
+    /**
+     * private method to sync SshInstance
+     */
+    private _sync(directionArg:string){
+        if(directionArg == "from"){
+            this.sshDir.readFromDir(); // call sync method of sshDir class;
+        } else if(directionArg == "to") {
+            this.sshDir.writeToDir();
+        } else {
+            throw new Error("directionArg not recognised. Must be 'to' or 'from'");
+        }
+    };
+}
+
+

ts/smartssh.classes.sshkey.ts

@@ -23,7 +23,7 @@ export class SshKey {
         return plugins.base64.encode(this.privKey);
     }
     get publicKey(){
-        return this.publicKey;
+        return this.pubKey;
     }
     get publicKeyBase64(){
         return plugins.base64.encode(this.pubKey);
@@ -45,10 +45,18 @@ export class SshKey {
     set privateKey(privateKeyArg:string){
         this.privKey = privateKeyArg;
     };
-    // setters
+    
+    set privateKeyBase64(privateKeyArg:string) {
+        this.privKey = plugins.base64.decode(privateKeyArg);
+    }
+
     set publicKey(publicKeyArg:string){
         this.pubKey = publicKeyArg;
     };
+
+    set publicKeyBase64(publicKeyArg:string) {
+        this.pubKey = plugins.base64.decode(publicKeyArg);
+    }
     
     store(filePathArg?:string){
         let filePathObj = plugins.path.parse(filePathArg);
@@ -59,7 +67,7 @@ export class SshKey {
         } else { //we assume we are given a directory as filePathArg, so we store the whole key
             plugins.fs.ensureDirSync(filePathObj.dir);
             this.store(plugins.path.join(filePathObj.dir,"key.priv")); // call this function recursivly
-            this.store(plugins.path.join(filePathObj.dir,"key.priv")); // call this function recursivly
+            this.store(plugins.path.join(filePathObj.dir,"key.pub")); // call this function recursivly
         }
     }
 }

ts/smartssh.plugins.ts

@@ -1,6 +1,8 @@
 import "typings-global"
-export let beautylog = require("beautylog");
+export import beautylog = require("beautylog");
 export let base64 = require("js-base64").Base64;
 export let fs = require("fs-extra");
-export let path = require("path");
-export let smartfile = require("smartfile");
+export let minimatch = require("minimatch");
+export import path = require("path");
+export import smartfile = require("smartfile");
+export import smartpath = require("smartpath");