@ps-aux/nodebup 0.4.0 → 0.5.0

package/lib/bup/AggregateBackupController.js

@@ -21,24 +21,24 @@ var _AppLogger = require("../log/AppLogger");
 
 var _Path = require("../fs/path/Path");
 
-var _StorageBackendProvider = require("../storage/StorageBackendProvider");
-
 var _config = require("../config");
 
+var _BackupController = require("./BackupController");
+
 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 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) {
+}, _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) {
     this.gpg = gpg;
     this.ssh = ssh;
     this.fs = fs;
     this.fsSyncer = fsSyncer;
     this.log = log;
-    this.storageBackendProvider = storageBackendProvider;
+    this.backupController = backupController;
     this.cfg = cfg;
 
     _defineProperty(this, "backup", async (aggrName, storage) => {
@@ -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.backupController.backup(storage, aggrDir);
       } finally {
         this.log.debug();
         this.fs.rmDir(aggrDir);

package/lib/bup/BackupController.js

@@ -0,0 +1,56 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.BackupController = void 0;
+
+var _FsSyncer = require("../fs/fssync/FsSyncer");
+
+var _Gpg = require("../tools/gpg/Gpg");
+
+var _Fs = require("../fs/Fs");
+
+var _SshKeyManager = require("../tools/ssh/SshKeyManager");
+
+var _inversify = require("inversify");
+
+var _ContextSymbols = require("../ctx/ContextSymbols");
+
+var _AppLogger = require("../log/AppLogger");
+
+var _StorageBackendProvider = require("../storage/StorageBackendProvider");
+
+var _config = require("../config");
+
+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 BackupController = (_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 BackupController {
+  constructor(gpg, ssh, fs, fsSyncer, log, storageBackendProvider, cfg) {
+    this.gpg = gpg;
+    this.ssh = ssh;
+    this.fs = fs;
+    this.fsSyncer = fsSyncer;
+    this.log = log;
+    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", name => this.storageBackendProvider.provide(name));
+  }
+
+}) || _class) || _class) || _class) || _class);
+exports.BackupController = BackupController;

package/lib/cli/app.js

@@ -17,18 +17,33 @@ var _AggregateBackupController = require("../bup/AggregateBackupController");
 
 var _ResticController = require("../storage/restic/ResticController");
 
+var _BackupController = require("../bup/BackupController");
+
+var _Path = require("../fs/path/Path");
+
 const createApp = () => _nclif.CliApp.of({
   commands: {
-    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)
-        })
-      }
+    backup: (0, _nclif.cmd)({
+      description: 'Backup a dir to the given storage',
+      positionals: [{
+        name: 'path',
+        required: true
+      }, {
+        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: 'path',
+        required: true
+      }],
+      run: (a, c) => c.get(_BackupController.BackupController).restore(a.storageName, _Path.AbsPath.from(a.path))
     }),
     aggr: (0, _nclif.cmdGroup)({
       commands: {
@@ -36,20 +51,30 @@ const createApp = () => _nclif.CliApp.of({
           description: 'Run backup',
           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)
         })
       }
-    })
+    }),
+    restic
   }
 }).addObjectConfig(pwd => (0, _Config.readConfig)(pwd)).context(({
   config
 }) => (0, _Context.createContext)(config));
 
-exports.createApp = createApp;
+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)
+    })
+  }
+});

package/lib/config/Config.js

@@ -14,9 +14,6 @@ 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);

package/lib/config/index.js

@@ -9,6 +9,5 @@ exports.StorageTypeConst = StorageTypeConst;
 
 (function (StorageTypeConst) {
   StorageTypeConst["Restic"] = "restic";
-  StorageTypeConst["File"] = "file";
   StorageTypeConst["RClone"] = "rclone";
 })(StorageTypeConst || (exports.StorageTypeConst = StorageTypeConst = {}));

package/lib/config/validateConfigAgainstSchema.js

@@ -25,7 +25,7 @@ const KeyTaskSchema = _joi.default.object({
 
 const createStorageSchema = props => _joi.default.object({
   name: _joi.default.string(),
-  type: _joi.default.string().valid(_index.StorageTypeConst.Restic, _index.StorageTypeConst.File, _index.StorageTypeConst.RClone),
+  type: _joi.default.string().valid(_index.StorageTypeConst.Restic, _index.StorageTypeConst.RClone),
   ...props
 });
 

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

@@ -33,13 +33,15 @@ var _B2CredentialsProvider = require("../storage/b2/B2CredentialsProvider");
 
 var _RCloneClientFactory = require("../storage/rclone/RCloneClientFactory");
 
+var _BackupController = require("../bup/BackupController");
+
 const createContext = cfg => {
   const c = new _inversify.Container();
   c.bind(_ContextSymbols.AppConfig_).toConstantValue(cfg);
   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];
+  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];
   self.forEach(s => c.bind(s).toSelf());
   return c;
 };

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,10 +7,6 @@ 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");
@@ -19,8 +15,6 @@ 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;
@@ -28,13 +22,11 @@ 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 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;
+  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) {
     this.resticFac = resticFac;
     this.rcloneFac = rcloneFac;
-    this.fs = fs;
     this.cfg = cfg;
 
     _defineProperty(this, "provide", name => {
@@ -43,33 +35,17 @@ let StorageBackendProvider = (_dec = (0, _inversify.injectable)(), _dec2 = funct
       let b;
 
       switch (s.type) {
-        case _config.StorageTypeConst.File:
-          b = this.localFile(s);
-          break;
-
         case _config.StorageTypeConst.Restic:
-          b = this.restic(s);
+          b = this.resticFac.create(s);
           break;
 
         case _config.StorageTypeConst.RClone:
-          b = this.rclone(s);
+          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);
     });
   }
 

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/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ps-aux/nodebup",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "description": "",
   "module": "lib/index.js",
   "main": "lib/index.js",

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;