Improved exception checks for docker

Author: fhasanaj28

docker/Dockerfile

@@ -4,6 +4,8 @@ MAINTAINER Sam Hausmann
 #install necessary packages
 RUN apt-get -y update && apt-get install -y git && apt-get install -y vim && apt-get install -y curl
 
+RUN npm install -g grunt-cli && npm install -g eslint
+
 ENV API_KEY api_key
 
 RUN mkdir /nodejs-dev

docker/runAll.sh

@@ -2,6 +2,7 @@
 
 ping_url="https://api.rosette.com/rest/v1/"
 retcode=0
+errors=( "Exception" "processingFailure" "badRequest" "ParseError" "ValueError" "SyntaxError" )
 
 #------------------- Functions -------------------------------------
 
@@ -15,6 +16,10 @@ function HELP {
     exit 1
 }
 
+if [ ! -z ${ALT_URL} ]; then
+    ping_url=${ALT_URL}
+fi
+
 #Checks if Rosette API key is valid
 function checkAPI() {
     match=$(curl "${ping_url}ping" -H "X-RosetteAPI-Key: ${API_KEY}" |  grep -o "forbidden")
@@ -54,11 +59,11 @@ function runExample() {
     fi
     echo "${result}"
     echo -e "\n---------- ${1} end -------------"
-    if [[ $result == *"Exception"* ]]; then
-        retcode=1
-    elif [[ $result == *"processingFailure"* ]]; then
-        retcode=1
-    fi
+    for err in "${errors[@]}"; do 
+        if [[ ${result} == *"${err}"* ]]; then
+            retcode=1
+        fi
+    done
 }
 
 
@@ -87,15 +92,11 @@ validateURL
 cp -r -n /source/. .
 
 #Run unit tests
-npm install -g grunt-cli
-npm install -g eslint
 npm install
 grunt test
 #run eslint
 eslint lib/*.js
 
-
-
 #Run the examples
 if [ ! -z ${API_KEY} ]; then
     checkAPI
@@ -104,8 +105,10 @@ if [ ! -z ${API_KEY} ]; then
     npm install argparse
     npm install temporary
     if [ ! -z ${FILENAME} ]; then
+        echo -e "\nRunning example against: ${ping_url}\n"
         runExample ${FILENAME}
     else
+        echo -e "\nRunning examples against: ${ping_url}\n"
         for file in *.js; do
             runExample $file
         done