wp-blank-scripts 2.6.0 → 2.6.3

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/cli/import.js

@@ -1,24 +1,15 @@
 const glob = require('glob');
-const fs = require('fs');
 
 const importSQL = require('../lib/importSQL');
 const logger = require('../logger');
 const getCliOptions = require('../utils/getCliOptions');
-const getSettings = require('../utils/projectSettings');
 const exitWithError = require('../utils/exitWithError');
-const settings = getSettings();
+const getSettings = require('../utils/projectSettings');
+const getMostRecentSqlFile = require('../utils/getMostRecentSqlFile');
 
 // Constants
 const { ENV_OPTIONS, SQL_FILE_NAME_ENV } = require('../constants');
 
-function getMostRecentFile(files) {
-  const sortedFiles = [...files].sort((a, b) => {
-    return fs.statSync(b).mtime - fs.statSync(a).mtime;
-  });
-
-  return sortedFiles[0];
-}
-
 function getEnvironmentFromFileName(file) {
   let env;
 
@@ -33,7 +24,7 @@ function getEnvironmentFromFileName(file) {
 }
 
 module.exports = async () => {
-  // Sql search
+  const settings = getSettings();
   const sqlDir = settings.directories.sql;
   const sqlFiles = glob.sync(`${sqlDir}/**/*.sql`);
 
@@ -75,7 +66,7 @@ module.exports = async () => {
     if (options.file === 'latest' && sqlFiles.length > 0) {
       // If latest is passed, grab the file and work out what environment it's for.
       // Then update the options with the new values
-      const file = getMostRecentFile(sqlFiles);
+      const file = getMostRecentSqlFile();
 
       if (file) {
         options.file = file;

package/lib/deployProject.js

@@ -4,18 +4,18 @@ const mysql = require('mysql');
 const Rsync = require('rsync');
 
 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 { 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 = {
@@ -272,8 +272,20 @@ module.exports = async (selectOptions, callbacks) => {
   if (options.sql) {
     await createTunnel();
     await connectMySQL();
-    const file = await exportSql({ environment: options.environment });
-    await deployMySQL(file);
+    const file = isCI()
+      ? getMostRecentSqlFile(true)
+      : await exportSql({ environment: options.environment });
+
+    if (file) {
+      await replaceSQL({
+        environmentIn: 'local',
+        environmentOut: options.environment,
+        file,
+      });
+
+      await deployMySQL(file);
+    }
+
     await disconnectMySQL();
   }
 

package/package.json

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

package/utils/getMostRecentSqlFile.js

@@ -0,0 +1,22 @@
+const glob = require('glob');
+const fs = require('fs');
+
+const getSettings = require('./projectSettings');
+
+function getMostRecentFile(files) {
+  const sortedFiles = [...files].sort((a, b) => {
+    return fs.statSync(b).mtime - fs.statSync(a).mtime;
+  });
+
+  return sortedFiles[0];
+}
+
+function getMostRecentSqlFile(localOnly = false) {
+  const settings = getSettings();
+  const sqlDir = settings.directories.sql;
+  const sqlFiles = glob.sync(localOnly ? `${sqlDir}/**/EXPORT-LOCAL-*.sql` : `${sqlDir}/**/*.sql`);
+
+  return getMostRecentFile(sqlFiles);
+}
+
+module.exports = getMostRecentSqlFile;