@verdnatura/myt 1.5.30 → 1.5.32

package/README.md

@@ -279,7 +279,7 @@ Builds and starts local database server container. It only rebuilds the image
 when dump have been modified.
 
 ```text
-$ myt run [-c|--ci] [-r|--random]
+$ myt run [-c|--ci] [-r|--random] [-n|--network <string>]
 ```
 
 ### start

package/myt-pull.js

@@ -50,7 +50,7 @@ class Pull extends Command {
                     const match = patch
                         .newFile()
                         .path()
-                        .match(/^routines\/(.+)\.sql$/);
+                        .match(opts.routinesRegex);
                     if (match) return true;
                 }
 

package/myt-push.js

@@ -461,13 +461,14 @@ class Push extends Command {
         const changes = [];
         const changesMap = new Map();
 
+        const {opts} = this;
         async function pushChanges(diff) {
             if (!diff) return;
             const patches = await diff.patches();
 
             for (const patch of patches) {
                 const path = patch.newFile().path();
-                const match = path.match(/^routines\/(.+)\.sql$/);
+                const match = path.match(opts.routinesRegex);
                 if (!match) continue;
 
                 let change = changesMap.get(match[1]);

package/myt-run.js

@@ -18,13 +18,15 @@ class Run extends Command {
         description: 'Build and start local database server container',
         params: {
             ci: 'Workaround for continuous integration system',
-            random: 'Whether to use a random container name or port'
+            network: 'Docker network to attach container to',
+            random: 'Whether to use a random container name and port'
         }
     };
 
     static opts = {
         alias: {
             ci: 'c',
+            network: 'n',
             random: 'r'
         },
         boolean: [
@@ -104,6 +106,9 @@ class Run extends Command {
             } catch (e) {}
         }
 
+        if (opts.network)
+            Object.assign(runOptions, {network: opts.network});
+
         const runChown = process.platform != 'linux';
 
         Object.assign(runOptions, null, {
@@ -120,10 +125,11 @@ class Run extends Command {
                     format: '{{json .NetworkSettings}}'
                 });
 
-                if (opts.ci)
-                    dbConfig.host = netSettings.Gateway;
-
-                dbConfig.port = netSettings.Ports['3306/tcp'][0].HostPort;
+                if (opts.ci) {
+                    dbConfig.host = netSettings.Networks[networkName].IPAddress;
+                    dbConfig.port = 3306;
+                } else
+                    dbConfig.port = netSettings.Ports['3306/tcp'][0].HostPort;
             } catch (err) {
                 await server.rm();
                 throw err;

package/myt.js

@@ -205,12 +205,20 @@ class Myt {
         Object.assign(opts, config);
         opts.configFile = configFile;
 
+        const subdir = opts.subdir || '';
         if (!opts.mytDir)
-            opts.mytDir = path.join(opts.workspace, opts.subdir || '');
+            opts.mytDir = path.join(opts.workspace, subdir);
 
-        opts.routinesDir = path.join(opts.mytDir, 'routines');
-        opts.versionsDir = path.join(opts.mytDir, 'versions');
-        opts.dumpDir = path.join(opts.mytDir, 'dump');
+        const routinesBaseRegex = subdir
+            ? `${subdir}\/routines`
+            : 'routines';
+
+        Object.assign(opts, {
+            routinesRegex: new RegExp(`^${routinesBaseRegex}\/(.+)\.sql$`),
+            routinesDir: path.join(opts.mytDir, 'routines'),
+            versionsDir: path.join(opts.mytDir, 'versions'),
+            dumpDir: path.join(opts.mytDir, 'dump')
+        });
 
         // Database configuration
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@verdnatura/myt",
-  "version": "1.5.30",
+  "version": "1.5.32",
   "author": "Verdnatura Levante SL",
   "description": "MySQL version control",
   "license": "GPL-3.0",