1 files changed, 126 insertions, 54 deletions
diff --git a/test-in-docker b/test-in-docker
index ff3bb86b..c1aafcd9 100755
--- a/test-in-docker
+++ b/test-in-docker
@@ -2,84 +2,156 @@
 
 set -eu
 
-setopt extendedglob
+# The default ZSH to use.
+default_version='4.3.11'
+
+setopt extended_glob glob_subst numeric_glob_sort
 cd "${${(%):-%x}:A:h}"
 
 # TODO: Crazy Logic to munge TERM to something supported in Ubuntu 14.04
 term=screen-256color
 
-frameworks()
+# Note: If versions and frameworks looks complicated, it isn't that bad...
+# ...see Modifiers in zshexpn(1) for details.
+
+# List of ZSH versions
+typeset -a versions
+versions=( docker/base-*/Dockerfile(N.on:h:t:s/base-//) )
+
+# List of frameworks
+typeset -a frameworks
+frameworks=( docker/*/Dockerfile(N.on:h:t) )
+frameworks=${(@)frameworks:#base-*}
+
+err()
 {
-  for path in docker/*/Dockerfile(N.); do
-    framework=${path:h:t}
-    if [[ "$framework" == base ]]; then continue; fi
-    echo "$framework"
-  done
+  print -P "%F{red}Error:%f $*"
+  exit 2
 }
 
-show-help()
-{
-  echo "Usage: ${(%):-%x} <framework>|--list"
-  echo
-  echo "Loads up a docker image with powershell9k configured in <framework>"
-  echo
-  echo " --list  Lists all available framework containers."
-  echo
-  echo "Framework containers:"
-  for f in $(frameworks); do
-    echo " - $f"
-  done
+resolve_framework() {
+  local f=$1 found
+  found=${frameworks[(In:-1:)$f*]}
+  if (( found <= $#frameworks )); then
+    echo "${frameworks[$found]}"
+  fi
 }
 
-build-and-run()
-{
-  local framework="$1" ; shift
+resolve_version() {
+  local v=$1 found
+  found=${versions[(In:-1:)$v*]}
+  if (( found <= $#versions )); then
+    echo "${versions[$found]}"
+  fi
+}
 
-  print -P "%F{green}Preparing ${framework} container...%f"
+build_and_run() {
+  local version="$1"
+  local framework="$2"
+  local name="${version}-${framework}"
 
-  if [[ "$framework" != "base" ]]; then
-    echo -n "p9k:base: "
-    docker build \
-      --quiet \
-      --tag p9k:base \
-      --file docker/base/Dockerfile \
-      .
-  fi
-  echo -n "p9k:${framework}: "
+  print -P "%F{green}Preparing containers...%f"
+
+  echo -n "p9k:base-${version}: "
   docker build \
     --quiet \
-    --tag "p9k:${framework}" \
-    --file "docker/${framework}/Dockerfile" \
+    --tag "p9k:base-${version}" \
+    --file "docker/base-${version}/Dockerfile" \
     .
 
+  echo -n "p9k:${version}-${framework}: "
+  docker build \
+    --quiet \
+    --build-arg="base=base-${version}" \
+    --tag "p9k:${version}-${framework}" \
+    --file "docker/${framework}/Dockerfile" \
+    .
 
-  print -P "%F{green}Starting ${framework} container...%f"
+  print -P "%F{green}Starting ${name} container...%f"
   exec docker run \
     --rm \
     --interactive \
     --tty \
-    --hostname="${framework}" \
+    --hostname="${name//./_}" \
     --env="TERM=${term}" \
-    "$@" \
-    "p9k:${framework}"
+    "p9k:${version}-${framework}"
+}
+
+show_help() {
+  local f v
+  echo "Usage: ${(%):-%x} <framework>|--list"
+  echo
+  echo "Loads up a docker image with powershell9k configured in <framework>"
+  echo
+  echo "  --frameworks  Lists all available frameworks, newline separated."
+  echo "  --versions    Lists all available ZSH versions, newline separated."
+  echo "  --zsh VER     Uses ZSH with version VER."
+  echo "  --help        You're soaking in it."
+  echo
+  echo "ZSH versions:"
+  for v in "${(@)versions}"; do
+    echo "  $v"
+  done
+  echo
+  echo "Framework containers:"
+  for f in "${(@)frameworks}"; do
+    echo "  $f"
+  done
 }
 
-arg1="${1:-}"; if (( $# > 0 )); then shift; fi
-
-if [[ -z "$arg1" ]] || [[ "$arg1" == "help" ]]; then
-  show-help
-  exit 0
-elif [[ "$arg1" == '--list' ]]; then
-  frameworks
-  exit 0
-elif [[ -d "docker/${arg1}" ]]; then
-  build-and-run "$arg1"
-elif [[ -n "docker/${arg1}"*/Dockerfile(#qN) ]]; then
-  # Allow globbing
-  build-and-run "docker/${arg1}"*(Y1:t)
-else
-  show-help
-  exit 1
+# No arguments
+if (( $# == 0 )); then
+  show_help
+  exit
 fi
 
+# Parse flags and such.
+use_version=$default_version
+use_framework=
+while (( $# > 0 )); do
+  case "$1" in
+    -f | --frameworks )
+      print -l "${(@)frameworks}"
+      exit
+      ;;
+    -v | --versions )
+      print -l "${(@)versions}"
+      exit
+      ;;
+    -z | --zsh )
+      shift
+      local v="$(resolve_version "$1")"
+      if [[ -n "$v" ]]; then
+        use_version=$v
+      else
+        err "No such ZSH version '${1}'"
+      fi
+      ;;
+    -h | --help )
+      show_help
+      exit
+      ;;;
+    -* )
+      err "Unknown option ${1}"
+      show_help
+      exit 1
+      ;;
+    * )
+      if [[ -z "$use_framework" ]]; then
+        local f="$(resolve_framework "$1")"
+        if [[ -n "$f" ]]; then
+          use_framework=$f
+        else
+          err "No such framework '${1}'"
+        fi
+      else
+        err "You can only specify one framework at a time; you already specified '${use_framework}'"
+      fi
+      ;;
+  esac
+  shift
+done
+
+build_and_run "$use_version" "$use_framework"
+
 # EOF