get shellcheck and tests to pass for long opts of verbose and help

Author: kdabir

has

@@ -365,7 +365,11 @@ while getopts ":qhv-" OPTION; do
     exit 0
     ;;
   -)
-    [ $OPTIND -ge 1 ] && optind=$((OPTIND - 1)) || optind=$OPTIND
+    if [ "$OPTIND" -ge 2 ]; then
+      optind=$((OPTIND - 1))
+    else
+      optind=$OPTIND
+    fi
     eval OPTION="\$$optind"
     OPTARG=$(echo "$OPTION" | cut -d'=' -f2)
     OPTION=$(echo "$OPTION" | cut -d'=' -f1)

tests/unit/unit-tests.bats

@@ -216,21 +216,25 @@ teardown() {
   [ -z "${output}" ]
 }
 
-@test "'has' prints version with --version and -v" {
-#  run $has --version
-#  [ "$status" -eq 0 ]
-#  [[ "${output}" =~ ^has\ version\ [0-9]+\.[0-9]+\.[0-9]+ ]]
+@test "'has' prints version with --version" {
+  run $has --version
+  [ "$status" -eq 0 ]
+  [[ "${output}" =~ ^v[0-9]+\.[0-9]+\.[0-9]+ ]]
+}
 
+@test "'has' prints version with -v" {
   run $has -v
   [ "$status" -eq 0 ]
   [[ "${output}" =~ ^v[0-9]+\.[0-9]+\.[0-9]+ ]]
 }
 
-@test "'has' prints help with --help and -h" {
-#  run $has --help
-#  [ "$status" -eq 0 ]
-#  [ "${lines[0]}" = 'Usage: has [OPTION] <command-names>...' ]
+@test "'has' prints help with --help" {
+  run $has --help
+  [ "$status" -eq 0 ]
+  __assert_usage
+}
 
+@test "'has' prints help with -h" {
   run $has -h
   [ "$status" -eq 0 ]
   __assert_usage