Merge pull request #453 from kool-dev/fix-error-message

Improve error message on docker compose check failure

services/checker/checker.go

@@ -3,6 +3,7 @@ package checker
 import (
 	"kool-dev/kool/core/builder"
 	"kool-dev/kool/core/shell"
+	"strings"
 )
 
 // Checker defines the check kool dependencies method
@@ -33,7 +34,11 @@ func (c *DefaultChecker) Check() error {
 	}
 
 	if _, err := c.shell.Exec(c.dockerComposeCmd); err != nil {
-		return ErrDockerComposeNotFound
+		if strings.Contains(strings.ToLower(err.Error()), "is not a docker command") {
+			return ErrDockerComposeNotFound
+		}
+		// anything else, raise the original error
+		return err
 	}
 
 	if _, err := c.shell.Exec(c.dockerCmd); err != nil {

services/checker/checker_test.go

@@ -41,7 +41,7 @@ func TestDockerComposeNotInstalled(t *testing.T) {
 	var c Checker
 
 	dockerCmd := &builder.FakeCommand{}
-	dockerComposeCmd := &builder.FakeCommand{MockExecError: errors.New("not installed")}
+	dockerComposeCmd := &builder.FakeCommand{MockExecError: errors.New("is not a docker command")}
 
 	s := &shell.FakeShell{}
 
@@ -57,6 +57,12 @@ func TestDockerComposeNotInstalled(t *testing.T) {
 	if !IsDockerComposeNotFoundError(err) {
 		t.Errorf("Expected the message '%s', got '%s'", ErrDockerComposeNotFound.Error(), err.Error())
 	}
+
+	dockerComposeCmd.MockExecError = errors.New("some other error")
+
+	if err := c.Check(); err == nil || err.Error() != "some other error" {
+		t.Errorf("Expected the error message 'some other error', got '%v'", err)
+	}
 }
 
 func TestDockerNotRunning(t *testing.T) {