Merge branch 'master' of https://github.com/wplib/box-scripts

Author: mikeschinkel

guest/cli/box

@@ -22,7 +22,7 @@ fi
 
 if [ ! -f "${command_file}" ]; then
     echo
-    echo "Command not found: $1"
+    echo -e "\tCommand not found: $1"
     echo
     exit
 fi

guest/cli/commands/backup-db

@@ -2,12 +2,27 @@
 #
 # Backup the database to /vagrant/sql/current.sql
 #
+#
+# Usage: box import-db {dump_file} [--echo-filename] [--quiet]
+#
+#   Result ==> Imports from /vagrant/sql/{dump_file}.sql
+#
+#   --echo-filename - Echos the backed-up filename
+#   --quiet - Omits status messages
+#   --dry-run - Do everything except actually run it
+#
 # Save the prior backup (if exists) to /vagrant/sql/previous.sql
 # If /vagrant/sql/previous.sql save to /vagrant/sql/previous.2.sql, and so on.
 #
 
 bakfile="/vagrant/sql/current.sql"
 
+if [ "true" == $(is_dry_run "$*") ]; then
+    dryrun=1
+else
+    dryrun=0
+fi
+
 #
 # Check to see if we need to save a prior backup
 #
@@ -22,15 +37,36 @@ if [[ -f "${bakfile}" ]]  ; then
     # Okay, we can now save the prior backup.
     #
     echo_if_not_quiet "$*", "=Saving Prior Backup as ${priorfile}..."
-    cp "${bakfile}" "${priorfile}"
+
+    if [ $dryrun -eq 0 ]; then
+        cp "${bakfile}" "${priorfile}"
+    fi
 
 fi
 
 echo_if_not_quiet "$*", "=Backing up database to ${bakfile}..."
 
-mkdir -p /vagrant/sql
+if [ $dryrun -eq 0 ]; then
+
+    mkdir -p /vagrant/sql
+
+    mysqldump -u wordpress -pwordpress wordpress > ${bakfile}
 
-mysqldump -u wordpress -pwordpress wordpress > ${bakfile}
+    result="$?"
+
+    if [ "${result}" != "0" ]; then
+
+        echo_if_not_quiet "$*", "=mysqldump error (${result})"
+        return
+    fi
+
+fi
+
+if [[ "$*" == *"--echo-filename"* ]]; then
+
+    echo "${bakfile}"
+
+fi
 
 
 

guest/cli/commands/import-db

@@ -0,0 +1,76 @@
+#!/usr/bin/env bash
+#
+# Import a database from /vagrant/sql/$1.sql
+#
+# Usage: box import-db {dump_file} [--echo] [--quiet]
+#
+#   Result ==> Imports from /vagrant/sql/{dump_file}.sql
+#
+#   --echo - Echos the backed-up filename
+#   --quiet - Omits
+
+importfile="$1"
+
+if [ 'sql' != $(to_lowercase $(file_extension "${importfile}")) ]; then
+    #
+    # If no .sql extension, add one.
+    #
+    importfile="${importfile}.sql"
+fi
+
+#
+# Force import from  /vagrant/sql/
+#
+importfile="${WPLIB_BOX_SQL_DIR}/${importfile}"
+
+#
+# Check to see if we need to import from exists
+#
+if [ ! -f "${importfile}" ]  ; then
+
+    echo_if_not_quiet "$*", "=No ${importfile} exists.."
+    return
+
+fi
+
+bakfile=$(box backup-db --quiet --echo-filename --dry-run)
+
+if [ "${bakfile}" == "${importfile}" ]; then
+
+    echo_if_not_quiet "$*", "=\tERROR: Cannot backup '$1' because the"
+    echo_if_not_quiet "$*", "=\t       default backup filename is '$1'"
+    echo_if_not_quiet "$*", "^\t       thus cannot backup before import."
+    echo_if_not_quiet "$*", "=\t       Rename ${importfile} to "
+    echo_if_not_quiet "$*", "=\t       bypass this check and allow import."
+    return
+
+fi
+
+echo_if_not_quiet "$*", "^Backing up database..."
+
+bakfile=$(box backup-db --quiet --echo-filename)
+
+if [ "" == "${bakfile}" ]; then
+
+    echo_if_not_quiet "$*", "^Unknown error when generating the backup."
+    return
+
+fi
+
+if [[ "$*" == *" error "* ]]; then
+
+    echo_if_not_quiet "$*", "^Error when generating the backup: ${bakfile}"
+    return
+
+fi
+
+echo_if_not_quiet "$*", "^Database backed-up to ${bakfile}..."
+
+echo_if_not_quiet "$*", "=Importing database from ${importfile}..."
+
+mysql -u wordpress -pwordpress wordpress < ${importfile}
+
+
+
+
+

guest/cli/commands/reassociate-git-repo

@@ -33,4 +33,4 @@ mv "${WPLIB_BOX_ORIGINAL_GIT_DIR}" "${WPLIB_BOX_GIT_DIR}" 2> /dev/null
 grep -q -F "/watchers" "${WPLIB_BOX_DIR}/.gitignore" || echo "/watchers" >> ${WPLIB_BOX_DIR}/.gitignore
 
 
-echo_if_not_quiet "$*" "=The WPLib Box Git repository has been reassociated and/nthe prior .git directory has been renamed to ${WPLIB_BOX_SAVE_GIT_DIR}/n(assuming there was one.)"
+echo_if_not_quiet "$*" "=The WPLib Box Git repository has been reassociated and\nthe prior .git directory has been renamed to ${WPLIB_BOX_SAVE_GIT_DIR}\n(assuming there was one.)"

guest/cli/includes/constants

@@ -23,3 +23,5 @@ export WPLIB_BOX_FLAG_FILE="WPLIB_BOX_GIT_REPO"
 export WPLIB_BOX_WP_CONTENT_DIR=$(find_wp_content_dir)
 export WPLIB_BOX_PLUGINS_DIR=$(find_wp_plugins_dir)
 export WPLIB_BOX_MU_PLUGINS_DIR=$(find_wp_mu_plugins_dir)
+
+export WPLIB_BOX_SQL_DIR="/vagrant/sql"

guest/cli/includes/functions

@@ -1,5 +1,44 @@
 #!/usr/bin/env bash
 
+#
+# Outputs the file extension given a file name
+#
+# $1 - String
+#
+# Usage: string=$(to_lowercase "FOO.BAR")
+#   Result: $string ==> "foo.bar"
+#
+#
+function to_lowercase() {
+    echo "${1,,}"
+}
+
+#
+# Outputs the file extension given a file name
+#
+# $1 - Filename
+#
+# Usage: extension=$(file_extension "foo.bar")
+#   Result: $extension ==> "bar"
+#
+#
+function file_extension() {
+    echo "${1##*.}"
+}
+
+#
+# Outputs the base filename given a full filename
+# Base filename means no path and no extension
+#
+# $1 - Filename
+#
+# Usage: basename=$(file_basename "foo/bar.bar")
+#   Result: $extension ==> "bar"
+#
+function file_basename() {
+    filename=$(basename "$1")
+    echo "${filename%.*}"
+}
 
 #
 # Returns a filename that does not exist given an existing filename.
@@ -21,8 +60,8 @@ function next_backup_file() {
     # Get the file extension if there is one
     # See: http://stackoverflow.com/a/965072/102699
     #
-    ext=".${bakfile##*.}"
-    if [[ "." == "${ext}" || "${ext}" == ".${bakfile}" ]]; then
+    ext=$(file_extension "${bakfile}")
+    if [[ "" == "${ext}" || "${ext}" == "${bakfile}" ]]; then
         ext=""
     fi
 
@@ -37,15 +76,22 @@ function next_backup_file() {
     # Now check to see if the default prior backup exists
     # Continue checking until we find a workable filename
     #
-    test="${bakfile}${ext}"
+    test="${bakfile}.${ext}"
     until [ ! -e "${test}" ]; do
         counter=$((counter))
         let counter++
-        test="${bakfile}${counter}${ext}"
+        test="${bakfile}${counter}.${ext}"
     done
     echo "${test}"
 }
 
+function is_dry_run() {
+    if [[ "$1" == *"--dry-run"* ]]; then
+        echo "true"
+        return
+    fi
+    echo "false"
+}
 
 function is_quiet() {
     if [[ "$1" == *"--quiet"* ]]; then
@@ -76,20 +122,20 @@ function echo_if_not_quiet() {
         message=${2:1}
         case "${control}" in
             "^")
-                echo "${message}" | sed "${regex}"
+                echo -e "${message}" | sed "${regex}"
                 echo
                 ;;
             "*")
                 echo
-                echo "${message}" | sed "${regex}"
+                echo -e "${message}" | sed "${regex}"
                 echo
                 ;;
             "=")
-                echo "${message}" | sed "${regex}"
+                echo -e "${message}" | sed "${regex}"
                 ;;
             "&")
                 echo
-                echo "${message}" | sed "${regex}"
+                echo -e "${message}" | sed "${regex}"
                 ;;
             *)
                 echo