@ps-aux/nodebup 0.2.2 → 0.3.0

package/lib/bup/AggregateBackupController.js

@@ -21,6 +21,8 @@ var _ContextSymbols = require("../ctx/ContextSymbols");
 
 var _AppLogger = require("../log/AppLogger");
 
+var _Path = require("../fs/path/Path");
+
 var _StorageBackendProvider = require("../storage/StorageBackendProvider");
 
 var _dec, _dec2, _dec3, _dec4, _class;
@@ -39,31 +41,44 @@ let AggregateBackupController = (_dec = (0, _inversify.injectable)(), _dec2 = fu
     this.storageBackendProvider = storageBackendProvider;
     this.cfg = cfg;
 
-    _defineProperty(this, "backup", async (aggregate, storage) => {
+    _defineProperty(this, "backup", async (aggrName, storage) => {
       const aggrDir = this.cfg.pwd.resolve('.aggr');
-      this.fs.ensureDir(aggrDir);
-      const aggr = this.cfg.aggregates.find(a => a.name === aggregate);
-
-      for (const f of aggr.sources.file) {
-        await this.runFileTask(f, aggrDir);
+      const aggr = this.cfg.aggregates.find(a => a.name === aggrName);
+      if (!aggr) throw new Error(`No backup aggregate with name '${aggrName}'`);
+      const {
+        file,
+        sshKey,
+        gpgKey
+      } = aggr.sources;
+
+      try {
+        this.fs.ensureDir(aggrDir);
+        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);
+      } finally {
+        this.log.debug();
+        this.fs.rmDir(aggrDir);
       }
-
-      this.storageBackendProvider.provide(storage).store(aggrDir);
-      this.fs.rmDir(aggrDir);
     });
 
-    _defineProperty(this, "runGpgKeyTask", t => {
+    _defineProperty(this, "runGpgKeyTask", (t, dir) => {
       this.log.info('Running GPG key task', t);
       const key = this.gpg.exportKey(t.id);
-      const to = this.storagePath(t.to || `keys/gpg/${t.id}.asc`);
-      this.fs.writeFile(to, key);
+
+      const to = t.to || _Path.RelativePath.from(`keys/gpg/${t.id}.asc`);
+
+      this.fs.writeFile(dir.resolve(to), key);
     });
 
-    _defineProperty(this, "runSshKeyTask", t => {
+    _defineProperty(this, "runSshKeyTask", (t, dir) => {
       this.log.info('Running SSH key task', t);
       const key = this.ssh.exportKey(t.id);
-      const to = this.storagePath(t.to || `keys/ssh/${t.id}`);
-      this.fs.writeFile(to, key);
+
+      const to = t.to || _Path.RelativePath.from(`keys/ssh/${t.id}`);
+
+      this.fs.writeFile(dir.resolve(to), key);
     });
 
     _defineProperty(this, "runFileTask", (f, dir) => {
@@ -74,10 +89,6 @@ let AggregateBackupController = (_dec = (0, _inversify.injectable)(), _dec2 = fu
       } = f;
       this.fsSyncer.sync(from, dir.resolve(to));
     });
-
-    _defineProperty(this, "storagePath", path => {
-      throw new Error('Unspported');
-    });
   }
 
 }) || _class) || _class) || _class) || _class);

package/lib/config/Config.js

@@ -27,6 +27,12 @@ const expandPaths = (cfg, exp, cwd) => {
       f.from = exp(f.from);
       f.to = _Path.RelativePath.from(f.to);
     });
+    a.sources.sshKey.forEach(f => {
+      if (f.to) f.to = _Path.RelativePath.from(f.to);
+    });
+    a.sources.gpgKey.forEach(f => {
+      if (f.to) f.to = _Path.RelativePath.from(f.to);
+    });
   });
 };
 

package/lib/fs/Fs.js

@@ -37,7 +37,7 @@ let Fs = (_dec = (0, _inversify.injectable)(), _dec2 = Reflect.metadata("design:
     _defineProperty(this, "isDir", path => _fs.default.lstatSync(path.str()).isDirectory());
 
     _defineProperty(this, "rmDir", path => {
-      _fs.default.rmdirSync(path.str(), {
+      _fs.default.rmSync(path.str(), {
         recursive: true
       });
     });

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

@@ -6,8 +6,6 @@ var _Shell = require("../../tools/shell/Shell");
 
 var _test = require("../../../test");
 
-var _fs = _interopRequireDefault(require("fs"));
-
 var _areDirsSame = require("../areDirsSame");
 
 var _Fs = require("../Fs");
@@ -16,7 +14,7 @@ var _Path = require("../path/Path");
 
 var _AppLogger = require("../../log/AppLogger");
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _testHelper = require("../../../test/testHelper");
 
 describe('FsSync', () => {
   const from = _Path.AbsPath.from((0, _test.testDir)('fs/fssync/src'));
@@ -30,8 +28,6 @@ describe('FsSync', () => {
     expect((0, _areDirsSame.areDirsSame)(from, to)).toBe(true);
   });
   afterAll(() => {
-    _fs.default.rmdirSync(to.str(), {
-      recursive: true
-    });
+    (0, _testHelper.cleanDir)(to.str());
   });
 });

package/lib/log/ConsoleLogger.js

@@ -11,15 +11,17 @@ class ConsoleLogger {
   constructor() {
     _defineProperty(this, "enabled", true);
 
+    _defineProperty(this, "print", (...args) => console.log(...args.map(a => a.toString())));
+
     _defineProperty(this, "debug", (...args) => {
-      if (this.enabled) console.log(...args);
+      if (this.enabled) this.print(args);
     });
 
     _defineProperty(this, "info", (...args) => {
-      if (this.enabled) console.log(...args);
+      if (this.enabled) this.print(args);
     });
 
-    _defineProperty(this, "error", console.error);
+    _defineProperty(this, "error", this.print);
 
     _defineProperty(this, "setEnabled", enabled => {
       this.enabled = enabled;

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

@@ -16,6 +16,8 @@ var _Path = require("../../fs/path/Path");
 
 var _dirCompare = require("dir-compare");
 
+var _testHelper = require("../../../test/testHelper");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 const getBackblazeConfig = () => {
@@ -43,13 +45,8 @@ describe('ResticClient', () => {
       }
     }, new _Shell.Shell(l), l);
     afterAll(() => {
-      _fs.default.rmdirSync(repoDir, {
-        recursive: true
-      });
-
-      _fs.default.rmdirSync(restoreDir, {
-        recursive: true
-      });
+      (0, _testHelper.cleanDir)(repoDir);
+      (0, _testHelper.cleanDir)(restoreDir);
     });
     it('create repo', () => {
       sut.prepareRepo();
@@ -81,9 +78,7 @@ describe('ResticClient', () => {
       backblaze: b2Cfg
     }, new _Shell.Shell(l), l);
     afterAll(() => {
-      _fs.default.rmdirSync(restoreDir, {
-        recursive: true
-      });
+      (0, _testHelper.cleanDir)(restoreDir);
     });
     it('push adn restore data', () => {
       //     sut.prepareRepo(repoUrl, password)

package/lib/tools/ssh/SshKeyManager.js

@@ -26,7 +26,7 @@ let SshKeyManager = (_dec = (0, _inversify.injectable)(), _dec2 = Reflect.metada
     _defineProperty(this, "sshDir", void 0);
 
     _defineProperty(this, "exportKey", id => {
-      return this.fs.readFile(this.sshDir);
+      return this.fs.readFile(this.sshDir.resolve(id));
     });
 
     this.sshDir = _Path.AbsPath.from(_os.default.homedir()).resolve('.ssh');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ps-aux/nodebup",
-  "version": "0.2.2",
+  "version": "0.3.0",
   "description": "",
   "module": "lib/index.js",
   "main": "lib/index.js",
@@ -37,6 +37,7 @@
     "@babel/plugin-proposal-optional-chaining": "^7.16.5",
     "@babel/preset-env": "^7.16.5",
     "@babel/preset-typescript": "^7.16.5",
+    "@ps-aux/cibs": "^0.6.3",
     "@types/jest": "^27.0.3",
     "@types/jest-when": "^2.7.4",
     "@types/node": "^17.0.5",
@@ -71,7 +72,7 @@
   },
   "dependencies": {
     "@hapi/joi": "^17.1.1",
-    "@ps-aux/nclif": "^0.0.6-alpha.2",
+    "@ps-aux/nclif": "^0.0.6-alpha.3",
     "@types/hapi__joi": "^17.1.8",
     "axios": "^0.24.0",
     "handlebars": "^4.7.7",