mythix 2.8.3 → 2.8.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mythix",
-  "version": "2.8.3",
+  "version": "2.8.5",
   "description": "Mythix is a NodeJS web-app framework",
   "main": "src/index",
   "scripts": {

package/src/application.js

@@ -235,14 +235,18 @@ class Application extends EventEmitter {
   }
 
   loadConfig(configPath) {
-    try {
-      let appOptions = this.getOptions();
+    let appOptions  = this.getOptions();
+    let environment = (appOptions.environment || process.NODE_ENV || 'development');
+
+    if (!configPath)
+      return wrapConfig(Object.assign({}, { environment }));
 
+    try {
       let config = require(configPath);
       if (config.__esModule)
         config = config['default'];
 
-      return wrapConfig(Object.assign({}, config || {}, { environment: (appOptions.environment || config.environment || 'development')}));
+      return wrapConfig(Object.assign({}, config || {}, { environment }));
     } catch (error) {
       this.getLogger().error(`Error while trying to load application configuration ${configPath}: `, error);
       throw error;

package/src/cli/cli-utils.js

@@ -324,6 +324,9 @@ function loadCommand(name) {
 
 function getCommandFiles(commandsPath, filterFunc) {
   try {
+    if (!commandsPath)
+      return [];
+
     return walkDir(commandsPath, {
       filter: (fullFileName, fileName, stats) => {
         if (typeof filterFunc === 'function')
@@ -390,7 +393,7 @@ function resolveConfig(config) {
 
 function loadMythixConfig(_mythixConfigPath, _appRootPath) {
   let mythixConfigPath = _mythixConfigPath;
-  let configPath        = mythixConfigPath;
+  let configPath       = mythixConfigPath;
 
   try {
     let stats = FileSystem.statSync(mythixConfigPath);

package/src/cli/deploy-command.js

@@ -112,6 +112,7 @@ module.exports = defineCommand('deploy', ({ Parent }) => {
 
         let {
           relativeFileName,
+          stats,
         } = context;
 
         let shouldIncludeFile = true;
@@ -121,7 +122,7 @@ module.exports = defineCommand('deploy', ({ Parent }) => {
         if (useGitIgnore && matchesAnyPattern(useGitIgnore))
           shouldIncludeFile = false;
 
-        if (Nife.isNotEmpty(include))
+        if (Nife.isNotEmpty(include) && !stats.isDirectory())
           shouldIncludeFile = matchesAnyPattern(include);
 
         if (Nife.isNotEmpty(exclude) && matchesAnyPattern(exclude))
@@ -288,6 +289,10 @@ module.exports = defineCommand('deploy', ({ Parent }) => {
       }
     }
 
+    async postCloneProject() {
+
+    }
+
     async copyFile(dryRun, sourceFilePath, targetFilePath) {
       let targetDir = Path.dirname(targetFilePath);
       if (!FileSystem.existsSync(targetDir))
@@ -297,6 +302,14 @@ module.exports = defineCommand('deploy', ({ Parent }) => {
       FileSystem.copyFileSync(sourceFilePath, targetFilePath);
     }
 
+    formatOutputPath(context, deployConfig) {
+      let { formatOutputPath } = deployConfig;
+      if (typeof formatOutputPath === 'function')
+        return formatOutputPath.call(this, context, deployConfig);
+
+      return context.targetPath;
+    }
+
     async copyProjectFilesToDeployFolder(deployConfig) {
       let {
         tempLocation,
@@ -316,7 +329,13 @@ module.exports = defineCommand('deploy', ({ Parent }) => {
       for (let i = 0, il = filesToDeploy.length; i < il; i++) {
         let sourcePath        = filesToDeploy[i];
         let relativeFilePath  = sourcePath.substring(projectLocation.length).replace(/^[/\\]+/, '');
-        let targetPath        = Path.join(deployFolderLocation, relativeFilePath);
+        let targetPath        = this.formatOutputPath({
+          targetPath: Path.join(deployFolderLocation, relativeFilePath),
+          outputPath: projectLocation,
+          deployPath: deployFolderLocation,
+          relativeFilePath,
+          sourcePath,
+        }, deployConfig);
 
         await this.copyFile(dryRun, sourcePath, targetPath);
       }
@@ -335,19 +354,19 @@ module.exports = defineCommand('deploy', ({ Parent }) => {
 
       let deployLocation = Path.join(tempLocation, ('' + version));
 
-      if (!installModulesCommand) {
+      if (installModulesCommand == null) {
         let yarnLockLocation = Path.join(deployLocation, 'yarn.lock');
         if (FileSystem.existsSync(yarnLockLocation))
           installModulesCommand = { command: 'bash', args: [ '--login', '-c', '"yarn --prod"' ] };
         else
           installModulesCommand = { command: 'bash', args: [ '--login', '-c', '"npm i --omit=dev"' ] };
-      } else if (Nife.isEmpty(typeof installModulesCommand !== 'function' && Nife.isEmpty(installModulesCommand.command))) {
+      } else if (installModulesCommand !== false && Nife.isEmpty(typeof installModulesCommand !== 'function' && Nife.isEmpty(installModulesCommand.command))) {
         throw new Error('You specified a "installModulesCommand" in your deploy config, but no "command" property found... you need to specify "installModulesCommand" as an object "{ installModulesCommand: { command: "npm", args: [ "i" ] } }", or as a function.');
       }
 
       if (typeof installModulesCommand === 'function') {
         await installModulesCommand(deployConfig);
-      } else {
+      } else if (installModulesCommand) {
         await this.executeRemoteCommands(target, deployConfig, [
           { sudo: false, command: 'cd', args: [ `"${remoteLocation}"` ]},
           installModulesCommand,
@@ -361,6 +380,7 @@ module.exports = defineCommand('deploy', ({ Parent }) => {
 
     async archiveProject(deployConfig) {
       let {
+        dryRun,
         tempLocation,
         version,
       } = deployConfig;
@@ -368,7 +388,7 @@ module.exports = defineCommand('deploy', ({ Parent }) => {
       let archiveLocation = deployConfig.archiveLocation = Path.join(tempLocation, `${version}.tar.gz`);
 
       await this.spawnCommand(
-        false,
+        dryRun,
         'tar',
         [
           '-czf',
@@ -552,9 +572,15 @@ module.exports = defineCommand('deploy', ({ Parent }) => {
       if (typeof target.preDeploy === 'function')
         return await target.preDeploy.call(this, target, deployConfig);
 
-      await this.executeRemoteCommands(target, deployConfig, [
-        { command: 'mkdir', args: [ '-p', this.joinUnixPath(decodeURIComponent(target.pathname), 'shared') ] },
-      ]);
+      let {
+        relativeConfigPath,
+      } = deployConfig;
+
+      if (relativeConfigPath) {
+        await this.executeRemoteCommands(target, deployConfig, [
+          { command: 'mkdir', args: [ '-p', this.joinUnixPath(decodeURIComponent(target.pathname), 'shared') ] },
+        ]);
+      }
     }
 
     async allRemotesDeploy(deployConfig) {
@@ -653,26 +679,28 @@ module.exports = defineCommand('deploy', ({ Parent }) => {
         relativeConfigPath,
       } = deployConfig;
 
-      let deployLocation    = this.joinUnixPath(decodeURIComponent(target.pathname), '' + deployConfig.version);
-      let targetConfigPath  = this.joinUnixPath(decodeURIComponent(target.pathname), 'shared', 'config');
-      let sourceConfigPath  = this.joinUnixPath(deployLocation, relativeConfigPath);
-      let nodeModulesLink   = this.joinUnixPath(targetConfigPath, 'node_modules');
+      if (relativeConfigPath) {
+        let deployLocation    = this.joinUnixPath(decodeURIComponent(target.pathname), '' + deployConfig.version);
+        let targetConfigPath  = this.joinUnixPath(decodeURIComponent(target.pathname), 'shared', 'config');
+        let sourceConfigPath  = this.joinUnixPath(deployLocation, relativeConfigPath);
+        let nodeModulesLink   = this.joinUnixPath(targetConfigPath, 'node_modules');
 
-      // Ensure shared/config exists
-      await this.executeRemoteCommands(target, deployConfig, [
-        { command: 'test', args: [ '!', '-d', `"${targetConfigPath}"`, '&&', `${this.sudo(deployConfig)}cp -a "${sourceConfigPath}" "${targetConfigPath}"`, '|| true' ] },
-      ]);
+        // Ensure shared/config exists
+        await this.executeRemoteCommands(target, deployConfig, [
+          { command: 'test', args: [ '!', '-d', `"${targetConfigPath}"`, '&&', `${this.sudo(deployConfig)}cp -a "${sourceConfigPath}" "${targetConfigPath}"`, '|| true' ] },
+        ]);
 
-      // Ensure shared/config/node_modules symlink exists
-      await this.executeRemoteCommands(target, deployConfig, [
-        { command: 'test', args: [ '!', '-e', `"${nodeModulesLink}"`, '&&', `{ cd "${targetConfigPath}"; ${this.sudo(deployConfig)}ln -s "../../current/node_modules" "node_modules"; }`, '|| true' ] },
-      ]);
+        // Ensure shared/config/node_modules symlink exists
+        await this.executeRemoteCommands(target, deployConfig, [
+          { command: 'test', args: [ '!', '-e', `"${nodeModulesLink}"`, '&&', `{ cd "${targetConfigPath}"; ${this.sudo(deployConfig)}ln -s "../../current/node_modules" "node_modules"; }`, '|| true' ] },
+        ]);
 
-      // Remove app/config and symlink to ../shared/app/config
-      await this.executeRemoteCommands(target, deployConfig, [
-        { command: 'rm', args: [ '-fr', `"${sourceConfigPath}"` ] },
-        { command: 'ln', args: [ '-s', `"${targetConfigPath}"`, `"${sourceConfigPath}"` ] },
-      ]);
+        // Remove app/config and symlink to ../shared/app/config
+        await this.executeRemoteCommands(target, deployConfig, [
+          { command: 'rm', args: [ '-fr', `"${sourceConfigPath}"` ] },
+          { command: 'ln', args: [ '-s', `"${targetConfigPath}"`, `"${sourceConfigPath}"` ] },
+        ]);
+      }
 
       await this.installModulesForApp(target, deployConfig);
     }
@@ -692,7 +720,7 @@ module.exports = defineCommand('deploy', ({ Parent }) => {
         { command: 'ls', args: [ '-1', `"${deployLocation}"`, '|', 'grep', '-P', '"\\d+"' ] },
       ]);
 
-      let versions          = result.stdout.split(/\n+/g).map((part) => part.trim()).filter(Boolean).sort();
+      let versions          = (result.stdout || '').split(/\n+/g).map((part) => part.trim()).filter(Boolean).sort();
       let versionsToRemove  = versions.slice(0, -LATEST_DEPLOY_VERSIONS_TO_KEEP);
 
       if (Nife.isNotEmpty(versionsToRemove)) {
@@ -717,7 +745,7 @@ module.exports = defineCommand('deploy', ({ Parent }) => {
         { command: 'ln', args: [ '-s', `"${deployLocation}"`, `"${currentLinkLocation}"` ] },
       ]);
 
-      if (target.index === 0) {
+      if (target.index === 0 && deployConfig.migrations !== false) {
         let targetLocation = `"${decodeURIComponent(target.pathname)}/current"`;
 
         let serviceUser   = target.serviceUser || target.uri.username;
@@ -732,11 +760,11 @@ module.exports = defineCommand('deploy', ({ Parent }) => {
       // Cleanup old deploy versions
       await this.cleanupOldDeployVersions(target, deployConfig);
 
-      if (Nife.isNotEmpty(target.restartService)) {
+      if (target.restartService !== false && Nife.isNotEmpty(target.restartService)) {
         await this.executeRemoteCommands(target, deployConfig, [
           target.restartService,
         ]);
-      } else {
+      } else if (target.restartService !== false) {
         console.log(`    !!!NOTICE!!! "restartService" command is not defined on your deploy "targets[${target.index}]". Your service will not be automatically restarted. Please make sure to manually restart your application service on this remote target.`);
       }
     }
@@ -809,7 +837,8 @@ module.exports = defineCommand('deploy', ({ Parent }) => {
         if (!deployConfig.rootPath)
           deployConfig.rootPath = Path.dirname(configPath);
 
-        deployConfig.relativeConfigPath = appOptions.configPath.substring(deployConfig.rootPath.length).replace(/^[/\\.]+/, '').replace(/[/\\]+$/, '');
+        if (appOptions.configPath)
+          deployConfig.relativeConfigPath = appOptions.configPath.substring(deployConfig.rootPath.length).replace(/^[/\\.]+/, '').replace(/[/\\]+$/, '');
 
         let git = deployConfig.git || {};
         if (git.useGitIgnore) {
@@ -894,7 +923,7 @@ module.exports = defineCommand('deploy', ({ Parent }) => {
 
       console.log(`-------- Deploy ${deployConfig.version} --------`);
       console.log(`  Application name: ${appName}`);
-      console.log(`  Application config location: ./${deployConfig.relativeConfigPath}`);
+      console.log(`  Application config location: ${(deployConfig.relativeConfigPath) ? `./${deployConfig.relativeConfigPath}` : '<none>'}`);
       console.log(`  Temporary file location: ${deployConfig.tempLocation}`);
       console.log(`  Project file location: ${deployConfig.rootPath}`);
       console.log('');
@@ -916,8 +945,8 @@ module.exports = defineCommand('deploy', ({ Parent }) => {
       console.log('  Command log:');
 
       try {
-        this.mkdirSync(dryRun, tempLocation);
-        this.mkdirSync(dryRun, Path.join(tempLocation, deployConfig.version));
+        this.mkdirSync(false, tempLocation);
+        this.mkdirSync(false, Path.join(tempLocation, deployConfig.version));
 
         if (Nife.isNotEmpty(branch) && Nife.isEmpty(repository)) {
           repository = await this.getRepositoryURL(remoteName);
@@ -926,6 +955,7 @@ module.exports = defineCommand('deploy', ({ Parent }) => {
         }
 
         await this.cloneProject(deployConfig);
+        await this.postCloneProject(deployConfig);
         await this.copyProjectFilesToDeployFolder(deployConfig);
         await this.prepProjectPreDeploy(deployConfig);
         await this.archiveProject(deployConfig);