@ps-aux/nodebup 0.8.0 → 0.9.1

package/lib/cli/app.js

@@ -101,14 +101,22 @@ const createApp = () => _nclif.CliApp.of({
 
 exports.createApp = createApp;
 const restic = (0, _nclif.cmdGroup)({
+  options: singleStorageOptions,
   commands: {
     'init-repo': (0, _nclif.cmd)({
-      options: singleStorageOptions,
       run: (_, c) => c.get(_ResticController.ResticController).initRepo()
     }),
     snapshots: (0, _nclif.cmd)({
-      options: singleStorageOptions,
       run: (_, c, p) => c.get(_ResticController.ResticController).listSnapshots(p.stdout)
+    }),
+    cmd: (0, _nclif.cmd)({
+      positionals: [{
+        name: 'cmd',
+        required: true
+      }],
+      run: ({
+        cmd
+      }, c, p) => c.get(_ResticController.ResticController).runResticCmd(cmd, p.stdout)
     })
   }
 });
@@ -126,9 +134,11 @@ const pg = (0, _nclif.cmdGroup)({
   }],
   commands: {
     backup: (0, _nclif.cmd)({
+      options: backupOptions,
       run: (inp, c) => c.get(_PgBackupController.PgBackupController).backup(inp)
     }),
     restore: (0, _nclif.cmd)({
+      options: restoreOptions,
       run: (inp, c) => c.get(_PgBackupController.PgBackupController).restore(inp)
     })
   }

package/lib/storage/restic/ResticClient.js

@@ -34,6 +34,12 @@ class ResticClient {
       });
     });
 
+    _defineProperty(this, "runCmd", cmd => {
+      return this.shell.execAndReturnBuffer(`restic ${cmd}`, {
+        env: this.env()
+      });
+    });
+
     _defineProperty(this, "backup", (cwd, from, tags = []) => {
       this.log.debug(`Running backup for repo=${this.url}`);
       let cmd = `restic backup ${from.str()}`;
@@ -56,12 +62,12 @@ class ResticClient {
     _defineProperty(this, "forget", () => {
       this.log.debug(`Pruning repo=${this.url}`);
       const cfg = {
-        hourly: 12,
+        hourly: 6,
         daily: 7,
         weekly: 8,
-        monthly: 24
+        monthly: 12
       };
-      this.shell.exec(`restic forget --prune ` + `--tag '' ` + // Ignore the tagged snapshots
+      this.shell.exec(`restic forget --prune ` + `--group-by tags ` + // The paths are often different when using tmp dirs
       `--keep-hourly ${cfg.hourly}  --keep-daily ${cfg.daily} ` + `--keep-weekly ${cfg.weekly} --keep-monthly ${cfg.monthly}`, {
         env: this.env()
       });

package/lib/storage/restic/ResticController.js

@@ -36,11 +36,12 @@ let ResticController = (_dec = (0, _inversify.injectable)(), _dec2 = function (t
     _defineProperty(this, "client", () => {
       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);
       return this.restFact.createClient(props);
     });
 
     _defineProperty(this, "initRepo", () => {
+      const props = this.storageConfigProvider.provide();
+      this.log.info(`Initializing Restic repo ${props.repo}`);
       this.client().prepareRepo();
     });
 
@@ -48,6 +49,11 @@ let ResticController = (_dec = (0, _inversify.injectable)(), _dec2 = function (t
       const res = this.client().snapshots();
       print(JSON.stringify(res, null, 4));
     });
+
+    _defineProperty(this, "runResticCmd", (cmd, print) => {
+      const res = this.client().runCmd(cmd);
+      print(res.toString());
+    });
   }
 
 }) || _class) || _class) || _class) || _class);

package/package.json

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