Merge remote-tracking branch 'origin/develop' for release 0.3.1

CHANGELOG.md

@@ -1,7 +1,19 @@
 # Change Log
 
 ## UNRELEASED [x.y.z](https://github.com/davidalger/warden/tree/x.y.z) (yyyy-mm-dd)
-[All Commits](https://github.com/davidalger/warden/compare/0.3.0..develop)
+[All Commits](https://github.com/davidalger/warden/compare/0.3.1..develop)
+
+## Version [0.3.1](https://github.com/davidalger/warden/tree/0.3.1) (2020-03-06)
+[All Commits](https://github.com/davidalger/warden/compare/0.3.0..0.3.1)
+
+**Upgrade Notes:**
+
+If you're upgrading from version 0.2.x to 0.3.x for the first time, please reference upgrade notes for [Warden 0.3.0](https://docs.warden.dev/changelog.html#version-0-3-0-2020-03-06) and plan accordingly.
+
+**Bug Fixes:**
+
+* Fixed issue where `env up` and `env start` would exit with an error on env types not using Mutagen sessions
+* Fixed issue where `env down` and `env stop` would exit with an error on env types not using Mutagen sessions
 
 ## Version [0.3.0](https://github.com/davidalger/warden/tree/0.3.0) (2020-03-06)
 [All Commits](https://github.com/davidalger/warden/compare/0.2.4..0.3.0)

commands/env.cmd

@@ -98,15 +98,15 @@ docker-compose \
 
 ## start mutagen sync if needed
 if ([[ "${WARDEN_PARAMS[0]}" == "up" ]] || [[ "${WARDEN_PARAMS[0]}" == "start" ]]) \
-    && [[ $OSTYPE =~ ^darwin ]] \
+    && [[ $OSTYPE =~ ^darwin ]] && [[ -f "${WARDEN_DIR}/environments/${WARDEN_ENV_TYPE}.mutagen.yml" ]] \
     && [[ $(warden sync list | grep -i 'Connection state: Connected' | wc -l | awk '{print $1}') != "2" ]]
 then
     warden sync start
 fi
 
 ## stop mutagen sync if needed
 if ([[ "${WARDEN_PARAMS[0]}" == "down" ]] || [[ "${WARDEN_PARAMS[0]}" == "stop" ]]) \
-    && [[ $OSTYPE =~ ^darwin ]]
+    && [[ $OSTYPE =~ ^darwin ]] && [[ -f "${WARDEN_DIR}/environments/${WARDEN_ENV_TYPE}.mutagen.yml" ]]
 then
     warden sync stop
 fi

commands/sync.cmd

@@ -3,6 +3,7 @@
 
 source "${WARDEN_DIR}/utils/core.sh"
 source "${WARDEN_DIR}/utils/env.sh"
+
 WARDEN_ENV_PATH="$(locateEnvPath)" || exit $?
 loadEnvConfig "${WARDEN_ENV_PATH}" || exit $?
 

version

@@ -1 +1 @@
-0.3.0
+0.3.1