wp-blank-scripts 2.6.2 → 2.6.5

package/cli/deploy.js

@@ -8,7 +8,6 @@ const { DEPLOY_OPTIONS, DEPLOY_MODES } = require('../constants');
 
 const getSettings = require('../utils/projectSettings');
 const exitWithError = require('../utils/exitWithError');
-// TODO: Move into function
 const settings = getSettings();
 const logger = require('../logger');
 

package/index.js

@@ -72,6 +72,9 @@ yargs
         })
         .option('serverPassword', {
           describe: 'The password for the configured user on the server, if sql is true.',
+        })
+        .option('serverPrivateKey', {
+          describe: 'The path to private key efaults to ~/.ssh/id_rsa',
         }),
     deploy
   )

package/lib/deployProject.js

@@ -15,6 +15,7 @@ const { DEPLOY_MODES } = require('../constants');
 const getProjectPath = require('../utils/getProjectPath');
 const getSettings = require('../utils/projectSettings');
 const logger = require('../logger');
+const replaceSQL = require('../utils/replaceSQL');
 
 // Default options
 const defaultOptions = {
@@ -176,16 +177,17 @@ async function deployToServer() {
 
 async function connectMySQL() {
   // Environment info
-  const { host } = settings.server[options.environment];
+  const { host, port } = 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: tunnelHost,
-      port: tunnelPort,
+      host: useTunnel ? tunnelHost : host,
+      port: useTunnel ? tunnelPort : port,
       user,
       password,
       database,
@@ -269,13 +271,21 @@ module.exports = async (selectOptions, callbacks) => {
   }
 
   if (options.sql) {
-    await createTunnel();
+    if (!isCI()) {
+      await createTunnel();
+    }
     await connectMySQL();
     const file = isCI()
-      ? getMostRecentSqlFile()
+      ? getMostRecentSqlFile(true)
       : await exportSql({ environment: options.environment });
 
     if (file) {
+      await replaceSQL({
+        environmentIn: 'local',
+        environmentOut: options.environment,
+        file,
+      });
+
       await deployMySQL(file);
     }
 

package/package.json

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

package/utils/getMostRecentSqlFile.js

@@ -11,12 +11,12 @@ function getMostRecentFile(files) {
   return sortedFiles[0];
 }
 
-function getMostRecentSqlFile() {
+function getMostRecentSqlFile(localOnly = false) {
   const settings = getSettings();
   const sqlDir = settings.directories.sql;
-  const sqlFiles = glob.sync(`${sqlDir}/**/*.sql`);
+  const sqlFiles = glob.sync(localOnly ? `${sqlDir}/**/EXPORT-LOCAL-*.sql` : `${sqlDir}/**/*.sql`);
 
   return getMostRecentFile(sqlFiles);
 }
 
-module.exports = getMostRecentSqlFile
+module.exports = getMostRecentSqlFile;