zeche 0.0.6 → 0.1.0

package/lib/action/deployDatabase.js

@@ -90,12 +90,25 @@ class DeployDatabase {
       }
     }
 
-    const filename = `${TMP_DIR}/${fromEnvironment.db.database}__${moment().
+    let tmpDirFrom = TMP_DIR;
+    if (fromEnvironment.paths.tmpDir) {
+      tmpDirFrom = fromEnvironment.paths.tmpDir;
+    }
+
+    let tmpDirTo = TMP_DIR;
+    if (toEnvironment.paths.tmpDir) {
+      tmpDirTo = toEnvironment.paths.tmpDir;
+    }
+
+    const filenameFrom = `${tmpDirFrom}/${fromEnvironment.db.database}__${moment().
+        format('YYYY_MM_DD_HH_mm_ss')}.sql`;
+
+    const filenameTo = `${tmpDirTo}/${fromEnvironment.db.database}__${moment().
         format('YYYY_MM_DD_HH_mm_ss')}.sql`;
 
     /** 1. Export dump on source environment: */
     let exportCommands = [
-      `mysqldump --opt -h ${fromEnvironment.db.host} -P ${fromEnvironment.db.port} -u ${fromEnvironment.db.user} -p'${fromEnvironment.db.password}' ${fromEnvironment.db.database} > ${filename}`,
+      `mysqldump --opt -h ${fromEnvironment.db.host} -P ${fromEnvironment.db.port} -u ${fromEnvironment.db.user} -p'${fromEnvironment.db.password}' ${fromEnvironment.db.database} > ${filenameFrom}`,
     ];
 
     /** Container exec for docker/vagrant: */
@@ -106,7 +119,7 @@ class DeployDatabase {
     }
 
     /** Create tmp dir: */
-    exportCommands.unshift(`mkdir -p ${TMP_DIR}`);
+    exportCommands.unshift(`mkdir -p ${tmpDirFrom}`);
 
     if (this.services.sshService.useSsh(fromEnvironment)) {
       exportCommands = exportCommands.map(command => {
@@ -117,12 +130,12 @@ class DeployDatabase {
     this.services.execService.exec(exportCommands);
 
     /** 2. Copy dump to target environment: */
-    this.services.syncService.sync(filename, filename, fromEnvironment,
+    this.services.syncService.sync(filenameFrom, filenameTo, fromEnvironment,
         toEnvironment);
 
     /** 3. Import dump on target environment: */
     let importCommands = [
-      `mysql -h ${toEnvironment.db.host} -P ${toEnvironment.db.port} -u ${toEnvironment.db.user} -p'${toEnvironment.db.password}' ${toEnvironment.db.database} < ${filename}`,
+      `mysql -h ${toEnvironment.db.host} -P ${toEnvironment.db.port} -u ${toEnvironment.db.user} -p'${toEnvironment.db.password}' ${toEnvironment.db.database} < ${filenameTo}`,
     ];
 
     /** Container exec for docker/vagrant: */
@@ -132,6 +145,9 @@ class DeployDatabase {
       });
     }
 
+    /** Create tmp dir to: */
+    exportCommands.unshift(`mkdir -p ${tmpDirTo}`);
+
     if (this.services.sshService.useSsh(toEnvironment)) {
       importCommands = importCommands.map(command => {
         return this.services.sshService.wrapCommand(command, toEnvironment);
@@ -140,7 +156,7 @@ class DeployDatabase {
     this.services.execService.exec(importCommands);
 
     /** Remove dump on export environment: */
-    let cleanUpExportCommands = [`rm ${filename}`];
+    let cleanUpExportCommands = [`rm ${filenameFrom}`];
     if (this.services.sshService.useSsh(fromEnvironment)) {
       cleanUpExportCommands = cleanUpExportCommands.map(command => {
         return this.services.sshService.wrapCommand(command, fromEnvironment);
@@ -149,7 +165,7 @@ class DeployDatabase {
     this.services.execService.exec(cleanUpExportCommands);
 
     /** Remove dump on import environment: */
-    let cleanUpImportCommands = [`rm ${filename}`];
+    let cleanUpImportCommands = [`rm ${filenameTo}`];
     if (this.services.sshService.useSsh(toEnvironment)) {
       cleanUpImportCommands = cleanUpImportCommands.map(command => {
         return this.services.sshService.wrapCommand(command, toEnvironment);
@@ -160,4 +176,4 @@ class DeployDatabase {
 
 }
 
-module.exports = DeployDatabase;
+module.exports = DeployDatabase;

package/lib/action/dumpDatabase.js

@@ -2,7 +2,6 @@
 
 const _ = require('lodash');
 const moment = require('moment');
-const TMP_DIR = '/tmp/zechetmp';
 
 module.exports = class DumpDatabase {
 
@@ -177,6 +176,7 @@ module.exports = class DumpDatabase {
       `mysql -h ${environment.db.host} -P ${environment.db.port} -u ${environment.db.user} -p'${environment.db.password}' ${environment.db.database} < ${path}/${fullFilename}`,
     ];
 
+
     /** Container exec for docker/vagrant: */
     if (environment.db.container_exec) {
       commands = commands.map(command => {
@@ -192,4 +192,4 @@ module.exports = class DumpDatabase {
 
     this.services.execService.exec(commands);
   }
-};
+};

package/lib/action/ssh.js

@@ -63,7 +63,6 @@ module.exports = class Ssh {
   }
 
   init(environment) {
-    console.log('iniinit', environment);
     if (!_.has(this.config, `environments.${environment}`)) {
       this.services.outputService.print(
           `environment ${environment} does not exist in configuration`,
@@ -94,4 +93,4 @@ module.exports = class Ssh {
     this.services.execService.exec(commands);
 
   }
-};
+};

package/lib/service/execService.js

@@ -33,4 +33,4 @@ class ExecService {
   }
 }
 
-module.exports = ExecService;
+module.exports = ExecService;

package/lib/service/outputService.js

@@ -84,4 +84,4 @@ class OutputService {
 
 }
 
-module.exports = OutputService;
+module.exports = OutputService;

package/lib/service/syncService.js

@@ -58,7 +58,7 @@ class SyncService {
   localToLocal(source, target) {
     let commands = [
       `mkdir -p ${target}`,
-      `rsync -r –l ${source} ${target}`
+      `rsync -r --links ${source} ${target}`
     ];
     this.services.execService.exec(commands);
   }
@@ -70,7 +70,7 @@ class SyncService {
     const key = targetEnvironment.ssh.key;
     let commands = [
       SyncService.getSSHCommand(targetEnvironment, `mkdir -p ${target}`),
-      `rsync -r –l -e "ssh -i ${key} ${sshParams}" ${source} ${user}@${host}:${target}`
+      `rsync -r --links -e "ssh -i ${key} ${sshParams}" ${source} ${user}@${host}:${target}`
     ];
     this.services.execService.exec(commands);
   }
@@ -89,7 +89,7 @@ class SyncService {
     const key = sourceEnvironment.ssh.key;
     let commands = [];
     commands.push(`mkdir -p ${target}`);
-    commands.push(`rsync -r –l -e "ssh -i ${key} ${sshParams}" ${user}@${host}:${source} ${target}`);
+    commands.push(`rsync -r --links -e "ssh -i ${key} ${sshParams}" ${user}@${host}:${source} ${target}`);
 
     this.services.execService.exec(commands);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zeche",
-  "version": "0.0.6",
+  "version": "0.1.0",
   "description": "CLI software project handling tool",
   "repository": {
     "type": "git",