@ps-aux/nodebup 0.12.0 → 0.12.1

package/lib/bup/dir/DirBackupController.js

@@ -23,22 +23,22 @@ let DirBackupController = (_dec = (0, _inversify.injectable)(), _dec2 = Reflect.
 
     _defineProperty(this, "log", (0, _logging.classObjLog)(this));
 
-    _defineProperty(this, "backup", inp => {
+    _defineProperty(this, "backup", async inp => {
       const storage = this.storageProvider.provide();
 
       const path = _Path.AbsPath.from(inp.path);
 
       this.log.info(`Backing up from ${path} to '${storage}'`);
-      storage.store(path);
+      await storage.store(path);
     });
 
-    _defineProperty(this, "restore", inp => {
+    _defineProperty(this, "restore", async inp => {
       const storage = this.storageProvider.provide();
 
       const path = _Path.AbsPath.from(inp.path);
 
       this.log.info(`Restoring from '${storage}' to ${path}`);
-      storage.restore(path);
+      await storage.restore(path);
     });
   }
 

package/lib/bup/pg/PgBackupController.js

@@ -102,7 +102,7 @@ let PgBackupController = (_dec = (0, _inversify.injectable)(), _dec2 = Reflect.m
           stderr: o => this.log.info('gzip: ' + o)
         });
         this.log.info('Uploading');
-        storage.store(dir);
+        await storage.store(dir);
       });
     });
 
@@ -131,7 +131,7 @@ let PgBackupController = (_dec = (0, _inversify.injectable)(), _dec2 = Reflect.m
       await this.fs.inTmpDir('pg-restore', async dirStr => {
         const dir = _Path.AbsPath.from(dirStr);
 
-        storage.restore(dir); // TODO check if the dir contains the with the expected name
+        await storage.restore(dir); // TODO check if the dir contains the with the expected name
         // TODO add e2e test for docker
 
         this.log.info('Backup dir restored');

package/lib/cli/app.js

@@ -45,6 +45,7 @@ const singleStorageOptions = [storageNameOpt, {
 }];
 const backupTagOption = {
   name: 'backup-tag',
+  fromConfig: 'backup.tag',
   convertCase: true
 };
 const backupOptions = [backupTagOption];
@@ -164,6 +165,7 @@ const pg = (0, _nclif.cmdGroup)({
       options: [...backupOptions, {
         name: 'backup-name',
         convertCase: true,
+        fromConfig: 'backup.name',
         required: true
       }],
       run: (inp, c) => c.get(_PgBackupController.PgBackupController).backup(inp)

package/lib/storage/BackupStorage.js

@@ -12,15 +12,15 @@ class BackupStorage {
     this.backend = backend;
     this.props = props;
 
-    _defineProperty(this, "store", from => {
+    _defineProperty(this, "store", async from => {
       const {
         tag
       } = this.props;
       const tags = tag ? [tag] : undefined;
-      this.backend.backup(from, tags);
+      await this.backend.backup(from, tags);
     });
 
-    _defineProperty(this, "restore", to => {
+    _defineProperty(this, "restore", async to => {
       const {
         snapshotId
       } = this.props;

package/lib/storage/rclone/RcloneBackupBackend.js

@@ -17,7 +17,7 @@ class RcloneBackupBackend {
 
     _defineProperty(this, "log", (0, _logging.classObjLog)(this));
 
-    _defineProperty(this, "backup", (from, tags) => {
+    _defineProperty(this, "backup", async (from, tags) => {
       if (tags) throw new _nclif.InvalidInputError(`Rclone does not support tags`);
       this.log.info('Performing backup', {
         from
@@ -25,14 +25,14 @@ class RcloneBackupBackend {
       this.rclone.backup(from);
     });
 
-    _defineProperty(this, "restoreLatest", to => {
+    _defineProperty(this, "restoreLatest", async to => {
       this.log.info('Restoring', {
         to
       });
       this.rclone.restore(to);
     });
 
-    _defineProperty(this, "restoreSnapshot", (to, snapshotId) => {
+    _defineProperty(this, "restoreSnapshot", async (to, snapshotId) => {
       throw new _nclif.InvalidInputError(`Rclone does not support snaphosts`);
     });
   }

package/lib/storage/restic/ResticBackupBackend.js

@@ -17,18 +17,18 @@ class ResticBackupBackend {
 
     _defineProperty(this, "log", (0, _logging.classObjLog)(this));
 
-    _defineProperty(this, "backup", (from, tags = []) => {
+    _defineProperty(this, "backup", async (from, tags = []) => {
       this.log.info(`Performing backup from=${from}, tags=${tags}`);
-      this.restic.backup(from, _Path.RelativePath.from('.'), tags);
+      await this.restic.backup(from, _Path.RelativePath.from('.'), tags);
       this.restic.forget();
     });
 
-    _defineProperty(this, "restoreLatest", to => {
+    _defineProperty(this, "restoreLatest", async to => {
       this.log.info(`Restoring latest snapshot to=${to}`);
       this.restic.restore(to);
     });
 
-    _defineProperty(this, "restoreSnapshot", (to, snapshotId) => {
+    _defineProperty(this, "restoreSnapshot", async (to, snapshotId) => {
       this.log.info(`Restoring snapshot '${snapshotId}'`, {
         to
       });

package/lib/storage/restic/ResticClient.js

@@ -46,15 +46,18 @@ class ResticClient {
       });
     });
 
-    _defineProperty(this, "backup", (cwd, from, tags = []) => {
+    _defineProperty(this, "backup", async (cwd, from, tags = []) => {
       this.log.debug('Running backup for repo=%s', this.url);
       let cmd = `restic backup ${from.str()}`;
       tags.forEach(t => {
         cmd += ` --tag=${t}`;
       });
-      this.shell.exec(cmd, {
+      await this.shell.asyncExec(cmd, {
         cwd: cwd.str(),
         env: this.env()
+      }, {
+        stdout: o => this.log.trace(o),
+        stderr: o => this.log.error(o)
       });
     });
 

package/package.json

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