2.1.58

dist/npmci.ssh.d.ts

@@ -1,3 +1,3 @@
 import "typings-global";
 export declare let ssh: () => void;
-export declare let evaluateSshkey: () => void;
+export declare let evaluateSshkey: (sshkeyEnvVarArg: any) => void;

dist/npmci.ssh.js

@@ -1,11 +1,25 @@
 "use strict";
 require("typings-global");
 var plugins = require("./npmci.plugins");
+var sshRegex = /^(.*)\|?(.*)\|?(.*)/;
+var sshInstance;
 exports.ssh = function () {
-    var sshInstance = new plugins.smartssh.SshInstance();
+    sshInstance = new plugins.smartssh.SshInstance();
     plugins.smartparam.forEachMinimatch(process.env, "NPMCI_SSHKEY_*", exports.evaluateSshkey);
+    sshInstance.sync("to");
 };
-exports.evaluateSshkey = function () {
+exports.evaluateSshkey = function (sshkeyEnvVarArg) {
+    var resultArray = sshRegex.exec(sshkeyEnvVarArg);
+    var sshKey = new plugins.smartssh.SshKey();
+    if (resultArray[1] && resultArray[1] != "undefined")
+        sshKey.privateKeyBase64 = resultArray[1];
+    var publicKey;
+    if (resultArray[2] && resultArray[2] != "undefined")
+        sshKey.publicKeyBase64 = resultArray[2];
+    var host;
+    if (resultArray[3] && resultArray[3] != "undefined")
+        sshKey.host = resultArray[1];
+    sshInstance.addKey(sshKey);
 };
 
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm5wbWNpLnNzaC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsUUFBTyxnQkFBZ0IsQ0FBQyxDQUFBO0FBQ3hCLElBQVksT0FBTyxXQUFNLGlCQUFpQixDQUFDLENBQUE7QUFFaEMsV0FBRyxHQUFHO0lBQ2IsSUFBSSxXQUFXLEdBQUcsSUFBSSxPQUFPLENBQUMsUUFBUSxDQUFDLFdBQVcsRUFBRSxDQUFDO0lBQ3JELE9BQU8sQ0FBQyxVQUFVLENBQUMsZ0JBQWdCLENBQUMsT0FBTyxDQUFDLEdBQUcsRUFBQyxnQkFBZ0IsRUFBQyxzQkFBYyxDQUFDLENBQUM7QUFDckYsQ0FBQyxDQUFDO0FBRVMsc0JBQWMsR0FBRztBQUU1QixDQUFDLENBQUMiLCJmaWxlIjoibnBtY2kuc3NoLmpzIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IFwidHlwaW5ncy1nbG9iYWxcIjtcbmltcG9ydCAqIGFzIHBsdWdpbnMgZnJvbSBcIi4vbnBtY2kucGx1Z2luc1wiO1xuXG5leHBvcnQgbGV0IHNzaCA9ICgpID0+IHtcbiAgICBsZXQgc3NoSW5zdGFuY2UgPSBuZXcgcGx1Z2lucy5zbWFydHNzaC5Tc2hJbnN0YW5jZSgpO1xuICAgIHBsdWdpbnMuc21hcnRwYXJhbS5mb3JFYWNoTWluaW1hdGNoKHByb2Nlc3MuZW52LFwiTlBNQ0lfU1NIS0VZXypcIixldmFsdWF0ZVNzaGtleSk7XG59O1xuXG5leHBvcnQgbGV0IGV2YWx1YXRlU3Noa2V5ID0gKCkgPT4ge1xuICAgIFxufTsiXX0=
+//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIm5wbWNpLnNzaC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsUUFBTyxnQkFBZ0IsQ0FBQyxDQUFBO0FBQ3hCLElBQVksT0FBTyxXQUFNLGlCQUFpQixDQUFDLENBQUE7QUFFM0MsSUFBSSxRQUFRLEdBQUcscUJBQXFCLENBQUE7QUFDcEMsSUFBSSxXQUF3QyxDQUFDO0FBRWxDLFdBQUcsR0FBRztJQUNiLFdBQVcsR0FBRyxJQUFJLE9BQU8sQ0FBQyxRQUFRLENBQUMsV0FBVyxFQUFFLENBQUM7SUFDakQsT0FBTyxDQUFDLFVBQVUsQ0FBQyxnQkFBZ0IsQ0FBQyxPQUFPLENBQUMsR0FBRyxFQUFDLGdCQUFnQixFQUFDLHNCQUFjLENBQUMsQ0FBQztJQUNqRixXQUFXLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDO0FBQzNCLENBQUMsQ0FBQztBQUVTLHNCQUFjLEdBQUcsVUFBQyxlQUFlO0lBQ3hDLElBQUksV0FBVyxHQUFHLFFBQVEsQ0FBQyxJQUFJLENBQUMsZUFBZSxDQUFDLENBQUM7SUFDakQsSUFBSSxNQUFNLEdBQUcsSUFBSSxPQUFPLENBQUMsUUFBUSxDQUFDLE1BQU0sRUFBRSxDQUFDO0lBRTNDLEVBQUUsQ0FBQSxDQUFDLFdBQVcsQ0FBQyxDQUFDLENBQUMsSUFBSSxXQUFXLENBQUMsQ0FBQyxDQUFDLElBQUksV0FBVyxDQUFDO1FBQUMsTUFBTSxDQUFDLGdCQUFnQixHQUFHLFdBQVcsQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUM3RixJQUFJLFNBQWdCLENBQUM7SUFDckIsRUFBRSxDQUFBLENBQUMsV0FBVyxDQUFDLENBQUMsQ0FBQyxJQUFJLFdBQVcsQ0FBQyxDQUFDLENBQUMsSUFBSSxXQUFXLENBQUM7UUFBQyxNQUFNLENBQUMsZUFBZSxHQUFHLFdBQVcsQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUM1RixJQUFJLElBQVcsQ0FBQztJQUNoQixFQUFFLENBQUEsQ0FBQyxXQUFXLENBQUMsQ0FBQyxDQUFDLElBQUksV0FBVyxDQUFDLENBQUMsQ0FBQyxJQUFJLFdBQVcsQ0FBQztRQUFDLE1BQU0sQ0FBQyxJQUFJLEdBQUcsV0FBVyxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBRWpGLFdBQVcsQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLENBQUM7QUFDL0IsQ0FBQyxDQUFDIiwiZmlsZSI6Im5wbWNpLnNzaC5qcyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBcInR5cGluZ3MtZ2xvYmFsXCI7XG5pbXBvcnQgKiBhcyBwbHVnaW5zIGZyb20gXCIuL25wbWNpLnBsdWdpbnNcIjtcblxubGV0IHNzaFJlZ2V4ID0gL14oLiopXFx8PyguKilcXHw/KC4qKS9cbmxldCBzc2hJbnN0YW5jZTpwbHVnaW5zLnNtYXJ0c3NoLlNzaEluc3RhbmNlO1xuXG5leHBvcnQgbGV0IHNzaCA9ICgpID0+IHtcbiAgICBzc2hJbnN0YW5jZSA9IG5ldyBwbHVnaW5zLnNtYXJ0c3NoLlNzaEluc3RhbmNlKCk7XG4gICAgcGx1Z2lucy5zbWFydHBhcmFtLmZvckVhY2hNaW5pbWF0Y2gocHJvY2Vzcy5lbnYsXCJOUE1DSV9TU0hLRVlfKlwiLGV2YWx1YXRlU3Noa2V5KTtcbiAgICBzc2hJbnN0YW5jZS5zeW5jKFwidG9cIik7XG59O1xuXG5leHBvcnQgbGV0IGV2YWx1YXRlU3Noa2V5ID0gKHNzaGtleUVudlZhckFyZykgPT4ge1xuICAgIGxldCByZXN1bHRBcnJheSA9IHNzaFJlZ2V4LmV4ZWMoc3Noa2V5RW52VmFyQXJnKTtcbiAgICBsZXQgc3NoS2V5ID0gbmV3IHBsdWdpbnMuc21hcnRzc2guU3NoS2V5KCk7XG4gICAgXG4gICAgaWYocmVzdWx0QXJyYXlbMV0gJiYgcmVzdWx0QXJyYXlbMV0gIT0gXCJ1bmRlZmluZWRcIikgc3NoS2V5LnByaXZhdGVLZXlCYXNlNjQgPSByZXN1bHRBcnJheVsxXTtcbiAgICBsZXQgcHVibGljS2V5OnN0cmluZztcbiAgICBpZihyZXN1bHRBcnJheVsyXSAmJiByZXN1bHRBcnJheVsyXSAhPSBcInVuZGVmaW5lZFwiKSBzc2hLZXkucHVibGljS2V5QmFzZTY0ID0gcmVzdWx0QXJyYXlbMl07XG4gICAgbGV0IGhvc3Q6c3RyaW5nO1xuICAgIGlmKHJlc3VsdEFycmF5WzNdICYmIHJlc3VsdEFycmF5WzNdICE9IFwidW5kZWZpbmVkXCIpIHNzaEtleS5ob3N0ID0gcmVzdWx0QXJyYXlbMV07XG4gICAgXG4gICAgc3NoSW5zdGFuY2UuYWRkS2V5KHNzaEtleSk7XG59OyJdfQ==

package.json

@@ -1,6 +1,6 @@
 {
   "name": "npmci",
-  "version": "2.1.57",
+  "version": "2.1.58",
   "description": "",
   "main": "dist/index.js",
   "bin": {

ts/index.ts

@@ -23,6 +23,7 @@ let command;
 let commandOption:string;
 
 plugins.commander
+    .version(npmciInfo.version)
     .arguments('<commandarg> [commandoptionarg]')
     .action(function (commandarg, commandoptionarg) {
         command = commandarg;

ts/npmci.ssh.ts

@@ -1,11 +1,24 @@
 import "typings-global";
 import * as plugins from "./npmci.plugins";
 
+let sshRegex = /^(.*)\|?(.*)\|?(.*)/
+let sshInstance:plugins.smartssh.SshInstance;
+
 export let ssh = () => {
-    let sshInstance = new plugins.smartssh.SshInstance();
+    sshInstance = new plugins.smartssh.SshInstance();
     plugins.smartparam.forEachMinimatch(process.env,"NPMCI_SSHKEY_*",evaluateSshkey);
+    sshInstance.sync("to");
 };
 
-export let evaluateSshkey = () => {
+export let evaluateSshkey = (sshkeyEnvVarArg) => {
+    let resultArray = sshRegex.exec(sshkeyEnvVarArg);
+    let sshKey = new plugins.smartssh.SshKey();
     
+    if(resultArray[1] && resultArray[1] != "undefined") sshKey.privateKeyBase64 = resultArray[1];
+    let publicKey:string;
+    if(resultArray[2] && resultArray[2] != "undefined") sshKey.publicKeyBase64 = resultArray[2];
+    let host:string;
+    if(resultArray[3] && resultArray[3] != "undefined") sshKey.host = resultArray[1];
+    
+    sshInstance.addKey(sshKey);
 };