CB-8506 - Use npm version of uncrustify in cordova-ios

bin/uncrustify.sh

@@ -20,6 +20,7 @@
 
 SCRIPT_PATH=$(dirname $0)
 CONFIG="$SCRIPT_PATH/uncrustify.cfg"
+EXE="$SCRIPT_PATH/../node_modules/.bin/uncrustify"
 
 function Usage() {
     echo "Formats code using uncrustify."
@@ -32,7 +33,7 @@ function Usage() {
 }
 
 function VerifyEnv() {
-    if ! which uncrustify > /dev/null; then
+    if ! which "$EXE" > /dev/null; then
         echo "uncrustify binary not found. Please ensure that it is in your PATH."
         echo "Install via homebrew using: brew install uncrustify"
         exit 1
@@ -77,7 +78,7 @@ elif [[ "$1" = "--all" ]]; then
     files=$(find .)
     FilterAndRun $files
 elif [[ "$1" = "--check-file" ]]; then
-    uncrustify -q -l OC -c "$CONFIG" -f "$2" | cmp --quiet - "$2"
+    "$EXE" -q -l OC -c "$CONFIG" -f "$2" | cmp --quiet - "$2"
 elif [[ "$1" = "--filter" ]]; then
     FilterFileList "$@"
 elif [[ "$1" = -* ]]; then

hooks/pre-commit

@@ -24,11 +24,6 @@ PATH=$PATH:/usr/local/bin:/usr/local/sbin
 exec 1>&2
 test $SKIP_UNCRUSTIFY && exit 0
 
-if [[ "$(uncrustify --version | cut -d' ' -f2)" != 0.60 ]]; then
-  echo "Please install version 0.60 of uncrustify."
-  exit 1
-fi
-
 RET=0
 files=$(bin/uncrustify.sh --filter $(git diff --cached --name-only))
 MSGS=

package.json

@@ -27,6 +27,7 @@
         "nodeunit": "^0.8.7"
     },
     "devDependencies": {
-        "jshint": "^2.6.0"
+        "jshint": "^2.6.0",
+        "uncrustify": "^0.6.1"
     }
 }