Merge pull request #3463 from dokku/version-command

Implement version flags

dokku

@@ -66,6 +66,9 @@ skip_arg=false
 if [[ "${args[0]}" =~ ^--.* ]]; then
   for arg in "$@"; do
     $skip_arg && skip_arg=false && continue
+    if [[ "$arg" == "--version" ]]; then
+      continue
+    fi
     if [[ "$arg" == "--app" ]]; then
       shift 2 && skip_arg=true
     elif [[ "$arg" =~ ^--.* ]]; then
@@ -129,7 +132,7 @@ execute_dokku_cmd() {
     deploy | delete | ls | run | cleanup)
       local PLUGIN_NAME="00_dokku-standard"
       ;;
-    trace | url | urls | report | version)
+    trace | url | urls | report)
       local PLUGIN_NAME="00_dokku-standard"
       ;;
   esac
@@ -233,6 +236,12 @@ case "$1" in
     fi
     ;;
 
+  version | -v | --version)
+    test -f "$DOKKU_ROOT/VERSION" || dokku_log_fail "Unable to determine dokku's version"
+    DOKKU_VERSION=$(cat "${DOKKU_ROOT}/VERSION")
+    echo "dokku version ${DOKKU_VERSION}"
+    ;;
+
   *)
     execute_dokku_cmd "$@"
     ;;

plugins/00_dokku-standard/subcommands/version

@@ -1,12 +0,0 @@
-#!/usr/bin/env bash
-set -eo pipefail
-[[ $DOKKU_TRACE ]] && set -x
-source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
-
-dokku_version_cmd() {
-  declare desc="prints dokku version"
-  local cmd="version"
-  cat "$DOKKU_ROOT/VERSION" || dokku_log_fail "Unable to determine dokku's version"
-}
-
-dokku_version_cmd "$@"

tests/unit/10_version.bats

@@ -0,0 +1,28 @@
+#!/usr/bin/env bats
+
+load test_helper
+
+setup() {
+  global_setup
+}
+
+teardown() {
+  global_teardown
+}
+
+@test "(version) version, -v, --version" {
+  run /bin/bash -c "dokku version"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  run /bin/bash -c "dokku -v"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+
+  run /bin/bash -c "dokku --version"
+  echo "output: $output"
+  echo "status: $status"
+  assert_success
+}