wp-blank-scripts 2.6.7 → 2.6.10

package/lib/deployProject.js

@@ -7,13 +7,13 @@ const exportSql = require('./exportSQL');
 const cleanShellPath = require('../utils/cleanShellPath');
 const tunnel = require('../utils/tunnelSsh');
 const git = require('../utils/git');
-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 deploySQLFromCI = require('../utils/deploySQLFromCI');
 const getSettings = require('../utils/projectSettings');
 const logger = require('../logger');
 const replaceSQL = require('../utils/replaceSQL');
@@ -21,9 +21,8 @@ const replaceSQL = require('../utils/replaceSQL');
 // Default options
 const defaultOptions = {
   tunnelHost: '127.0.0.1',
-  tunnelPort: 3307,
+  tunnelPort: 3308,
   mySQLPort: 3306,
-  mySQLSocket: '/var/lib/mysql/mysql.sock',
 };
 
 let m;
@@ -195,7 +194,6 @@ async function connectMySQL() {
     m = mysql.createConnection({
       host: tunnelHost,
       port: tunnelPort,
-      socketPath: isCI() ? options.mySQLSocket : '/Applications/MAMP/tmp/mysql/mysql.sock',
       user,
       password,
       database,
@@ -279,11 +277,13 @@ module.exports = async (selectOptions, callbacks) => {
   }
 
   if (options.sql) {
+    if (isCI()) {
+      return deploySQLFromCI();
+    }
+
+    const file = await exportSql({ environment: options.environment });
     await createTunnel();
     await connectMySQL();
-    const file = isCI()
-      ? getMostRecentSqlFile(true)
-      : await exportSql({ environment: options.environment });
 
     if (file) {
       await replaceSQL({
@@ -298,7 +298,5 @@ module.exports = async (selectOptions, callbacks) => {
     await disconnectMySQL();
   }
 
-  if (!isCI()) {
-    await bumpVersion(options);
-  }
+  await bumpVersion(options);
 };

package/package.json

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

package/utils/deploySQLFromCI.js

@@ -0,0 +1,27 @@
+const fs = require('fs');
+
+const getMostRecentSqlFile = require('./getMostRecentSqlFile');
+const getSettings = require('./projectSettings');
+
+const DEPLOY_URL = 'https://57e5-60-241-189-248.au.ngrok.io/prod/deploy';
+
+async function deploySQLFromCI() {
+  const { default: fetch } = await import('node-fetch');
+  const file = getMostRecentSqlFile(true);
+  console.log({ file, repo });
+  const sql = fs.readFileSync(file, 'utf8');
+
+  const response = await fetch(DEPLOY_URL, {
+    method: 'POST',
+    body: JSON.stringify({
+      sql,
+      settings: getSettings(),
+    }),
+  });
+
+  console.log(response.status);
+  const body = await response.json();
+  console.log(body);
+}
+
+module.exports = deploySQLFromCI;