Further refinement of pantheon-deploy

Author: mikeschinkel

guest/cli/commands/pantheon-deploy

@@ -50,50 +50,44 @@ if [ "" == "${git_url}" ]; then
     return 5
 fi
 
-echo_if_not_quiet "$*" "^Deploying to the ${target_domain} ${deploy_host} server at Pantheon..."
+echo_if_not_quiet "$*" "=Beginning deploy to '${deploy_host}' server for ${target_domain} at Pantheon..."
 
 #
 # Create temporary directories to work in
 # See Method # 2 Use of $$ variable:
 #  - http://www.cyberciti.biz/tips/shell-scripting-bash-how-to-create-temporary-random-file-name.html
 #
-clone_dir="${HOME}/build/${target_domain}/pantheon-clone"
-upstream_dir="${HOME}/build/pantheon-upstream"
+clone_dir="${HOME}/.wplib.box.cache/${target_domain}/pantheon-clone"
+upstream_dir="${HOME}/.wplib.box.cache/pantheon-upstream"
 build_dir="/tmp/deploy-build.$$.dir"
 
 #
 # Clone the site from our repo on Pantheon
 #
-echo_if_not_quiet "$*" "=Cloning from ${deploy_host}'s Git repo..."
-ensure_git_clone "${git_url}" "${clone_dir}" || return $?
+echo_if_not_quiet "$*" "=Cloning/revising clone of ${target_domain}'s Git repo at Pantheon..."
+ensure_git_clone "${git_url}" "${clone_dir}" --quiet || return $?
 
 #
 # Clone the pristine Pantheon Upstream
 #
-echo_if_not_quiet "$*" "&Cloning from the Pantheon upstream Git repo..."
-git clone https://github.com/pantheon-systems/WordPress "${upstream_dir}" || return $?
-cp "${upstream_dir}" "${build_dir}" || return ?*
+echo_if_not_quiet "$*" "=Cloning/revising clone of Pantheon's WordPress upstream Git repo..."
+ensure_git_clone https://github.com/pantheon-systems/WordPress "${upstream_dir}" --quiet || return $?
 
 #
-# Copy the pristine upstream to the build dir
+# Copy the upstream to the build directory
 #
-echo_if_not_quiet "$*" "&Copying the Pantheon upstream to local build dir..."
-git clone https://github.com/pantheon-systems/WordPress "${upstream_dir}" || return $?
-cd -R "${upstream_dir}" || return ?*
-
-echo_if_not_quiet "$*" "&Cleaning the pantheon-systems/WordPress Git repo..."
+echo_if_not_quiet "$*" "=Copying Pantheon's WordPress upstream to build directory..."
+cp -RP "${upstream_dir}" "${build_dir}" || return ?*
 
+echo_if_not_quiet "$*" "=Removing '.git' and 'wp-content' sub-directories from build directory..."
 #
 # Erase the .git that points to Pantheon's pristine Upstream repo
+# AND Rip out it's content directory
 #
 rm -rf "${build_dir}/.git" || return ?*
-
-#
-# Rip out it's content directory
-#
 rm -rf "${build_dir}/wp-content" || return ?*
 
-echo_if_not_quiet "$*" "=Copying content directories from dev..."
+echo_if_not_quiet "$*" "=Copying content directories from /var/www to build directory..."
 #
 # Replace with our content directory
 #
@@ -103,106 +97,89 @@ cp -RP "${WPLIB_BOX_CONTENT_DIR}/" "${build_dir}/wp-content" || return ?*
 # If there is a /vendor directory, don't forget it
 #
 if [[ -d "${WPLIB_BOX_VENDOR_DIR}" ]]; then
-    echo_if_not_quiet "$*" "=Copying vendor directories from dev..."
+    echo_if_not_quiet "$*" "=Copying vendor directories from /var/www to build directory..."
     cp -RP "${WPLIB_BOX_VENDOR_DIR}/" "${build_dir}/vendor" || return ?*
 fi
 
 #
 # If there is a /pantheon.yaml, don't forget it
 #
 if [ -f "${WPLIB_BOX_DIR}/pantheon.yaml" ]; then
-    echo_if_not_quiet "$*" "=Copying pantheon.yaml from dev..."
+    echo_if_not_quiet "$*" "=Copying pantheon.yaml from /vagrant..."
     cp "${WPLIB_BOX_DIR}/pantheon.yaml" "${build_dir}/pantheon.yaml"
 fi
 
 #
 # Strip .git "submodules"
 #
-echo_if_not_quiet "$*" "&Stripping Git submodule references..."
+echo_if_not_quiet "$*" "=Stripping Git submodule references in build directory..."
 find "${build_dir}" -name .git | xargs rm -fr || return ?*
 find "${build_dir}" -name .gitignore | xargs rm -fr || return ?*
 find "${build_dir}" -name .gitattributes | xargs rm -fr || return ?*
 
 #
 # Remove these. We do not need these on a hosted site.
 #
-echo_if_not_quiet "$*" "=Removing items to exclude from ${build_dir}/..."
+echo_if_not_quiet "$*" "=Removing items to exclude from build..."
 delete_exclude_items "${build_dir}" || return ?*
 
 #
 # Remove anything that is in the "require-dev" category
 #
-echo_if_not_quiet "$*" "&Removing \"require-dev\" items from ${build_dir}/..."
+echo_if_not_quiet "$*" "=Removing 'require-dev' items from build..."
 $WPLIB_BOX_PHPCLI "${WPLIB_BOX_INCLUDES_DIR}/run-command.php" --args remove-composer-require-dev "${build_dir}" || return ?*
 
 #
 # Now get the Pantheon repo's .git dir and make it our own
 #
-echo_if_not_quiet "$*" "&Copying over .git directory from source..."
-mv "${clone_dir}/.git" "${build_dir}" || return ?*
+echo_if_not_quiet "$*" "=Copying over .git directory from /vagrant..."
+cp -R "${clone_dir}/.git" "${build_dir}" || return ?*
 
 cd "${build_dir}" || return ?*
-#
-# So we can view after the fact
-#
-#git status
 
 #
 # Delete directories that Pantheon Reserves
 #
-echo_if_not_quiet "$*" "=Deleting all upload directories that Pantheon-reserves..."
+echo_if_not_quiet "$*" "=Deleting all Pantheon-reserved sub-directories from build directory..."
 rm -rf "${build_dir}/sites/default/files" || return ?*
 rm -rf "${build_dir}/wp-content/uploads" || return ?*
 rm -rf "${build_dir}/web/sites/default/files" || return ?*
 rm -rf "${build_dir}/web/wp-content/uploads" || return ?*
 
-echo_if_not_quiet "$*" "^Staging all files for commit..."
 #
 # Add any changes to staging
 #
+echo_if_not_quiet "$*" "=Staging all files in build directory for commit..."
 quiet_git add --all . || return ?*
 
-#
-# Add any changes to staging
-#
-quiet_git add -u || return ?*
 
 #
-# So we can view after the fact
-#
-#git status
-
-echo_if_not_quiet "$*" "=Committing all files to prepare for deployment..."
-#
-# Merge in any changes
+# Commit all changes
 #
+echo_if_not_quiet "$*" "=Committing all updates in build directory to prepare for deployment..."
 quiet_git commit -m "${commit_message}" || return ?*
 
 #
 # Now do a pull, just in case.
 # It should be up to date though.
 #
-quiet_git pull --commit --no-edit --no-ff --verbose || return ?*
+#echo_if_not_quiet "$*" "=Pulling ..."
+#quiet_git pull --commit --no-edit --no-ff --verbose || return ?*
 
 #
-# So we can view after the fact
+# Push our changes back to Panethon
 #
-#git status
-echo_if_not_quiet "$*" "=Pushing files for ${project_name} to ${deploy_host} at Pantheon..."
+echo_if_not_quiet "$*" "=Pushing commit for ${project_name} to '${deploy_host}' at Pantheon..."
 #
 # Ensure this is already set
 #
 quiet_git config --global push.default simple || return ?*
-
-#
-# Push our changes back to Panethon
-#
 quiet_git push || return ?*
 
-echo_if_not_quiet "$*" "=Cleaning up..."
+echo_if_not_quiet "$*" "=Removing build directory..."
 #
 # Clean up
 #
 rm -rf "${build_dir}" || return ?*
 
-echo_if_not_quiet "$*" "&Done."
+echo_if_not_quiet "$*" "=Deployment for ${project_name} to '${deploy_host}' at Pantheon is now complete."