@frakjs/frak 0.2.0 → 0.3.0

package/.prettierrc

@@ -0,0 +1,8 @@
+{
+    "tabSize": 4,
+    "singleQuote": true,
+    "semi": true,
+    "trailingComma": "es5",
+    "printWidth": 100,
+    "bracketSpacing": true
+}

package/bin/frak.js

@@ -20,15 +20,11 @@ import * as date from '../src/date.js';
  * @param {String} env
  */
 async function tryLoadConfig(env) {
-    try {
-        await loadConfig(env);
-    } catch (e) {
+    return await loadConfig(env).catch((e) => {
         console.error(ansi.red(e.message));
 
         process.exit(1);
-    }
-
-    return;
+    });
 }
 
 /**
@@ -55,20 +51,22 @@ async function main(args) {
 
     debug('parsed:', { command, options });
 
-    // Initialize Frak in the current directory
     if (command === 'init') {
+        // Initialize Frak in the current directory
         const configPath = path.join(process.cwd(), 'frak.config.js');
 
         if (!existsSync(configPath)) {
-            writeFileSync(configPath, `export default ${JSON.stringify({ server: 'example.com', root: '/var/www/html' }, null, 4)}`);
+            writeFileSync(
+                configPath,
+                `export default ${JSON.stringify({ server: 'example.com', root: '/var/www/html' }, null, 4)}`
+            );
             console.info(ansi.green('Configuration file created: frak.config.js'));
         } else {
             console.error(ansi.red('Frak is already initialized in this directory.'));
         }
-
-    // Start a console session, or run the provided command on
-    // the remote server.
     } else if (command === 'console') {
+        // Start a console session, or run the provided command on
+        // the remote server.
         await tryLoadConfig(options.env);
 
         if (!config.server) {
@@ -77,14 +75,16 @@ async function main(args) {
         }
 
         try {
-            const cmd = options.command ?? '\\$SHELL -l -i';
+            const cmd = options.command || '\\$SHELL -l -i';
 
-            execSync(`ssh -t ${config.server} -- cd ${config.root} \\&\\& ${cmd}`, { stdio: 'inherit' });
+            execSync(`ssh -t ${config.server} -- cd ${config.root} \\&\\& ${cmd}`, {
+                stdio: 'inherit',
+            });
         } catch (e) {
-            debug(e)
+            debug(e);
         }
-    // Show the differences between local files and remote server
     } else if (command === 'diff') {
+        // Show the differences between local files and remote server
         await tryLoadConfig(options.env);
 
         try {
@@ -98,9 +98,8 @@ async function main(args) {
 
             console.error(e.message);
         }
-
-    // Push or pull changes to remote server
     } else if (command === 'push' || command === 'pull') {
+        // Push or pull changes to remote server
         await tryLoadConfig(options.env);
 
         // Execute dry-run
@@ -115,7 +114,9 @@ async function main(args) {
             console.log('');
         }
 
-        const proceed = await cli.agree(ansi.yellow('The above actions will be taken. Continue? (This cannot be undone): '));
+        const proceed = await cli.agree(
+            ansi.yellow('The above actions will be taken. Continue? (This cannot be undone): ')
+        );
 
         if (!proceed) {
             process.exit(1);
@@ -125,14 +126,13 @@ async function main(args) {
         let patch = '';
 
         if (command === 'push') {
-            try {
-                patch = await diff(output, { interactive: false });
-            /* node:coverage disable */
-            } catch (e) {
-                console.error(e);
-
-                process.exit(1);
-            }
+            patch = await diff(output, { interactive: false })
+                /* node:coverage disable */
+                .catch((e) => {
+                    console.error(e);
+
+                    process.exit(1);
+                });
             /* node:coverage enable */
         }
 
@@ -145,7 +145,11 @@ async function main(args) {
         // Place patch file in backup dir
         if (command === 'push') {
             const hash = sha256(patch).slice(0, 7);
-            const copy = spawn('ssh', [config.server, '--', `cat > '${config.root || '.'}/${backupPath}/${hash}.patch'`]);
+            const copy = spawn('ssh', [
+                config.server,
+                '--',
+                `cat > '${config.root || '.'}/${backupPath}/${hash}.patch'`,
+            ]);
 
             copy.stdout.on('data', (data) => debug('' + data));
             copy.stderr.on('data', (data) => debug('' + data));
@@ -158,13 +162,12 @@ async function main(args) {
 
             debug({ command: config.after });
 
-            try {
-                await ssh.exec(config.after, { server: config.server, root: config.root });
-            /* node:coverage disable */
-            } catch (e) {
-                debug(e);
-            }
-            /* node:coverage enable */
+            await ssh
+                .exec(config.after, {
+                    server: config.server,
+                    root: config.root,
+                })
+                .catch(debug);
         }
 
         // TODO Webhook
@@ -179,13 +182,16 @@ async function main(args) {
         const grep = {
             additions: `grep -e '^+' "$NAME"/*.patch | grep -v '^+++' | wc -l`,
             deletions: `grep -e '^-' "$NAME"/*.patch | grep -v '^---' | wc -l`,
-        }
+        };
         const ls = `stat --format='%Y %n' .backups/* | sort -r`;
 
-        const list = ssh.exec(`${ls} | xargs -I {} sh -c 'TIMESTAMP=$(echo {} | cut -d" " -f1); NAME=$(echo {} | cut -d" " -f2-); echo $TIMESTAMP${delimeter}$NAME${delimeter}$(${grep.additions})${delimeter}$(${grep.deletions})'`, { quiet: true, server: config.server, root: config.root });
+        const list = ssh.exec(
+            `${ls} | xargs -I {} sh -c 'TIMESTAMP=$(echo {} | cut -d" " -f1); NAME=$(echo {} | cut -d" " -f2-); echo $TIMESTAMP${delimeter}$NAME${delimeter}$(${grep.additions})${delimeter}$(${grep.deletions})'`,
+            { quiet: true, server: config.server, root: config.root }
+        );
         let backups = '';
 
-        list.stdout.on('data', data => backups += data);
+        list.stdout.on('data', (data) => (backups += data));
 
         await list;
 
@@ -201,17 +207,22 @@ async function main(args) {
             {
                 header: 'Changes',
                 width: 30,
-            }
+            },
         ]);
 
-        backups.trim().split(/\n/).forEach(backup => {
-            const [ timestamp, name, additions, deletions ] = backup.split(delimeter);
-            table.row([
-                name.replace(/^.backups\//, ''),
-                date.relative(timestamp * 1000),
-                ansi.green(`${additions} addition${additions == 1 ? '' : 's'}`) + ', ' + ansi.red(`${deletions} deletion${deletions == 1 ? '' : 's'}`),
-            ]);
-        });
+        backups
+            .trim()
+            .split(/\n/)
+            .forEach((backup) => {
+                const [timestamp, name, additions, deletions] = backup.split(delimeter);
+                table.row([
+                    name.replace(/^.backups\//, ''),
+                    date.relative(timestamp * 1000),
+                    ansi.green(`${additions} addition${additions == 1 ? '' : 's'}`) +
+                        ', ' +
+                        ansi.red(`${deletions} deletion${deletions == 1 ? '' : 's'}`),
+                ]);
+            });
 
         table.print();
     } else {

package/package.json

@@ -1,15 +1,18 @@
 {
   "name": "@frakjs/frak",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "A commandline deployment tool for syncing files to remote servers.",
   "main": "index.js",
+  "engines": {
+    "node": ">=12"
+  },
   "bin": {
     "frak": "bin/frak.js"
   },
   "type": "module",
   "scripts": {
     "eslint": "eslint",
-    "test": "node --test --experimental-test-coverage"
+    "test": "node --experimental-test-coverage tests/index.test.js"
   },
   "repository": {
     "type": "git",
@@ -32,6 +35,6 @@
     "globals": "^16.3.0"
   },
   "dependencies": {
-    "yaml": "^2.8.1"
+    "yaml": "^1.10.0"
   }
 }

package/src/cli.js

@@ -30,13 +30,13 @@ export function parse(args) {
 }
 
 export async function agree(string, { stdin = null, stdout = null } = {}) {
-    stdout = stdout ?? process.stdout;
-    stdin = stdin ?? process.stdin;
+    stdout = stdout || process.stdout;
+    stdin = stdin || process.stdin;
 
     stdout.write(string);
 
     const answer = await new Promise((resolve) => {
-        stdin.on('data', data => resolve(data));
+        stdin.on('data', (data) => resolve(data));
     });
 
     return ['y', 'yes'].includes(`${answer}`.trim().toLowerCase());
@@ -56,8 +56,8 @@ export class Table {
         const { border, header } = this.columns.reduce(({ header, border }, column, i) => {
             const width = ansi.strip(column.header).length;
             const padding = Math.max(0, column.width - width - 2);
-            const paddingString = (new Array(padding + 1)).join(' ');
-            const borderString = (new Array(column.width + 1).join('-'));
+            const paddingString = new Array(padding + 1).join(' ');
+            const borderString = new Array(column.width + 1).join('-');
 
             return {
                 border: `${border || ''}+${borderString}${i === this.columns.length - 1 ? '+' : ''}`,
@@ -69,17 +69,17 @@ export class Table {
         console.log(header);
         console.log(ansi.gray(border));
 
-        this.rows.forEach(r => {
+        this.rows.forEach((r) => {
             const rowString = r.reduce((row, cell, i) => {
-                const width = ansi.strip(cell).length
+                const width = ansi.strip(cell).length;
                 const padding = Math.max(0, this.columns[i].width - width - 2);
-                const paddingString = (new Array(padding + 1)).join(' ');
+                const paddingString = new Array(padding + 1).join(' ');
 
-                return `${row || ''}${ansi.gray('|')} ${cell}${paddingString} ${i === r.length - 1 ? ansi.gray('|') : ''}`
+                return `${row || ''}${ansi.gray('|')} ${cell}${paddingString} ${i === r.length - 1 ? ansi.gray('|') : ''}`;
             }, '');
 
             console.log(rowString);
             console.log(ansi.gray(border));
-        })
+        });
     }
 }

package/src/config.js

@@ -1,6 +1,6 @@
 import fs from 'node:fs';
 import path from 'node:path';
-import { parse } from 'yaml';
+import * as yaml from 'yaml';
 
 // Cached config object. The config is stored in here so it can
 // be loaded once and imported across all modules.
@@ -43,18 +43,14 @@ export async function load(env = null) {
     if (path.basename(configPath) === 'frak.config.js') {
         Object.assign(config, (await import(configPath)).default);
     } else if (path.basename(configPath) === '.frak') {
-        Object.assign(config, parse(fs.readFileSync(configPath).toString('utf-8')));
+        Object.assign(config, yaml.parse(fs.readFileSync(configPath).toString('utf-8')));
     }
 
     if (env in config) {
-        Object.assign(config, {...config[env]});
+        Object.assign(config, { ...config[env] });
 
         delete config[env];
-
-        return config;
-    }
-
-    if (env) {
+    } else if (env) {
         throw new Error(`Missing configuration for environment "${env}"!`);
     }
 
@@ -84,4 +80,3 @@ export function reset() {
 }
 
 export default config;
-

package/src/date.js

@@ -29,28 +29,28 @@ export function relative(date) {
         value = 'just';
         unit = 'now';
         agoOrFromNow = '';
-    // Less than a minute
     } else if (seconds < 60) {
+        // Less than a minute
         value = Math.floor(seconds);
         unit = plural('second', value);
-    // Less than an hour
     } else if (seconds < 60 * 60) {
+        // Less than an hour
         value = Math.floor(seconds / 60);
         unit = plural('minute', value);
-    // Less than a day
     } else if (seconds < 60 * 60 * 24) {
+        // Less than a day
         value = Math.floor(seconds / 60 / 60);
         unit = plural('hour', value);
-    // Less than a week
     } else if (seconds < 60 * 60 * 24 * 7) {
+        // Less than a week
         value = Math.floor(seconds / 60 / 60 / 24);
         unit = plural('day', value);
-    // Less than a month
     } else if (seconds < 60 * 60 * 24 * 30) {
+        // Less than a month
         value = Math.floor(seconds / 60 / 60 / 24 / 7);
         unit = plural('week', value);
-    // Less than a year
     } else if (seconds < 60 * 60 * 24 * 365) {
+        // Less than a year
         value = Math.floor(seconds / 60 / 60 / 24 / 30);
         unit = plural('month', value);
     } else {

package/src/debug.js

@@ -5,6 +5,6 @@ import * as ansi from '../src/ansi.js';
  */
 export default function debug() {
     if (process.env.DEBUG) {
-        console.log.apply(console, [ ansi.bold(ansi.cyan('DEBUG:')), ...arguments ]);
+        console.log.apply(console, [ansi.bold(ansi.cyan('DEBUG:')), ...arguments]);
     }
 }

package/src/diff.js

@@ -16,7 +16,7 @@ export default async function diff(dryRunOutput, options) {
     const changes = dryRunOutput
         .split(/\r?\n/)
         .filter(Boolean)
-        .map(line => {
+        .map((line) => {
             // Split line into action and file, preserving whitespace for filenames
             const [action, ...parts] = line.split(/\s+/);
 
@@ -26,7 +26,7 @@ export default async function diff(dryRunOutput, options) {
             if (action.match(/^cL.+/)) {
                 const index = parts.indexOf('->');
 
-                debug({ parts })
+                debug({ parts });
 
                 file = parts.slice(0, index).join(' ');
                 target = parts.slice(index + 1).join(' ');
@@ -38,12 +38,14 @@ export default async function diff(dryRunOutput, options) {
         })
         .filter(([, file]) => file.slice(-1) !== '/');
 
-    debug({ changes })
+    debug({ changes });
 
     let proceed = true;
 
     if (changes.length >= 50 && options.interactive) {
-        proceed = await cli.agree(ansi.yellow(`${changes.length} file(s) will be compared. Continue? `))
+        proceed = await cli.agree(
+            ansi.yellow(`${changes.length} file(s) will be compared. Continue? `)
+        );
     }
 
     if (!proceed) {
@@ -52,53 +54,57 @@ export default async function diff(dryRunOutput, options) {
 
     const files = changes.map(([, file]) => file);
 
-    const diffs = changes.sort((a, b) => a[1].localeCompare(b[1])).map(change => {
-        const [action, file] = change;
+    const diffs = changes
+        .sort((a, b) => a[1].localeCompare(b[1]))
+        .map((change) => {
+            const [action, file] = change;
 
-        // Escape double quotes in file
-        const fileEscaped = file.replace(/"/g, '\\"');
+            // Escape double quotes in file
+            const fileEscaped = file.replace(/"/g, '\\"');
 
-        const header = [
-            file.match(/"/) ? `diff --git "a/${fileEscaped}" "b/${fileEscaped}"` : `diff --git a/${file} b/${file}`,
-        ];
+            const header = [
+                file.match(/"/)
+                    ? `diff --git "a/${fileEscaped}" "b/${fileEscaped}"`
+                    : `diff --git a/${file} b/${file}`,
+            ];
 
-        let diff = '';
+            let diff = '';
 
-        if (action === '*deleting') {
-            header.push('deleted file mode 100644');
-            header.push('index 0000000..0000000');
+            if (action === '*deleting') {
+                header.push('deleted file mode 100644');
+                header.push('index 0000000..0000000');
 
-            diff = `diff -Naurp --label="a/${fileEscaped}" --label=/dev/null "${fileEscaped}" /dev/null`;
-        } else if (action.match(/^<f\++/)) {
-            const { mode } = statSync(file);
+                diff = `diff -Naurp --label="a/${fileEscaped}" --label=/dev/null "${fileEscaped}" /dev/null`;
+            } else if (action.match(/^<f\++/)) {
+                const { mode } = statSync(file);
 
-            header.push(`new file mode ${mode.toString(8)}`);
-            header.push('index 0000000..0000000');
+                header.push(`new file mode ${mode.toString(8)}`);
+                header.push('index 0000000..0000000');
 
-            diff = `diff -Naurp --label=/dev/null --label="b/${fileEscaped}" /dev/null <(tar xzOf $tarball "${fileEscaped}" || cat /dev/null)`;
-        } else if (action.match(/^cL\++/)) {
-            const target = change[2];
+                diff = `diff -Naurp --label=/dev/null --label="b/${fileEscaped}" /dev/null <(tar xzOf $tarball "${fileEscaped}" || cat /dev/null)`;
+            } else if (action.match(/^cL\++/)) {
+                const target = change[2];
 
-            header.push('new file mode 120000');
-            header.push('index 0000000..0000000');
+                header.push('new file mode 120000');
+                header.push('index 0000000..0000000');
 
-            diff = `diff -Naurp --label=/dev/null --label="b/${fileEscaped}" /dev/null <(printf %s "${target}")`;
-        } else if (action.match(/^cL.+/)) {
-            const target = change[2];
+                diff = `diff -Naurp --label=/dev/null --label="b/${fileEscaped}" /dev/null <(printf %s "${target}")`;
+            } else if (action.match(/^cL.+/)) {
+                const target = change[2];
 
-            header.push('index 0000000..0000000');
+                header.push('index 0000000..0000000');
 
-            diff = `diff -Naurp --label="a/${fileEscaped}" --label="b/${fileEscaped}" <(printf %s "$(readlink "${fileEscaped}")") <(printf %s "${target}")`;
-        } else {
-            const { mode } = statSync(file);
+                diff = `diff -Naurp --label="a/${fileEscaped}" --label="b/${fileEscaped}" <(printf %s "$(readlink "${fileEscaped}")") <(printf %s "${target}")`;
+            } else {
+                const { mode } = statSync(file);
 
-            header.push(`index 0000000..0000000  ${mode.toString(8)}`);
+                header.push(`index 0000000..0000000  ${mode.toString(8)}`);
 
-            diff = `diff -Naurp --label="a/${fileEscaped}" --label="b/${fileEscaped}" "${fileEscaped}" <(tar xzOf $tarball "${fileEscaped}" || cat /dev/null)`;
-        }
+                diff = `diff -Naurp --label="a/${fileEscaped}" --label="b/${fileEscaped}" "${fileEscaped}" <(tar xzOf $tarball "${fileEscaped}" || cat /dev/null)`;
+            }
 
-        return `printf "%s\\n" '${header.join('\n')}'; ${diff}`;
-    });
+            return `printf "%s\\n" '${header.join('\n')}'; ${diff}`;
+        });
 
     if (diffs.length > 0) {
         debug({ diffs, files });
@@ -111,9 +117,10 @@ export default async function diff(dryRunOutput, options) {
             'tarball=$(mktemp /tmp/frak-diff-tarball.XXXXXX);',
             'cat > $tarball;',
             `cd ${config.root};`,
-            diffs.join('; '), ';',
+            diffs.join('; '),
+            ';',
             'rm $tarball',
-        ])
+        ]);
         tar.stdout.pipe(ssh.stdin);
 
         let less;
@@ -125,22 +132,35 @@ export default async function diff(dryRunOutput, options) {
         if (options.interactive && options.colorize) {
             const colorize = spawn('sed', [
                 // headers
-                '-e', `s/^\\(diff --git .*\\)/${ansi.bold('\\1')}/`,
-                '-e', `s/^\\(index .*\\)/${ansi.bold('\\1')}/`,
-                '-e', `s/^\\(new file mode .*\\)/${ansi.bold('\\1')}/`,
-                '-e', `s/^\\(deleted file mode .*\\)/${ansi.bold('\\1')}/`,
-                '-e', `s/^\\(--- .*\\)/${ansi.bold('\\1')}/`,
-                '-e', `s/^\\(+++ .*\\)/${ansi.bold('\\1')}/`,
+                '-e',
+                `s/^\\(diff --git .*\\)/${ansi.bold('\\1')}/`,
+                '-e',
+                `s/^\\(index .*\\)/${ansi.bold('\\1')}/`,
+                '-e',
+                `s/^\\(new file mode .*\\)/${ansi.bold('\\1')}/`,
+                '-e',
+                `s/^\\(deleted file mode .*\\)/${ansi.bold('\\1')}/`,
+                '-e',
+                `s/^\\(--- .*\\)/${ansi.bold('\\1')}/`,
+                '-e',
+                `s/^\\(+++ .*\\)/${ansi.bold('\\1')}/`,
                 // additions
-                '-e', `s/^\\(+[^+].*\\)/${ansi.green('\\1')}/`,
-                '-e', `s/^\\(+\\)$/${ansi.green('\\1')}/`,
+                '-e',
+                `s/^\\(+[^+].*\\)/${ansi.green('\\1')}/`,
+                '-e',
+                `s/^\\(+\\)$/${ansi.green('\\1')}/`,
                 // deletions
-                '-e', `s/^\\(-[^-].*\\)/${ansi.red('\\1')}/`,
-                '-e', `s/^\\(-\\)$/${ansi.red('\\1')}/`,
+                '-e',
+                `s/^\\(-[^-].*\\)/${ansi.red('\\1')}/`,
+                '-e',
+                `s/^\\(-\\)$/${ansi.red('\\1')}/`,
                 // markers
-                '-e', `s/^\\(@@ -[0-9][0-9]*,[0-9][0-9]* +[0-9][0-9]*,[0-9][0-9]* .*@@\\)/${ansi.blue('\\1')}/`,
-                '-e', `s/^\\(@@ -[0-9][0-9]*,[0-9][0-9]* +[0-9][0-9]* .*@@\\)/${ansi.blue('\\1')}/`,
-                '-e', `s/^\\(@@ -[0-9][0-9]* +[0-9][0-9]*,[0-9][0-9]* .*@@\\)/${ansi.blue('\\1')}/`,
+                '-e',
+                `s/^\\(@@ -[0-9][0-9]*,[0-9][0-9]* +[0-9][0-9]*,[0-9][0-9]* .*@@\\)/${ansi.blue('\\1')}/`,
+                '-e',
+                `s/^\\(@@ -[0-9][0-9]*,[0-9][0-9]* +[0-9][0-9]* .*@@\\)/${ansi.blue('\\1')}/`,
+                '-e',
+                `s/^\\(@@ -[0-9][0-9]* +[0-9][0-9]*,[0-9][0-9]* .*@@\\)/${ansi.blue('\\1')}/`,
             ]);
             ssh.stdout.pipe(colorize.stdin);
             colorize.stdout.pipe(less.stdin);
@@ -153,19 +173,19 @@ export default async function diff(dryRunOutput, options) {
                 less.on('exit', (code) => {
                     if (code === 0) {
                         resolve();
-                    /* node:coverage disable */
                     } else {
+                        /* node :coverage disable */
                         reject(`exited with code ${code}`);
+                        /* node:coverage enable */
                     }
-                    /* node:coverage enable */
                 });
             });
-        /* node:coverage disable */
         } else {
+            /* node:coverage disable */
             return await new Promise((resolve) => {
                 let diff = '';
 
-                ssh.stdout.on('data', (data) => diff += data);
+                ssh.stdout.on('data', (data) => (diff += data));
 
                 ssh.stderr.pipe(process.stderr);
 
@@ -173,8 +193,8 @@ export default async function diff(dryRunOutput, options) {
                     resolve(diff);
                 });
             });
+            /* node:coverage enable */
         }
-        /* node:coverage enable */
     } else if (options.interactive) {
         console.log(ansi.yellow('No changes detected.'));
     }

package/src/rsync.js

@@ -32,23 +32,24 @@ export function filters() {
 
     // merge path
     if (options.path) {
-        const paths = options.path.split(/((?<!\\) )+/)
-            .map(p => p.replace(/\\ /g, ' '))
-            .map(p => path.resolve(p))
-            .map(p => p) // TODO glob // paths.map! { |p| p[/[*?]/] ? Dir.glob(p) : p }
+        const paths = options.path
+            .split(/((?<!\\) )+/)
+            .map((p) => p.replace(/\\ /g, ' '))
+            .map((p) => path.resolve(p))
+            .map((p) => p) // TODO glob // paths.map! { |p| p[/[*?]/] ? Dir.glob(p) : p }
             .flat(Infinity)
             // make paths relative to .frak file
-            .map(p => p.replace(path.dirname(locateConfig()), ''));
+            .map((p) => p.replace(path.dirname(locateConfig()), ''));
 
         // include all parent directories to fix recursive rsync from excluding all
-        paths.forEach(p => {
+        paths.forEach((p) => {
             includes.push(p);
 
             while (path.dirname(p) !== '/') {
                 excludes.push(`${path.dirname(p)}/*`);
 
                 p = path.dirname(p);
-                includes.push(p)
+                includes.push(p);
             }
         });
 
@@ -60,8 +61,8 @@ export function filters() {
         filters.push('.e .frakignore');
     }
 
-    includes.forEach(include => filters.push(`+ ${include}`));
-    excludes.forEach(include => filters.push(`- ${include}`));
+    includes.forEach((include) => filters.push(`+ ${include}`));
+    excludes.forEach((include) => filters.push(`- ${include}`));
 
     return filters;
 }
@@ -90,35 +91,45 @@ export function exec(...options) {
     }
 
     let backup = [];
-    let backupName = 'name' in commandOptions
-        ? `${commandOptions.name}_${(new Date()).toISOString()}`
-        : (new Date()).toISOString();
+    let backupName =
+        'name' in commandOptions
+            ? `${commandOptions.name}_${new Date().toISOString()}`
+            : new Date().toISOString();
 
     // Figure out backup options
-    backup = [
-        '--exclude=.backups/',
-    ];
+    backup = ['--exclude=.backups/'];
 
     // Keep the same backup path for all rsync commands
     if (backupPath === null) {
-        backupPath = `.backups/${backupName}`
+        backupPath = `.backups/${backupName}`;
     }
 
     // This should only happen on push
     if (command === 'push') {
-        backup = [...backup, '--backup', `--backup-dir='${backupPath}'`]
+        backup = [...backup, '--backup', `--backup-dir=${backupPath}`];
     }
 
     const args = [
         'rsync',
         [
-            '--archive', '--no-group', '--no-owner', '--no-perms', '--no-times', '--human-readable',
-            '--compress', '--checksum', '--itemize-changes', '--recursive', '--delete',
+            '--archive',
+            '--no-group',
+            '--no-owner',
+            '--no-perms',
+            '--no-times',
+            '--human-readable',
+            '--compress',
+            '--checksum',
+            '--itemize-changes',
+            '--recursive',
+            '--delete',
+            process.env.DEBUG ? '--rsh=ssh' : '--rsh=ssh -q',
             `--rsync-path=${config['rsync_path'] ? config['rsync_path'] : 'rsync'}`,
             '--filter=. -',
             ...backup,
             ...options,
-            source, destination,
+            source,
+            destination,
         ],
     ];
 
@@ -126,17 +137,21 @@ export function exec(...options) {
     debug(args.flat().join(' '));
     debug('filters:', filters());
 
-    let output = '';
+    let output = '',
+        stderr = '';
 
     const rsync = spawn.apply(null, args);
 
-    const echo = spawn('echo', [ filters().join('\n') ]);
+    const echo = spawn('echo', [filters().join('\n')]);
 
     echo.stdout.pipe(rsync.stdin);
 
     rsync.stdout.on('data', (data) => {
         output += `${data}`;
     });
+    rsync.stderr.on('data', (data) => {
+        stderr += `${data}`;
+    });
 
     /* node:coverage disable */
     rsync.stderr.on('data', (data) => {
@@ -151,11 +166,11 @@ export function exec(...options) {
                     output,
                     backupPath,
                 });
-            /* node:coverage disable */
             } else {
-                reject(`rsync exited with code ${code}`);
+                /* node:coverage disable */
+                reject(`rsync exited with code ${code}: ${stderr}`);
+                /* node:coverage enable */
             }
-            /* node:coverage enable */
         });
     });
 }

package/src/ssh.js

@@ -6,7 +6,7 @@ export function exec(command, options = {}) {
 
     const cmd = `cd ${options.root || '.'}; sh`;
 
-    const ssh = spawn('ssh', [ options.server, '--', cmd ]);
+    const ssh = spawn('ssh', [options.server, '--', cmd]);
 
     // const echo = spawn('echo', [ command ]);
 
@@ -31,11 +31,11 @@ export function exec(command, options = {}) {
         ssh.on('exit', (code) => {
             if (code === 0) {
                 resolve();
-            /* node:coverage disable */
             } else {
+                /* node:coverage disable */
                 reject(`exited with code ${code}`);
+                /* node:coverage enable */
             }
-            /* node:coverage enable */
         });
     });