wp-blank-scripts 3.1.6 → 3.1.8

package/README.md

@@ -321,9 +321,11 @@ exports.copyFiles = (paths) => {
       // Copy all files from vendor (except vivo-digital & johnpbloch) to the theme/inc/vendor
       from: path.join(__dirname, "..", "vendor"),
       to: path.join(themePath, "inc", "vendor"),
-      ignore: [
-        path.join("@(vivo-digital|johnpbloch)", '**')
-      ],
+      globOptions: {
+        ignore: [
+          path.join("@(vivo-digital|johnpbloch)", '**')
+        ],
+      }
     }
   ];
 }

package/cli/pull.js

@@ -1,5 +1,6 @@
 const chalk = require('chalk');
 const path = require('path');
+const ora = require('ora');
 
 const pullSQL = require('../lib/pullSQL');
 const getSettings = require('../utils/projectSettings');
@@ -8,14 +9,16 @@ const exitWithError = require('../utils/exitWithError');
 const logger = require('../logger');
 const { DEPLOY_OPTIONS } = require('../constants');
 
-function handleError(err) {
+function handleError(err, spinner) {
   // Show error
+  spinner.stop();
   logger.error('Dang! Something went wrong');
   exitWithError(err);
 }
 
-function handleFinish(sqlFilePath) {
+function handleFinish(sqlFilePath, spinner) {
   const fileName = path.basename(sqlFilePath);
+  spinner.stop();
   logger.success(`Exported ${chalk.yellow(fileName)} successfully!`);
 }
 
@@ -32,7 +35,7 @@ module.exports = async () => {
       },
       {
         name: 'serverPassword',
-        message: answers => {
+        message: (answers) => {
           const user = settings.server[answers.environment].user;
           const host = settings.server[answers.environment].host;
           return chalk.cyan(
@@ -43,25 +46,22 @@ module.exports = async () => {
       },
       {
         name: 'serverPrivateKey',
-        message: answers => {
+        message: (answers) => {
           const user = settings.server[answers.environment].user;
           const host = settings.server[answers.environment].host;
-          return chalk.cyan(
-            `Enter the path to your private key for user ${user} on host ${host}`
-          );
+          return chalk.cyan(`Enter the path to your private key for user ${user} on host ${host}`);
         },
         default: '~/.ssh/id_rsa',
         type: 'input',
-        when: answers => !answers.serverPassword,
+        when: (answers) => !answers.serverPassword,
       },
     ]);
 
-    logger.log('Starting pull...');
+    const spinner = ora('Starting pull...').start();
 
     const sqlFilePath = await pullSQL(options);
 
-    handleFinish(sqlFilePath);
-
+    handleFinish(sqlFilePath, spinner);
   } catch (err) {
     handleError(err);
   }

package/lib/pullSQL.js

@@ -9,7 +9,7 @@ const getProjectPath = require('../utils/getProjectPath');
 const getSqlFileName = require('../utils/getSqlFileName');
 const { SQL_BACKUPS_DIR } = require('../constants');
 
-module.exports = async options => {
+module.exports = async (options) => {
   const settings = getSettings();
   const server = settings.server[options.environment];
   const { user, password, database } = settings.mysql[options.environment];
@@ -28,7 +28,7 @@ module.exports = async options => {
     fs.mkdirSync(destinationDir, { recursive: true });
   }
 
-  const command = `mysqldump --user='${user}' --password='${password}' ${database}`;
+  const command = `mysqldump --add-drop-table --user='${user}' --password='${password}' ${database}`;
 
   let privateKey;
   if (options.serverPrivateKey) {
@@ -47,7 +47,7 @@ module.exports = async options => {
 
   stdio.setEncoding('utf8');
 
-  stdio.on('data', data => {
+  stdio.on('data', (data) => {
     writeStream.write(data);
   });
 
@@ -71,7 +71,7 @@ module.exports = async options => {
       resolve();
     });
 
-    stdio.on('exit', code => {
+    stdio.on('exit', (code) => {
       exitCode = code;
     });
   });

package/package.json

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