Release v1.3.0

Author: mdeboer

LICENSE

@@ -1,4 +1,4 @@
-Copyright 2019 Maarten de Boer, Cloudstek
+Copyright 2019-2020 Maarten de Boer, Cloudstek
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

README.md

@@ -48,4 +48,15 @@ Vagrant doesn't have a `down`, `restart`, `start` or `stop` commands natively bu
 ## Updating
 
 1. Go to the directory where you cloned the plugin repository
-2. Run `git pull origin master`
+2. Run `git pull origin master`
+
+## Configuration options
+
+AppUp has a few configuration options to customise its behaviour. Please make sure you define these in `~/.zshrc` *before* you load any plugins.
+
+| Name                 | Values     | Default | Description                                                  |
+| -------------------- | ---------- | ------- | ------------------------------------------------------------ |
+| APPUP_CHECK_STARTED  | true/false | true    | Enable/disable checking if docker is running completely.     |
+| APPUP_DOCKER_MACHINE | true/false | true    | If both docker (e.g. Docker Desktop) and docker-machine are installed, check if docker-machine (when `true`) or docker (when `false`) is running. |
+|                      |            |         |                                                              |
+

appup.plugin.zsh

@@ -1,17 +1,41 @@
 # Docker
 _appup_docker () {
     if hash docker-compose >/dev/null 2>&1; then
-        # Check if docker-machine has been started
-        if hash docker-machine >/dev/null 2>&1; then            
-            if docker-machine status | grep -qi "Stopped"; then
-                read -q "REPLY?Docker Machine is not running, would you like to start it? [y/n] "
+        # Check if docker has been started
+        if [ "${APPUP_CHECK_STARTED:-true}" = true ]; then
+            if hash docker-machine >/dev/null 2>&1 && [ "${APPUP_DOCKER_MACHINE:-true}" = true ]; then            
+                if docker-machine status | grep -qi "Stopped"; then
+                    read -r -k 1 "REPLY?Docker Machine is not running, would you like to start it? [y/N] "
+                    echo ""
+                    
+                    if [[ "$REPLY" == "y" ]]; then
+                        docker-machine start default && eval $(docker-machine env default)
+                        echo ""
+                    else
+                        return 0
+                    fi
+                fi
+            elif docker ps 2>&1 | grep -qi "Is the docker daemon running?"; then
+                read -r -k 1 "REPLY?Docker for Mac is not running, would you like to start it? [y/N] "
                 echo ""
 
                 if [[ "$REPLY" == "y" ]]; then
-                    docker-machine start default && eval $(docker-machine env default)
+                    open -a Docker
+                    
                     echo ""
+                    echo "Waiting for docker to start.."
+                    echo ""
+
+                    # Wait for it to start
+                    while true; do
+                        if docker ps 2>&1 | grep -qi "Is the docker daemon running?" || docker ps 2>&1 | grep -qi "connection refused"; then
+                            sleep 5
+                        else
+                            break
+                        fi
+                    done
                 else
-                    return
+                    return0
                 fi
             fi
         fi
@@ -65,6 +89,7 @@ _appup_vagrant () {
     fi
 }
 
+# Commands
 up () {
     if [ -e "docker-compose.yml" ] || [ -e "docker-compose.yaml" ]; then
         _appup_docker up "$@"

tests/_support/bin/docker-machine

@@ -0,0 +1,8 @@
+#!/usr/bin/env zsh
+
+if [ "$1" = "status" ]; then
+	echo ${DM_STARTED:-Started}
+	return 0
+fi
+
+echo docker-machine "$@"