From f28b1b52e2f09a8c444db1329e010679f9aa0793 Mon Sep 17 00:00:00 2001
From: Stefan Majewsky <majewsky@gmx.net>
Date: Sat, 9 Apr 2016 01:00:02 +0200
Subject: [PATCH] bump HOLO_API_VERSION from 2 to 3

Since Holo 1.1 is not yet released, use the master branch of Holo for
Travis.
---
 .travis.yml                         |  2 +-
 src/holo-run-scripts                | 10 +++++++---
 test/.gitignore                     |  4 ++++
 test/01-basic/expected-apply-output |  1 -
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ec1fa3f..808cc78 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,7 @@ go:
 
 before_install:
     - mkdir -p build/deps
-    - git clone --branch=stable https://github.com/holocm/holo.git build/deps/holo
+    - git clone --branch=master https://github.com/holocm/holo.git build/deps/holo
     - make -C build/deps/holo build/holo
     - cp build/deps/holo/src/holo-test build/deps/holo/build/holo-test
 
diff --git a/src/holo-run-scripts b/src/holo-run-scripts
index 9732444..86c57d0 100755
--- a/src/holo-run-scripts
+++ b/src/holo-run-scripts
@@ -17,12 +17,16 @@
 # Holo. If not, see <http://www.gnu.org/licenses/>.
 #
 
-if [ "$HOLO_API_VERSION" != 2 ]; then
-    echo "holo-run-scripts plugin called with unknown HOLO_API_VERSION $HOLO_API_VERSION" >&2
+if [ "$HOLO_API_VERSION" != 3 ]; then
+    echo "!! holo-run-scripts plugin called with unknown HOLO_API_VERSION $HOLO_API_VERSION" >&2
     exit 1
 fi
 
 case "$1" in
+    info)
+        echo MIN_API_VERSION=3
+        echo MAX_API_VERSION=3
+        ;;
     scan)
         # list executables in $HOLO_RESOURCE_DIR
         set -e
@@ -46,7 +50,7 @@ case "$1" in
         exec "$SCRIPT"
         ;;
     *)
-        echo "holo-run-scripts plugin called with unknown command: $@" >&2
+        echo "!! holo-run-scripts plugin called with unknown command: $@" >&2
         exit 1
         ;;
 esac
diff --git a/test/.gitignore b/test/.gitignore
index 89afab8..96cc3f0 100644
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -4,3 +4,7 @@ apply-output
 apply-force-output
 diff-output
 scan-output
+colored-apply-output
+colored-apply-force-output
+colored-diff-output
+colored-scan-output
diff --git a/test/01-basic/expected-apply-output b/test/01-basic/expected-apply-output
index ef19b6c..b7caac3 100644
--- a/test/01-basic/expected-apply-output
+++ b/test/01-basic/expected-apply-output
@@ -14,7 +14,6 @@ Running provisioning script 02-failing.sh
 This is output on stdout
 This is output on stderr
 Done with 02-failing.sh, exiting with code 1
-
 !! exit status 1
 
 Executing script:03-successful-nooutput.sh