Add --on-demand and more verbosity when passing env flags

docs/sync.md

@@ -30,6 +30,9 @@ lando pull --code=none --database=dev --files=none
 
 # Attempt a pull using a different key and secret
 lando pull --key "$ACQUIA_KEY" --secret "$ACQUIA_SECRET"
+
+# Use the on-demand flag to generate a new database copy before pulling
+lando pull --on-demand
 ```
 
 #### Options
@@ -41,6 +44,7 @@ lando pull --key "$ACQUIA_KEY" --secret "$ACQUIA_SECRET"
 --files, -f     The environment from which to pull the files
 --key           An Acquia API key
 --secret        An Acquia API secret
+--on-demand     Generate a fresh database export when pulling the database
 ```
 
 Please consult the manual import documentation below if this command produces an error.

lib/pull.js

@@ -39,7 +39,7 @@
   level: 'app',
   stdio: ['inherit', 'pipe', 'pipe'],
   options: {
     key: {
       describe: 'An Acquia API key',
       passthrough: true,
       string: true,
@@ -51,12 +51,12 @@
         weight: 100,
       },
     },
     secret: {
       describe: 'An Acquia API secret',
       passthrough: true,
       password: true,
     },
     code: {
       description: 'The environment from which to pull the code',
       passthrough: true,
       alias: ['c'],
@@ -66,7 +66,7 @@
         weight: 200,
       },
     },
     database: {
       description: 'The environment from which to pull the database',
       passthrough: true,
       alias: ['d'],
@@ -76,7 +76,7 @@
         weight: 300,
       },
     },
     files: {
       description: 'The environment from which to pull the files',
       passthrough: true,
       alias: ['f'],
@@ -86,6 +86,10 @@
         weight: 400,
       },
     },
+    'on-demand': {
+      description: 'Generate a new backup of the database when pulling',
+      passthrough: true,
+    },
   },
 };
 

scripts/acquia-pull.sh

@@ -38,6 +38,7 @@ while (( "$#" )); do
       fi
       ;;
     -c|--code|--code=*)
+      CODEFLAG=true
       if [ "${1##--code=}" != "$1" ]; then
         CODE="${1##--code=}"
         shift
@@ -47,6 +48,7 @@ while (( "$#" )); do
       fi
       ;;
     -d|--database|--database=*)
+      DATABASEFLAG=true
       if [ "${1##--database=}" != "$1" ]; then
         DATABASE="${1##--database=}";
         shift
@@ -56,6 +58,7 @@ while (( "$#" )); do
       fi
       ;;
     -f|--files|--files=*)
+      FILEFLAG=true
       if [ "${1##--files=}" != "$1" ]; then
         FILES="${1##--files=}"
         shift
@@ -72,6 +75,10 @@ while (( "$#" )); do
         NO_AUTH=true
         shift
       ;;
+    --on-demand)
+        ON_DEMAND=" --on-demand"
+        shift
+      ;;
     --)
       shift
       break
@@ -94,11 +101,17 @@ fi
 
 # Get the codez
 if [ "$CODE" != "none" ]; then
+  if [ $CODEFLAG ]; then
+    echo -n "Using the code flag supplied to pull code from $CODE."
+  fi
   acli -n pull:code "$AH_SITE_GROUP.$CODE"
 fi
 
 # Get the database
 if [ "$DATABASE" != "none" ]; then
+  if [ $DATABASEFLAG ]; then
+    echo -n "Using the database flag supplied to pull the database from $DATABASE."
+  fi
   # Destroy existing tables
   # NOTE: We do this so the source DB **EXACTLY MATCHES** the target DB
   TABLES=$(mysql --user=acquia --password=acquia --database=acquia --host=database --port=3306 -e 'SHOW TABLES' | awk '{ print $1}' | grep -v '^Tables' ) || true
@@ -115,7 +128,7 @@ EOF
   done
 
   # Importing database
-  acli -n pull:db "$AH_SITE_GROUP.$DATABASE"
+  acli -n pull:db "$AH_SITE_GROUP.$DATABASE"$ON_DEMAND
 
   # Weak check that we got tables
   PULL_DB_CHECK_TABLE=${LANDO_DB_USER_TABLE:-users}
@@ -129,6 +142,9 @@ fi
 
 # Get the files
 if [ "$FILES" != "none" ]; then
+  if [ $FILESFLAG ]; then
+    echo -n "Using the files flag supplied to pull files from $FILES."
+  fi
   # acli -n pull:files "$FILES" -> non interactive causes a broken pipe error right now
   acli -n pull:files "$AH_SITE_GROUP.$FILES"
 fi