wp-blank-scripts 2.6.5 → 2.6.6

package/lib/deployProject.js

@@ -11,6 +11,7 @@ const getMostRecentSqlFile = require('../utils/getMostRecentSqlFile');
 const runProjectBuildTask = require('../utils/runProjectBuildTask');
 const bumpVersion = require('../utils/bumpVersion');
 const isCI = require('../utils/isCI');
+const execAsync = require('../utils/execAsync');
 const { DEPLOY_MODES } = require('../constants');
 const getProjectPath = require('../utils/getProjectPath');
 const getSettings = require('../utils/projectSettings');
@@ -19,8 +20,8 @@ const replaceSQL = require('../utils/replaceSQL');
 
 // Default options
 const defaultOptions = {
-  tunnelHost: 'localhost',
-  tunnelPort: 33333,
+  tunnelHost: '127.0.0.1',
+  tunnelPort: 3307,
   mySQLPort: 3306,
 };
 
@@ -68,6 +69,12 @@ async function createTunnel() {
 
   const { tunnelHost, tunnelPort, mySQLPort } = options;
 
+  if (isCI()) {
+    execAsync(`ssh -L ${tunnelPort}:${tunnelHost}:${mySQLPort} -N ${server.user}@${server.host}`);
+    logger.log(`Created tunnel to ${server.host}`);
+    return;
+  }
+
   let serverPrivateKey;
   if (options.serverPrivateKey) {
     serverPrivateKey = fs.readFileSync(cleanShellPath(options.serverPrivateKey));
@@ -177,17 +184,16 @@ async function deployToServer() {
 
 async function connectMySQL() {
   // Environment info
-  const { host, port } = settings.server[options.environment];
+  const { host } = settings.server[options.environment];
   const { user, password, database } = settings.mysql[options.environment];
 
   // Tunnel info
   const { tunnelHost, tunnelPort } = options;
-  const useTunnel = !isCI();
 
   return new Promise((resolve, reject) => {
     m = mysql.createConnection({
-      host: useTunnel ? tunnelHost : host,
-      port: useTunnel ? tunnelPort : port,
+      host: tunnelHost,
+      port: tunnelPort,
       user,
       password,
       database,
@@ -271,9 +277,7 @@ module.exports = async (selectOptions, callbacks) => {
   }
 
   if (options.sql) {
-    if (!isCI()) {
-      await createTunnel();
-    }
+    await createTunnel();
     await connectMySQL();
     const file = isCI()
       ? getMostRecentSqlFile(true)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wp-blank-scripts",
-  "version": "2.6.5",
+  "version": "2.6.6",
   "description": "Personal Wordpress Scripts",
   "main": "index.js",
   "bin": {