@ps-aux/nodebup 0.5.0 → 0.6.0

package/lib/bup/AggregateBackupController.js

@@ -23,7 +23,7 @@ var _Path = require("../fs/path/Path");
 
 var _config = require("../config");
 
-var _BackupController = require("./BackupController");
+var _StorageBackendProvider = require("../storage/StorageBackendProvider");
 
 var _dec, _dec2, _dec3, _dec4, _class;
 
@@ -31,17 +31,17 @@ 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 _BackupController.BackupController === "undefined" ? Object : _BackupController.BackupController, typeof _config.Config === "undefined" ? Object : _config.Config]), _dec(_class = _dec2(_class = _dec3(_class = _dec4(_class = class AggregateBackupController {
-  constructor(gpg, ssh, fs, fsSyncer, log, backupController, cfg) {
+}, _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, storageProvider, cfg) {
     this.gpg = gpg;
     this.ssh = ssh;
     this.fs = fs;
     this.fsSyncer = fsSyncer;
     this.log = log;
-    this.backupController = backupController;
+    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.backupController.backup(storage, aggrDir);
+        this.storageProvider.provide().store(aggrDir);
       } finally {
         this.log.debug();
         this.fs.rmDir(aggrDir);

package/lib/bup/BackupController.js

@@ -19,6 +19,8 @@ var _ContextSymbols = require("../ctx/ContextSymbols");
 
 var _AppLogger = require("../log/AppLogger");
 
+var _Path = require("../fs/path/Path");
+
 var _StorageBackendProvider = require("../storage/StorageBackendProvider");
 
 var _config = require("../config");
@@ -39,17 +41,22 @@ let BackupController = (_dec = (0, _inversify.injectable)(), _dec2 = function (t
     this.storageBackendProvider = storageBackendProvider;
     this.cfg = cfg;
 
-    _defineProperty(this, "backup", (storageName, path) => {
-      this.log.info(`Backing up from ${path} to '${storageName}'`);
-      this.storage(storageName).store(path);
-    });
-
-    _defineProperty(this, "restore", (storageName, path) => {
-      this.log.info(`Restoring from '${storageName}' to ${path}`);
-      this.storage(storageName).restore(path);
+    _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);
+        }
+      };
     });
-
-    _defineProperty(this, "storage", name => this.storageBackendProvider.provide(name));
   }
 
 }) || _class) || _class) || _class) || _class);

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

@@ -19,62 +19,77 @@ var _ResticController = require("../storage/restic/ResticController");
 
 var _BackupController = require("../bup/BackupController");
 
-var _Path = require("../fs/path/Path");
+const storageNameOpt = {
+  name: 'storage-name',
+  convertCase: true,
+  fromConfig: 'storage.name'
+};
 
 const createApp = () => _nclif.CliApp.of({
   commands: {
-    backup: (0, _nclif.cmd)({
-      description: 'Backup a dir to the given storage',
-      positionals: [{
-        name: 'path',
-        required: true
+    data: (0, _nclif.cmdGroup)({
+      options: [storageNameOpt, {
+        name: 'storage-type',
+        convertCase: true,
+        fromConfig: 'storage.type'
       }, {
-        name: 'storageName',
-        required: true
-      }],
-      run: (a, c) => c.get(_BackupController.BackupController).backup(a.storageName, _Path.AbsPath.from(a.path))
-    }),
-    restore: (0, _nclif.cmd)({
-      description: 'Restore the storage to the given dir',
-      positionals: [{
-        name: 'storageName',
-        required: true
+        name: 'storage-repo',
+        convertCase: true,
+        fromConfig: 'storage.repo'
       }, {
-        name: 'path',
-        required: true
+        name: 'storage-password',
+        convertCase: true,
+        fromConfig: 'storage.password'
+      }, {
+        name: 'storage-credentials',
+        convertCase: true,
+        fromConfig: 'storage.credentials'
       }],
-      run: (a, c) => c.get(_BackupController.BackupController).restore(a.storageName, _Path.AbsPath.from(a.path))
+      commands: {
+        backup: (0, _nclif.cmd)({
+          description: 'Backup a dir to the given storage',
+          positionals: [{
+            name: 'path',
+            required: true
+          }],
+          run: (cmd, c) => c.get(_BackupController.BackupController).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(_BackupController.BackupController).storage(cmd).restore()
+        })
+      }
     }),
     aggr: (0, _nclif.cmdGroup)({
       commands: {
         backup: (0, _nclif.cmd)({
           description: 'Run backup',
+          options: [storageNameOpt],
           positionals: [{
             name: 'aggregateName',
             required: true
-          }, {
-            name: 'storageName',
-            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
   }
-}).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;
 const restic = (0, _nclif.cmdGroup)({
   commands: {
     'init-repo': (0, _nclif.cmd)({
-      positionals: [{
-        name: 'resticStorageName',
-        required: true
-      }],
-      run: (arg, c) => c.get(_ResticController.ResticController).initRepo(arg.resticStorageName)
+      options: [storageNameOpt],
+      run: (arg, c) => c.get(_ResticController.ResticController).initRepo()
     })
   }
 });

package/lib/config/Config.js

@@ -13,12 +13,7 @@ var _validateConfigAgainstSchema = require("./validateConfigAgainstSchema");
 
 var _expandAndCreatePath = require("./expandAndCreatePath");
 
-const expandPaths = (cfg, exp, cwd) => {
-  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);
-  });
+const expandPaths = (cfg, exp) => {
   cfg.aggregates.forEach(a => {
     a.sources.file.forEach(f => {
       f.from = exp(f.from);
@@ -54,7 +49,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,12 +2,4 @@
 
 Object.defineProperty(exports, "__esModule", {
   value: true
-});
-exports.StorageTypeConst = void 0;
-let StorageTypeConst;
-exports.StorageTypeConst = StorageTypeConst;
-
-(function (StorageTypeConst) {
-  StorageTypeConst["Restic"] = "restic";
-  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.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/ctx/Context.js

@@ -35,13 +35,17 @@ var _RCloneClientFactory = require("../storage/rclone/RCloneClientFactory");
 
 var _BackupController = require("../bup/BackupController");
 
-const createContext = cfg => {
+var _StorageConfigProvider = require("../storage/StorageConfigProvider");
+
+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, _BackupController.BackupController];
+  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, _BackupController.BackupController];
   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,23 @@ exports.Fs = void 0;
 
 var _fs = _interopRequireDefault(require("fs"));
 
+var _Path = require("./path/Path");
+
 var _inversify = require("inversify");
 
 var _AppLogger = require("../log/AppLogger");
 
+var _expandAndCreatePath = require("../config/expandAndCreatePath");
+
 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) => {
@@ -75,6 +80,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/storage/StorageBackendProvider.js

@@ -7,9 +7,7 @@ exports.StorageBackendProvider = void 0;
 
 var _inversify = require("inversify");
 
-var _ContextSymbols = require("../ctx/ContextSymbols");
-
-var _config = require("../config");
+var _types = require("./types");
 
 var _ResticClientFactory = require("./restic/ResticClientFactory");
 
@@ -17,29 +15,28 @@ var _BackupClientStorageBackend = require("./BackupClientStorageBackend");
 
 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, 2);
-}, _dec3 = Reflect.metadata("design:type", Function), _dec4 = Reflect.metadata("design:paramtypes", [typeof _ResticClientFactory.ResticClientFactory === "undefined" ? Object : _ResticClientFactory.ResticClientFactory, typeof _RCloneClientFactory.RCloneClientFactory === "undefined" ? Object : _RCloneClientFactory.RCloneClientFactory, typeof _config.Config === "undefined" ? Object : _config.Config]), _dec(_class = _dec2(_class = _dec3(_class = _dec4(_class = class StorageBackendProvider {
-  constructor(resticFac, rcloneFac, cfg) {
+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.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.Restic:
+        case _types.StorageType.Restic:
           b = this.resticFac.create(s);
           break;
 
-        case _config.StorageTypeConst.RClone:
+        case _types.StorageType.RClone:
           b = this.rcloneFac.create(s);
           break;
       }
@@ -49,5 +46,5 @@ let StorageBackendProvider = (_dec = (0, _inversify.injectable)(), _dec2 = funct
     });
   }
 
-}) || _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().optional(),
+  storagePassword: _joi.default.string().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/restic/ResticClientFactory.js

@@ -29,18 +29,18 @@ 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');
       }

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/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,6 +1,6 @@
 {
   "name": "@ps-aux/nodebup",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "description": "",
   "module": "lib/index.js",
   "main": "lib/index.js",
@@ -72,7 +72,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/types.d.js

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