@ps-aux/nodebup 0.4.0 → 0.7.0

package/README.md

@@ -0,0 +1 @@
+

package/lib/bup/{AggregateBackupController.js → aggregate/AggregateBackupController.js}

@@ -5,25 +5,25 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.AggregateBackupController = void 0;
 
-var _FsSyncer = require("../fs/fssync/FsSyncer");
+var _FsSyncer = require("../../fs/fssync/FsSyncer");
 
-var _Gpg = require("../tools/gpg/Gpg");
+var _Gpg = require("../../tools/gpg/Gpg");
 
-var _Fs = require("../fs/Fs");
+var _Fs = require("../../fs/Fs");
 
-var _SshKeyManager = require("../tools/ssh/SshKeyManager");
+var _SshKeyManager = require("../../tools/ssh/SshKeyManager");
 
 var _inversify = require("inversify");
 
-var _ContextSymbols = require("../ctx/ContextSymbols");
+var _ContextSymbols = require("../../ctx/ContextSymbols");
 
-var _AppLogger = require("../log/AppLogger");
+var _AppLogger = require("../../log/AppLogger");
 
-var _Path = require("../fs/path/Path");
+var _Path = require("../../fs/path/Path");
 
-var _StorageBackendProvider = require("../storage/StorageBackendProvider");
+var _config = require("../../config");
 
-var _config = require("../config");
+var _StorageBackendProvider = require("../../storage/StorageBackendProvider");
 
 var _dec, _dec2, _dec3, _dec4, _class;
 
@@ -32,16 +32,16 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 let AggregateBackupController = (_dec = (0, _inversify.injectable)(), _dec2 = function (target, key) {
   return (0, _inversify.inject)(_ContextSymbols.AppConfig_)(target, undefined, 6);
 }, _dec3 = Reflect.metadata("design:type", Function), _dec4 = Reflect.metadata("design:paramtypes", [typeof _Gpg.Gpg === "undefined" ? Object : _Gpg.Gpg, typeof _SshKeyManager.SshKeyManager === "undefined" ? Object : _SshKeyManager.SshKeyManager, typeof _Fs.Fs === "undefined" ? Object : _Fs.Fs, typeof _FsSyncer.FsSyncer === "undefined" ? Object : _FsSyncer.FsSyncer, typeof _AppLogger.AppLogger === "undefined" ? Object : _AppLogger.AppLogger, typeof _StorageBackendProvider.StorageBackendProvider === "undefined" ? Object : _StorageBackendProvider.StorageBackendProvider, typeof _config.Config === "undefined" ? Object : _config.Config]), _dec(_class = _dec2(_class = _dec3(_class = _dec4(_class = class AggregateBackupController {
-  constructor(gpg, ssh, fs, fsSyncer, log, storageBackendProvider, cfg) {
+  constructor(gpg, ssh, fs, fsSyncer, log, storageProvider, cfg) {
     this.gpg = gpg;
     this.ssh = ssh;
     this.fs = fs;
     this.fsSyncer = fsSyncer;
     this.log = log;
-    this.storageBackendProvider = storageBackendProvider;
+    this.storageProvider = storageProvider;
     this.cfg = cfg;
 
-    _defineProperty(this, "backup", async (aggrName, storage) => {
+    _defineProperty(this, "backup", async aggrName => {
       const aggrDir = this.cfg.pwd.resolve('.aggr');
       const aggr = this.cfg.aggregates.find(a => a.name === aggrName);
       if (!aggr) throw new Error(`No backup aggregate with name '${aggrName}'`);
@@ -56,7 +56,7 @@ let AggregateBackupController = (_dec = (0, _inversify.injectable)(), _dec2 = fu
         file.forEach(f => this.runFileTask(f, aggrDir));
         sshKey.forEach(k => this.runSshKeyTask(k, aggrDir));
         gpgKey.forEach(k => this.runGpgKeyTask(k, aggrDir));
-        this.storageBackendProvider.provide(storage).store(aggrDir);
+        this.storageProvider.provide().store(aggrDir);
       } finally {
         this.log.debug();
         this.fs.rmDir(aggrDir);

package/lib/bup/dir/DataBackupController.js

@@ -0,0 +1,44 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.DataBackupController = void 0;
+
+var _inversify = require("inversify");
+
+var _AppLogger = require("../../log/AppLogger");
+
+var _Path = require("../../fs/path/Path");
+
+var _StorageBackendProvider = require("../../storage/StorageBackendProvider");
+
+var _dec, _dec2, _dec3, _class;
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+let DataBackupController = (_dec = (0, _inversify.injectable)(), _dec2 = Reflect.metadata("design:type", Function), _dec3 = Reflect.metadata("design:paramtypes", [typeof _AppLogger.AppLogger === "undefined" ? Object : _AppLogger.AppLogger, typeof _StorageBackendProvider.StorageBackendProvider === "undefined" ? Object : _StorageBackendProvider.StorageBackendProvider]), _dec(_class = _dec2(_class = _dec3(_class = class DataBackupController {
+  constructor(log, storageBackendProvider) {
+    this.log = log;
+    this.storageBackendProvider = storageBackendProvider;
+
+    _defineProperty(this, "storage", inp => {
+      const storage = this.storageBackendProvider.provide();
+
+      const path = _Path.AbsPath.from(inp.path);
+
+      return {
+        backup: () => {
+          this.log.info(`Backing up from ${path} to '${storage}'`);
+          storage.store(path);
+        },
+        restore: () => {
+          this.log.info(`Restoring from '${storage}' to ${path}`);
+          storage.restore(path);
+        }
+      };
+    });
+  }
+
+}) || _class) || _class) || _class);
+exports.DataBackupController = DataBackupController;

package/lib/bup/pg/PgBackupController.js

@@ -0,0 +1,110 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.PgBackupController = void 0;
+
+var _Fs = require("../../fs/Fs");
+
+var _inversify = require("inversify");
+
+var _AppLogger = require("../../log/AppLogger");
+
+var _Shell = require("../../tools/shell/Shell");
+
+var _Path = require("../../fs/path/Path");
+
+var _StorageBackendProvider = require("../../storage/StorageBackendProvider");
+
+var _dec, _dec2, _dec3, _class, _class2, _temp;
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+const parseConnectionUrl = url => {
+  var _url$match;
+
+  const regex = /postgres:\/\/(?<username>.*):(?<password>.*)@(?<host>.*):(?<port>\d*)$/;
+  const match = (_url$match = url.match(regex)) === null || _url$match === void 0 ? void 0 : _url$match.groups;
+  if (!match || !match.username || !match.password || !match.host || !match.port) throw new Error(`The Postgres connection URL does not match required regex: ${regex.toString()}`);
+  return {
+    username: match.username,
+    password: match.password,
+    host: match.host,
+    port: parseInt(match.port, 10)
+  };
+};
+
+let PgBackupController = (_dec = (0, _inversify.injectable)(), _dec2 = Reflect.metadata("design:type", Function), _dec3 = Reflect.metadata("design:paramtypes", [typeof _Fs.Fs === "undefined" ? Object : _Fs.Fs, typeof _AppLogger.AppLogger === "undefined" ? Object : _AppLogger.AppLogger, typeof _StorageBackendProvider.StorageBackendProvider === "undefined" ? Object : _StorageBackendProvider.StorageBackendProvider, typeof _Shell.Shell === "undefined" ? Object : _Shell.Shell]), _dec(_class = _dec2(_class = _dec3(_class = (_temp = _class2 = class PgBackupController {
+  constructor( // private gpg: Gpg,
+  // private ssh: SshKeyManager,
+  fs, // private fsSyncer: FsSyncer,
+  log, storageBackendProvider, // @inject(AppConfig_) private cfg: Config,
+  sh) {
+    this.fs = fs;
+    this.log = log;
+    this.storageBackendProvider = storageBackendProvider;
+    this.sh = sh;
+
+    _defineProperty(this, "now", () => {
+      const d = new Date();
+      const fields = [d.getFullYear(), d.getMonth(), d.getDay(), d.getUTCHours(), d.getMinutes(), d.getSeconds()];
+      return fields.join('-');
+    });
+
+    _defineProperty(this, "getVersion", version => version || PgBackupController.defaultPgVersion);
+
+    _defineProperty(this, "backup", ({
+      pgUrl,
+      pgVersion
+    }) => {
+      const storage = this.storageBackendProvider.provide();
+      const version = this.getVersion(pgVersion); // TODO validate url
+
+      this.log.info(`Backing up Postgres database, version=${version}`);
+      const connParams = parseConnectionUrl(pgUrl);
+      const pass = connParams.password;
+      this.fs.inTmpDir('pg-backup', dir => {
+        const outputDir = _Path.AbsPath.from(dir);
+
+        this.log.info('Dumping database to a file');
+        const bashCmds = [`echo "*:*:*:*:${pass}" > ~/.pgpass`, `chmod 400 ~/.pgpass`, `pg_dumpall -d ${pgUrl}`]; // TODO improve sh logging to avoid showing secrets
+
+        const b = this.sh.execAndReturnBuffer(`docker run --network host ` + `postgres:${version} ` + `bash -c '${bashCmds.join(' && ')}'`);
+        const outFileName = PgBackupController.outFileName;
+        const dumpOut = outputDir.resolve(outFileName);
+        this.fs.writeFile(dumpOut, b);
+        this.log.info('Compressing');
+        const zipOutputName = `pg-backup-${this.now()}.zip`;
+        this.sh.exec(`cd ${outputDir.str()}; zip ${zipOutputName} ${outFileName}`);
+        this.fs.rmFile(dumpOut);
+        this.log.info('Uploading');
+        storage.store(_Path.AbsPath.from(dir));
+      });
+    });
+
+    _defineProperty(this, "restore", ({
+      pgUrl,
+      pgVersion
+    }) => {
+      const version = this.getVersion(pgVersion);
+      const storage = this.storageBackendProvider.provide(); // To validate
+
+      parseConnectionUrl(pgUrl);
+      this.log.info(`Restoring Postgres database, version=${version}`);
+      this.fs.inTmpDir('pg-restore', dirStr => {
+        const dir = _Path.AbsPath.from(dirStr);
+
+        storage.restore(dir);
+        const zipFile = this.fs.listFiles(dir)[0]; //
+
+        this.sh.exec(`unzip ${zipFile.str()} -d ${dir.str()}`);
+        this.fs.rmFile(zipFile);
+        const outFile = this.fs.listFiles(dir)[0];
+        this.sh.exec(`docker run --network host ` + `-v "${outFile.str()}":/pg/import.sql -w /pg ` + `postgres:${version} ` + `psql ${pgUrl} -v ON_ERROR_STOP=0 -f import.sql`);
+      });
+    });
+  }
+
+}, _defineProperty(_class2, "defaultPgVersion", '14.2'), _defineProperty(_class2, "outFileName", 'out.sql'), _temp)) || _class) || _class) || _class);
+exports.PgBackupController = PgBackupController;

package/lib/cli/InvalidInput.js

@@ -0,0 +1,10 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.InvalidInput = void 0;
+
+class InvalidInput extends Error {}
+
+exports.InvalidInput = InvalidInput;

package/lib/cli/app.js

@@ -13,20 +13,57 @@ var _Config = require("../config/Config");
 
 var _Context = require("../ctx/Context");
 
-var _AggregateBackupController = require("../bup/AggregateBackupController");
+var _AggregateBackupController = require("../bup/aggregate/AggregateBackupController");
 
 var _ResticController = require("../storage/restic/ResticController");
 
+var _DataBackupController = require("../bup/dir/DataBackupController");
+
+var _PgBackupController = require("../bup/pg/PgBackupController");
+
+const storageNameOpt = {
+  name: 'storage-name',
+  convertCase: true,
+  fromConfig: 'storage.name'
+};
+const singleStorageOptions = [storageNameOpt, {
+  name: 'storage-type',
+  convertCase: true,
+  fromConfig: 'storage.type'
+}, {
+  name: 'storage-repo',
+  convertCase: true,
+  fromConfig: 'storage.repo'
+}, {
+  name: 'storage-password',
+  convertCase: true,
+  fromConfig: 'storage.password'
+}, {
+  name: 'storage-credentials',
+  convertCase: true,
+  fromConfig: 'storage.credentials'
+}];
+
 const createApp = () => _nclif.CliApp.of({
   commands: {
-    restic: (0, _nclif.cmdGroup)({
+    data: (0, _nclif.cmdGroup)({
+      options: singleStorageOptions,
       commands: {
-        'init-repo': (0, _nclif.cmd)({
+        backup: (0, _nclif.cmd)({
+          description: 'Backup a dir to the given storage',
           positionals: [{
-            name: 'resticStorageName',
+            name: 'path',
             required: true
           }],
-          run: (arg, c) => c.get(_ResticController.ResticController).initRepo(arg.resticStorageName)
+          run: (cmd, c) => c.get(_DataBackupController.DataBackupController).storage(cmd).backup()
+        }),
+        restore: (0, _nclif.cmd)({
+          description: 'Restore the storage to the given dir',
+          positionals: [{
+            name: 'path',
+            required: true
+          }],
+          run: (cmd, c) => c.get(_DataBackupController.DataBackupController).storage(cmd).restore()
         })
       }
     }),
@@ -34,22 +71,50 @@ const createApp = () => _nclif.CliApp.of({
       commands: {
         backup: (0, _nclif.cmd)({
           description: 'Run backup',
+          options: [storageNameOpt],
           positionals: [{
             name: 'aggregateName',
-            type: 'string',
-            required: true
-          }, {
-            name: 'storageName',
-            type: 'string',
             required: true
           }],
-          run: (a, c) => c.get(_AggregateBackupController.AggregateBackupController).backup(a.aggregateName, a.storageName)
+          run: (a, c) => c.get(_AggregateBackupController.AggregateBackupController).backup(a.aggregateName)
         })
       }
-    })
+    }),
+    restic,
+    pg
   }
-}).addObjectConfig(pwd => (0, _Config.readConfig)(pwd)).context(({
-  config
-}) => (0, _Context.createContext)(config));
+}).envConfig('NODEBUP').addObjectConfig(pwd => (0, _Config.readConfig)(pwd)).context(({
+  config,
+  inputs
+}) => (0, _Context.createContext)(config, inputs));
 
-exports.createApp = createApp;
+exports.createApp = createApp;
+const restic = (0, _nclif.cmdGroup)({
+  commands: {
+    'init-repo': (0, _nclif.cmd)({
+      options: singleStorageOptions,
+      run: (_, c) => c.get(_ResticController.ResticController).initRepo()
+    })
+  }
+});
+const pg = (0, _nclif.cmdGroup)({
+  options: [...singleStorageOptions, {
+    name: 'pg-url',
+    convertCase: true,
+    fromConfig: 'pg.url',
+    required: true
+  }, {
+    name: 'pg-version',
+    convertCase: true,
+    fromConfig: 'pg.version',
+    description: `Postgres version - default is ${_PgBackupController.PgBackupController.defaultPgVersion}`
+  }],
+  commands: {
+    backup: (0, _nclif.cmd)({
+      run: (inp, c) => c.get(_PgBackupController.PgBackupController).backup(inp)
+    }),
+    restore: (0, _nclif.cmd)({
+      run: (inp, c) => c.get(_PgBackupController.PgBackupController).restore(inp)
+    })
+  }
+});

package/lib/config/Config.js

@@ -13,15 +13,11 @@ var _validateConfigAgainstSchema = require("./validateConfigAgainstSchema");
 
 var _expandAndCreatePath = require("./expandAndCreatePath");
 
-const expandPaths = (cfg, exp, cwd) => {
-  cfg.storage.filter(s => s.type === 'file').map(s => s).forEach(s => {
-    s.path = exp(s.path);
-  });
-  cfg.storage.filter(s => s.type === 'restic' || s.type === 'rclone').map(s => s).forEach(s => {
-    if (s.credentialsFile) s.credentialsFile = exp(s.credentialsFile);
-    s.passwordFile = exp(s.passwordFile);
-    if (s.repo.startsWith('local:')) s.repo = (0, _expandAndCreatePath.expandStrPath)(s.repo, cwd);
-  });
+var _Fs = require("../fs/Fs");
+
+var _AppLogger = require("../log/AppLogger");
+
+const expandPaths = (cfg, exp) => {
   cfg.aggregates.forEach(a => {
     a.sources.file.forEach(f => {
       f.from = exp(f.from);
@@ -34,15 +30,27 @@ const expandPaths = (cfg, exp, cwd) => {
       if (f.to) f.to = _Path.RelativePath.from(f.to);
     });
   });
+}; // TODO
+
+
+const readFromFile = cwd => {
+  // TODO get from the context, maybe move FS to CLI framework later?
+  const fs = new _Fs.Fs(cwd, new _AppLogger.AppLogger());
+  const cfgPath = cwd.resolve('bup.yaml');
+  const cfg = fs.exists(cfgPath) ? (0, _readYaml.readYaml)(cfgPath.str()) : {
+    aggregates: [],
+    storage: []
+  };
+  (0, _validateConfigAgainstSchema.validateConfigAgainstSchema)(cfg);
+  return cfg;
 };
 
 const readConfig = pwdStr => {
   const cwd = _Path.AbsPath.from(pwdStr);
 
-  const cfgFile = (0, _readYaml.readYaml)(cwd.resolve('bup.yaml').str());
-  (0, _validateConfigAgainstSchema.validateConfigAgainstSchema)(cfgFile);
-  const cfg = cfgFile;
-  cfg.pwd = cwd;
+  const cfg = { ...readFromFile(cwd),
+    pwd: cwd
+  };
   cfg.aggregates.forEach(t => {
     const {
       sources
@@ -57,7 +65,7 @@ const readConfig = pwdStr => {
     return p;
   };
 
-  expandPaths(cfg, expand, cwd);
+  expandPaths(cfg, expand);
   return cfg;
 };
 

package/lib/config/expandAndCreatePath.js

@@ -9,12 +9,14 @@ var _Path = require("../fs/path/Path");
 
 var _os = _interopRequireDefault(require("os"));
 
+var _path = _interopRequireDefault(require("path"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 const expandStrPath = (path, pwd) => {
   path = path.replace('<cwd>', pwd.str());
   path = path.replace('~', _os.default.homedir());
-  return path;
+  return _path.default.resolve(path);
 };
 
 exports.expandStrPath = expandStrPath;

package/lib/config/index.js

@@ -2,13 +2,4 @@
 
 Object.defineProperty(exports, "__esModule", {
   value: true
-});
-exports.StorageTypeConst = void 0;
-let StorageTypeConst;
-exports.StorageTypeConst = StorageTypeConst;
-
-(function (StorageTypeConst) {
-  StorageTypeConst["Restic"] = "restic";
-  StorageTypeConst["File"] = "file";
-  StorageTypeConst["RClone"] = "rclone";
-})(StorageTypeConst || (exports.StorageTypeConst = StorageTypeConst = {}));
+});

package/lib/config/validateConfigAgainstSchema.js

@@ -7,7 +7,7 @@ exports.validateConfigAgainstSchema = void 0;
 
 var _joi = _interopRequireDefault(require("@hapi/joi"));
 
-var _index = require("./index");
+var _StoreConfig = require("../storage/StoreConfig");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -23,21 +23,6 @@ const KeyTaskSchema = _joi.default.object({
   to: _joi.default.string().optional()
 });
 
-const createStorageSchema = props => _joi.default.object({
-  name: _joi.default.string(),
-  type: _joi.default.string().valid(_index.StorageTypeConst.Restic, _index.StorageTypeConst.File, _index.StorageTypeConst.RClone),
-  ...props
-});
-
-const FileStorageSchema = createStorageSchema({
-  path: _joi.default.string()
-});
-const ResticStorageSchema = createStorageSchema({
-  repo: _joi.default.string(),
-  credentialsFile: _joi.default.string().optional(),
-  passwordFile: _joi.default.string()
-});
-
 const Sources = _joi.default.object({
   dir: _joi.default.array().items(DirTaskSchema).optional(),
   file: _joi.default.array().items(FileTaskSchema).optional(),
@@ -52,7 +37,7 @@ const Aggregate = _joi.default.object({
 
 const Schema = () => _joi.default.object({
   // TODO undescriptive error msg. Invalid config."storage[0]" does not match any of the allowed types
-  storage: _joi.default.array().items(FileStorageSchema, ResticStorageSchema),
+  storage: _joi.default.array().items((0, _StoreConfig.NamedStorageSchema)()),
   aggregates: _joi.default.array().items(Aggregate)
 });
 

package/lib/config/validateConfigAgainstSchema.spec.js

@@ -4,10 +4,6 @@ var _validateConfigAgainstSchema = require("./validateConfigAgainstSchema");
 
 const f1 = {
   storage: [{
-    name: 'fs',
-    type: 'file',
-    path: '~/tmp/nodepub/test-store'
-  }, {
     name: 'restic',
     type: 'restic',
     repo: 'b2:reo',

package/lib/ctx/Context.js

@@ -19,7 +19,7 @@ var _inversify = require("inversify");
 
 var _ContextSymbols = require("./ContextSymbols");
 
-var _AggregateBackupController = require("../bup/AggregateBackupController");
+var _AggregateBackupController = require("../bup/aggregate/AggregateBackupController");
 
 var _AppLogger = require("../log/AppLogger");
 
@@ -33,13 +33,21 @@ var _B2CredentialsProvider = require("../storage/b2/B2CredentialsProvider");
 
 var _RCloneClientFactory = require("../storage/rclone/RCloneClientFactory");
 
-const createContext = cfg => {
+var _DataBackupController = require("../bup/dir/DataBackupController");
+
+var _StorageConfigProvider = require("../storage/StorageConfigProvider");
+
+var _PgBackupController = require("../bup/pg/PgBackupController");
+
+const createContext = (cfg, inp) => {
   const c = new _inversify.Container();
   c.bind(_ContextSymbols.AppConfig_).toConstantValue(cfg);
+  c.bind(_ContextSymbols.Inputs_).toConstantValue(inp);
   const log = new _AppLogger.AppLogger();
   c.bind(_ContextSymbols.Log_).toConstantValue(log);
   c.bind(_AppLogger.AppLogger).toConstantValue(log);
-  const self = [_Gpg.Gpg, _Shell.Shell, _Fs.Fs, _FsSyncer.FsSyncer, _SshKeyManager.SshKeyManager, _StorageBackendProvider.StorageBackendProvider, _ResticClientFactory.ResticClientFactory, _AggregateBackupController.AggregateBackupController, _ResticController.ResticController, _B2CredentialsProvider.B2CredentialsProvider, _RCloneClientFactory.RCloneClientFactory];
+  c.bind(_Fs.Fs).toConstantValue(new _Fs.Fs(cfg.pwd, log));
+  const self = [_Gpg.Gpg, _Shell.Shell, _FsSyncer.FsSyncer, _SshKeyManager.SshKeyManager, _StorageBackendProvider.StorageBackendProvider, _StorageConfigProvider.StorageConfigProvider, _ResticClientFactory.ResticClientFactory, _AggregateBackupController.AggregateBackupController, _ResticController.ResticController, _B2CredentialsProvider.B2CredentialsProvider, _RCloneClientFactory.RCloneClientFactory, _DataBackupController.DataBackupController, _PgBackupController.PgBackupController];
   self.forEach(s => c.bind(s).toSelf());
   return c;
 };

package/lib/ctx/ContextSymbols.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.TaskConfig_ = exports.StorageConfig_ = exports.Log_ = exports.AppConfig_ = void 0;
+exports.TaskConfig_ = exports.StorageConfig_ = exports.Log_ = exports.Inputs_ = exports.AppConfig_ = void 0;
 const Log_ = Symbol.for('Log');
 exports.Log_ = Log_;
 const TaskConfig_ = Symbol.for('config.Tasks');
@@ -11,4 +11,6 @@ exports.TaskConfig_ = TaskConfig_;
 const StorageConfig_ = Symbol.for('config.Storage');
 exports.StorageConfig_ = StorageConfig_;
 const AppConfig_ = Symbol.for('config.app');
-exports.AppConfig_ = AppConfig_;
+exports.AppConfig_ = AppConfig_;
+const Inputs_ = Symbol.for('cmd.input');
+exports.Inputs_ = Inputs_;

package/lib/fs/Fs.js

@@ -7,18 +7,27 @@ exports.Fs = void 0;
 
 var _fs = _interopRequireDefault(require("fs"));
 
+var _path = _interopRequireDefault(require("path"));
+
+var _Path = require("./path/Path");
+
 var _inversify = require("inversify");
 
 var _AppLogger = require("../log/AppLogger");
 
+var _expandAndCreatePath = require("../config/expandAndCreatePath");
+
+var _os = _interopRequireDefault(require("os"));
+
 var _dec, _dec2, _dec3, _class;
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-let Fs = (_dec = (0, _inversify.injectable)(), _dec2 = Reflect.metadata("design:type", Function), _dec3 = Reflect.metadata("design:paramtypes", [typeof _AppLogger.AppLogger === "undefined" ? Object : _AppLogger.AppLogger]), _dec(_class = _dec2(_class = _dec3(_class = class Fs {
-  constructor(log) {
+let Fs = (_dec = (0, _inversify.injectable)(), _dec2 = Reflect.metadata("design:type", Function), _dec3 = Reflect.metadata("design:paramtypes", [typeof _Path.AbsPath === "undefined" ? Object : _Path.AbsPath, typeof _AppLogger.AppLogger === "undefined" ? Object : _AppLogger.AppLogger]), _dec(_class = _dec2(_class = _dec3(_class = class Fs {
+  constructor(cwd, log) {
+    this.cwd = cwd;
     this.log = log;
 
     _defineProperty(this, "writeFile", (path, content) => {
@@ -42,6 +51,30 @@ let Fs = (_dec = (0, _inversify.injectable)(), _dec2 = Reflect.metadata("design:
       });
     });
 
+    _defineProperty(this, "rmFile", path => {
+      _fs.default.rmSync(path.str());
+    });
+
+    _defineProperty(this, "listFiles", path => {
+      return _fs.default.readdirSync(path.str()).map(f => path.resolve(f));
+    });
+
+    _defineProperty(this, "inTmpDir", (name, withDir) => {
+      const dir = this.mkTmpDir(name);
+
+      try {
+        withDir(dir);
+      } finally {
+        this.rmDir(_Path.AbsPath.from(dir));
+      }
+    });
+
+    _defineProperty(this, "mkTmpDir", name => {
+      const dir = _fs.default.mkdtempSync(_path.default.resolve(_os.default.tmpdir(), name));
+
+      return dir;
+    });
+
     _defineProperty(this, "ensureIsDir", p => {
       if (!this.isDir(p)) throw new Error(`${p} is not a dir`);
     });
@@ -75,6 +108,10 @@ let Fs = (_dec = (0, _inversify.injectable)(), _dec2 = Reflect.metadata("design:
     });
 
     _defineProperty(this, "exists", path => _fs.default.existsSync(path.str()));
+
+    _defineProperty(this, "expand", strPath => (0, _expandAndCreatePath.expandAndCreatePath)(strPath, this.cwd));
+
+    _defineProperty(this, "expandStrPath", strPath => (0, _expandAndCreatePath.expandStrPath)(strPath, this.cwd));
   }
 
 }) || _class) || _class) || _class);

package/lib/fs/fssync/FsSync.spec.js

@@ -23,7 +23,7 @@ describe('FsSync', () => {
 
   it('syncs dir', () => {
     const l = new _AppLogger.AppLogger();
-    const sut = new _FsSyncer.FsSyncer(new _Shell.Shell(l), new _Fs.Fs(l), l);
+    const sut = new _FsSyncer.FsSyncer(new _Shell.Shell(l), new _Fs.Fs(_Path.AbsPath.from(__dirname), l), l);
     sut.syncDirs(from, to);
     expect((0, _areDirsSame.areDirsSame)(from, to)).toBe(true);
   });

package/lib/fs/path/Path.js

@@ -24,7 +24,11 @@ class AbsPath {
       return AbsPath.from(_path.default.resolve(this.path, '..'));
     });
 
-    _defineProperty(this, "str", () => this.path);
+    _defineProperty(this, "basename", () => {
+      return _path.default.basename(this.path);
+    });
+
+    _defineProperty(this, "str", () => _path.default.resolve(this.path));
 
     if (!_path.default.isAbsolute(path)) throw new Error(`Path ${path} must be absolute`);
   }

package/lib/log/AppLogger.js

@@ -9,12 +9,12 @@ var _ConsoleLogger = require("./ConsoleLogger");
 
 var _inversify = require("inversify");
 
-var _dec, _class;
+var _dec, _dec2, _dec3, _class;
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-let AppLogger = (_dec = (0, _inversify.injectable)(), _dec(_class = class AppLogger {
-  constructor() {
+let AppLogger = (_dec = (0, _inversify.injectable)(), _dec2 = Reflect.metadata("design:type", Function), _dec3 = Reflect.metadata("design:paramtypes", [void 0]), _dec(_class = _dec2(_class = _dec3(_class = class AppLogger {
+  constructor(mute = false) {
     _defineProperty(this, "log", new _ConsoleLogger.ConsoleLogger());
 
     _defineProperty(this, "debug", this.log.debug);
@@ -22,7 +22,9 @@ let AppLogger = (_dec = (0, _inversify.injectable)(), _dec(_class = class AppLog
     _defineProperty(this, "info", this.log.info);
 
     _defineProperty(this, "error", this.log.error);
+
+    if (mute) this.log.setEnabled(false);
   }
 
-}) || _class);
+}) || _class) || _class) || _class);
 exports.AppLogger = AppLogger;

package/lib/storage/BackupClientStorageBackend.js

@@ -16,6 +16,10 @@ class BackupClientStorageBackend {
     _defineProperty(this, "store", from => {
       this.client.backup(from, _Path.RelativePath.from('.'));
     });
+
+    _defineProperty(this, "restore", to => {
+      this.client.restore(to);
+    });
   }
 
 }

package/lib/storage/StorageBackendProvider.js

@@ -7,71 +7,44 @@ exports.StorageBackendProvider = void 0;
 
 var _inversify = require("inversify");
 
-var _FsSyncer = require("../fs/fssync/FsSyncer");
-
-var _LocalFileStorageBackend = require("./local-file/LocalFileStorageBackend");
-
-var _ContextSymbols = require("../ctx/ContextSymbols");
-
-var _config = require("../config");
+var _types = require("./types");
 
 var _ResticClientFactory = require("./restic/ResticClientFactory");
 
 var _BackupClientStorageBackend = require("./BackupClientStorageBackend");
 
-var _Fs = require("../fs/Fs");
-
 var _RCloneClientFactory = require("./rclone/RCloneClientFactory");
 
-var _dec, _dec2, _dec3, _dec4, _class;
+var _StorageConfigProvider = require("./StorageConfigProvider");
+
+var _dec, _dec2, _dec3, _class;
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-let StorageBackendProvider = (_dec = (0, _inversify.injectable)(), _dec2 = function (target, key) {
-  return (0, _inversify.inject)(_ContextSymbols.AppConfig_)(target, undefined, 4);
-}, _dec3 = Reflect.metadata("design:type", Function), _dec4 = Reflect.metadata("design:paramtypes", [typeof _FsSyncer.FsSyncer === "undefined" ? Object : _FsSyncer.FsSyncer, typeof _ResticClientFactory.ResticClientFactory === "undefined" ? Object : _ResticClientFactory.ResticClientFactory, typeof _RCloneClientFactory.RCloneClientFactory === "undefined" ? Object : _RCloneClientFactory.RCloneClientFactory, typeof _Fs.Fs === "undefined" ? Object : _Fs.Fs, typeof _config.Config === "undefined" ? Object : _config.Config]), _dec(_class = _dec2(_class = _dec3(_class = _dec4(_class = class StorageBackendProvider {
-  constructor(fsSyncer, resticFac, rcloneFac, fs, cfg) {
-    this.fsSyncer = fsSyncer;
+let StorageBackendProvider = (_dec = (0, _inversify.injectable)(), _dec2 = Reflect.metadata("design:type", Function), _dec3 = Reflect.metadata("design:paramtypes", [typeof _ResticClientFactory.ResticClientFactory === "undefined" ? Object : _ResticClientFactory.ResticClientFactory, typeof _RCloneClientFactory.RCloneClientFactory === "undefined" ? Object : _RCloneClientFactory.RCloneClientFactory, typeof _StorageConfigProvider.StorageConfigProvider === "undefined" ? Object : _StorageConfigProvider.StorageConfigProvider]), _dec(_class = _dec2(_class = _dec3(_class = class StorageBackendProvider {
+  constructor(resticFac, rcloneFac, cfgProvider) {
     this.resticFac = resticFac;
     this.rcloneFac = rcloneFac;
-    this.fs = fs;
-    this.cfg = cfg;
+    this.cfgProvider = cfgProvider;
 
-    _defineProperty(this, "provide", name => {
-      const s = this.cfg.storage.find(s => s.name === name);
-      if (!s) throw new Error(`No such storage '${name}'`);
-      let b;
+    _defineProperty(this, "provide", () => {
+      const s = this.cfgProvider.provide();
+      let b = null;
 
       switch (s.type) {
-        case _config.StorageTypeConst.File:
-          b = this.localFile(s);
-          break;
-
-        case _config.StorageTypeConst.Restic:
-          b = this.restic(s);
+        case _types.StorageType.Restic:
+          b = this.resticFac.create(s);
           break;
 
-        case _config.StorageTypeConst.RClone:
-          b = this.rclone(s);
+        case _types.StorageType.RClone:
+          b = this.rcloneFac.create(s);
           break;
       }
 
       if (!b) throw new Error(`Unsupported storage type ${s.type}`);
-      return b;
-    });
-
-    _defineProperty(this, "rclone", cfg => {
-      return new _BackupClientStorageBackend.BackupClientStorageBackend(this.rcloneFac.create(cfg));
-    });
-
-    _defineProperty(this, "restic", cfg => {
-      return new _BackupClientStorageBackend.BackupClientStorageBackend(this.resticFac.create(cfg));
-    });
-
-    _defineProperty(this, "localFile", cfg => {
-      return new _LocalFileStorageBackend.LocalFileStorageBackend(this.fsSyncer, cfg.path);
+      return new _BackupClientStorageBackend.BackupClientStorageBackend(b);
     });
   }
 
-}) || _class) || _class) || _class) || _class);
+}) || _class) || _class) || _class);
 exports.StorageBackendProvider = StorageBackendProvider;

package/lib/storage/StorageConfigProvider.js

@@ -0,0 +1,89 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.StorageConfigProvider = void 0;
+
+var _inversify = require("inversify");
+
+var _ContextSymbols = require("../ctx/ContextSymbols");
+
+var _config = require("../config");
+
+var _Fs = require("../fs/Fs");
+
+var _InvalidInput = require("../cli/InvalidInput");
+
+var _StoreConfig = require("./StoreConfig");
+
+var _dec, _dec2, _dec3, _dec4, _dec5, _class;
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+let StorageConfigProvider = (_dec = (0, _inversify.injectable)(), _dec2 = function (target, key) {
+  return (0, _inversify.inject)(_ContextSymbols.AppConfig_)(target, undefined, 1);
+}, _dec3 = function (target, key) {
+  return (0, _inversify.inject)(_ContextSymbols.Inputs_)(target, undefined, 2);
+}, _dec4 = Reflect.metadata("design:type", Function), _dec5 = Reflect.metadata("design:paramtypes", [typeof _Fs.Fs === "undefined" ? Object : _Fs.Fs, typeof _config.Config === "undefined" ? Object : _config.Config, typeof StorageInputs === "undefined" ? Object : StorageInputs]), _dec(_class = _dec2(_class = _dec3(_class = _dec4(_class = _dec5(_class = class StorageConfigProvider {
+  constructor(fs, cfg, inputs) {
+    this.fs = fs;
+    this.cfg = cfg;
+    this.inputs = inputs;
+
+    _defineProperty(this, "provide", () => {
+      const {
+        storageName,
+        storagePassword,
+        storageRepo,
+        storageType
+      } = this.inputs;
+      let res;
+
+      if (storageName) {
+        if (storageType || storageRepo || storagePassword) throw new _InvalidInput.InvalidInput('Storage config provided. Storage name is therefore invalid input');
+        res = this.getByName(storageName);
+      } else {
+        res = this.getByCliConfig(this.inputs);
+      }
+
+      if (res.repo.startsWith('local:')) {
+        const path = res.repo.split('local:')[1];
+        res.repo = 'local:' + this.fs.expandStrPath(path);
+      }
+
+      return res;
+    });
+
+    _defineProperty(this, "getByCliConfig", inp => {
+      // // TODO unify validation usage
+      const r = (0, _StoreConfig.CliStorageConfigSchema)().validate(inp, {
+        presence: 'required',
+        allowUnknown: true
+      });
+      if (r.error) throw new _InvalidInput.InvalidInput(r.error.toString());
+      const cfg = inp;
+      return {
+        type: cfg.storageType,
+        repo: cfg.storageRepo,
+        encryptionPassword: cfg.storagePassword,
+        credentials: cfg.storageCredentials
+      };
+    });
+
+    _defineProperty(this, "getByName", name => {
+      const cfg = this.cfg.storage.find(s => s.name === name);
+      if (!cfg) throw new Error(`No such storage '${name}'`);
+      const encryptionPassword = cfg.passwordFile ? this.fs.readFile(this.fs.expand(cfg.passwordFile)).trim() : undefined;
+      const credentials = cfg.credentialsFile ? this.fs.readFile(this.fs.expand(cfg.credentialsFile)).trim() : undefined;
+      return {
+        type: cfg.type,
+        repo: cfg.repo,
+        credentials,
+        encryptionPassword
+      };
+    });
+  }
+
+}) || _class) || _class) || _class) || _class) || _class);
+exports.StorageConfigProvider = StorageConfigProvider;

package/lib/storage/StoreConfig.js

@@ -0,0 +1,39 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.StorageSchema = exports.NamedStorageSchema = exports.CliStorageConfigSchema = void 0;
+
+var _joi = _interopRequireDefault(require("@hapi/joi"));
+
+var _types = require("./types");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const props = {
+  type: _joi.default.string().valid(_types.StorageType.Restic, _types.StorageType.RClone),
+  repo: _joi.default.string(),
+  credentialsFile: _joi.default.string().optional(),
+  passwordFile: _joi.default.string().optional()
+};
+
+const StorageSchema = () => _joi.default.object(props);
+
+exports.StorageSchema = StorageSchema;
+
+const CliStorageConfigSchema = () => _joi.default.object({
+  storageType: _joi.default.string().valid(_types.StorageType.Restic, _types.StorageType.RClone),
+  storageRepo: _joi.default.string(),
+  storageCredentials: _joi.default.string().allow(null).optional(),
+  storagePassword: _joi.default.string().allow(null).optional()
+});
+
+exports.CliStorageConfigSchema = CliStorageConfigSchema;
+
+const NamedStorageSchema = () => _joi.default.object({
+  name: _joi.default.string(),
+  ...props
+});
+
+exports.NamedStorageSchema = NamedStorageSchema;

package/lib/storage/b2/B2CredentialsProvider.js

@@ -36,11 +36,15 @@ let B2CredentialsProvider = (_dec = (0, _inversify.injectable)(), _dec2 = Reflec
     this.fs = fs;
 
     _defineProperty(this, "fromFile", path => {
-      const credJson = this.fs.readJson(path);
+      return this.fromString(this.fs.readFile(path));
+    });
+
+    _defineProperty(this, "fromString", str => {
+      const credJson = JSON.parse(str);
       const validationErr = validateCredentials(credJson);
 
       if (validationErr) {
-        throw new Error(`Invalid B2 credential in ${path}: ${validationErr}`);
+        throw new Error(`Invalid B2 credential in '${str.substring(0, 3)}...': ${validationErr}`);
       }
 
       const creds = credJson;

package/lib/storage/rclone/RCloneClientFactory.js

@@ -48,15 +48,15 @@ let RCloneClientFactory = (_dec = (0, _inversify.injectable)(), _dec2 = Reflect.
         type,
         location
       };
-      const password = cfg.passwordFile && this.fs.readFile(cfg.passwordFile).trim();
+      const password = cfg.encryptionPassword;
       if (password) props.encryption = {
         password
       };
-      const creds = cfg.credentialsFile && this.b2.fromFile(cfg.credentialsFile);
+      const creds = cfg.credentials;
 
       if (type === 'b2') {
-        if (!creds) throw new Error(`Credentials are required for '${cfg.name}'`);
-        props.creds = creds;
+        if (!creds) throw new Error(`Credentials are required for RClone storage repo='${cfg.repo}'`);
+        props.creds = this.b2.fromString(creds);
       } else {
         if (creds) throw new Error(`Credentials not supported for local rclone`);
       }

package/lib/storage/rclone/RcloneClient.js

@@ -76,7 +76,7 @@ let RcloneClient = (_dec = (0, _inversify.injectable)(), _dec2 = Reflect.metadat
       return res;
     });
 
-    _defineProperty(this, "obscure", str => this.shell.execAndReturnVal(`rclone obscure ${str}`));
+    _defineProperty(this, "obscure", str => this.shell.execAndReturnString(`rclone obscure ${str}`));
   }
 
   get actualRemoteName() {

package/lib/storage/rclone/RcloneClient.spec.js

@@ -1,7 +1,5 @@
 "use strict";
 
-var _AppLogger = require("../../log/AppLogger");
-
 var _Shell = require("../../tools/shell/Shell");
 
 var _test = require("../../../test");
@@ -17,7 +15,7 @@ var _b2TestConfig = require("../../../test/b2TestConfig");
 var _testHelper = require("../../../test/testHelper");
 
 describe('RcloneClient', () => {
-  const l = new _AppLogger.AppLogger();
+  const l = _testHelper.testLog;
   const getRestoreDir = (0, _test.testdataDirBuilder)('b2/restore');
   describe('local', () => {
     const backupDir = (0, _test.testDir)('backup/1');

package/lib/storage/restic/ResticClient.spec.js

@@ -2,8 +2,6 @@
 
 var _ResticClient = require("./ResticClient");
 
-var _AppLogger = require("../../log/AppLogger");
-
 var _Shell = require("../../tools/shell/Shell");
 
 var _test = require("../../../test");
@@ -17,7 +15,7 @@ var _testHelper = require("../../../test/testHelper");
 var _b2TestConfig = require("../../../test/b2TestConfig");
 
 describe('ResticClient', () => {
-  const l = new _AppLogger.AppLogger();
+  const l = _testHelper.testLog;
   const password = 'foo123';
   describe('local', () => {
     const backupDir = (0, _test.testDir)('backup/1');

package/lib/storage/restic/ResticClientFactory.js

@@ -29,20 +29,20 @@ let ResticClientFactory = (_dec = (0, _inversify.injectable)(), _dec2 = Reflect.
     this.b2 = b2;
 
     _defineProperty(this, "create", cfg => {
-      const password = this.fs.readFile(cfg.passwordFile).trim();
+      if (!cfg.encryptionPassword) throw new Error(`Restic needs encryptionPassword. Repo=${cfg.repo}`);
       const props = {
         repo: {
-          password,
+          password: cfg.encryptionPassword,
           url: cfg.repo
         }
       };
-      const creds = cfg.credentialsFile && this.b2.fromFile(cfg.credentialsFile);
+      const creds = cfg.credentials;
 
       if (cfg.repo.startsWith('b2:')) {
-        if (!creds) throw new Error(`Credentials must be provided for b2 repo in '${cfg.name}'`);
-        props.backblaze = creds;
+        if (!creds) throw new Error(`Credentials must be provided for b2 repo in '${props.repo.url}'`);
+        props.backblaze = this.b2.fromString(creds);
       } else {
-        if (creds) throw new Error('Credentials can be supported only for the B2 restic backend');
+        if (creds) throw new Error('Credentials can be set only for the B2 restic backend');
       }
 
       return new _ResticClient.ResticClient(props, this.sh, this.log);

package/lib/storage/restic/ResticController.js

@@ -15,23 +15,28 @@ var _ResticClientFactory = require("./ResticClientFactory");
 
 var _AppLogger = require("../../log/AppLogger");
 
+var _StorageConfigProvider = require("../StorageConfigProvider");
+
+var _types = require("../types");
+
 var _dec, _dec2, _dec3, _dec4, _class;
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
 let ResticController = (_dec = (0, _inversify.injectable)(), _dec2 = function (target, key) {
   return (0, _inversify.inject)(_ContextSymbols.AppConfig_)(target, undefined, 2);
-}, _dec3 = Reflect.metadata("design:type", Function), _dec4 = Reflect.metadata("design:paramtypes", [typeof _ResticClientFactory.ResticClientFactory === "undefined" ? Object : _ResticClientFactory.ResticClientFactory, typeof _AppLogger.AppLogger === "undefined" ? Object : _AppLogger.AppLogger, typeof _config.Config === "undefined" ? Object : _config.Config]), _dec(_class = _dec2(_class = _dec3(_class = _dec4(_class = class ResticController {
-  constructor(restFact, log, cfg) {
+}, _dec3 = Reflect.metadata("design:type", Function), _dec4 = Reflect.metadata("design:paramtypes", [typeof _ResticClientFactory.ResticClientFactory === "undefined" ? Object : _ResticClientFactory.ResticClientFactory, typeof _AppLogger.AppLogger === "undefined" ? Object : _AppLogger.AppLogger, typeof _config.Config === "undefined" ? Object : _config.Config, typeof _StorageConfigProvider.StorageConfigProvider === "undefined" ? Object : _StorageConfigProvider.StorageConfigProvider]), _dec(_class = _dec2(_class = _dec3(_class = _dec4(_class = class ResticController {
+  constructor(restFact, log, cfg, storageConfigProvider) {
     this.restFact = restFact;
     this.log = log;
     this.cfg = cfg;
+    this.storageConfigProvider = storageConfigProvider;
 
-    _defineProperty(this, "initRepo", storageName => {
-      const s = this.cfg.storage.filter(s => s.type === 'restic').find(s => s.name === storageName);
-      if (!s) throw new Error(`No restic storage '${storageName}'`);
-      this.log.info('Initializing repo', storageName);
-      this.restFact.create(s).prepareRepo();
+    _defineProperty(this, "initRepo", () => {
+      const props = this.storageConfigProvider.provide();
+      if (props.type !== _types.StorageType.Restic) throw new Error('Storage is not Restic storage');
+      this.log.info('Initializing repo', props.repo);
+      this.restFact.create(props).prepareRepo();
     });
   }
 

package/lib/storage/types.js

@@ -0,0 +1,13 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.StorageType = void 0;
+let StorageType;
+exports.StorageType = StorageType;
+
+(function (StorageType) {
+  StorageType["Restic"] = "restic";
+  StorageType["RClone"] = "rclone";
+})(StorageType || (exports.StorageType = StorageType = {}));

package/lib/tools/gpg/Gpg.js

@@ -25,7 +25,7 @@ let Gpg = (_dec = (0, _inversify.injectable)(), _dec2 = Reflect.metadata("design
     });
 
     _defineProperty(this, "exportKey", id => {
-      const res = this.sh.execAndReturnVal(`gpg --batch --pinentry-mode=loopback  --pinentry-mode=loopback --yes --passphrase foo123 --export-secret-key --armor ${id}`);
+      const res = this.sh.execAndReturnString(`gpg --batch --pinentry-mode=loopback  --pinentry-mode=loopback --yes --passphrase foo123 --export-secret-key --armor ${id}`);
       if (!res) throw new Error(`Key '${id}' not in  keyring`);
       return res;
     });

package/lib/tools/gpg/Gpg.spec.js

@@ -1,7 +1,5 @@
 "use strict";
 
-var _AppLogger = require("../../log/AppLogger");
-
 var _Gpg = require("./Gpg");
 
 var _Shell = require("../shell/Shell");
@@ -10,10 +8,12 @@ var _test = require("../../../test");
 
 var _fs = _interopRequireDefault(require("fs"));
 
+var _testHelper = require("../../../test/testHelper");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 it('works', () => {
-  const sut = new _Gpg.Gpg(new _Shell.Shell(new _AppLogger.AppLogger()));
+  const sut = new _Gpg.Gpg(new _Shell.Shell(_testHelper.testLog));
 
   const key = _fs.default.readFileSync((0, _test.testDir)('gpg/john.doe@foo.com.key.asc')).toString();
 

package/lib/tools/shell/Shell.js

@@ -22,8 +22,7 @@ let Shell = (_dec = (0, _inversify.injectable)(), _dec2 = Reflect.metadata("desi
 
     _defineProperty(this, "exec", (cmd, opts = {}) => {
       this.log.debug(cmd);
-      (0, _shellCmd.shellCmd)(cmd, { ...opts,
-        returnStdout: false
+      (0, _shellCmd.shellCmd)(cmd, { ...opts
       });
     });
 
@@ -34,15 +33,22 @@ let Shell = (_dec = (0, _inversify.injectable)(), _dec2 = Reflect.metadata("desi
     }) => {
       this.log.debug(`<stdin> > ${cmd}`);
       (0, _shellCmd.shellCmd)(cmd, { ...opts,
-        stdin,
-        returnStdout: false
+        stdin
+      });
+    });
+
+    _defineProperty(this, "execAndReturnString", (cmd, ops = {}) => {
+      this.log.debug(cmd, '[stdout consumed]');
+      return (0, _shellCmd.shellCmd)(cmd, {
+        returnStdout: 'string',
+        ...ops
       });
     });
 
-    _defineProperty(this, "execAndReturnVal", (cmd, ops = {}) => {
+    _defineProperty(this, "execAndReturnBuffer", (cmd, ops = {}) => {
       this.log.debug(cmd, '[stdout consumed]');
       return (0, _shellCmd.shellCmd)(cmd, {
-        returnStdout: true,
+        returnStdout: 'buffer',
         ...ops
       });
     });

package/lib/tools/shell/shellCmd.js

@@ -16,10 +16,16 @@ const shellCmd = (cmd, {
   const res = (0, _child_process.execSync)(cmd, {
     cwd,
     input: stdin,
-    stdio: [stdin ? undefined : 'inherit', returnStdout ? undefined : 'inherit', 'inherit'],
+    stdio: [stdin ? undefined : 'inherit', returnStdout ? undefined : 'inherit', 'pipe' // TODO changed from 'inherit' as the message is not shown in the console - find out how to catch the stderr output
+    ],
     env
   });
-  if (returnStdout) return res.toString().trim();
+
+  if (returnStdout) {
+    if (returnStdout === 'string') return res.toString().trim();
+    return res;
+  }
+
   return null;
 };
 

package/lib/tools/ssh/SshKeyManager.spec.js

@@ -6,9 +6,11 @@ var _Fs = require("../../fs/Fs");
 
 var _AppLogger = require("../../log/AppLogger");
 
+var _Path = require("../../fs/path/Path");
+
 // TODO setup ci to make tests work
 it.skip('works', () => {
-  const sut = new _SshKeyManager.SshKeyManager(new _Fs.Fs(new _AppLogger.AppLogger()));
+  const sut = new _SshKeyManager.SshKeyManager(new _Fs.Fs(_Path.AbsPath.from(__dirname), new _AppLogger.AppLogger()));
   const key = sut.exportKey('id_rsa');
   console.log('key', key);
 });

package/package.json

@@ -1,13 +1,15 @@
 {
   "name": "@ps-aux/nodebup",
-  "version": "0.4.0",
+  "version": "0.7.0",
   "description": "",
   "module": "lib/index.js",
   "main": "lib/index.js",
   "scripts": {
     "build": "rm -rf build && babel --extensions '.ts,.js,.md' src -d lib src",
+    "publish:local": "npm run build && chmod +x lib/cli/bin.js && npm link",
     "pub": "npm publish --access public",
     "test": "jest",
+    "test:ci": "jest --group=-no-ci",
     "tc": "tsc --noEmit",
     "format": "prettier \"**/*.{js,ts,tsx}\" --write",
     "build-n-run": "npm run build && ",
@@ -41,12 +43,14 @@
     "@types/jest": "^27.4.0",
     "@types/jest-when": "^2.7.4",
     "@types/node": "^17.0.6",
+    "@types/pg": "^8.6.5",
     "@types/ramda": "^0.27.62",
     "@typescript-eslint/eslint-plugin": "^5.8.1",
     "@typescript-eslint/parser": "^5.8.1",
     "babel-plugin-module-resolver": "^4.1.0",
     "babel-plugin-transform-typescript-metadata": "^0.3.2",
     "dir-compare": "^4.0.0",
+    "docker-compose": "^0.23.17",
     "eslint": "^8.6.0",
     "eslint-config-standard": "^16.0.3",
     "eslint-plugin-import": "^2.25.3",
@@ -57,9 +61,11 @@
     "husky": "^7.0.4",
     "jest": "^27.4.5",
     "jest-extended": "^1.2.0",
+    "jest-runner-groups": "^2.2.0",
     "jest-when": "^3.5.0",
     "lint-staged": "^12.1.4",
     "npm-check-updates": "^12.0.5",
+    "pg": "^8.7.3",
     "prettier": "^2.5.1",
     "ts-jest": "^27.1.2",
     "typescript": "^4.5.4"
@@ -72,7 +78,7 @@
   },
   "dependencies": {
     "@hapi/joi": "^17.1.1",
-    "@ps-aux/nclif": "^0.0.6-alpha.3",
+    "@ps-aux/nclif": "^0.0.7-alpha.1",
     "@types/hapi__joi": "^17.1.8",
     "axios": "^0.24.0",
     "handlebars": "^4.7.7",

package/lib/storage/local-file/LocalFileStorageBackend.js

@@ -1,22 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.LocalFileStorageBackend = void 0;
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
-class LocalFileStorageBackend {
-  constructor(fsSyncer, dst) {
-    this.fsSyncer = fsSyncer;
-    this.dst = dst;
-
-    _defineProperty(this, "store", from => {
-      this.fsSyncer.syncDirs(from, this.dst);
-    });
-  }
-
-}
-
-exports.LocalFileStorageBackend = LocalFileStorageBackend;

package/lib/storage/types.d.js

@@ -1,5 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});