@verdnatura/myt 1.5.19 → 1.5.21

package/lib/command.js

@@ -1,13 +1,19 @@
-/**
- * Base class for Myt commands.
- */
-module.exports = class MytCommand {
-    constructor(myt, opts) {
-        this.myt = myt;
-        this.opts = opts;
-    }
-
-    async run(myt, opts) {
-        throw new Error('run command not defined');
-    }
-}
+/**
+ * Base class for Myt commands.
+ */
+module.exports = class MytCommand {
+    constructor(myt, opts) {
+        this.myt = myt;
+        this.opts = opts;
+    }
+
+    async run(myt, opts) {
+        throw new Error('run command not defined');
+    }
+
+    emit(event) {
+        const messages = this.constructor.messages;
+        if (messages && messages[event])
+            console.log(messages[event]);
+    }
+}

package/lib/conn.js

@@ -1,141 +1,141 @@
-const fs = require('fs-extra');
-
-/**
- * Executes an SQL script.
- *
- * @param {Connection} conn MySQL connection object
- * @returns {Array<Result>} The resultset
- */
-async function queryFromFile(conn, file) {
-    const sql = await fs.readFile(file, 'utf8');
-    return await this.multiQuery(conn, sql);
-}
-
-/**
- * Executes a multi-query string.
- *
- * @param {Connection} conn MySQL connection object
- * @param {String} sql SQL multi-query string
- * @returns {Array<Result>} The resultset
- */
-async function multiQuery(conn, sql) {
-    let results = [];
-    const stmts = this.querySplit(sql);
-
-    for (const stmt of stmts)
-        results = results.concat(await conn.query(stmt));
-
-    return results;
-}
-
-/**
- * Splits an SQL muti-query into a single-query array, it does an small 
- * parse to correctly handle the DELIMITER statement.
- *
- * @param {Array<String>} stmts The splitted SQL statements
- */
-function querySplit(sql) {
-    const stmts = [];
-    let i,
-        char,
-        token,
-        escaped,
-        stmtStart;
-
-    let delimiter = ';';
-    const delimiterRe = /\s*delimiter\s+(\S+)[^\S\r\n]*(?:\r?\n|\r|$)/yi;
-
-    function begins(str) {
-        let j;
-        for (j = 0; j < str.length; j++)
-            if (sql[i + j] != str[j])
-                return false;
-        i += j;
-        return true;
-    }
-
-    for (i = 0; i < sql.length;) {
-        stmtStart = i;
-
-        delimiterRe.lastIndex = i;
-        const match = sql.match(delimiterRe);
-        if (match) {
-            delimiter = match[1];
-            i += match[0].length;
-            continue;
-        }
-
-        let delimiterFound = false;
-        while (i < sql.length) {
-            char = sql[i];
-
-            if (token) {
-                if (!escaped && begins(token.end))
-                    token = null;
-                else {
-                    escaped = !escaped && token.escape(char);
-                    i++;
-                }
-            } else {
-                delimiterFound = begins(delimiter);
-                if (delimiterFound) break;
-
-                const tok = tokenIndex.get(char);
-                if (tok && begins(tok.start))
-                    token = tok;
-                else
-                    i++;
-            }
-        }
-
-        let len = i - stmtStart;
-        if (delimiterFound) len -= delimiter.length;
-        const stmt = sql.substr(stmtStart, len);
-
-        if (!/^\s*$/.test(stmt))
-            stmts.push(stmt);
-    }
-
-    return stmts;
-}
-
-const tokens = {
-    string: {
-        start: '\'',
-        end: '\'',
-        escape: char => char == '\'' || char == '\\'
-    },
-    quotedString: {
-        start: '"',
-        end: '"',
-        escape: char => char == '"' || char == '\\'
-    },
-    id: {
-        start: '`',
-        end: '`',
-        escape: char => char == '`'
-    },
-    multiComment: {
-        start: '/*',
-        end: '*/',
-        escape: () => false
-    },
-    singleComment: {
-        start: '-- ',
-        end: '\n',
-        escape: () => false
-    }
-};
-
-const tokenIndex = new Map();
-for (const tokenId in tokens) {
-    const token = tokens[tokenId];
-    tokenIndex.set(token.start[0], token);
-}
-
-module.exports = {
-    queryFromFile,
-    multiQuery,
-    querySplit,
-    tokens
-};
+const fs = require('fs-extra');
+
+/**
+ * Executes an SQL script.
+ *
+ * @param {Connection} conn MySQL connection object
+ * @returns {Array<Result>} The resultset
+ */
+async function queryFromFile(conn, file) {
+    const sql = await fs.readFile(file, 'utf8');
+    return await this.multiQuery(conn, sql);
+}
+
+/**
+ * Executes a multi-query string.
+ *
+ * @param {Connection} conn MySQL connection object
+ * @param {String} sql SQL multi-query string
+ * @returns {Array<Result>} The resultset
+ */
+async function multiQuery(conn, sql) {
+    let results = [];
+    const stmts = this.querySplit(sql);
+
+    for (const stmt of stmts)
+        results = results.concat(await conn.query(stmt));
+
+    return results;
+}
+
+/**
+ * Splits an SQL muti-query into a single-query array, it does an small 
+ * parse to correctly handle the DELIMITER statement.
+ *
+ * @param {Array<String>} stmts The splitted SQL statements
+ */
+function querySplit(sql) {
+    const stmts = [];
+    let i,
+        char,
+        token,
+        escaped,
+        stmtStart;
+
+    let delimiter = ';';
+    const delimiterRe = /\s*delimiter\s+(\S+)[^\S\r\n]*(?:\r?\n|\r|$)/yi;
+
+    function begins(str) {
+        let j;
+        for (j = 0; j < str.length; j++)
+            if (sql[i + j] != str[j])
+                return false;
+        i += j;
+        return true;
+    }
+
+    for (i = 0; i < sql.length;) {
+        stmtStart = i;
+
+        delimiterRe.lastIndex = i;
+        const match = sql.match(delimiterRe);
+        if (match) {
+            delimiter = match[1];
+            i += match[0].length;
+            continue;
+        }
+
+        let delimiterFound = false;
+        while (i < sql.length) {
+            char = sql[i];
+
+            if (token) {
+                if (!escaped && begins(token.end))
+                    token = null;
+                else {
+                    escaped = !escaped && token.escape(char);
+                    i++;
+                }
+            } else {
+                delimiterFound = begins(delimiter);
+                if (delimiterFound) break;
+
+                const tok = tokenIndex.get(char);
+                if (tok && begins(tok.start))
+                    token = tok;
+                else
+                    i++;
+            }
+        }
+
+        let len = i - stmtStart;
+        if (delimiterFound) len -= delimiter.length;
+        const stmt = sql.substr(stmtStart, len);
+
+        if (!/^\s*$/.test(stmt))
+            stmts.push(stmt);
+    }
+
+    return stmts;
+}
+
+const tokens = {
+    string: {
+        start: '\'',
+        end: '\'',
+        escape: char => char == '\'' || char == '\\'
+    },
+    quotedString: {
+        start: '"',
+        end: '"',
+        escape: char => char == '"' || char == '\\'
+    },
+    id: {
+        start: '`',
+        end: '`',
+        escape: char => char == '`'
+    },
+    multiComment: {
+        start: '/*',
+        end: '*/',
+        escape: () => false
+    },
+    singleComment: {
+        start: '-- ',
+        end: '\n',
+        escape: () => false
+    }
+};
+
+const tokenIndex = new Map();
+for (const tokenId in tokens) {
+    const token = tokens[tokenId];
+    tokenIndex.set(token.start[0], token);
+}
+
+module.exports = {
+    queryFromFile,
+    multiQuery,
+    querySplit,
+    tokens
+};

package/lib/docker.js

@@ -1,133 +1,133 @@
-const spawn = require('child_process').spawn;
-const execFile = require('child_process').execFile;
-const camelToSnake = require('./util').camelToSnake;
-
-const docker = {
-    async run(image, commandArgs, options, execOptions) {
-        const args = commandArgs
-            ? [image].concat(commandArgs)
-            : image;
-        const execMode = options.detach ? 'exec' : 'spawn';
-        
-        const child = await this.command('run',
-            args,
-            options,
-            execMode,
-            execOptions
-        );
-        return options.detach
-            ? new Container(child.stdout.trim())
-            : child;
-    },
-
-    async build(url, options, execOptions) {
-        return await this.command('build',
-            url,
-            options,
-            'spawn',
-            execOptions
-        );
-    },
-
-    async start(id, options) {
-        const ct = new Container(id);
-        await ct.start(options);
-        return ct;
-    },
-
-    async stop(id, options) {
-        const ct = new Container(id);
-        return await ct.stop(options);
-    },
-
-    async rm(id, options) {
-        const ct = new Container(id);
-        return await ct.rm(options);
-    },
-
-    async inspect(id, options) {
-        const ct = new Container(id);
-        return await ct.inspect(options);
-    },
-
-    async command(command, args, options, execMode, execOptions) {
-        const execArgs = [command];
-
-        if (options)
-            for (const option in options) {
-                execArgs.push(`--${camelToSnake(option)}`);
-                if (typeof options[option] !== 'boolean')
-                    execArgs.push(options[option]);
-            }
-
-        if (Array.isArray(args))
-            Array.prototype.push.apply(execArgs, args);
-        else if (args)
-            execArgs.push(args);
-
-        return await new Promise((resolve, reject) => {
-            if (execMode == 'spawn') {
-                if (execOptions === true)
-                    execOptions = {
-                        stdio: [
-                            process.stdin,
-                            process.stdout,
-                            process.stderr
-                        ] 
-                    };
-
-                const child = spawn('docker', execArgs, execOptions || undefined);
-                child.on('exit', code => {
-                    if (code !== 0) {
-                        const quotedArgs = execArgs
-                            .map(x => /\s/g.test(x) ? `"${x}"` : x)
-                            .join(' ');
-                        reject(new Error(`Docker exit code ${code}: 'docker ${quotedArgs}'`));
-                    } else
-                        resolve(code);
-                });
-            } else {
-                execFile('docker', execArgs, (err, stdout, stderr) => {
-                    if (err)
-                        reject(err);
-                    else
-                        resolve({stdout, stderr});
-                });
-            }
-        });
-    }
-};
-
-class Container {
-    constructor(id) {
-        if (!id)
-            throw new Error('Container id argument is required');
-        this.id = id;
-    }
-
-    async start(options) {
-        await docker.command('start', this.id, options);
-    }
-
-    async stop(options) {
-        await docker.command('stop', this.id, options);
-    }
-
-    async rm(options) {
-        await docker.command('rm', this.id, options);
-    }
-
-    async inspect(options) {
-        const child = await docker.command('inspect', this.id, options);
-        return JSON.parse(child.stdout);
-    }
-
-    async exec(options, command, commandArgs, execMode, execOptions) {
-        let args = [this.id, command];
-        if (commandArgs) args = args.concat(commandArgs);
-        await docker.command('exec', args, options, execMode, execOptions);
-    }
-}
-
-module.exports = docker;
-module.exports.Container = Container;
+const spawn = require('child_process').spawn;
+const execFile = require('child_process').execFile;
+const camelToSnake = require('./util').camelToSnake;
+
+const docker = {
+    async run(image, commandArgs, options, execOptions) {
+        const args = commandArgs
+            ? [image].concat(commandArgs)
+            : image;
+        const execMode = options.detach ? 'exec' : 'spawn';
+        
+        const child = await this.command('run',
+            args,
+            options,
+            execMode,
+            execOptions
+        );
+        return options.detach
+            ? new Container(child.stdout.trim())
+            : child;
+    },
+
+    async build(url, options, execOptions) {
+        return await this.command('build',
+            url,
+            options,
+            'spawn',
+            execOptions
+        );
+    },
+
+    async start(id, options) {
+        const ct = new Container(id);
+        await ct.start(options);
+        return ct;
+    },
+
+    async stop(id, options) {
+        const ct = new Container(id);
+        return await ct.stop(options);
+    },
+
+    async rm(id, options) {
+        const ct = new Container(id);
+        return await ct.rm(options);
+    },
+
+    async inspect(id, options) {
+        const ct = new Container(id);
+        return await ct.inspect(options);
+    },
+
+    async command(command, args, options, execMode, execOptions) {
+        const execArgs = [command];
+
+        if (options)
+            for (const option in options) {
+                execArgs.push(`--${camelToSnake(option)}`);
+                if (typeof options[option] !== 'boolean')
+                    execArgs.push(options[option]);
+            }
+
+        if (Array.isArray(args))
+            Array.prototype.push.apply(execArgs, args);
+        else if (args)
+            execArgs.push(args);
+
+        return await new Promise((resolve, reject) => {
+            if (execMode == 'spawn') {
+                if (execOptions === true)
+                    execOptions = {
+                        stdio: [
+                            process.stdin,
+                            process.stdout,
+                            process.stderr
+                        ] 
+                    };
+
+                const child = spawn('docker', execArgs, execOptions || undefined);
+                child.on('exit', code => {
+                    if (code !== 0) {
+                        const quotedArgs = execArgs
+                            .map(x => /\s/g.test(x) ? `"${x}"` : x)
+                            .join(' ');
+                        reject(new Error(`Docker exit code ${code}: 'docker ${quotedArgs}'`));
+                    } else
+                        resolve(code);
+                });
+            } else {
+                execFile('docker', execArgs, (err, stdout, stderr) => {
+                    if (err)
+                        reject(err);
+                    else
+                        resolve({stdout, stderr});
+                });
+            }
+        });
+    }
+};
+
+class Container {
+    constructor(id) {
+        if (!id)
+            throw new Error('Container id argument is required');
+        this.id = id;
+    }
+
+    async start(options) {
+        await docker.command('start', this.id, options);
+    }
+
+    async stop(options) {
+        await docker.command('stop', this.id, options);
+    }
+
+    async rm(options) {
+        await docker.command('rm', this.id, options);
+    }
+
+    async inspect(options) {
+        const child = await docker.command('inspect', this.id, options);
+        return JSON.parse(child.stdout);
+    }
+
+    async exec(options, command, commandArgs, execMode, execOptions) {
+        let args = [this.id, command];
+        if (commandArgs) args = args.concat(commandArgs);
+        await docker.command('exec', args, options, execMode, execOptions);
+    }
+}
+
+module.exports = docker;
+module.exports.Container = Container;