Multi-OS: Provide binaries

.travis.yml

@@ -9,38 +9,47 @@ go:
   - 1.13.x
 
 os:
+  - osx
   - linux
+  - windows
 
 dist: trusty
 
 services:
   - docker
 
+before_install:
+  - if [[ "${TRAVIS_OS_NAME}" == "windows" ]]; then choco install make; fi
+  # bash from macOS is too old to have readarray. Install newer version.
+  - if [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then brew install bash; fi
+
 install:
-  - go get -u golang.org/x/lint/golint
-  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
-  - chmod +x ./cc-test-reporter
+  - ./ci/install.sh "${TRAVIS_OS_NAME}"
 
 before_script:
-  - ./cc-test-reporter before-build
+  - ./ci/before-build.sh "${TRAVIS_OS_NAME}"
 
 script:
-  - make all
+  - ./ci/build.sh "${TRAVIS_OS_NAME}"
 
 after_script:
-  - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT -d
+  - ./ci/after-build.sh "${TRAVIS_OS_NAME}"
 
 deploy:
   provider: releases
   token:
     secure: hEHCC4EN7iHz7pIWKRn2qw22NTqUxnuBp59wfAlLBtV26j5rHMzSu8mlxkJInusDUGLJiNLrZPRWN0mzOdIXalbUeLhlX7EflJgEj6Q0MchUR69LzCAp0KMIFL1Sfq0v81VgujRLUUy5utxDL8Er4tZknn2PpXAMzpO+ozjNRDhhSEM4iMXfY3bcOIMnx6XRgCjFCb036wlBgOfdgv5fwm2PP638DTKar4W6ZZbqCQByhJ5RyL3BMDPTT0moA/tYbG+FA6p6Rme1OcBkMnpsiJZoB3u8gxsNiEJ43/C2RcULW/18qqp2UVD5FipSDYP7GQ5ugKCbgpWXb0Ctl8o4hv1UsNl0XoyJhAt0PRp6vqnyy6LWB2FzX30Xj/vGIhO/IfiJvspHxpatTk7Esjr46K4u9ao/x63LX6F6yI1ZTfbzt2MhRYRjwh4ORNfqhysuzXChftX1S9hj6s6gO0/zqoOsRK/PK8DProbUn4bxrGOBzi16P0GEk4agWWUm74Pis9qCThXNW8MXEV936KvE1wb1RxTACYvFBtO2IM5eQ26t2Y7mGJd7FJup9LR4oUtUTSbYo5P2Sal6xntBKH5P4nwEtM+TtHoeSCKQ3X5i1VSdvAH7soEAly6rP5d5wwPhqqx9mgUPYO/3ulvxLJOYHamrbj6nlHDXnCEoj1ZMxX4=
   file:
+    - release/goss-alpha-darwin-amd64
+    - release/goss-alpha-darwin-amd64.sha256
     - release/goss-linux-amd64
     - release/goss-linux-amd64.sha256
     - release/goss-linux-386
     - release/goss-linux-386.sha256
     - release/goss-linux-arm
     - release/goss-linux-arm.sha256
+    - release/goss-alpha-windows-amd64.exe
+    - release/goss-alpha-windows-amd64.exe.sha256
     - extras/dgoss/dgoss
     - extras/dgoss/dgoss.sha256
   skip_cleanup: true

Makefile

@@ -3,28 +3,21 @@ export GO15VENDOREXPERIMENT=1
 exe = github.com/aelsabbahy/goss/cmd/goss
 pkgs = $(shell ./novendor.sh)
 cmd = goss
-TRAVIS_TAG ?= "0.0.0"
-GO_FILES = $(shell find . \( -path ./vendor -o -name '_test.go' \) -prune -o -name '*.go' -print)
 GO111MODULE=on
 
 .PHONY: all build install test release bench fmt lint vet test-int-all gen centos7 wheezy precise alpine3 arch test-int32 centos7-32 wheezy-32 precise-32 alpine3-32 arch-32
 
-all: test-all dgoss-sha256
+all: test-short-all test-int-all dgoss-sha256
 
-test-all: fmt lint vet test test-int-all
+test-short-all: fmt lint vet test
 
 install: release/goss-linux-amd64
 	$(info INFO: Starting build $@)
 	cp release/$(cmd)-linux-amd64 $(GOPATH)/bin/goss
 
 test:
 	$(info INFO: Starting build $@)
-	{ \
-set -e ;\
-go test -coverprofile=c.out ${pkgs} ;\
-cat c.out | sed 's|github.com/aelsabbahy/goss/||' > c.out.tmp ;\
-mv c.out.tmp c.out ;\
-}
+	./ci/go-test.sh $(pkgs)
 
 lint:
 	$(info INFO: Starting build $@)
@@ -36,30 +29,20 @@ vet:
 
 fmt:
 	$(info INFO: Starting build $@)
-	{ \
-set -e ;\
-fmt=$$(gofmt -l ${GO_FILES}) ;\
-[ -z "$$fmt" ] && echo "valid gofmt" || (echo -e "invalid gofmt\n$$fmt"; exit 1)\
-}
+	./ci/go-fmt.sh
 
 bench:
 	$(info INFO: Starting build $@)
 	go test -bench=.
 
-
-
-# Pattern rule for platform builds.
-# `subst` substitutes space for -, thus making an array
-# firstword, and word select indexes from said array.
-release/goss-%: $(GO_FILES)
-	CGO_ENABLED=0 GOOS=$(firstword $(subst -, ,$*)) GOARCH=$(word 2, $(subst -, ,$*)) go build -ldflags "-X main.version=$(TRAVIS_TAG) -s -w" -o $@ $(exe)
-	sha256sum $@ > $@.sha256
+release/goss-%:
+	./release-build.sh $*
 
 release:
 	$(MAKE) clean
 	$(MAKE) build
 
-build: release/goss-linux-386 release/goss-linux-amd64 release/goss-linux-arm
+build: release/goss-alpha-darwin-amd64 release/goss-linux-386 release/goss-linux-amd64 release/goss-linux-arm release/goss-alpha-windows-amd64
 
 gen:
 	$(info INFO: Starting build $@)

README.md

@@ -31,6 +31,8 @@ Goss is a YAML based [serverspec](http://serverspec.org/) alternative tool for v
 
 ## Installation
 
+Note: macOS and Windows binaries are new and considered alpha-quality. Some functionality may be missing, some may be broken. Refer to <platform-feature-parity.md> (Enhancements and bug-reports welcome, please see [#551: Multi-OS support](https://github.com/aelsabbahy/goss/issues/551))
+
 This will install goss and [dgoss](https://github.com/aelsabbahy/goss/tree/master/extras/dgoss).
 
 **Note:** Using `curl | sh` is not recommended for production systems, use manual installation below.
@@ -45,8 +47,8 @@ curl -fsSL https://goss.rocks/install | GOSS_VER=v0.3.6 GOSS_DST=~/bin sh
 
 ### Manual installation
 
-
 #### Latest
+
 ```bash
 curl -L https://github.com/aelsabbahy/goss/releases/latest/download/goss-linux-amd64 -o /usr/local/bin/goss
 chmod +rx /usr/local/bin/goss
@@ -58,6 +60,7 @@ chmod +rx /usr/local/bin/dgoss
 ```
 
 #### Specific Version
+
 ```bash
 # See https://github.com/aelsabbahy/goss/releases for release versions
 VERSION=v0.3.10
@@ -88,7 +91,7 @@ An initial set of tests can be derived from the system state by using the [add](
 
 Let's write a simple sshd test using autoadd.
 
-```
+```txt
 # Running it as root will allow it to also detect ports
 $ sudo goss autoadd sshd
 ```
@@ -132,7 +135,7 @@ Now that we have a test suite, we can:
 
 * Run it once
 
-```
+```txt
 goss validate
 ...............
 
@@ -142,19 +145,19 @@ Count: 15, Failed: 0
 
 * Edit it to use [templates](https://github.com/aelsabbahy/goss/blob/master/docs/manual.md#templates), and run with a vars file
 
-```
+```txt
 goss --vars vars.yaml validate
 ```
 
 * keep running it until the system enters a valid state or we timeout
 
-```
+```txt
 goss validate --retry-timeout 30s --sleep 1s
 ```
 
 * serve the tests as a health endpoint
 
-```
+```txt
 goss serve &
 curl localhost:8080/healthz
 

ci/after-build.sh

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+os_name="${1:?"No value from TRAVIS_OS_NAME in 1st arg. This is meant to be run in Travis CI, see also https://docs.travis-ci.com/user/environment-variables/#convenience-variables"}"
+
+if [[ "${os_name}" != "windows" ]]; then
+  ./cc-test-reporter after-build --exit-code "${TRAVIS_TEST_RESULT}" -d
+fi

ci/before-build.sh

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+os_name="${1:?"No value from TRAVIS_OS_NAME in 1st arg. This is meant to be run in Travis CI, see also https://docs.travis-ci.com/user/environment-variables/#convenience-variables"}"
+
+if [[ "${os_name}" != "windows" ]]; then
+  ./cc-test-reporter before-build
+fi

ci/build.sh

@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+os_name="${1:?"No value from TRAVIS_OS_NAME in 1st arg. This is meant to be run in Travis CI, see also https://docs.travis-ci.com/user/environment-variables/#convenience-variables"}"
+
+# darwin & windows do not support integration-testing approach via docker, so on those, just run fast tests.
+# linux runs all tests; unit and integration.
+if [[ "${os_name}" == "osx" ]]; then
+  make test-short-all release/goss-alpha-darwin-amd64
+  # darwin is the GOOS value which is easier to work with
+  integration-tests/run-tests-alpha.sh "darwin"
+elif [[ "${os_name}" == "windows" ]]; then
+  make test-short-all release/goss-alpha-windows-amd64
+  integration-tests/run-tests-alpha.sh "windows"
+else
+  make all
+fi

ci/go-fmt.sh

@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+os_name="${TRAVIS_OS_NAME:?"No value from TRAVIS_OS_NAME. This is meant to be run in Travis CI, see also https://docs.travis-ci.com/user/environment-variables/#convenience-variables"}"
+
+# gofmt must be on PATH
+command -v gofmt
+
+if [[ "${os_name}" == "windows" ]]; then
+  echo "Skipping go-fmt on Windows because line-endings cause every file to need formatting."
+  echo "Linux is treated as authoritative."
+  echo "Exiting 0..."
+  exit 0
+fi
+
+fmt="$(go fmt github.com/aelsabbahy/goss/...)"
+
+if [[ -z "${fmt}" ]]; then
+  echo "valid gofmt"
+else
+  echo "invalid gofmt:"
+  echo "${fmt}"
+  exit 1
+fi

ci/go-test.sh

@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+command -v go
+
+go test -coverprofile="c.out" "${1}"
+
+sed 's|github.com/aelsabbahy/goss/||' <"c.out" >"c.out.tmp"
+
+mv "c.out.tmp" "c.out"

ci/install.sh

@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+os_name="${1:?"No value from TRAVIS_OS_NAME in 1st arg. This is meant to be run in Travis CI, see also https://docs.travis-ci.com/user/environment-variables/#convenience-variables"}"
+goos="${os_name}"
+if [[ "${goos}" == "osx" ]]; then
+  goos="darwin"
+fi
+
+go get -u golang.org/x/lint/golint
+
+if [[ "${goos}" != "windows" ]]; then
+  curl -L "https://codeclimate.com/downloads/test-reporter/test-reporter-latest-${goos}-amd64" > "./cc-test-reporter"
+  chmod +x "./cc-test-reporter"
+fi