move assert() to separate files

Author: X1011

circle.yml

@@ -5,4 +5,4 @@ dependencies:
 
 test:
     post:
-        - bats *.bats
+        - bats . lib

lib/assert.bash

@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+set -o errexit
+
+source lib/batslib.bash
+
+assert() {
+	[[ $1 = that ]] && shift
+	
+	case $@ in
+		*' = '*) assert_equal $1 "${*:3}" ;;
+		'output contains '*) assert_output -p "${*:3}" ;;
+		'output does not contain '*) refute_output -p "${*:5}" ;;
+		*) fail invalid assertion: $@
+	esac
+}

lib/assert.bats

@@ -0,0 +1,15 @@
+#!/usr/bin/env bats
+
+load assert
+
+@test 'assert asserts equality' {
+	assert that 1 = 1
+}
+@test '       asserts output content' {
+	run echo abc
+	assert that output contains b
+}
+@test '       refutes output content' {
+	run echo abc
+	assert that output does not contain d
+}

unit-test.bats

@@ -1,30 +1,6 @@
 #!/usr/bin/env bats
 
-source lib/batslib.bash
-
-assert() {
-	[[ $1 = that ]] && shift
-	
-	case $@ in
-		*' = '*) assert_equal $1 "${*:3}" ;;
-		'output contains '*) assert_output -p "${*:3}" ;;
-		'output does not contain '*) refute_output -p "${*:5}" ;;
-		*) fail invalid assertion: $@
-	esac
-}
-
-@test 'assert asserts equality' {
-	assert that 1 = 1
-}
-@test '       asserts output content' {
-	run echo abc
-	assert that output contains b
-}
-@test '       refutes output content' {
-	run echo abc
-	assert that output does not contain d
-}
-
+source lib/assert.bash
 source deploy.sh --source-only
 
 repo=https://secret@github.com/user/repo.git

watch

@@ -2,8 +2,10 @@
 
 # uses entr to watch for changes: http://entrproject.org
 
-# re-run any individual .bats file when it changes. -p to postpone the first execution, since the 2nd entr command below will run all the .bats files.
-ls *.bats | entr -p bats /_ &
+# re-run any individual .bats file when it changes. -p to postpone the first execution, since the commands below will run all the .bats files.
+shopt -s globstar
+ls **/*.bats | entr -p bats /_ &
 
-# re-run all tests when the script under test changes.
-echo deploy.sh | entr bats .
+# re-run relevant tests when a source file changes.
+echo deploy.sh | entr bats . &
+ls  lib/*.bash | entr bats lib