From 119cf76bff4f383815502fdd5510c312ab182eeb Mon Sep 17 00:00:00 2001
From: Jim Myhrberg <contact@jimeh.me>
Date: Thu, 21 Aug 2014 01:59:12 +0100
Subject: [PATCH] Update/cleanup Makefile, and switch to test-runner.sh

---
 .gitignore |  1 +
 Makefile   | 59 +++++++++++++++++++++++++++++++++++-------------------
 test.sh    | 34 -------------------------------
 3 files changed, 39 insertions(+), 55 deletions(-)
 delete mode 100755 test.sh

diff --git a/.gitignore b/.gitignore
index 3aefff8..63b1ae7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 test/assert.sh
 test/stub.sh
+test-runner.sh
diff --git a/Makefile b/Makefile
index 47de2be..5831a0b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,38 +1,55 @@
-test: build prepare
-	./test.sh
+build: bin/dotify
 
-build:
+bin/dotify: src/*/**
 	./build.sh
 
-prepare: prepare-assert.sh prepare-stub.sh
+test: bootstrap build
+	./test-runner.sh
 
-prepare-assert.sh:
-	test -f "test/assert.sh" || ( \
-		echo "fetching test/assert.sh..." && \
-		curl -s -L -o test/assert.sh \
-			https://raw.github.com/lehmannro/assert.sh/v1.0.2/assert.sh \
-	)
+bootstrap: test-runner.sh test/assert.sh test/stub.sh
+clean: remove_test-runner.sh remove_test/assert.sh remove_test/stub.sh
+update: update_test-runner.sh update_test/assert.sh update_test/stub.sh
 
-update-assert.sh: remove-assert.sh prepare-assert.sh
+test-runner.sh:
+	echo "fetching test-runner.sh..." && \
+	curl -s -L -o test-runner.sh \
+		https://github.com/jimeh/test-runner.sh/raw/v0.2.0/test-runner.sh && \
+	chmod +x test-runner.sh
 
-remove-assert.sh:
+remove_test-runner.sh:
+	( \
+		test -f "test-runner.sh" && rm "test-runner.sh" && \
+		echo "removed test-runner.sh"\
+	) || exit 0
+
+update_test-runner.sh: remove_test-runner.sh test-runner.sh
+
+test/assert.sh:
+	echo "fetching test/assert.sh..." && \
+	curl -s -L -o test/assert.sh \
+		https://raw.github.com/lehmannro/assert.sh/v1.0.2/assert.sh
+
+remove_test/assert.sh:
 	test -f "test/assert.sh" && \
 		rm "test/assert.sh" && \
 		echo "removed test/assert.sh"
 
-prepare-stub.sh:
-	test -f "test/stub.sh" || ( \
-		echo "fetching test/stub.sh..." && \
-		curl -s -L -o test/stub.sh \
-			https://raw.github.com/jimeh/stub.sh/v0.3.0/stub.sh \
-	)
+update_test/assert.sh: remove_test/assert.sh test/assert.sh
 
-update-stub.sh: remove-stub.sh prepare-stub.sh
+test/stub.sh:
+	echo "fetching test/stub.sh..." && \
+	curl -s -L -o test/stub.sh \
+		https://raw.github.com/jimeh/stub.sh/v1.0.1/stub.sh
 
-remove-stub.sh:
+remove_test/stub.sh:
 	test -f "test/stub.sh" && \
 		rm "test/stub.sh" && \
 		echo "removed test/stub.sh"
 
+update_test/stub.sh: remove_test/stub.sh test/stub.sh
+
 .SILENT:
-.PHONY: build test prepare preare-assert.sh prepare-stub.sh
+.PHONY: test bootstrap clean \
+	remove_test-runner.sh update_test-runner.sh \
+	remove_test/assert.sh update_test/assert.sh \
+	remove_test/stub.sh   update_test/stub.sh
diff --git a/test.sh b/test.sh
deleted file mode 100755
index 656e3ac..0000000
--- a/test.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#! /usr/bin/env bash
-
-resolve_link() {
-  $(type -p greadlink readlink | head -1) $1
-}
-
-abs_dirname() {
-  local cwd="$(pwd)"
-  local path="$1"
-
-  while [ -n "$path" ]; do
-    cd "${path%/*}"
-    local name="${path##*/}"
-    path="$(resolve_link "$name" || true)"
-  done
-
-  pwd
-  cd "$cwd"
-}
-
-
-testdir="$(abs_dirname "$0")/test"
-testfiles="$(find "$testdir" -name "*-test.sh")"
-
-RET=0
-for testfile in $testfiles; do
-  echo ""
-  echo "running: ${testfile/#$(dirname "$testdir")\//}"
-  cd "$(dirname "$testfile")"
-  "$testfile"
-  if [ "$?" != "0" ]; then RET=1; fi
-done
-echo ""
-exit $RET