@ps-aux/nodebup 0.10.0 → 0.12.0

package/lib/bup/aggregate/AggregateBackupController.js

@@ -5,14 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.AggregateBackupController = 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");
@@ -25,6 +17,14 @@ var _BackupStorageProvider = require("../../storage/BackupStorageProvider");
 
 var _logging = require("../../log/logging");
 
+var _SshKeyManager = require("../../tools/ssh/SshKeyManager");
+
+var _Gpg = require("../../tools/gpg/Gpg");
+
+var _Fs = require("../../fs/Fs");
+
+var _FsSyncer = require("../../fs/fssync/FsSyncer");
+
 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; }
@@ -53,7 +53,7 @@ let AggregateBackupController = (_dec = (0, _inversify.injectable)(), _dec2 = fu
       } = aggr.sources;
 
       try {
-        this.fs.ensureDir(aggrDir);
+        await 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));

package/lib/bup/pg/PgBackupController.js

@@ -5,8 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.PgBackupController = void 0;
 
-var _Fs = require("../../fs/Fs");
-
 var _inversify = require("inversify");
 
 var _Shell = require("../../tools/shell/Shell");
@@ -19,6 +17,8 @@ var _Zipper = require("../../tools/compression/Zipper");
 
 var _logging = require("../../log/logging");
 
+var _Fs = require("../../fs/Fs");
+
 var _dec, _dec2, _dec3, _class, _class2, _temp;
 
 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; }
@@ -59,61 +59,123 @@ let PgBackupController = (_dec = (0, _inversify.injectable)(), _dec2 = Reflect.m
 
     _defineProperty(this, "getVersion", version => version || PgBackupController.defaultPgVersion);
 
-    _defineProperty(this, "outFileName", 'backup.sql');
-
     _defineProperty(this, "backup", async ({
       pgUrl,
-      pgVersion
+      pgBinDir,
+      backupName
     }) => {
       const storage = this.storageBackendProvider.provide();
-      const version = this.getVersion(pgVersion); // TODO validate url
+      const connParams = parseConnectionUrl(pgUrl); // TODO validate url
 
-      this.log.info(`Backing up Postgres database, version=${version}`);
-      const connParams = parseConnectionUrl(pgUrl);
-      const pass = connParams.password; // if (3 > 2)
-      // return
+      this.log.info(`Backing up Postgres database @${connParams.host}`);
 
-      await this.fs.inTmpDir('pg-backup', async dir => {
-        const outputDir = _Path.AbsPath.from(dir);
+      const dir = _Path.AbsPath.from(`/var/backup/bup/${backupName}/postgres`); // const dir = AbsPath.from('/var/foo')
 
-        this.log.info('Processing Postgres backup');
-        const bashCmds = [`echo "*:*:*:*:${pass}" > ~/.pgpass`, `chmod 400 ~/.pgpass`, `pg_dumpall -d ${pgUrl}`]; // Don't forget that this itself might be run in docker
+
+      await this.fs.inNewDir(dir, async () => {
+        // const outputDir = AbsPath.from(dir)
+        this.log.info('Processing Postgres backup'); // Don't forget that this itself might be run in docker
         // therefore volume mounts are not usable (will apply to the location at host)
 
-        const zipOutPath = outputDir.resolve(`pg-backup-${this.now()}.sql.gz`);
-        this.log.info(`Dumping database to ${zipOutPath.str()}`);
-        await this.sh.exec(`docker run --rm --network host ` + `postgres:${version} ` + `bash -c '${bashCmds.join(' && ')}' | gzip> ${zipOutPath.str()}`);
+        const file = PgBackupController.dumpFileName;
+        this.log.info(`Dumping data into ${file}`);
+        let cmd = `pg_dumpall -d ${pgUrl} `;
+
+        if (pgBinDir) {
+          cmd = this.addPgBinDir(cmd, pgBinDir);
+        }
+
+        await this.sh.asyncExec(`${cmd} > ${file}`, {
+          env: {
+            PGPASSWORD: connParams.password
+          },
+          cwd: dir.str()
+        }, {
+          stdout: o => this.log.trace(o),
+          stderr: o => this.log.error(o)
+        });
+        this.log.info(`Compressing ${file}`);
+        await this.sh.asyncExec(`gzip -v ${file}`, {
+          cwd: dir.str()
+        }, {
+          stdout: o => this.log.trace('gzip: ' + o),
+          stderr: o => this.log.info('gzip: ' + o)
+        });
         this.log.info('Uploading');
-        storage.store(_Path.AbsPath.from(dir));
+        storage.store(dir);
       });
     });
 
+    _defineProperty(this, "dumpFromDockerCmd", (pass, pgUrl, version) => {
+      const bashCmds = [`echo "*:*:*:*:${pass}" > ~/.pgpass`, `chmod 400 ~/.pgpass`, `pg_dumpall -d ${pgUrl}`]; // Restore docker command
+      // this.sh.exec(
+      //     `gzip --decompress --stdout ${zipFile.str()} | docker run --network host -i ` +
+      //     `-e PGPASSWORD=${con.password} ` +
+      //     `postgres:${version} ` +
+      //     `psql ${connectionArgs} -v ON_ERROR_STOP=0`
+      // )
+      // TODO consider pulling the docker images first so the Docke daremon info messages about container pulling are not logged as errors
+
+      return `docker run --rm --network host postgres:${version} ` + `bash -c '${bashCmds.join(' && ')}'`;
+    });
+
     _defineProperty(this, "restore", async ({
       pgUrl,
-      pgVersion
+      pgBinDir
     }) => {
-      const version = this.getVersion(pgVersion);
+      // const version = this.getVersion(pgVersion)
       const storage = this.storageBackendProvider.provide(); // To validate
 
       const con = parseConnectionUrl(pgUrl);
-      this.log.info(`Restoring Postgres database, version=${version}`);
+      this.log.info(`Restoring Postgres database`);
       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
         // TODO add e2e test for docker
 
-        const zipFile = this.fs.listFiles(dir)[0];
-        this.log.debug('Will run psql import from %s', zipFile.str()); // Database is set to 'postgres' so that also users which don't have db created can use db-less URL
+        this.log.info('Backup dir restored');
+        const file = PgBackupController.dumpFileName;
+        const zipFile = file + '.gz';
+        const zipPath = this.fs.listFiles(dir).find(n => n.basename() === zipFile);
+        if (!zipPath) throw new Error(`Expected to find file ${zipFile} in the restore data`);
+        this.log.info(`Decompressing ${zipFile}`);
+        await this.sh.asyncExec(`gzip --decompress -v ${zipFile}`, {
+          cwd: dir.str()
+        }, {
+          stdout: o => this.log.trace('gzip: ' + o),
+          stderr: o => this.log.info('gzip: ' + o)
+        }); // Database is set to 'postgres' so that also users which don't have db created can use db-less URL
         // Restoring user needs to have the admin access anyway
 
         const connectionArgs = `-h ${con.host} -p ${con.port} -U ${con.username} -d postgres`; // Don't forget that this itself might be run in docker
         // therefore volume mounts are not usable (will apply to the location at host)
 
-        this.sh.exec(`gzip --decompress --stdout ${zipFile.str()} | docker run --network host -i ` + `-e PGPASSWORD=${con.password} ` + `postgres:${version} ` + `psql ${connectionArgs} -v ON_ERROR_STOP=0`);
+        let cmd = `psql ${connectionArgs} -v ON_ERROR_STOP=0 < ${file}`;
+
+        if (pgBinDir) {
+          cmd = this.addPgBinDir(cmd, pgBinDir);
+        }
+
+        await this.sh.asyncExec(cmd, {
+          cwd: dir.str(),
+          env: {
+            PGPASSWORD: con.password
+          }
+        }, {
+          stdout: o => this.log.trace(o),
+          stderr: o => this.log.error(o)
+        });
+        this.log.info(`Data successfully inserted into database @${con.host}`);
       });
     });
+
+    _defineProperty(this, "addPgBinDir", (cmd, pgBinDir) => {
+      this.log.info(`Using PG bin dir ${pgBinDir}`);
+      this.fs.ensureIsDir(_Path.AbsPath.from(pgBinDir));
+      return pgBinDir + '/' + cmd;
+    });
   }
 
-}, _defineProperty(_class2, "defaultPgVersion", '14.2'), _temp)) || _class) || _class) || _class);
+}, _defineProperty(_class2, "defaultPgVersion", '14.2'), _defineProperty(_class2, "dumpFileName", 'pg-dump.sql'), _temp)) || _class) || _class) || _class);
 exports.PgBackupController = PgBackupController;

package/lib/cli/app.js

@@ -53,55 +53,63 @@ const restoreOptions = [backupTagOption, {
   convertCase: true
 }];
 
-const createApp = () => _nclif.CliApp.of({
-  commands: {
-    dir: (0, _nclif.cmdGroup)({
-      options: singleStorageOptions,
-      commands: {
-        backup: (0, _nclif.cmd)({
-          description: 'Backup a dir to the given storage',
-          options: backupOptions,
-          positionals: [{
-            name: 'path',
-            required: true
-          }],
-          run: (cmd, c) => c.get(_DirBackupController.DirBackupController).backup(cmd)
-        }),
-        restore: (0, _nclif.cmd)({
-          description: 'Restore the storage to the given dir',
-          options: restoreOptions,
-          positionals: [{
-            name: 'path',
-            required: true
-          }],
-          run: (cmd, c) => c.get(_DirBackupController.DirBackupController).restore(cmd)
-        })
-      }
-    }),
-    aggr: (0, _nclif.cmdGroup)({
-      commands: {
-        backup: (0, _nclif.cmd)({
-          description: 'Run backup',
-          options: [storageNameOpt],
-          positionals: [{
-            name: 'aggregateName',
-            required: true
-          }],
-          run: (a, c) => c.get(_AggregateBackupController.AggregateBackupController).backup(a.aggregateName)
-        })
-      }
-    }),
-    restic,
-    pg
-  }
-}).envConfig('NODEBUP').addObjectConfig(pwd => (0, _Config.readConfig)(pwd)).context(({
-  config,
-  inputs
-}) => (0, _Context.createContext)(config, inputs));
+const createApp = () => {
+  const p = _nclif.CliApp.of({
+    binName: 'bup',
+    description: 'Data backup utility'
+  }, {
+    commands: {
+      dir: (0, _nclif.cmdGroup)({
+        options: singleStorageOptions,
+        commands: {
+          backup: (0, _nclif.cmd)({
+            description: 'Backup a dir to the given storage',
+            options: backupOptions,
+            positionals: [{
+              name: 'path',
+              required: true
+            }],
+            run: (cmd, c) => c.get(_DirBackupController.DirBackupController).backup(cmd)
+          }),
+          restore: (0, _nclif.cmd)({
+            description: 'Restore the storage to the given dir',
+            options: restoreOptions,
+            positionals: [{
+              name: 'path',
+              required: true
+            }],
+            run: (cmd, c) => c.get(_DirBackupController.DirBackupController).restore(cmd)
+          })
+        }
+      }),
+      aggr: (0, _nclif.cmdGroup)({
+        commands: {
+          backup: (0, _nclif.cmd)({
+            description: 'Run backup',
+            options: [storageNameOpt],
+            positionals: [{
+              name: 'aggregateName',
+              required: true
+            }],
+            run: (a, c) => c.get(_AggregateBackupController.AggregateBackupController).backup(a.aggregateName)
+          })
+        }
+      }),
+      restic,
+      pg
+    }
+  }).envConfig('NODEBUP').addObjectConfig(pwd => (0, _Config.readConfig)(pwd)).context(({
+    config,
+    inputs
+  }) => (0, _Context.createContext)(config, inputs));
+
+  return p;
+};
 
 exports.createApp = createApp;
 const restic = (0, _nclif.cmdGroup)({
   options: singleStorageOptions,
+  description: 'Restic commands',
   commands: {
     'init-repo': (0, _nclif.cmd)({
       run: (_, c) => c.get(_ResticController.ResticController).initRepo()
@@ -109,6 +117,17 @@ const restic = (0, _nclif.cmdGroup)({
     snapshots: (0, _nclif.cmd)({
       run: (_, c, p) => c.get(_ResticController.ResticController).listSnapshots(p.stdout)
     }),
+    env: (0, _nclif.cmd)({
+      run: ({
+        export: doExport
+      }, c) => c.get(_ResticController.ResticController).printEnv(doExport),
+      options: [{
+        name: 'export',
+        type: 'boolean',
+        description: 'Add "export" statement to each env variable inoutput',
+        convertCase: true
+      }]
+    }),
     cmd: (0, _nclif.cmd)({
       positionals: [{
         name: 'cmd',
@@ -121,20 +140,32 @@ const restic = (0, _nclif.cmdGroup)({
   }
 });
 const pg = (0, _nclif.cmdGroup)({
+  description: 'Postgres backup commands',
   options: [...singleStorageOptions, {
     name: 'pg-url',
+    description: 'Postgres URL',
     convertCase: true,
     fromConfig: 'pg.url',
     required: true
   }, {
-    name: 'pg-version',
+    name: 'pg-bin-dir',
+    description: 'A directory with Postgres binaries (if the ones on the path should not be used)',
     convertCase: true,
-    fromConfig: 'pg.version',
-    description: `Postgres version - default is ${_PgBackupController.PgBackupController.defaultPgVersion}`
-  }],
+    fromConfig: 'pg.bin-dir'
+  } // {
+  //     name: 'pg-version',
+  //     convertCase: true,
+  //     fromConfig: 'pg.version',
+  //     description: `Postgres version - default is ${PgBackupController.defaultPgVersion}`
+  // }
+  ],
   commands: {
     backup: (0, _nclif.cmd)({
-      options: backupOptions,
+      options: [...backupOptions, {
+        name: 'backup-name',
+        convertCase: true,
+        required: true
+      }],
       run: (inp, c) => c.get(_PgBackupController.PgBackupController).backup(inp)
     }),
     restore: (0, _nclif.cmd)({

package/lib/config/Config.js

@@ -5,16 +5,16 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.readConfig = void 0;
 
+var _expandAndCreatePath = require("./expandAndCreatePath");
+
+var _Fs = require("../fs/Fs");
+
 var _Path = require("../fs/path/Path");
 
 var _readYaml = require("../fs/readYaml");
 
 var _validateConfigAgainstSchema = require("./validateConfigAgainstSchema");
 
-var _expandAndCreatePath = require("./expandAndCreatePath");
-
-var _Fs = require("../fs/Fs");
-
 const expandPaths = (cfg, exp) => {
   cfg.aggregates.forEach(a => {
     a.sources.file.forEach(f => {
@@ -37,7 +37,8 @@ const readFromFile = cwd => {
   const cfg = fs.exists(cfgPath) ? (0, _readYaml.readYaml)(cfgPath.str()) : {
     aggregates: [],
     storage: []
-  };
+  }; // eslint-disable-next-line no-undef
+
   (0, _validateConfigAgainstSchema.validateConfigAgainstSchema)(cfg);
   return cfg;
 };

package/lib/config/expandAndCreatePath.js

@@ -5,12 +5,12 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.expandStrPath = exports.expandAndCreatePath = void 0;
 
-var _Path = require("../fs/path/Path");
-
 var _os = _interopRequireDefault(require("os"));
 
 var _path = _interopRequireDefault(require("path"));
 
+var _Path = require("../fs/path/Path");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 const expandStrPath = (path, pwd) => {

package/lib/ctx/Context.js

@@ -5,16 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.createContext = void 0;
 
-var _Shell = require("../tools/shell/Shell");
-
-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("./ContextSymbols");
@@ -39,6 +29,16 @@ var _PgBackupController = require("../bup/pg/PgBackupController");
 
 var _Zipper = require("../tools/compression/Zipper");
 
+var _FsSyncer = require("../fs/fssync/FsSyncer");
+
+var _Gpg = require("../tools/gpg/Gpg");
+
+var _Shell = require("../tools/shell/Shell");
+
+var _Fs = require("../fs/Fs");
+
+var _SshKeyManager = require("../tools/ssh/SshKeyManager");
+
 const createContext = (cfg, inp) => {
   const c = new _inversify.Container();
   c.bind(_ContextSymbols.AppConfig_).toConstantValue(cfg);

package/lib/fs/Fs.js

@@ -7,9 +7,9 @@ exports.Fs = void 0;
 
 var _fs = _interopRequireDefault(require("fs"));
 
-var _path = _interopRequireDefault(require("path"));
+var _promises = _interopRequireDefault(require("fs/promises"));
 
-var _Path = require("./path/Path");
+var _path = _interopRequireDefault(require("path"));
 
 var _inversify = require("inversify");
 
@@ -19,6 +19,8 @@ var _os = _interopRequireDefault(require("os"));
 
 var _logging = require("../log/logging");
 
+var _Path = require("./path/Path");
+
 var _dec, _dec2, _dec3, _class;
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -73,10 +75,23 @@ let Fs = (_dec = (0, _inversify.injectable)(), _dec2 = Reflect.metadata("design:
       try {
         await withDir(dir);
       } finally {
+        // TODO handle if not exists?
         this.rmDir(_Path.AbsPath.from(dir));
       }
     });
 
+    _defineProperty(this, "inNewDir", async (path, withDir) => {
+      let created = false;
+
+      try {
+        await this.ensureDir(path, true);
+        created = true;
+        await withDir();
+      } finally {
+        if (created) this.rmDir(path);
+      }
+    });
+
     _defineProperty(this, "mkTmpDir", name => {
       const dir = _fs.default.mkdtempSync(_path.default.resolve(_os.default.tmpdir(), name));
 
@@ -97,7 +112,7 @@ let Fs = (_dec = (0, _inversify.injectable)(), _dec2 = Reflect.metadata("design:
       return JSON.parse(file);
     });
 
-    _defineProperty(this, "ensureDir", path => {
+    _defineProperty(this, "ensureDir", async (path, mustBeEmpty = false) => {
       if (!this.exists(path)) {
         this.log.trace('Dir %s does not exist. Wil be created', path.str());
 
@@ -106,13 +121,18 @@ let Fs = (_dec = (0, _inversify.injectable)(), _dec2 = Reflect.metadata("design:
         });
       } else {
         if (this.isFile(path)) throw new Error(`${path.str()} exists and is not a directory`);
+
+        if (mustBeEmpty) {
+          const content = await _promises.default.readdir(path.str());
+          if (content.length) throw new Error(`${path.str()} exists but is not empty`);
+        }
       }
     });
 
-    _defineProperty(this, "ensureParentDir", path => {
+    _defineProperty(this, "ensureParentDir", async path => {
       const parent = path.parent();
       if (this.exists(parent)) return;
-      this.ensureDir(parent);
+      await this.ensureDir(parent);
     });
 
     _defineProperty(this, "exists", path => _fs.default.existsSync(path.str()));

package/lib/fs/fssync/FsSyncer.js

@@ -34,7 +34,7 @@ let FsSyncer = (_dec = (0, _inversify.injectable)(), _dec2 = Reflect.metadata("d
       if (this.fs.isFile(from)) this.syncFile(from, to);else this.syncDirs(from, to);
     });
 
-    _defineProperty(this, "syncDirs", (from, to) => {
+    _defineProperty(this, "syncDirs", async (from, to) => {
       this.fs.ensureIsDir(from);
       this.log.info('Syncing dir', from.str(), '==>', to.str());
       const fromPath = toUnixDirString(from);

package/lib/storage/rclone/RcloneClient.spec.js

@@ -15,11 +15,12 @@ var _b2TestConfig = require("../../../test/b2TestConfig");
 var _testHelper = require("../../../test/testHelper");
 
 describe('RcloneClient', () => {
-  const getRestoreDir = (0, _test.testdataDirBuilder)('b2/restore');
+  // TODO clean up dir locations more
+  const testData = (0, _test.testdataDirBuilder)('rclone');
   describe('local', () => {
     const backupDir = (0, _test.testDir)('backup/1');
-    const restoreDir = getRestoreDir('local');
-    const storeDir = (0, _test.testdataDir)('b2/store');
+    const restoreDir = testData('local');
+    const storeDir = testData('store');
     const cfg = {
       type: 'local',
       location: (0, _test.testdataDir)(storeDir),
@@ -68,11 +69,11 @@ describe('RcloneClient', () => {
         password: 'foo123'
       }
     }, new _Shell.Shell());
-    const restoreDir = getRestoreDir('b2');
+    const restoreDir = testData('b2');
     afterAll(() => {
       (0, _testHelper.cleanDir)(restoreDir);
     });
-    it('push adn restore data', () => {
+    it('push and restore data', () => {
       sut.backup(_Path.AbsPath.from(backupDir));
       sut.restore(_Path.AbsPath.from(restoreDir));
       const res = (0, _dirCompare.compareSync)(backupDir, restoreDir);

package/lib/storage/restic/ResticClient.js

@@ -30,10 +30,13 @@ class ResticClient {
 
     _defineProperty(this, "log", (0, _logging.classObjLog)(this));
 
-    _defineProperty(this, "prepareRepo", () => {
+    _defineProperty(this, "prepareRepo", async () => {
       this.log.info('Preparing a restic repo at %s', this.url);
-      this.shell.exec(`restic init`, {
+      await this.shell.asyncExec(`restic init`, {
         env: this.env()
+      }, {
+        stdout: o => this.log.trace(o),
+        stderr: o => this.log.error(o)
       });
     });
 
@@ -77,14 +80,17 @@ class ResticClient {
     });
 
     _defineProperty(this, "snapshots", () => {
-      this.log.debug('Listing snapshots of repo=%', this.url);
+      this.log.debug(`Listing snapshots of repo=${this.url}`);
       const out = this.shell.execAndReturnString(`restic snapshots --json`, {
         env: this.env()
       });
       const res = JSON.parse(out);
       return res.map(r => ({
         id: r.id,
+        short_id: r.short_id,
         time: new Date(r.time),
+        paths: r.paths,
+        hostname: r.hostname,
         tags: r.tags
       }));
     });

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

@@ -30,8 +30,9 @@ describe('ResticClient', () => {
       (0, _testHelper.cleanDir)(repoDir);
       (0, _testHelper.cleanDir)(restoreDir);
     });
-    it('create repo', () => {
-      sut.prepareRepo();
+    it('create repo', async () => {
+      await sut.prepareRepo();
+      console.log('repo created');
     });
     it('push data & forget', () => {
       const from = _Path.AbsPath.from(backupDir);
@@ -76,7 +77,7 @@ describe('ResticClient', () => {
     afterAll(() => {
       (0, _testHelper.cleanDir)(restoreDir);
     });
-    it('push adn restore data', () => {
+    it('push and restore data', () => {
       // sut.prepareRepo()
       sut.backup(_Path.AbsPath.from(backupDir), _Path.RelativePath.from('.'));
       sut.restore(_Path.AbsPath.from(restoreDir));

package/lib/storage/restic/ResticController.js

@@ -39,10 +39,11 @@ let ResticController = (_dec = (0, _inversify.injectable)(), _dec2 = function (t
       return this.restFact.createClient(props);
     });
 
-    _defineProperty(this, "initRepo", () => {
+    _defineProperty(this, "initRepo", async () => {
       const props = this.storageConfigProvider.provide();
       this.log.info(`Initializing Restic repo ${props.repo}`);
-      this.client().prepareRepo();
+      await this.client().prepareRepo();
+      this.log.info('Repo initialized');
     });
 
     _defineProperty(this, "listSnapshots", print => {
@@ -54,6 +55,15 @@ let ResticController = (_dec = (0, _inversify.injectable)(), _dec2 = function (t
       const res = this.client().runCmd(cmd);
       print(res.toString());
     });
+
+    _defineProperty(this, "printEnv", (doExport = false) => {
+      const env = this.client().env();
+      const out = Object.entries(env).map(([k, v]) => `${k}=${v}`).map(line => {
+        if (!doExport) return line;
+        return `export ${line}`;
+      }).join('\n');
+      console.log(out);
+    });
   }
 
 }) || _class) || _class) || _class) || _class);

package/lib/tools/shell/Shell.js

@@ -48,7 +48,7 @@ let Shell = (_dec = (0, _inversify.injectable)(), _dec(_class = class Shell {
       });
     });
 
-    _defineProperty(this, "asyncExec", (cmd, onStdout, ops = {}) => {
+    _defineProperty(this, "asyncExec", (cmd, ops = {}, on) => {
       let onDone;
       let onError;
       const p = new Promise((res, rej) => {
@@ -60,8 +60,8 @@ let Shell = (_dec = (0, _inversify.injectable)(), _dec(_class = class Shell {
         cwd: ops.cwd,
         env: ops.env
       });
-      r.stdout.on('data', onStdout);
-      r.stderr.on('data', data => console.error(data.toString()));
+      r.stdout.on('data', o => on.stdout(o.toString()));
+      r.stderr.on('data', o => on.stderr(o.toString()));
       r.on('exit', status => {
         if (status === 0) onDone();else onError(new Error('Exited with non zero return code: ' + status));
       });

package/lib/tools/shell/Shell.test.js

@@ -14,8 +14,13 @@ it.skip('execAndReturnStream', async () => {
   expect(() => sh.execAndReturnString(bigStdOutCme())).toThrow('spawnSync /bin/sh ENOBUFS'); //
 
   let out = '';
-  await sh.asyncExec(bigStdOutCme(), data => {
-    out = data.toString().trim();
+  await sh.asyncExec(bigStdOutCme(), {}, {
+    stdout: data => {
+      out = data.toString().trim();
+    },
+    stderr: data => {
+      console.error(data);
+    }
   });
   expect(out).toEndWith('Done');
 }, 5000_000);

package/lib/tools/ssh/SshKeyManager.js

@@ -5,14 +5,14 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.SshKeyManager = void 0;
 
-var _Fs = require("../../fs/Fs");
-
-var _Path = require("../../fs/path/Path");
-
 var _os = _interopRequireDefault(require("os"));
 
 var _inversify = require("inversify");
 
+var _Fs = require("../../fs/Fs");
+
+var _Path = require("../../fs/path/Path");
+
 var _dec, _dec2, _dec3, _class;
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

package/package.json

@@ -1,15 +1,16 @@
 {
   "name": "@ps-aux/nodebup",
-  "version": "0.10.0",
+  "version": "0.12.0",
   "description": "",
   "module": "lib/index.js",
   "main": "lib/index.js",
   "scripts": {
+    "run": "ts-node ./src/cli/bin.ts",
     "build": "rm -rf build && babel --extensions '.ts,.js,.md' src -d lib src",
     "publish:local": "npm run build && chmod +x lib/cli/bin.js && npm link",
     "pub": "npm publish --access public",
-    "test": "jest",
-    "test:ci": "jest --group=-no-ci",
+    "test": "jest --runInBand",
+    "test:ci": "jest --group=-no-ci --runInBand",
     "tc": "tsc --noEmit",
     "format": "prettier \"**/*.{js,ts,tsx}\" --write",
     "build-n-run": "npm run build && ",
@@ -68,6 +69,7 @@
     "pg": "^8.7.3",
     "prettier": "^2.5.1",
     "ts-jest": "^27.1.2",
+    "ts-node": "^10.9.2",
     "typescript": "^4.5.4"
   },
   "lint-staged": {
@@ -78,7 +80,7 @@
   },
   "dependencies": {
     "@hapi/joi": "^17.1.1",
-    "@ps-aux/nclif": "^0.0.7-alpha.1",
+    "@ps-aux/nclif": "^0.9.0-alpha5",
     "@types/hapi__joi": "^17.1.8",
     "axios": "^0.24.0",
     "handlebars": "^4.7.7",