1.0.7

.gitlab-ci.yml

@@ -0,0 +1,38 @@
+image: hosttoday/ht-docker-node:npmts
+
+stages:
+- test
+- release
+- page
+
+testLTS:
+  stage: test
+  script:
+    - npmci test lts
+  tags:
+    - docker
+    - lossless
+    
+testSTABLE:
+  stage: test
+  script:
+    - npmci test stable
+  tags:
+    - docker
+    - lossless
+
+testLEGACY:
+  stage: test
+  script:
+    - npmci test legacy
+  allow_failure: true
+
+release:
+  stage: release
+  script:
+    - npmci publish
+  only:
+    - tags
+  tags:
+    - docker
+    - lossless

README.md

@@ -2,7 +2,6 @@
 setups SSH quickly and in a painless manner
 
 > Attention: This is still alpha, so some things won't work, not all things are inplemented.
-I (Phil from Lossless) expect this to be ready 2016/05/01.
 
 ## Usage
 
@@ -16,18 +15,20 @@ var sshInstance = new smartssh.sshInstance({
 sshInstance.addKey(new smartssh.sshKey({ 
     private: "somestring",
     public: "somestring", // optional
-    for:"github.com",
+    host:"github.com",
     encoding: "base64" // optional, defaults to "utf8", can be "utf8" or "base64", useful for reading ssh keys from environment variables
 }));
 
+sshInstance.removeKey(sshInstance.getKey("github.com")); // removes key for host "github.com" is present
+
 sshInstance.createKey({
-    for:"gitlab.com" // returns new key in the form sshKey, read more about the sshKey class below
+    host:"gitlab.com" // returns new key in the form sshKey, read more about the sshKey class below
 })
 
 sshInstance.getKey({ // returns ssh key in the form sshKey, read more about the sshKey class below
-    for:"github.com"
+    host:"github.com"
 });
 
 sshInstance.getKeys() // returns array of all available getKeys. Each key is in form of class sshKey
 
-```
+```

dist/index.d.ts

@@ -0,0 +1,5 @@
+import "typings-global";
+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,3 +1,12 @@
 "use strict";
+require("typings-global");
+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");
+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;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IiIsImZpbGUiOiJpbmRleC5qcyIsInNvdXJjZXNDb250ZW50IjpbXSwic291cmNlUm9vdCI6Ii9zb3VyY2UvIn0=
+//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImluZGV4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSxRQUFPLGdCQUNQLENBQUMsQ0FEc0I7QUFHdkIsNkNBQTBCLGdDQUFnQyxDQUFDO0FBQW5ELGlFQUFtRDtBQUMzRCx3Q0FBcUIsMkJBQTJCLENBQUM7QUFBekMsa0RBQXlDO0FBQ2pELHdDQUFxQiwyQkFBMkIsQ0FBQztBQUF6QyxrREFBeUM7QUFDakQsMkNBQXdCLDhCQUE4QixDQUFDO0FBQS9DLDJEQUErQyIsImZpbGUiOiJpbmRleC5qcyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBcInR5cGluZ3MtZ2xvYmFsXCJcbmltcG9ydCAqIGFzIHBsdWdpbnMgZnJvbSBcIi4vc21hcnRzc2gucGx1Z2luc1wiO1xuXG5leHBvcnQge1NzaEluc3RhbmNlfSBmcm9tIFwiLi9zbWFydHNzaC5jbGFzc2VzLnNzaGluc3RhbmNlXCI7XG5leHBvcnQge1NzaEtleX0gZnJvbSBcIi4vc21hcnRzc2guY2xhc3Nlcy5zc2hrZXlcIjtcbmV4cG9ydCB7U3NoRGlyfSBmcm9tIFwiLi9zbWFydHNzaC5jbGFzc2VzLnNzaGRpclwiO1xuZXhwb3J0IHtTc2hDb25maWd9IGZyb20gXCIuL3NtYXJ0c3NoLmNsYXNzZXMuc3NoY29uZmlnXCI7Il19

dist/smartssh.classes.helpers.d.ts

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

dist/smartssh.classes.helpers.js

@@ -1,7 +1,8 @@
 "use strict";
+require("typings-global");
 exports.sshKeyArrayFromDir = function (dirArg) {
-    var sshKeyArray = [];
+    var sshKeyArray = []; //TODO
     return sshKeyArray;
 };
 
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInNtYXJ0c3NoLmNsYXNzZXMuaGVscGVycy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBSVcsMEJBQWtCLEdBQUcsVUFBUyxNQUFhO0lBQ2xELElBQUksV0FBVyxHQUFHLEVBQUUsQ0FBQztJQUNyQixNQUFNLENBQUMsV0FBVyxDQUFDO0FBQ3ZCLENBQUMsQ0FBQSIsImZpbGUiOiJzbWFydHNzaC5jbGFzc2VzLmhlbHBlcnMuanMiLCJzb3VyY2VzQ29udGVudCI6WyIvLy8gPHJlZmVyZW5jZSBwYXRoPVwiLi90eXBpbmdzL21haW4uZC50c1wiIC8+XG5pbXBvcnQgcGx1Z2lucyA9IHJlcXVpcmUoXCIuL3NtYXJ0c3NoLnBsdWdpbnNcIik7XG5pbXBvcnQgY2xhc3NlcyA9IHJlcXVpcmUoXCIuL3NtYXJ0c3NoLmNsYXNzZXNcIik7XG5cbmV4cG9ydCBsZXQgc3NoS2V5QXJyYXlGcm9tRGlyID0gZnVuY3Rpb24oZGlyQXJnOnN0cmluZyk6Y2xhc3Nlcy5zc2hLZXlbXXtcbiAgICBsZXQgc3NoS2V5QXJyYXkgPSBbXTtcbiAgICByZXR1cm4gc3NoS2V5QXJyYXk7XG59Il0sInNvdXJjZVJvb3QiOiIvc291cmNlLyJ9
+//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInNtYXJ0c3NoLmNsYXNzZXMuaGVscGVycy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsUUFBTyxnQkFDUCxDQUFDLENBRHNCO0FBSVosMEJBQWtCLEdBQUcsVUFBUyxNQUFhO0lBQ2xELElBQUksV0FBVyxHQUFHLEVBQUUsQ0FBQyxDQUFDLE1BQU07SUFDNUIsTUFBTSxDQUFDLFdBQVcsQ0FBQztBQUN2QixDQUFDLENBQUEiLCJmaWxlIjoic21hcnRzc2guY2xhc3Nlcy5oZWxwZXJzLmpzIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IFwidHlwaW5ncy1nbG9iYWxcIlxuaW1wb3J0ICogYXMgcGx1Z2lucyBmcm9tIFwiLi9zbWFydHNzaC5wbHVnaW5zXCI7XG5pbXBvcnQge1NzaEtleX0gZnJvbSBcIi4vc21hcnRzc2guY2xhc3Nlcy5zc2hrZXlcIjtcblxuZXhwb3J0IGxldCBzc2hLZXlBcnJheUZyb21EaXIgPSBmdW5jdGlvbihkaXJBcmc6c3RyaW5nKTpTc2hLZXlbXXtcbiAgICBsZXQgc3NoS2V5QXJyYXkgPSBbXTsgLy9UT0RPXG4gICAgcmV0dXJuIHNzaEtleUFycmF5O1xufSJdfQ==

dist/smartssh.classes.sshconfig.d.ts

@@ -0,0 +1,4 @@
+import "typings-global";
+export declare class SshConfig {
+    constructor();
+}

dist/smartssh.classes.sshconfig.js

@@ -0,0 +1,10 @@
+"use strict";
+require("typings-global");
+var SshConfig = (function () {
+    function SshConfig() {
+    }
+    return SshConfig;
+}());
+exports.SshConfig = SshConfig;
+
+//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInNtYXJ0c3NoLmNsYXNzZXMuc3NoY29uZmlnLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7QUFBQSxRQUFPLGdCQUFnQixDQUFDLENBQUE7QUFHeEI7SUFDSTtJQUVBLENBQUM7SUFDTCxnQkFBQztBQUFELENBSkEsQUFJQyxJQUFBO0FBSlksaUJBQVMsWUFJckIsQ0FBQSIsImZpbGUiOiJzbWFydHNzaC5jbGFzc2VzLnNzaGNvbmZpZy5qcyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBcInR5cGluZ3MtZ2xvYmFsXCI7XG5pbXBvcnQgKiBhcyBwbHVnaW5zIGZyb20gXCIuL3NtYXJ0c3NoLnBsdWdpbnNcIjtcbmltcG9ydCAqIGFzIGhlbHBlcnMgZnJvbSBcIi4vc21hcnRzc2guY2xhc3Nlcy5oZWxwZXJzXCI7XG5leHBvcnQgY2xhc3MgU3NoQ29uZmlnIHtcbiAgICBjb25zdHJ1Y3Rvcigpe1xuICAgICAgICBcbiAgICB9XG59Il19

dist/smartssh.classes.sshdir.d.ts

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

dist/smartssh.classes.sshdir.js

@@ -0,0 +1,28 @@
+"use strict";
+require("typings-global");
+var plugins = require("./smartssh.plugins");
+var helpers = require("./smartssh.classes.helpers");
+var SshDir = (function () {
+    function SshDir(sshInstanceArg, sshDirPathArg) {
+        var sshDirPath;
+        if (sshDirPathArg) {
+            sshDirPath = sshDirPathArg;
+        }
+        else {
+            sshDirPath = plugins.smartpath.get.home();
+        }
+        this.path = sshDirPath;
+    }
+    SshDir.prototype.writeToDir = function () {
+    };
+    ;
+    SshDir.prototype.readFromDir = function () {
+    };
+    SshDir.prototype.getKeys = function () {
+        return helpers.sshKeyArrayFromDir(this.path);
+    };
+    return SshDir;
+}());
+exports.SshDir = SshDir;
+
+//# 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

@@ -0,0 +1,18 @@
+import "typings-global";
+export declare class SshKey {
+    private privKey;
+    private pubKey;
+    private hostVar;
+    constructor(optionsArg?: {
+        private?: string;
+        public?: string;
+        host?: string;
+    });
+    host: string;
+    privateKey: string;
+    privateKeyBase64: string;
+    publicKey: string;
+    publicKeyBase64: string;
+    type: string;
+    store(filePathArg?: string): void;
+}

dist/smartssh.plugins.d.ts

@@ -0,0 +1,8 @@
+import "typings-global";
+export import beautylog = require("beautylog");
+export declare let base64: any;
+export declare let fs: 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

@@ -1,9 +1,11 @@
 "use strict";
-/// <reference path="./typings/main.d.ts" />
+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;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInNtYXJ0c3NoLnBsdWdpbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLDRDQUE0QztBQUNqQyxpQkFBUyxHQUFHLE9BQU8sQ0FBQyxXQUFXLENBQUMsQ0FBQztBQUNqQyxjQUFNLEdBQUcsT0FBTyxDQUFDLFdBQVcsQ0FBQyxDQUFDLE1BQU0sQ0FBQztBQUNyQyxVQUFFLEdBQUcsT0FBTyxDQUFDLFVBQVUsQ0FBQyxDQUFDO0FBQ3pCLFlBQUksR0FBRyxPQUFPLENBQUMsTUFBTSxDQUFDLENBQUM7QUFDdkIsaUJBQVMsR0FBRyxPQUFPLENBQUMsV0FBVyxDQUFDLENBQUMiLCJmaWxlIjoic21hcnRzc2gucGx1Z2lucy5qcyIsInNvdXJjZXNDb250ZW50IjpbIi8vLyA8cmVmZXJlbmNlIHBhdGg9XCIuL3R5cGluZ3MvbWFpbi5kLnRzXCIgLz5cbmV4cG9ydCBsZXQgYmVhdXR5bG9nID0gcmVxdWlyZShcImJlYXV0eWxvZ1wiKTtcbmV4cG9ydCBsZXQgYmFzZTY0ID0gcmVxdWlyZShcImpzLWJhc2U2NFwiKS5CYXNlNjQ7XG5leHBvcnQgbGV0IGZzID0gcmVxdWlyZShcImZzLWV4dHJhXCIpO1xuZXhwb3J0IGxldCBwYXRoID0gcmVxdWlyZShcInBhdGhcIik7XG5leHBvcnQgbGV0IHNtYXJ0ZmlsZSA9IHJlcXVpcmUoXCJzbWFydGZpbGVcIik7Il0sInNvdXJjZVJvb3QiOiIvc291cmNlLyJ9
+//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbInNtYXJ0c3NoLnBsdWdpbnMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLFFBQU8sZ0JBQ1AsQ0FBQyxDQURzQjtBQUNULGlCQUFTLFdBQVcsV0FBVyxDQUFDLENBQUM7QUFDcEMsY0FBTSxHQUFHLE9BQU8sQ0FBQyxXQUFXLENBQUMsQ0FBQyxNQUFNLENBQUM7QUFDckMsVUFBRSxHQUFHLE9BQU8sQ0FBQyxVQUFVLENBQUMsQ0FBQztBQUN6QixpQkFBUyxHQUFHLE9BQU8sQ0FBQyxXQUFXLENBQUMsQ0FBQztBQUM5QixZQUFJLFdBQVcsTUFBTSxDQUFDLENBQUM7QUFDdkIsaUJBQVMsV0FBVyxXQUFXLENBQUMsQ0FBQztBQUNqQyxpQkFBUyxXQUFXLFdBQVcsQ0FBQyxDQUFDIiwiZmlsZSI6InNtYXJ0c3NoLnBsdWdpbnMuanMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgXCJ0eXBpbmdzLWdsb2JhbFwiXG5leHBvcnQgaW1wb3J0IGJlYXV0eWxvZyA9IHJlcXVpcmUoXCJiZWF1dHlsb2dcIik7XG5leHBvcnQgbGV0IGJhc2U2NCA9IHJlcXVpcmUoXCJqcy1iYXNlNjRcIikuQmFzZTY0O1xuZXhwb3J0IGxldCBmcyA9IHJlcXVpcmUoXCJmcy1leHRyYVwiKTtcbmV4cG9ydCBsZXQgbWluaW1hdGNoID0gcmVxdWlyZShcIm1pbmltYXRjaFwiKTtcbmV4cG9ydCBpbXBvcnQgcGF0aCA9IHJlcXVpcmUoXCJwYXRoXCIpO1xuZXhwb3J0IGltcG9ydCBzbWFydGZpbGUgPSByZXF1aXJlKFwic21hcnRmaWxlXCIpO1xuZXhwb3J0IGltcG9ydCBzbWFydHBhdGggPSByZXF1aXJlKFwic21hcnRwYXRoXCIpOyJdfQ==

npmts.json

@@ -0,0 +1,3 @@
+{
+    "mode":"default"
+}

package.json

@@ -1,14 +1,15 @@
 {
   "name": "smartssh",
-  "version": "1.0.1",
+  "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,17 +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": "^4.1.2",
-    "fs-extra": "^0.28.0",
+    "beautylog": "^5.0.12",
+    "fs-extra": "^0.30.0",
     "js-base64": "^2.1.9",
-    "smartfile": "^3.0.5"
+    "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.0.4",
-    "should": "^8.3.1"
+    "npmts-g": "^5.2.6",
+    "should": "^9.0.2"
   }
 }

test/test.d.ts

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

test/test.ts

@@ -1,3 +1,66 @@
-/// <reference path="../ts/typings/main.d.ts" />
-let should = require("should");
-let smartssh = require("../dist/index.js");
+import "typings-test"
+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,3 +1,7 @@
-/// <reference path="./typings/main.d.ts" />
-import plugins = require("./smartssh.plugins");
-import classes = require("./smartssh.classes");
+import "typings-global"
+import * as plugins from "./smartssh.plugins";
+
+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

@@ -1,8 +1,8 @@
-/// <reference path="./typings/main.d.ts" />
-import plugins = require("./smartssh.plugins");
-import classes = require("./smartssh.classes");
+import "typings-global"
+import * as plugins from "./smartssh.plugins";
+import {SshKey} from "./smartssh.classes.sshkey";
 
-export let sshKeyArrayFromDir = function(dirArg:string):classes.sshKey[]{
-    let sshKeyArray = [];
+export let sshKeyArrayFromDir = function(dirArg:string):SshKey[]{
+    let sshKeyArray = []; //TODO
     return sshKeyArray;
 }

ts/smartssh.classes.sshconfig.ts

@@ -0,0 +1,8 @@
+import "typings-global";
+import * as plugins from "./smartssh.plugins";
+import * as helpers from "./smartssh.classes.helpers";
+export class SshConfig {
+    constructor(){
+        
+    }
+}

ts/smartssh.classes.sshdir.ts

@@ -0,0 +1,28 @@
+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; // 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;
+    }
+    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

@@ -1,37 +1,21 @@
-/// <reference path="./typings/main.d.ts" />
-import plugins = require("./smartssh.plugins");
-import helpers = require("./smartssh.classes.helpers");
+import "typings-global";
+import * as plugins from "./smartssh.plugins";
+import * as helpers from "./smartssh.classes.helpers";
 
-export class ssh {
-    private sshDir:string;
-    private sshKeys:sshKey[];
-    private sshSync:boolean; // if set to true, the ssh dir will be kept in sync automatically
-    constructor(optionsArg:{sshDir?:string,sshSync?:boolean}={}){
-        this.sshDir = optionsArg.sshDir
-        this.sshDir ?
-            this.sshKeys = helpers.sshKeyArrayFromDir(this.sshDir)
-            : void(0);
-        this.sshSync = optionsArg.sshSync;
-    };
-    
-}
-
-export class sshConfig {
-    constructor(){
-        
-    }
-}
-
-export class sshKey {
+export class SshKey {
     private privKey:string;
     private pubKey:string;
-    constructor(optionsArg:{private:string,public:string}){
-        if(!optionsArg) optionsArg = {private:undefined,public:undefined};
+    private hostVar:string;
+    constructor(optionsArg:{private?:string,public?:string,host?:string}={}){
         this.privKey = optionsArg.private;
         this.pubKey = optionsArg.public;
+        this.hostVar = optionsArg.host;
     };
     
     // getters
+    get host(){
+        return this.hostVar;
+    };
     get privateKey(){
         return this.privKey;
     };
@@ -39,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);
@@ -55,13 +39,24 @@ export class sshKey {
     };
     
     // setters
+    set host(hostArg:string){
+        this.hostVar = hostArg;
+    };
     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);
@@ -72,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 @@
-/// <reference path="./typings/main.d.ts" />
-export let beautylog = require("beautylog");
+import "typings-global"
+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");