Make some final adjustments based on testing.

Author: beporter

codesniffer-run

@@ -18,6 +18,12 @@ Usage:
     n - Suppress warnings during the sniff run.
     x - Always exit zero regardless of sniff results.
 
+Environment:
+    CODESNIFFER_RUN_STANDARD - If set, overrides the name of the Coding
+                               Standard to use. The standard is assumed
+                               to be "installed" already.
+                               (Default: Loadsys)
+
 EOT
 
 	exit ${1:-0}  # Exit with code 0 unless an arg is passed to the method.
@@ -32,7 +38,8 @@ REPORT_DIR="${TMP_DIR}/code-sniffs"
 FULL_REPORT_FILE="${REPORT_DIR}/report-full.txt"
 SUMMARY_REPORT_FILE="${REPORT_DIR}/report-summary.txt"
 
-CODE_STANDARD="vendor/cakephp/cakephp-codesniffer/CakePHP,vendor/loadsys/loadsys_codesniffer/Loadsys"
+CODE_STANDARD=${CODESNIFFER_RUN_STANDARD:-Loadsys}
+CODE_STANDARDS=("vendor/cakephp/cakephp-codesniffer" "vendor/loadsys/loadsys_codesniffer")
 SNIFF_FOLDERS=("./src" "./plugins" "./tests" "./config" "./webroot")
 SNIFF_FAIL_CAUSES_SCRIPT_FAIL=0 # 0 = true. Script will exit with phpcs's return code.
 
@@ -66,7 +73,27 @@ while getopts ":fhnx" opt; do
 done
 
 
+# Make sure phpcs has the sniffs configured.
+INSTALLED_ALREADY=$( bin/phpcs --config-show | grep installed_paths )
+INSTALLED_ALREADY=${INSTALLED_ALREADY#installed_paths: }
+#echo "old = $INSTALLED_ALREADY"
+
+for STANDARD in "${CODE_STANDARDS[@]}"; do
+	if [[ ! $INSTALLED_ALREADY == *"$STANDARD"* ]]; then
+		TO_INSTALL="${TO_INSTALL-},${STANDARD}"
+	fi
+done
+
+TO_INSTALL=${TO_INSTALL#,}
+#echo "new = $TO_INSTALL"
+if [ -n "$TO_INSTALL" ] && [ "$TO_INSTALL" != "$INSTALLED_ALREADY" ]; then
+	echo "## Adding required coding standards installed paths."
+	bin/phpcs --config-set installed_paths $TO_INSTALL > /dev/null
+fi
+
+
 # Run the sniffs.
+echo "## Executing code sniffer:"
 bin/phpcs -ps $SUPPRESS_WARNINGS \
  --extensions=php \
  --standard="$CODE_STANDARD" \

coverage-report

@@ -27,8 +27,8 @@ fi
 COVERAGE_PATH="tmp/coverage/html"
 
 
-# Launch the coverage in a browser if requested and we're on the host.
-if command -v 'open' >/dev/null 2>&1; then
+# Launch the coverage in a browser if we're on the host.
+if command -v 'open' >/dev/null 2>&1 && command -v 'vagrant' >/dev/null 2>&1; then
     bin/vagrant-exec "bin/phpunit --coverage-html="$COVERAGE_PATH""
     open "${COVERAGE_PATH}/index.html"
 else

db-login

@@ -39,11 +39,9 @@ eval $( bin/db-credentials )
 if [ -n "${DB_PORT}" ]; then
 	PORT_CLAUSE="--port=${DB_PORT}"
 else
-	PORT_CLAUSE=""
-fi
 
 # Define the primary command line.
-CMD="mysql --host=${DB_HOST} ${PORT_CLAUSE} --database=${DB_DATABASE} --user=${DB_USERNAME}"
+CMD="mysql --host=${DB_HOST} ${PORT_CLAUSE-} --database=${DB_DATABASE} --user=${DB_USERNAME}"
 
 # Handle all the different ways to provide (or not provide) a password.
 if [[ $DB_PASSWORD =~ " |'" ]]; then

db-sample-data

@@ -43,16 +43,35 @@ WEBROOT_PATH="webroot/"
 
 # Internal var setup.
 eval $( bin/db-credentials ) # Yuck, but nothing else works!
-DATE=$(date +%Y-%m-%d)
 OPTIONS="--skip-add-drop-table --no-create-info"
-TMP_PATH="tmp/"
-DESTINATION_NAME="${DB_NAME}_sample_data_${DATE}"
-
-# Generate the dump, compress it and move it into place.
-cd "${TMP_PATH}"
-mysqldump --host="${DB_HOST}" --user="${DB_USER}" -p${DB_PASS} ${OPTIONS} ${DB_NAME} $TABLES > "${DESTINATION_NAME}.sql"
-zip -rq9 "${WEBROOT_PATH}${DESTINATION_NAME}.zip" "${DESTINATION_NAME}.sql"
-rm -f "${DESTINATION_NAME}.sql"
+TMP_PATH="tmp"
+DESTINATION_NAME="${DB_DATABASE}_sample_data_$(date +%Y-%m-%d)"
+
+
+# Generate the dump command.
+if [ -n "$DB_PORT" ]; then
+	PORT_CLAUSE="--port=$DB_PORT"
+fi
+CMD="mysqldump --host=${DB_HOST} ${PORT_CLAUSE} --user=${DB_USERNAME} ${OPTIONS} ${DB_DATABASE} $TABLES"
+
+
+# Run the dump command.
+# Handle all the different ways to provide (or not provide) a password.
+pushd "${TMP_PATH}" >/dev/null
+if [[ $DB_PASSWORD =~ " |'" ]]; then
+	$CMD -p"${DB_PASSWORD}" > "${DESTINATION_NAME}.sql"
+elif [ -n "${DB_PASSWORD}" ]; then
+	$CMD -p$DB_PASSWORD > "${DESTINATION_NAME}.sql"
+else
+	$CMD > "${DESTINATION_NAME}.sql"
+fi
+popd >/dev/null
+
+
+# Zip the file and remove the original .sql.
+zip -rq9 "${WEBROOT_PATH}${DESTINATION_NAME}.zip" "${TMP_PATH}/${DESTINATION_NAME}.sql"
+rm -f "${TMP_PATH}/${DESTINATION_NAME}.sql"
+
 
 # Prompt to download the file, then delete it.
 echo "## Download URL: ${PUBLIC_URL}/${DESTINATION_NAME}.zip"

migrations

@@ -22,5 +22,4 @@ if [ "$1" = '-h' ]; then
 fi
 
 bin/cache-clear
-bin/cake Migrations.migration migrate
-bin/cache-clear
+bin/cake migrations migrate