@verdnatura/myt 1.8.6 → 2.0.2

package/myt-run.js

@@ -1,12 +1,8 @@
 const Myt = require('./myt');
 const Command = require('./lib/command');
-const Push = require('./myt-push');
 const docker = require('./lib/docker');
-const fs = require('fs-extra');
-const path = require('path');
 const Server = require('./lib/server');
-const connExt = require('./lib/conn');
-const SqlString = require('sqlstring');
+const Build = require('./myt-build');
 
 /**
  * Builds the database image and runs a container. It only rebuilds the image
@@ -23,12 +19,12 @@ class Run extends Command {
             persist: 'Whether to not use tmpfs mount for MySQL data',
             keep: 'Keep container on failure',
             realm: 'Name of fixture realm to use',
-            realm: 'Use container IP instead of localhost'
+            ip: 'Bind to container IP instead of localhost'
         },
         operand: 'realm'
     };
 
-    static opts = {
+    static args = {
         alias: {
             network: 'n',
             random: 'r',
@@ -37,84 +33,48 @@ class Run extends Command {
             realm: 'm',
             ip: 'i'
         },
+        string: [
+            'network',
+            'realm'
+        ],
         boolean: [
             'ci',
             'random',
             'persist',
-            'keep'
+            'keep',
+            'ip'
         ]
     };
 
     static reporter = {
         buildingImage: 'Building container image.',
         runningContainer: 'Running container.',
-        mockingDate: 'Mocking date functions.',
-        applyingFixtures: 'Applying fixtures.',
-        applyingRealms: 'Applying realm fixtures.',
-        creatingTriggers: 'Creating triggers.',
         waitingDb: function(dbConfig) {
-            console.log(`Waiting for MySQL: ${dbConfig.host}:${dbConfig.port}`);
+            console.log(`Waiting for database: ${dbConfig.host}:${dbConfig.port}`);
         }
     };
 
-    async run(myt, opts) {
-        const dumpDir = opts.dumpDir;
-        const dumpDataDir = path.join(dumpDir, '.dump');
-        const serverDir = path.join(__dirname, 'server');
-
-        if (!await fs.pathExists(`${dumpDataDir}/structure.sql`))
-            throw new Error('To run local database you have to create a dump first');
-
-        // Build base image
-
-        this.emit('buildingImage');
-
-        let basePath = dumpDir;
-        let baseDockerfile = path.join(dumpDir, 'Dockerfile');
-
-        if (!await fs.pathExists(baseDockerfile)) {
-            basePath = serverDir;
-            baseDockerfile = path.join(serverDir, 'Dockerfile.base');
-        }
-
-        await docker.build(basePath, {
-            tag: 'myt/base',
-            file: baseDockerfile
-        }, opts.debug);
-
-        // Build server image
-
-        await docker.build(serverDir, {
-            tag: 'myt/server',
-            file: path.join(serverDir, 'Dockerfile.server')
-        }, opts.debug);
-
-        // Build dump image
-
-        const dumpContext = path.join(opts.mytDir, 'dump');
-        await docker.build(dumpContext, {
-            tag: opts.code,
-            file: path.join(serverDir, 'Dockerfile.dump')
-        }, opts.debug);
-
-        // Run container
+    async _run(myt, ctx, cfg, opts) {
+        const tag = await myt.run(Build, {
+            realm: opts.realm
+        });
 
         this.emit('runningContainer');
 
         const isRandom = opts.random;
-        const dbConfig = opts.dbConfig;
+        const dbConfig = ctx.dbConfig;
 
-        let runOptions;
+        const runOptions = {};
 
         if (isRandom)
-            runOptions = {publish: '3306'};
+            Object.assign(runOptions, {publish: '3306'});
         else {
-            runOptions = {
-                name: opts.code,
+            Object.assign(runOptions, {
+                name: cfg.code,
                 publish: `3306:${dbConfig.port}`
-            };
+            });
             try {
-                const server = new Server(new docker.Container(opts.code));
+                const server = new Server(new docker.Container(cfg.code));
                 await server.rm();
             } catch (e) {}
         }
@@ -122,13 +82,15 @@ class Run extends Command {
         const {network} = opts;
         if (opts.network)
             runOptions.network = network;
+
         if (!opts.persist)
             runOptions.tmpfs = '/var/lib/mysql';
 
-        Object.assign(runOptions, null, {
+        Object.assign(runOptions, {
             detach: true
         });
-        const ct = await docker.run(opts.code, null, runOptions);
+
+        const ct = await docker.run(tag, null, runOptions, undefined, cfg.debug);
 
         try {
             const server = new Server(ct, dbConfig);
@@ -146,15 +108,15 @@ class Run extends Command {
                     if (network) {
                         host = network != 'host'
                             ? ctNetworks[network].IPAddress
-                            : localhost
+                            : localhost;
                     } else {
                         host = netSettings.IPAddress
-                            ?? ctNetworks.bridge?.IPAddress
+                            ?? ctNetworks.bridge?.IPAddress;
                     }
                     port = 3306;
                 } else {
                     host = localhost;
-                    port = netSettings.Ports['3306/tcp'][0].HostPort
+                    port = netSettings.Ports['3306/tcp'][0].HostPort;
                 }
 
                 if (!host)
@@ -168,76 +130,6 @@ class Run extends Command {
 
             this.emit('waitingDb', dbConfig);
             await server.wait();
-            const conn = await myt.createConnection();
-
-            // Mock date functions
-
-            this.emit('mockingDate');
-            const mockDateScript = path.join(dumpDir, 'mockDate.sql');
-
-            if (opts.mockDate) {
-                if (!await fs.pathExists(mockDateScript))
-                    throw new Error(`Date mock enabled but mock script does not exist: ${mockDateScript}`);
-
-                let sql = await fs.readFile(mockDateScript, 'utf8');
-                sql = sql.replace(/@mockDate/g, SqlString.escape(opts.mockDate));
-                await connExt.multiQuery(conn, sql);
-            }
-
-            // Apply changes
-
-            const hasTriggers = await fs.exists(`${dumpDataDir}/triggers.sql`);
-
-            Object.assign(opts, {
-                triggers: !hasTriggers,
-                commit: true,
-                dbConfig
-            });
-            await myt.run(Push, opts);
-
-            // Apply fixtures
-
-            this.emit('applyingFixtures');
-            const fixturesFiles = [
-                'fixtures.before',
-                '.fixtures',
-                'fixtures.after',
-                'fixtures.local'
-            ]
-            for (const file of fixturesFiles) {
-                if (!await fs.exists(`${dumpDir}/${file}.sql`)) continue;
-                await execFile(`dump/${file}`)
-            }
-
-            // Apply realms
-
-            if(opts.realm) {
-                this.emit('applyingRealms');
-                const realmDir = `realms/${opts.realm}`;
-                let realmFiles =  await fs.readdir(`${dumpDir}/${realmDir}`);
-                realmFiles = realmFiles.map(file => path.parse(file).name);
-                for (const file of realmFiles) {
-                    await execFile(`${realmDir}/${file}`)
-                }
-            }
-
-            // Create triggers
-
-            if (!hasTriggers) {
-                this.emit('creatingTriggers');
-
-                for (const schema of opts.schemas) {
-                    const triggersPath = `${opts.routinesDir}/${schema}/triggers`;
-                    if (!await fs.pathExists(triggersPath))
-                        continue;
-
-                    const triggersDir = await fs.readdir(triggersPath);
-                    for (const triggerFile of triggersDir)
-                        await connExt.queryFromFile(conn, `${triggersPath}/${triggerFile}`);
-                }
-            }
-
-            await conn.end();
             return server;
         } catch (err) {
             try {
@@ -245,14 +137,6 @@ class Run extends Command {
             } catch (e) {}
             throw err;
         }
-
-        async function execFile(path){
-            await ct.exec(null, 'docker-import.sh',
-                [`/workspace/${path}` ],
-                'spawn',
-                true
-            );
-        }
     }
 }
 

package/myt-start.js

@@ -19,8 +19,8 @@ class Start extends Command {
         startingContainer: 'Starting container.'
     };
 
-    async run(myt, opts) {
-        const ct = new Container(opts.code);
+    async _run(myt, ctx, cfg, opts) {
+        const ct = new Container(cfg.code);
         let status;
         let exists;
         let server;
@@ -31,7 +31,7 @@ class Start extends Command {
             });
             exists = true;
         } catch (err) {
-            server = await myt.run(Run, opts);
+            server = await myt.run(Run);
         }
 
         if (exists) {
@@ -41,7 +41,7 @@ class Start extends Command {
             case 'exited':
                 this.emit('startingContainer');
                 await ct.start();
-                server = new Server(ct, opts.dbConfig);
+                server = new Server(ct, ctx.dbConfig);
                 await server.wait();
                 break;
             default:

package/myt-version.js

@@ -16,7 +16,7 @@ class Version extends Command {
         operand: 'name'
     };
 
-    static opts = {
+    static args = {
         alias: {
             name: 'n',
             deprecate: 'p'
@@ -46,7 +46,7 @@ class Version extends Command {
         deprecate: 'Generating SQL for deprecated objects deletion.'
     };
 
-    async run(myt, opts) {
+    async _run(myt, ctx, cfg, opts) {
         let newVersionDir;
 
         // Fetch last version number
@@ -61,7 +61,7 @@ class Version extends Command {
                     FROM version
                     WHERE code = ?
                     FOR UPDATE`,
-                [opts.code]
+                [cfg.code]
             );
             const number = row && row.number;
             const lastNumber = row && row.lastNumber;
@@ -78,7 +78,7 @@ class Version extends Command {
 
             const versionDigits = number
                 ? number.length
-                : opts.versionDigits;
+                : cfg.versionDigits;
 
             newVersion = String(newVersion).padStart(versionDigits, '0');
 
@@ -87,7 +87,7 @@ class Version extends Command {
             let versionName = opts.name;
 
             const versionNames = new Set();
-            const versionDirs = await fs.readdir(opts.versionsDir);
+            const versionDirs = await fs.readdir(ctx.versionsDir);
             for (const versionDir of versionDirs) {
                 const version = myt.parseVersionDir(versionDir);
                 if (!version) continue;
@@ -117,7 +117,7 @@ class Version extends Command {
             // Create version
 
             const versionFolder = `${newVersion}-${versionName}`;
-            newVersionDir = `${opts.versionsDir}/${versionFolder}`;
+            newVersionDir = `${ctx.versionsDir}/${versionFolder}`;
 
             await conn.query(
                 `INSERT INTO version
@@ -125,13 +125,13 @@ class Version extends Command {
                         lastNumber = ?
                     ON DUPLICATE KEY UPDATE
                         lastNumber = VALUES(lastNumber)`,
-                [opts.code, newVersion]
+                [cfg.code, newVersion]
             );
             await fs.mkdir(newVersionDir);
 
             if (opts.deprecate) {
                 this.emit('deprecate');
-                await deprecate(conn, opts, newVersionDir);
+                await deprecate(conn, cfg, newVersionDir);
             } else
                 await fs.writeFile(
                     `${newVersionDir}/00-firstScript.sql`,
@@ -150,12 +150,12 @@ class Version extends Command {
     }
 }
 
-async function deprecate(conn, opts, newVersionDir) {
+async function deprecate(conn, cfg, newVersionDir) {
     const now = new Date();
-    const minDeprecDate = new Date(now.getTime() - opts.deprecRetentionPeriod * 24 * 60 * 60 * 1000);    
-    const deprecMarkRegex = opts.deprecMarkRegex;
-    const deprecCommentRegex = opts.deprecCommentRegex;
-    const deprecDateRegex = opts.deprecDateRegex;
+    const minDeprecDate = new Date(now.getTime() - cfg.deprecRetentionPeriod * 24 * 60 * 60 * 1000);    
+    const deprecMarkRegex = cfg.deprecMarkRegex;
+    const deprecCommentRegex = cfg.deprecCommentRegex;
+    const deprecDateRegex = cfg.deprecDateRegex;
     const filePath = `${newVersionDir}/00-deprecate.sql`;
 
     // Generate the drops of the primary keys