Support latest version of pack

Additionally, added a check that warns if the installed
version of pack is different than what's expected (typically
latest).

We were seeing failures in CI that we weren't seeing locally.
It came down to CI running a newer (latest) version of pack
in which the platform API was changed so therefore the output
changed slightly.

Signed-off-by: Javier Romero <[email protected]>

Author: jromero

Makefile

@@ -1,7 +1,6 @@
 # Retrieve latest pack version
 PACK_VERSION?=
 GITHUB_TOKEN?=
-PACK_BIN?=$(shell which pack)
 SERVE_PORT=1313
 BASE_URL?=
 
@@ -71,22 +70,35 @@ endif
 
 .PHONY: upgrade-pack
 upgrade-pack: pack-version
-	@echo "> Upgrading to pack version $(PACK_VERSION)"
+	@echo "> Upgrading pack library version $(PACK_VERSION)"
 	cd tools; go get github.com/buildpacks/pack@v$(PACK_VERSION)
 
 .PHONY: install-pack-cli
+install-pack-cli: export PACK_BIN:=$(shell which pack)
 install-pack-cli: upgrade-pack
 	@echo "> Installing pack bin..."
-ifeq ($(PACK_BIN),)
-	cd tools; go get github.com/buildpacks/pack/cmd/pack
-else
-	@echo "pack already installed at $(PACK_BIN)"
-endif
+	@if [ -z "$(PACK_BIN)" ]; then \
+		cd tools; go install github.com/buildpacks/pack/cmd/pack; \
+	else \
+		echo "pack already installed at $(PACK_BIN)"; \
+	fi
+	@echo "pack version: $(shell pack --version)"
+
+.PHONY: check-pack-cli-version
+check-pack-cli-version: export INSTALLED_VERSION:=$(shell pack --version | cut -d '+' -f 1)
+check-pack-cli-version:
+	@echo "> Installed pack version: $(INSTALLED_VERSION)"
+	@if [ "$(INSTALLED_VERSION)" != "$(PACK_VERSION)" ]; then \
+		echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"; \
+		echo "WARNING: Expected pack version: $(PACK_VERSION)"; \
+		echo "You may need to upgrade your version of pack!  "; \
+		echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"; \
+	fi
 
 .PHONY: install-ugo
 install-ugo:
 	@echo "> Installing ugo..."
-	cd tools; go get github.com/jromero/ugo/cmd/[email protected]
+	cd tools; go install github.com/jromero/ugo/cmd/[email protected]
 
 .PHONY: pack-docs-update
 pack-docs-update: upgrade-pack
@@ -120,7 +132,7 @@ build: $(HUGO_BIN) pack-version pack-docs-update
 	$(HUGO_BIN)
 
 .PHONY: test
-test: install-pack-cli install-ugo
+test: install-pack-cli check-pack-cli-version install-ugo
 	@echo "> Testing..."
 	ugo run -r -p ./content/docs/
 

content/docs/buildpack-author-guide/create-buildpack/detection.md

@@ -38,10 +38,10 @@ You should see the following output:
 
 <!-- test:assert=contains -->
 ```
-===> DETECTING
-[detector] examples/ruby 0.0.1
 ===> ANALYZING
 [analyzer] Previous image with name "test-ruby-app" not found
+===> DETECTING
+[detector] examples/ruby 0.0.1
 ===> RESTORING
 ===> BUILDING
 [builder] ---> Ruby Buildpack

tools/go.mod

@@ -3,12 +3,9 @@ module github.com/buildpacks/docs/tools
 go 1.14
 
 require (
-	github.com/buildpacks/pack v0.22.0
+	github.com/buildpacks/pack v0.23.0
 	github.com/gohugoio/hugo v0.82.0
 	github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351 // indirect
-	github.com/maxbrunsfeld/counterfeiter/v6 v6.2.2 // indirect
 	github.com/sabhiram/go-gitignore v0.0.0-20201211210132-54b8a0bf510f // indirect
 	github.com/spf13/cobra v1.2.1
-	k8s.io/code-generator v0.19.7 // indirect
-	k8s.io/gengo v0.0.0-20201113003025-83324d819ded // indirect
 )