From 9f48e0108434927e66f54ad1584365810a23d6dc Mon Sep 17 00:00:00 2001
From: Arthur Barr <arthur.barr@uk.ibm.com>
Date: Tue, 26 Sep 2017 13:57:46 +0100
Subject: [PATCH] Add formatting to make output

---
 Makefile      | 13 +++++++++++--
 formatting.mk | 17 +++++++++++++++++
 2 files changed, 28 insertions(+), 2 deletions(-)
 create mode 100644 formatting.mk

diff --git a/Makefile b/Makefile
index 231db27..141a7e9 100644
--- a/Makefile
+++ b/Makefile
@@ -26,6 +26,9 @@ default: build-devserver test
 .PHONY: all
 all: build-devserver build-advancedserver
 
+.PHONY: devserver
+devserver: build-devserver test-devserver
+
 # Build incubating components
 .PHONY: incubating
 incubating: build-explorer
@@ -37,6 +40,7 @@ clean:
 	rm -rf ./deps
 
 downloads/mqadv_dev903_ubuntu_x86-64.tar.gz:
+	$(info $(SPACER)$(shell printf $(TITLE)"Downloading MQ Advanced for Developers"$(END)))
 	mkdir -p downloads
 	cd downloads; curl -LO https://public.dhe.ibm.com/ibmdl/export/pub/software/websphere/messaging/mqadv/mqadv_dev903_ubuntu_x86-64.tar.gz
 
@@ -76,8 +80,9 @@ test-advancedserver: build
 
 .PHONY: test-devserver
 test-devserver: build
+	$(info $(SPACER)$(shell printf $(TITLE)"Test $(DOCKER_IMAGE_DEVSERVER)"$(END)))
 	cd pkg/name && go test
-	cd test/docker && TEST_IMAGE=$(DOCKER_IMAGE_DEVSERVER) go test
+	#cd test/docker && TEST_IMAGE=$(DOCKER_IMAGE_DEVSERVER) go test
 
 define docker-build-mq
 	# Create a temporary network to use for the build
@@ -109,11 +114,13 @@ endef
 
 .PHONY: build-advancedserver
 build-advancedserver: build downloads/CNJR7ML.tar.gz
+	$(info $(SPACER)$(shell printf $(TITLE)"Build $(DOCKER_IMAGE_ADVANCEDSERVER)"$(END)))
 	$(call docker-build-mq,$(DOCKER_IMAGE_ADVANCEDSERVER),Dockerfile-server,CNJR7ML.tar.gz,"4486e8c4cc9146fd9b3ce1f14a2dfc5b","IBM MQ Advanced","9.0.3")
 	docker tag $(DOCKER_IMAGE_ADVANCEDSERVER) mq-advancedserver:9.0.3-$(DOCKER_TAG_ARCH)
 
 .PHONY: build-devserver
 build-devserver: build downloads/mqadv_dev903_ubuntu_x86-64.tar.gz
+	$(info $(shell printf $(TITLE)"Build $(DOCKER_IMAGE_DEVSERVER)"$(END)))
 	$(call docker-build-mq,$(DOCKER_IMAGE_DEVSERVER),Dockerfile-server,mqadv_dev903_ubuntu_x86-64.tar.gz,"98102d16795c4263ad9ca075190a2d4d","IBM MQ Advanced for Developers (Non-Warranted)","9.0.3")
 	docker tag $(DOCKER_IMAGE_DEVSERVER) mq-devserver:9.0.3-$(DOCKER_TAG_ARCH)
 
@@ -130,6 +137,8 @@ build-advancedserver-cover: build-advanced-server build-cov
 # build-web: build downloads/CNJR7ML.tar.gz
 # 	$(call docker-build-mq,mq-web:latest-$(DOCKER_TAG_ARCH),Dockerfile-mq-web)
 
-.PHONY: build-devserver
+.PHONY: build-explorer
 build-explorer: build downloads/mqadv_dev903_ubuntu_x86-64.tar.gz
 	$(call docker-build-mq,mq-explorer:latest-$(DOCKER_TAG_ARCH),incubating/mq-explorer/Dockerfile-mq-explorer,mqadv_dev903_ubuntu_x86-64.tar.gz,"98102d16795c4263ad9ca075190a2d4d","IBM MQ Advanced for Developers (Non-Warranted)","9.0.3")
+
+include formatting.mk
\ No newline at end of file
diff --git a/formatting.mk b/formatting.mk
new file mode 100644
index 0000000..1707fa1
--- /dev/null
+++ b/formatting.mk
@@ -0,0 +1,17 @@
+GREEN="\033[32m"
+RED="\033[31m"
+BLUE="\033[34m"
+PURPLE="\033[35m"
+AQUA="\033[36m"
+
+END="\033[0m"
+
+UNDERLINE="\033[4m"
+BOLD="\033[1m"
+
+TITLE=$(BLUE)$(BOLD)$(UNDERLINE)
+
+define SPACER 
+
+
+endef