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

wardenenv · Jul 19, 2019 · 3a6ed18 · 3a6ed18
2 parents 1a4e779 + 1016dc0
commit 3a6ed18
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+0.1.5
+===============
+
+* Changed Mutagen polling interval from 20 to 10 seconds
+* Removed `generated` directory from exclusions in Mutagen sync configuration (having this ignored breaks ability to step into generated class files during Xdebug sessions)
+* Fixed issue with Mutagen sync cofiguration causing `pub/static` (and other files) to have incorrect permissions resulting in 404'ing static resources
+* Fixed issue causing `warden env` to break when run from a path which contained a space (issue #3 reported by @fooman)
+
 0.1.4
 ===============
 

diff --git a/commands/env.cmd b/commands/env.cmd
@@ -14,21 +14,26 @@ fi
 trap '' ERR
 
 ## configure docker-compose files
-DOCKER_COMPOSE_ARGS=-f\ "${WARDEN_DIR}/environments/${WARDEN_ENV_TYPE}.base.yml"
+DOCKER_COMPOSE_ARGS=()
+DOCKER_COMPOSE_ARGS+=("-f")
+DOCKER_COMPOSE_ARGS+=("${WARDEN_DIR}/environments/${WARDEN_ENV_TYPE}.base.yml")
 
 if [[ -f "${WARDEN_DIR}/environments/${WARDEN_ENV_TYPE}.${WARDEN_ENV_SUBT}.yml" ]]; then
-    DOCKER_COMPOSE_ARGS+=\ -f\ "${WARDEN_DIR}/environments/${WARDEN_ENV_TYPE}.${WARDEN_ENV_SUBT}.yml"
+    DOCKER_COMPOSE_ARGS+=("-f")
+    DOCKER_COMPOSE_ARGS+=("${WARDEN_DIR}/environments/${WARDEN_ENV_TYPE}.${WARDEN_ENV_SUBT}.yml")
 fi
 
 if [[ -f "${WARDEN_ENV_PATH}/.warden/warden-env.yml" ]]; then
-    DOCKER_COMPOSE_ARGS+=\ -f\ "${WARDEN_ENV_PATH}/.warden/warden-env.yml"
+    DOCKER_COMPOSE_ARGS+=("-f")
+    DOCKER_COMPOSE_ARGS+=("${WARDEN_ENV_PATH}/.warden/warden-env.yml")
 fi
 
 if [[ -f "${WARDEN_ENV_PATH}/.warden/warden-env.${WARDEN_ENV_SUBT}.yml" ]]; then
-    DOCKER_COMPOSE_ARGS+=\ -f\ "${WARDEN_ENV_PATH}/.warden/warden-env.${WARDEN_ENV_SUBT}.yml"
+    DOCKER_COMPOSE_ARGS+=("-f")
+    DOCKER_COMPOSE_ARGS+=("${WARDEN_ENV_PATH}/.warden/warden-env.${WARDEN_ENV_SUBT}.yml")
 fi
 
 ## anything not caught above is simply passed through to docker-compose to orchestrate
 docker-compose \
     --project-directory "${WARDEN_ENV_PATH}" -p "${WARDEN_ENV_NAME}" \
-    ${DOCKER_COMPOSE_ARGS} "${WARDEN_PARAMS[@]}" "$@"
+    "${DOCKER_COMPOSE_ARGS[@]}" "${WARDEN_PARAMS[@]}" "$@"
diff --git a/commands/usage.help b/commands/usage.help
@@ -11,7 +11,7 @@ WARDEN_HEADER='
 
 WARDEN_USAGE=$(cat <<EOF
 ${WARDEN_HEADER:1}
-Warden version 0.1.4
+Warden version 0.1.5
 
 \033[33mUsage:\033[0m
   command [options] [arguments]

diff --git a/environments/magento2.mutagen.toml b/environments/magento2.mutagen.toml
@@ -1,6 +1,6 @@
 
 [watch]
-pollingInterval = 20
+pollingInterval = 10
 
 [sync]
 mode = "two-way-resolved"
@@ -20,7 +20,6 @@ default = [
     ".idea",
 
     # Magento files
-    "/generated",
     "/pub/media",
     "/pub/static/**",
     "!/pub/static/.htaccess",
@@ -29,7 +28,5 @@ default = [
 ]
 
 [permissions]
-fileModeBeta = "0644"
-directoryModeBeta = "0755"
-defaultOwnerBeta = "www-data"
-defaultGroupBeta = "www-data"
+defaultFileMode = "0644"
+defaultDirectoryMode = "0755"