C/misc

baremetal-bootstrap

@@ -15,7 +15,7 @@ ${0##*/}
 Usage:
 	From the machine to be provisioned:
 
-	curl https://raw.githubusercontent.com/loadsys/CakePHP-Shell-Scripts/master/${0##*/} | bash -s -- <REPO_CLONE_URL> <GIT_BRANCH> <APP_ENV_VALUE>
+	curl -sS https://raw.githubusercontent.com/loadsys/CakePHP-Shell-Scripts/master/baremetal-bootstrap | bash -s -- <REPO_CLONE_URL> <GIT_BRANCH> <APP_ENV_VALUE>
 
 	Should be run as the user the app will run as on the target server.
 
@@ -93,6 +93,19 @@ fi
 # EOD
 
 
+if [ -n "$(which git-lfs)" ]; then
+	echo "## Git-LFS support appears to already be installed."
+elif [ -n "$(which brew)" ]; then
+	echo "## Installing git-lfs support using Homebrew."
+	brew install git-lfs
+	git lfs install
+elif [ -n "$(which port)" ]; then
+	echo "## Installing git-lfs support using MacPorts."
+	sudo port install git-lfs
+	git lfs install
+fi
+
+
 echo "## Cloning repo."
 git clone -b $GIT_BRANCH $REPO_CLONE_URL repo
 

deploy

@@ -102,7 +102,7 @@ echo "## Current commit is $EXISTINGBRANCH ($EXISTINGCOMMIT)";
 
 # Update repository.
 echo "## Pulling changes from remote repo.";
-git fetch origin refs/heads/*:refs/remotes/origin/* +refs/tags/*:refs/tags/*
+git fetch origin --prune refs/heads/*:refs/remotes/origin/* +refs/tags/*:refs/tags/*
 
 
 # Apply database updates, one way or another.
@@ -118,7 +118,7 @@ fi
 # forward on the same branch, or switch to the HEAD of a different branch.
 # if [ "$ARG_NEWCOMMIT" = "origin/master" ]; then
 	echo "## Merging upstream changes from: $ARG_NEWCOMMIT";
-	git merge $ARG_NEWCOMMIT
+	git merge --ff-only $ARG_NEWCOMMIT
 # else
 # 	echo "## Checking out new commit: $ARG_NEWCOMMIT";
 # 	git checkout $ARG_NEWCOMMIT

tests-run

@@ -99,15 +99,13 @@ if (isset($argv[1]) && $argv[1] == '-h') {
 // Set up variables.
 array_shift($argv); // Strip the script name off and throw it away.
 $argc--; // Reindex argc so we can use it directly on remaining args.
+$args = '';
 
 if ($argc) {
 	$args = array_map('Loadsys\CakePHPShellScripts\TestsRun\findTestCase', $argv);
 	$args = array_map('escapeshellarg', $args);
 	$args = implode(' ', $args);
-// 	$args = '"' . $args . '"';
 	$args = ' ' . $args;
-} else {
-	$args = '';
 }
 
 $testCmd = "bin/vagrant-exec \"bin/phpunit{$args}\"";

watch

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+# Wrapper around `fswatch` to pass changed files into `bin/tests-run`.
+
+#@TODO: Bail if fswatch is not available. (add to readme as a dep.)
+
+echo "## Test watcher running. Save a file to execute the corresponding test in vagrant."
+
+fswatch -0 src/ tests/ | xargs -0 -n 1 -I {} sh -c 'echo " - {}"; bin/tests-run "{}"'
+
+#@TODO: Use a custom phpunit.xml that does not produce TWO coverage reports by default.
+
+#@TODO: Suppress tests/bootstrap.php from clearing caches? (reduce output "noise")