verdnatura/myt
verdnatura
/
myt
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

#4036 Project renamed to Myt

This commit is contained in:
Juan Ferrer 2022-12-21 14:17:50 +01:00
parent 313655ea12
commit d8a5133436
21 changed files with 139 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
README.md
View File

@ -1,4 +1,4 @@
# MyVC (MySQL Version Control) # Myt - MySQL and MariaDB version control using Git
Utilities to ease the maintenance of MySQL or MariaDB database versioning using Utilities to ease the maintenance of MySQL or MariaDB database versioning using
a Git repository. a Git repository.
@ -16,23 +16,23 @@ development, so any help is welcomed! Feel free to contribute.
It's recommended to install the package globally. It's recommended to install the package globally.
```text ```text
# npm install -g myvc # npm install -g myt
$ myvc <command> $ myt <command>
``` ```
You can also install locally and use the *npx* command to execute it. You can also install locally and use the *npx* command to execute it.
```text ```text
$ npm install myvc $ npm install myt
$ npx myvc <command> $ npx myt <command>
``` ```
## How to use ## How to use
Execute *myvc* with the desired command. Execute *myt* with the desired command.
```text ```text
$ [npx] myvc [-w|--workspace <string>] [-r|--remote <string>] [-d|--debug] $ [npx] myt [-w|--workspace <string>] [-r|--remote <string>] [-d|--debug]
[-h|--help] <command> [<args>] [-h|--help] <command> [<args>]
``` ```
@ -60,10 +60,10 @@ Each command can have its own specific commandline options.
First of all you have to initalize the workspace. First of all you have to initalize the workspace.
```text ```text
$ myvc init $ myt init
``` ```
Now you can configure MyVC using *myvc.config.yml* file, located at the root of Now you can configure Myt using *myt.config.yml* file, located at the root of
your workspace. This file should include the project codename and schemas/tables your workspace. This file should include the project codename and schemas/tables
wich are exported when you use *pull* or *dump* commands. wich are exported when you use *pull* or *dump* commands.
@ -88,7 +88,7 @@ Once the basic configuration is done, routines can be imported from the
database into the project, it is recommended to use the *production* remote. database into the project, it is recommended to use the *production* remote.
```text ```text
$ myvc pull production $ myt pull production
``` ```
From now on, you can use the project as if it were a standard git repository From now on, you can use the project as if it were a standard git repository
@ -96,7 +96,7 @@ From now on, you can use the project as if it were a standard git repository
desired remote. desired remote.
```text ```text
$ myvc push [<remote>] [--commit] $ myt push [<remote>] [--commit]
``` ```
### Routines ### Routines
@ -157,7 +157,7 @@ You can create your local fixture and structure files.
Initializes an empty workspace. Initializes an empty workspace.
```text ```text
$ myvc init $ myt init
``` ```
### pull ### pull
@ -165,7 +165,7 @@ $ myvc init
Incorporates database routine changes into workspace. Incorporates database routine changes into workspace.
```text ```text
$ myvc pull [remote] [-f|--force] [-c|--checkout] [-u|--update] [-s|--sums] $ myt pull [remote] [-f|--force] [-c|--checkout] [-u|--update] [-s|--sums]
``` ```
When *--checkout* option is provided, it does the following before export: When *--checkout* option is provided, it does the following before export:
@ -178,7 +178,7 @@ When *--checkout* option is provided, it does the following before export:
Applies versions and routine changes into database. Applies versions and routine changes into database.
```text ```text
$ myvc push [<remote>] [-f|--force] [-c|--commit] [-s|--sums] $ myt push [<remote>] [-f|--force] [-c|--commit] [-s|--sums]
``` ```
Commit is saved into database only if *--commit* option is provided, it Commit is saved into database only if *--commit* option is provided, it
@ -192,7 +192,7 @@ Creates a new version folder, when name is not specified it generates a random
name mixing a color with a plant name. name mixing a color with a plant name.
```text ```text
$ myvc version [<name>] $ myt version [<name>]
``` ```
### clean ### clean
@ -200,7 +200,7 @@ $ myvc version [<name>]
Cleans all already applied versions older than *maxOldVersions*. Cleans all already applied versions older than *maxOldVersions*.
```text ```text
$ myvc clean $ myt clean
``` ```
## Local server commands ## Local server commands
@ -211,7 +211,7 @@ Exports database structure and fixtures from remote into hidden files located
in *dump* folder. If no remote is specified *production* is used. in *dump* folder. If no remote is specified *production* is used.
```text ```text
$ myvc dump [<remote>] $ myt dump [<remote>]
``` ```
### fixtures ### fixtures
@ -220,7 +220,7 @@ Exports local database fixtures into *dump/fixtures.sql* files. If no remote is
specified *local* is used. specified *local* is used.
```text ```text
$ myvc fixtures [<remote>] $ myt fixtures [<remote>]
``` ```
### run ### run
@ -230,7 +230,7 @@ when fixtures have been modified or when the day on which the image was built
is different to today. is different to today.
```text ```text
$ myvc run [-c|--ci] [-r|--random] $ myt run [-c|--ci] [-r|--random]
``` ```
### start ### start
@ -241,7 +241,7 @@ mind that when you do not rebuild the docker you may be using an outdated
version of it. version of it.
```text ```text
$ myvc start $ myt start
``` ```
## Why ## Why

6
assets/myvc.default.yml
View File

@ -1,9 +1,9 @@
versionSchema: myvc versionSchema: myt
versionDigits: 5 versionDigits: 5
maxOldVersions: 30 maxOldVersions: 30
schemas: schemas:
- myvc - myt
fixtures: fixtures:
myvc: myt:
- version - version
- versionLog - versionLog

4
cli.js
View File

@ -1,4 +1,4 @@
#!/usr/bin/env node #!/usr/bin/env node
const MyVC = require('./myvc'); const Myt = require('./myt');
new MyVC().run(); new Myt().run();

6
lib/command.js
View File

@ -1,7 +1,7 @@
/** /**
* Base class for MyVC commands. * Base class for Myt commands.
*/ */
module.exports = class MyVCCommand { module.exports = class MytCommand {
get usage() { get usage() {
return {}; return {};
} }
@ -10,7 +10,7 @@ module.exports = class MyVCCommand {
return {}; return {};
} }
async run(myvc, opts) { async run(myt, opts) {
throw new Error('run command not defined'); throw new Error('run command not defined');
} }
} }

4
lib/exporter-engine.js
View File

@ -4,9 +4,9 @@ const fs = require('fs-extra');
const Exporter = require('./exporter'); const Exporter = require('./exporter');
module.exports = class ExporterEngine { module.exports = class ExporterEngine {
constructor(conn, myvcDir) { constructor(conn, mytDir) {
this.conn = conn; this.conn = conn;
this.pullFile = `${myvcDir}/.pullinfo.json`; this.pullFile = `${mytDir}/.pullinfo.json`;
this.exporters = []; this.exporters = [];
this.exporterMap = {}; this.exporterMap = {};
} }

12
myvc-clean.js → myt-clean.js
View File

@ -1,5 +1,5 @@
const MyVC = require('./myvc'); const Myt = require('./myt');
const Command = require('./lib/command'); const Command = require('./lib/command');
const fs = require('fs-extra'); const fs = require('fs-extra');
@ -17,15 +17,15 @@ class Clean extends Command {
} }
}; };
async run(myvc, opts) { async run(myt, opts) {
await myvc.dbConnect(); await myt.dbConnect();
const version = await myvc.fetchDbVersion() || {}; const version = await myt.fetchDbVersion() || {};
const number = version.number; const number = version.number;
const oldVersions = []; const oldVersions = [];
const versionDirs = await fs.readdir(opts.versionsDir); const versionDirs = await fs.readdir(opts.versionsDir);
for (const versionDir of versionDirs) { for (const versionDir of versionDirs) {
const dirVersion = myvc.parseVersionDir(versionDir); const dirVersion = myt.parseVersionDir(versionDir);
if (!dirVersion) continue; if (!dirVersion) continue;
if (parseInt(dirVersion.number) < parseInt(number)) if (parseInt(dirVersion.number) < parseInt(number))
@ -49,4 +49,4 @@ class Clean extends Command {
module.exports = Clean; module.exports = Clean;
if (require.main === module) if (require.main === module)
new MyVC().run(Clean); new Myt().run(Clean);

19
myvc-dump.js → myt-dump.js
View File

@ -1,8 +1,7 @@
const MyVC = require('./myvc'); const Myt = require('./myt');
const Command = require('./lib/command'); const Command = require('./lib/command');
const fs = require('fs-extra'); const fs = require('fs-extra');
const path = require('path');
class Dump extends Command { class Dump extends Command {
static usage = { static usage = {
@ -16,8 +15,8 @@ class Dump extends Command {
} }
}; };
async run(myvc, opts) { async run(myt, opts) {
const dumpStream = await myvc.initDump('.dump.sql'); const dumpStream = await myt.initDump('.dump.sql');
console.log('Dumping structure.'); console.log('Dumping structure.');
let dumpArgs = [ let dumpArgs = [
@ -30,10 +29,10 @@ class Dump extends Command {
'--databases' '--databases'
]; ];
dumpArgs = dumpArgs.concat(opts.schemas); dumpArgs = dumpArgs.concat(opts.schemas);
await myvc.runDump('docker-dump.sh', dumpArgs, dumpStream); await myt.runDump('docker-dump.sh', dumpArgs, dumpStream);
console.log('Dumping fixtures.'); console.log('Dumping fixtures.');
await myvc.dumpFixtures(dumpStream, opts.fixtures); await myt.dumpFixtures(dumpStream, opts.fixtures);
console.log('Dumping privileges.'); console.log('Dumping privileges.');
const privs = opts.privileges; const privs = opts.privileges;
@ -48,14 +47,14 @@ class Dump extends Command {
args = args.concat(['mysql'], privs.tables); args = args.concat(['mysql'], privs.tables);
await dumpStream.write('USE `mysql`;\n', 'utf8'); await dumpStream.write('USE `mysql`;\n', 'utf8');
await myvc.runDump('mysqldump', args, dumpStream); await myt.runDump('mysqldump', args, dumpStream);
} }
await dumpStream.end(); await dumpStream.end();
console.log('Saving version.'); console.log('Saving version.');
await myvc.dbConnect(); await myt.dbConnect();
const version = await myvc.fetchDbVersion(); const version = await myt.fetchDbVersion();
if (version) { if (version) {
await fs.writeFile( await fs.writeFile(
`${opts.dumpDir}/.dump.json`, `${opts.dumpDir}/.dump.json`,
@ -68,5 +67,5 @@ class Dump extends Command {
module.exports = Dump; module.exports = Dump;
if (require.main === module) if (require.main === module)
new MyVC().run(Dump); new Myt().run(Dump);

10
myvc-fixtures.js → myt-fixtures.js
View File

@ -1,5 +1,5 @@
const MyVC = require('./myvc'); const Myt = require('./myt');
const Command = require('./lib/command'); const Command = require('./lib/command');
class Fixtures extends Command { class Fixtures extends Command {
@ -14,9 +14,9 @@ class Fixtures extends Command {
} }
}; };
async run(myvc, opts) { async run(myt, opts) {
const dumpStream = await myvc.initDump('fixtures.sql'); const dumpStream = await myt.initDump('fixtures.sql');
await myvc.dumpFixtures(dumpStream, opts.localFixtures, true); await myt.dumpFixtures(dumpStream, opts.localFixtures, true);
await dumpStream.end(); await dumpStream.end();
} }
} }
@ -24,5 +24,5 @@ class Fixtures extends Command {
module.exports = Fixtures; module.exports = Fixtures;
if (require.main === module) if (require.main === module)
new MyVC().run(Fixtures); new Myt().run(Fixtures);

8
myvc-init.js → myt-init.js
View File

@ -1,5 +1,5 @@
const MyVC = require('./myvc'); const Myt = require('./myt');
const Command = require('./lib/command'); const Command = require('./lib/command');
const fs = require('fs-extra'); const fs = require('fs-extra');
@ -8,11 +8,11 @@ class Init extends Command {
description: 'Initialize an empty workspace' description: 'Initialize an empty workspace'
}; };
async run(myvc, opts) { async run(myt, opts) {
const templateDir = `${__dirname}/template`; const templateDir = `${__dirname}/template`;
const templates = await fs.readdir(templateDir); const templates = await fs.readdir(templateDir);
for (let template of templates) { for (let template of templates) {
const dst = `${opts.myvcDir}/${template}`; const dst = `${opts.mytDir}/${template}`;
if (!await fs.pathExists(dst)) if (!await fs.pathExists(dst))
await fs.copy(`${templateDir}/${template}`, dst); await fs.copy(`${templateDir}/${template}`, dst);
} }
@ -22,4 +22,4 @@ class Init extends Command {
module.exports = Init; module.exports = Init;
if (require.main === module) if (require.main === module)
new MyVC().run(Init); new Myt().run(Init);

23
myvc-pull.js → myt-pull.js
View File

@ -1,9 +1,10 @@
const MyVC = require('./myvc'); const Myt = require('./myt');
const Command = require('./lib/command'); const Command = require('./lib/command');
const fs = require('fs-extra'); const fs = require('fs-extra');
const nodegit = require('nodegit'); const nodegit = require('nodegit');
const ExporterEngine = require('./lib/exporter-engine'); const ExporterEngine = require('./lib/exporter-engine');
class Pull extends Command { class Pull extends Command {
static usage = { static usage = {
description: 'Incorporate database routine changes into workspace', description: 'Incorporate database routine changes into workspace',
@ -31,9 +32,9 @@ class Pull extends Command {
] ]
}; };
async run(myvc, opts) { async run(myt, opts) {
const conn = await myvc.dbConnect(); const conn = await myt.dbConnect();
const repo = await myvc.openRepo(); const repo = await myt.openRepo();
if (!opts.force) { if (!opts.force) {
async function hasChanges(diff) { async function hasChanges(diff) {
@ -51,14 +52,14 @@ class Pull extends Command {
// Check for unstaged changes // Check for unstaged changes
const unstagedDiff = await myvc.getUnstaged(repo); const unstagedDiff = await myt.getUnstaged(repo);
if (await hasChanges(unstagedDiff)) if (await hasChanges(unstagedDiff))
throw new Error('You have unstaged changes, save them before pull'); throw new Error('You have unstaged changes, save them before pull');
// Check for staged changes // Check for staged changes
const stagedDiff = await myvc.getStaged(repo); const stagedDiff = await myt.getStaged(repo);
if (await hasChanges(stagedDiff)) if (await hasChanges(stagedDiff))
throw new Error('You have staged changes, save them before pull'); throw new Error('You have staged changes, save them before pull');
@ -67,15 +68,15 @@ class Pull extends Command {
// Checkout to remote commit // Checkout to remote commit
if (opts.checkout) { if (opts.checkout) {
const version = await myvc.fetchDbVersion(); const version = await myt.fetchDbVersion();
if (version && version.gitCommit) { if (version && version.gitCommit) {
const now = parseInt(new Date().toJSON()); const now = parseInt(new Date().toJSON());
const branchName = `myvc-pull_${now}`; const branchName = `myt-pull_${now}`;
console.log(`Creating branch '${branchName}' from database commit.`); console.log(`Creating branch '${branchName}' from database commit.`);
const commit = await repo.getCommit(version.gitCommit); const commit = await repo.getCommit(version.gitCommit);
const branch = await nodegit.Branch.create(repo, const branch = await nodegit.Branch.create(repo,
`myvc-pull_${now}`, commit, () => {}); `myt-pull_${now}`, commit, () => {});
await repo.checkoutBranch(branch); await repo.checkoutBranch(branch);
} }
} }
@ -84,7 +85,7 @@ class Pull extends Command {
console.log(`Incorporating routine changes.`); console.log(`Incorporating routine changes.`);
const engine = new ExporterEngine(conn, opts.myvcDir); const engine = new ExporterEngine(conn, opts.mytDir);
await engine.init(); await engine.init();
const shaSums = engine.shaSums; const shaSums = engine.shaSums;
@ -125,4 +126,4 @@ class Pull extends Command {
module.exports = Pull; module.exports = Pull;
if (require.main === module) if (require.main === module)
new MyVC().run(Pull); new Myt().run(Pull);

32
myvc-push.js → myt-push.js
View File

@ -1,5 +1,5 @@
const MyVC = require('./myvc'); const Myt = require('./myt');
const Command = require('./lib/command'); const Command = require('./lib/command');
const fs = require('fs-extra'); const fs = require('fs-extra');
const nodegit = require('nodegit'); const nodegit = require('nodegit');
@ -32,8 +32,8 @@ class Push extends Command {
] ]
}; };
async run(myvc, opts) { async run(myt, opts) {
const conn = await myvc.dbConnect(); const conn = await myt.dbConnect();
this.conn = conn; this.conn = conn;
if (opts.remote == 'local') if (opts.remote == 'local')
@ -42,14 +42,14 @@ class Push extends Command {
// Obtain exclusive lock // Obtain exclusive lock
const [[row]] = await conn.query( const [[row]] = await conn.query(
`SELECT GET_LOCK('myvc_push', 30) getLock`); `SELECT GET_LOCK('myt_push', 30) getLock`);
if (!row.getLock) { if (!row.getLock) {
let isUsed = 0; let isUsed = 0;
if (row.getLock == 0) { if (row.getLock == 0) {
const [[row]] = await conn.query( const [[row]] = await conn.query(
`SELECT IS_USED_LOCK('myvc_push') isUsed`); `SELECT IS_USED_LOCK('myt_push') isUsed`);
isUsed = row.isUsed; isUsed = row.isUsed;
} }
@ -57,11 +57,11 @@ class Push extends Command {
} }
async function releaseLock() { async function releaseLock() {
await conn.query(`DO RELEASE_LOCK('myvc_push')`); await conn.query(`DO RELEASE_LOCK('myt_push')`);
} }
try { try {
await this.push(myvc, opts, conn); await this.push(myt, opts, conn);
} catch(err) { } catch(err) {
try { try {
await releaseLock(); await releaseLock();
@ -74,12 +74,12 @@ class Push extends Command {
await releaseLock(); await releaseLock();
} }
async push(myvc, opts, conn) { async push(myt, opts, conn) {
const pushConn = await myvc.createConnection(); const pushConn = await myt.createConnection();
// Get database version // Get database version
const version = await myvc.fetchDbVersion() || {}; const version = await myt.fetchDbVersion() || {};
console.log( console.log(
`Database information:` `Database information:`
@ -148,7 +148,7 @@ class Push extends Command {
if (versionDir == 'README.md') if (versionDir == 'README.md')
continue; continue;
const dirVersion = myvc.parseVersionDir(versionDir); const dirVersion = myt.parseVersionDir(versionDir);
if (!dirVersion) { if (!dirVersion) {
logVersion('[?????]'.yellow, versionDir, logVersion('[?????]'.yellow, versionDir,
`Wrong directory name.` `Wrong directory name.`
@ -214,7 +214,7 @@ class Push extends Command {
let err; let err;
try { try {
await myvc.queryFromFile(pushConn, await myt.queryFromFile(pushConn,
`${scriptsDir}/${script}`); `${scriptsDir}/${script}`);
} catch (e) { } catch (e) {
err = e; err = e;
@ -258,7 +258,7 @@ class Push extends Command {
const gitExists = await fs.pathExists(`${opts.workspace}/.git`); const gitExists = await fs.pathExists(`${opts.workspace}/.git`);
let nRoutines = 0; let nRoutines = 0;
let changes = await myvc.changedRoutines(version.gitCommit); let changes = await myt.changedRoutines(version.gitCommit);
changes = this.parseChanges(changes); changes = this.parseChanges(changes);
const routines = []; const routines = [];
@ -283,7 +283,7 @@ class Push extends Command {
); );
} }
const engine = new ExporterEngine(conn, opts.myvcDir); const engine = new ExporterEngine(conn, opts.mytDir);
await engine.init(); await engine.init();
async function finalize() { async function finalize() {
@ -328,7 +328,7 @@ class Push extends Command {
if (change.type.name === 'VIEW') if (change.type.name === 'VIEW')
await pushConn.query(`USE ${scapedSchema}`); await pushConn.query(`USE ${scapedSchema}`);
await myvc.multiQuery(pushConn, newSql); await myt.multiQuery(pushConn, newSql);
if (change.isRoutine) { if (change.isRoutine) {
await conn.query( await conn.query(
@ -472,4 +472,4 @@ class Routine {
module.exports = Push; module.exports = Push;
if (require.main === module) if (require.main === module)
new MyVC().run(Push); new Myt().run(Push);

22
myvc-run.js → myt-run.js
View File

@ -1,7 +1,7 @@
const MyVC = require('./myvc'); const Myt = require('./myt');
const Command = require('./lib/command'); const Command = require('./lib/command');
const Push = require('./myvc-push'); const Push = require('./myt-push');
const docker = require('./lib/docker'); const docker = require('./lib/docker');
const fs = require('fs-extra'); const fs = require('fs-extra');
const path = require('path'); const path = require('path');
@ -33,7 +33,7 @@ class Run extends Command {
] ]
}; };
async run(myvc, opts) { async run(myt, opts) {
const dumpDir = opts.dumpDir; const dumpDir = opts.dumpDir;
const serverDir = path.join(__dirname, 'server'); const serverDir = path.join(__dirname, 'server');
@ -47,14 +47,14 @@ class Run extends Command {
serverDockerfile = path.join(serverDir, 'Dockerfile.base'); serverDockerfile = path.join(serverDir, 'Dockerfile.base');
await docker.build(__dirname, { await docker.build(__dirname, {
tag: 'myvc/base', tag: 'myt/base',
file: serverDockerfile file: serverDockerfile
}, opts.debug); }, opts.debug);
// Build myvc server image // Build myt server image
await docker.build(__dirname, { await docker.build(__dirname, {
tag: 'myvc/server', tag: 'myt/server',
file: path.join(serverDir, 'Dockerfile.server') file: path.join(serverDir, 'Dockerfile.server')
}, opts.debug); }, opts.debug);
@ -67,7 +67,7 @@ class Run extends Command {
const day = pad(today.getDate()); const day = pad(today.getDate());
const stamp = `${year}-${month}-${day}`; const stamp = `${year}-${month}-${day}`;
await docker.build(opts.myvcDir, { await docker.build(opts.mytDir, {
tag: opts.code, tag: opts.code,
file: path.join(serverDir, 'Dockerfile.dump'), file: path.join(serverDir, 'Dockerfile.dump'),
buildArg: `STAMP=${stamp}` buildArg: `STAMP=${stamp}`
@ -127,7 +127,7 @@ class Run extends Command {
commit: true, commit: true,
dbConfig dbConfig
}); });
await myvc.runCommand(Push, opts); await myt.runCommand(Push, opts);
// Apply fixtures // Apply fixtures
@ -138,7 +138,7 @@ class Run extends Command {
// Create triggers // Create triggers
console.log('Creating triggers.'); console.log('Creating triggers.');
const conn = await myvc.createConnection(); const conn = await myt.createConnection();
for (const schema of opts.schemas) { for (const schema of opts.schemas) {
const triggersPath = `${opts.routinesDir}/${schema}/triggers`; const triggersPath = `${opts.routinesDir}/${schema}/triggers`;
@ -147,7 +147,7 @@ class Run extends Command {
const triggersDir = await fs.readdir(triggersPath); const triggersDir = await fs.readdir(triggersPath);
for (const triggerFile of triggersDir) for (const triggerFile of triggersDir)
await myvc.queryFromFile(conn, `${triggersPath}/${triggerFile}`); await myt.queryFromFile(conn, `${triggersPath}/${triggerFile}`);
} }
return server; return server;
@ -157,4 +157,4 @@ class Run extends Command {
module.exports = Run; module.exports = Run;
if (require.main === module) if (require.main === module)
new MyVC().run(Run); new Myt().run(Run);

10
myvc-start.js → myt-start.js
View File

@ -1,9 +1,9 @@
const MyVC = require('./myvc'); const Myt = require('./myt');
const Command = require('./lib/command'); const Command = require('./lib/command');
const Container = require('./lib/docker').Container; const Container = require('./lib/docker').Container;
const Server = require('./lib/server'); const Server = require('./lib/server');
const Run = require('./myvc-run'); const Run = require('./myt-run');
/** /**
* Does the minium effort to start the database container, if it doesn't * Does the minium effort to start the database container, if it doesn't
@ -16,7 +16,7 @@ class Start extends Command {
description: 'Start local database server container' description: 'Start local database server container'
}; };
async run(myvc, opts) { async run(myt, opts) {
const ct = new Container(opts.code); const ct = new Container(opts.code);
let status; let status;
@ -26,7 +26,7 @@ class Start extends Command {
}); });
} catch (err) { } catch (err) {
const run = new Run() const run = new Run()
return await run.run(myvc, opts); return await run.run(myt, opts);
} }
switch (status) { switch (status) {
@ -48,4 +48,4 @@ class Start extends Command {
module.exports = Start; module.exports = Start;
if (require.main === module) if (require.main === module)
new MyVC().run(Start); new Myt().run(Start);

10
myvc-version.js → myt-version.js
View File

@ -1,5 +1,5 @@
const MyVC = require('./myvc'); const Myt = require('./myt');
const Command = require('./lib/command'); const Command = require('./lib/command');
const fs = require('fs-extra'); const fs = require('fs-extra');
@ -27,12 +27,12 @@ class Version extends Command {
} }
}; };
async run(myvc, opts) { async run(myt, opts) {
let newVersionDir; let newVersionDir;
// Fetch last version number // Fetch last version number
const conn = await myvc.dbConnect(); const conn = await myt.dbConnect();
try { try {
await conn.query('START TRANSACTION'); await conn.query('START TRANSACTION');
@ -75,7 +75,7 @@ class Version extends Command {
const versionNames = new Set(); const versionNames = new Set();
const versionDirs = await fs.readdir(opts.versionsDir); const versionDirs = await fs.readdir(opts.versionsDir);
for (const versionDir of versionDirs) { for (const versionDir of versionDirs) {
const dirVersion = myvc.parseVersionDir(versionDir); const dirVersion = myt.parseVersionDir(versionDir);
if (!dirVersion) continue; if (!dirVersion) continue;
versionNames.add(dirVersion.name); versionNames.add(dirVersion.name);
} }
@ -216,4 +216,4 @@ const plants = [
module.exports = Version; module.exports = Version;
if (require.main === module) if (require.main === module)
new MyVC().run(Version); new Myt().run(Version);

42
myvc.js → myt.js
View File

@ -13,7 +13,7 @@ const camelToSnake = require('./lib/util').camelToSnake;
const docker = require('./lib/docker'); const docker = require('./lib/docker');
const Command = require('./lib/command'); const Command = require('./lib/command');
class MyVC { class Myt {
get usage() { get usage() {
return { return {
description: 'Utility for database versioning', description: 'Utility for database versioning',
@ -51,7 +51,7 @@ class MyVC {
async run(CommandClass) { async run(CommandClass) {
console.log( console.log(
'MyVC (MySQL Version Control)'.green, 'Myt'.green,
`v${packageJson.version}`.magenta `v${packageJson.version}`.magenta
); );
@ -72,7 +72,7 @@ class MyVC {
if (!/^[a-z]+$/.test(commandName)) if (!/^[a-z]+$/.test(commandName))
throw new Error (`Invalid command name '${commandName}'`); throw new Error (`Invalid command name '${commandName}'`);
const commandFile = path.join(__dirname, `myvc-${commandName}.js`); const commandFile = path.join(__dirname, `myt-${commandName}.js`);
if (!await fs.pathExists(commandFile)) if (!await fs.pathExists(commandFile))
throw new Error (`Unknown command '${commandName}'`); throw new Error (`Unknown command '${commandName}'`);
@ -126,7 +126,7 @@ class MyVC {
try { try {
depVersion = wsPackageJson depVersion = wsPackageJson
.dependencies .dependencies
.myvc.match(versionRegex); .myt.match(versionRegex);
} catch (e) {} } catch (e) {}
} }
@ -137,11 +137,11 @@ class MyVC {
depVersion[1] === myVersion[1] && depVersion[1] === myVersion[1] &&
depVersion[2] === myVersion[2]; depVersion[2] === myVersion[2];
if (!isSameVersion) if (!isSameVersion)
throw new Error(`MyVC version differs a lot from package.json, please run 'npm i' first to install the proper version.`); throw new Error(`Myt version differs a lot from package.json, please run 'npm i' first to install the proper version.`);
const isSameMinor = depVersion[3] === myVersion[3]; const isSameMinor = depVersion[3] === myVersion[3];
if (!isSameMinor) if (!isSameMinor)
console.warn(`Warning! MyVC minor version differs from package.json, maybe you shoud run 'npm i' to install the proper version.`.yellow); console.warn(`Warning! Myt minor version differs from package.json, maybe you shoud run 'npm i' to install the proper version.`.yellow);
} }
// Load method // Load method
@ -178,9 +178,9 @@ class MyVC {
async load(opts) { async load(opts) {
// Configuration file // Configuration file
const config = require(`${__dirname}/assets/myvc.default.yml`); const config = require(`${__dirname}/assets/myt.default.yml`);
const configFile = 'myvc.config.yml'; const configFile = 'myt.config.yml';
const configPath = path.join(opts.workspace, configFile); const configPath = path.join(opts.workspace, configFile);
if (await fs.pathExists(configPath)) if (await fs.pathExists(configPath))
Object.assign(config, require(configPath)); Object.assign(config, require(configPath));
@ -188,12 +188,12 @@ class MyVC {
Object.assign(opts, config); Object.assign(opts, config);
opts.configFile = configFile; opts.configFile = configFile;
if (!opts.myvcDir) if (!opts.mytDir)
opts.myvcDir = path.join(opts.workspace, opts.subdir || ''); opts.mytDir = path.join(opts.workspace, opts.subdir || '');
opts.routinesDir = path.join(opts.myvcDir, 'routines'); opts.routinesDir = path.join(opts.mytDir, 'routines');
opts.versionsDir = path.join(opts.myvcDir, 'versions'); opts.versionsDir = path.join(opts.mytDir, 'versions');
opts.dumpDir = path.join(opts.myvcDir, 'dump'); opts.dumpDir = path.join(opts.mytDir, 'dump');
// Database configuration // Database configuration
@ -201,7 +201,7 @@ class MyVC {
let iniFile = 'db.ini'; let iniFile = 'db.ini';
if (opts.remote) { if (opts.remote) {
iniDir = `${opts.myvcDir}/remotes`; iniDir = `${opts.mytDir}/remotes`;
iniFile = `${opts.remote}.ini`; iniFile = `${opts.remote}.ini`;
} }
const iniPath = path.join(iniDir, iniFile); const iniPath = path.join(iniDir, iniFile);
@ -226,7 +226,7 @@ class MyVC {
}; };
if (iniConfig.ssl_ca) { if (iniConfig.ssl_ca) {
dbConfig.ssl = { dbConfig.ssl = {
ca: await fs.readFile(`${opts.myvcDir}/${iniConfig.ssl_ca}`), ca: await fs.readFile(`${opts.mytDir}/${iniConfig.ssl_ca}`),
rejectUnauthorized: iniConfig.ssl_verify_server_cert != undefined rejectUnauthorized: iniConfig.ssl_verify_server_cert != undefined
} }
} }
@ -422,7 +422,7 @@ class MyVC {
const dumpStream = await fs.createWriteStream(dumpPath); const dumpStream = await fs.createWriteStream(dumpPath);
await docker.build(__dirname, { await docker.build(__dirname, {
tag: 'myvc/client', tag: 'myt/client',
file: path.join(__dirname, 'server', 'Dockerfile.client') file: path.join(__dirname, 'server', 'Dockerfile.client')
}, this.opts.debug); }, this.opts.debug);
@ -469,15 +469,15 @@ class MyVC {
] ]
}; };
const commandArgs = [command].concat(myArgs, args); const commandArgs = [command].concat(myArgs, args);
await docker.run('myvc/client', commandArgs, { await docker.run('myt/client', commandArgs, {
addHost: 'host.docker.internal:host-gateway', addHost: 'host.docker.internal:host-gateway',
volume: `${this.opts.myvcDir}:/workspace`, volume: `${this.opts.mytDir}:/workspace`,
rm: true rm: true
}, execOptions); }, execOptions);
} }
showHelp(opts, usage, command) { showHelp(opts, usage, command) {
const prefix = `${'Usage:'.gray} [npx] myvc`; const prefix = `${'Usage:'.gray} [npx] myt`;
if (command) { if (command) {
let log = [prefix, command.blue]; let log = [prefix, command.blue];
@ -640,7 +640,7 @@ for (const tokenId in tokens) {
tokenIndex.set(token.start[0], token); tokenIndex.set(token.start[0], token);
} }
module.exports = MyVC; module.exports = Myt;
if (require.main === module) if (require.main === module)
new MyVC().run(); new Myt().run();

9
package-lock.json generated
View File

@ -1,12 +1,12 @@
{ {
"name": "myvc", "name": "@verdnatura/myt",
"version": "1.5.0", "version": "1.5.2",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "myvc", "name": "@verdnatura/myt",
"version": "1.5.0", "version": "1.5.2",
"license": "GPL-3.0", "license": "GPL-3.0",
"dependencies": { "dependencies": {
"@sqltools/formatter": "^1.2.3", "@sqltools/formatter": "^1.2.3",
@ -21,6 +21,7 @@
"sha.js": "^2.4.11" "sha.js": "^2.4.11"
}, },
"bin": { "bin": {
"myt": "cli.js",
"myv": "cli.js", "myv": "cli.js",
"myvc": "cli.js" "myvc": "cli.js"
} }

9
package.json
View File

@ -1,16 +1,17 @@
{ {
"name": "myvc", "name": "@verdnatura/myt",
"version": "1.5.0", "version": "1.5.2",
"author": "Verdnatura Levante SL", "author": "Verdnatura Levante SL",
"description": "MySQL Version Control", "description": "MySQL and MariaDB version control using Git",
"license": "GPL-3.0", "license": "GPL-3.0",
"bin": { "bin": {
"myt": "cli.js",
"myvc": "cli.js", "myvc": "cli.js",
"myv": "cli.js" "myv": "cli.js"
}, },
"repository": { "repository": {
"type": "git", "type": "git",
"url": "https://github.com/verdnatura/myvc.git" "url": "https://github.com/verdnatura/myt.git"
}, },
"dependencies": { "dependencies": {
"@sqltools/formatter": "^1.2.3", "@sqltools/formatter": "^1.2.3",

2
server/Dockerfile.dump
View File

@ -1,4 +1,4 @@
FROM myvc/server FROM myt/server
USER root USER root

2
server/Dockerfile.server
View File

@ -1,4 +1,4 @@
FROM myvc/base FROM myt/base
USER root USER root
ENV MYSQL_ROOT_PASSWORD root ENV MYSQL_ROOT_PASSWORD root

4
template/myvc.config.yml
View File

@ -1,9 +1,9 @@
code: my-db code: my-db
schemas: schemas:
- myvc - myt
- my_db - my_db
fixtures: fixtures:
myvc: myt:
- version - version
- versionLog - versionLog
my_db: my_db:

2
template/package.json
View File

@ -8,6 +8,6 @@
"type": "git" "type": "git"
}, },
"dependencies": { "dependencies": {
"myvc": "^1.5.0" "myt": "^1.5.2"
} }
} }