move composer tests and test data out of main repo and into shell-composer-plugin repo

Fixes #1018

Author: starpit

.gitignore

@@ -12,3 +12,5 @@ app/plugins/.pre-scanned
 dump.rdb
 openwhisk
 .idea
+.DS_Store
+app.inst

.travis.yml

@@ -53,6 +53,9 @@ install:
     - cat app/plugins/.pre-scanned  | jq .commandToPlugin                                                       # ibid
     - cat app/plugins/.pre-scanned  | jq .overrides                                                             # ibid
     - echo "install steps completed with success"
+   # corral the tests that plugins might offer
+    - echo "Test corral"
+    - (cd tests && ./bin/corral.sh)
 
 # if for some reason we want to avoid the use of travis jobs:
 #script: (cd tests && npm run test)

app/plugins/ui/commands/tab-completion.js

@@ -30,6 +30,34 @@ const completeWith = (partial, match, addSpace=false) => {
     return (partialIdx >= 0 ? match.substring(partialIdx + partial.length) : match) + (addSpace ? ' ' : '')
 }
 
+/**
+ * Is the given filepath a directory?
+ *
+ */
+const isDirectory = filepath => new Promise((resolve, reject) => {
+    fs.lstat(filepath, (err, stats) => {
+        if (err) {
+            reject(err)
+        } else {
+            if (stats.isSymbolicLink()) {
+                debug('following symlink')
+                // TODO: consider turning these into the better async calls?
+                return fs.realpath(filepath, (err, realpath) => {
+                    if (err) {
+                        reject(err)
+                    } else {
+                        return isDirectory(realpath)
+                            .then(resolve)
+                            .catch(reject)
+                    }
+                })
+            }
+
+            resolve(stats.isDirectory())
+        }
+    })
+})
+
 /**
  * We've found a match. Add this match to the given partial match,
  * located in the given dirname'd directory, and update the given
@@ -48,9 +76,10 @@ const complete = (match, prompt, { temporaryContainer, partial=temporaryContaine
 
     if (dirname) {
         // see if we need to add a trailing slash
-        fs.lstat(expandHomeDir(path.join(dirname, match)), (err, stats) => {
-            if (!err) {
-                if (stats.isDirectory()) {
+        const filepath = expandHomeDir(path.join(dirname, match))
+        isDirectory(filepath)
+            .then(isDir => {
+                if (isDir) {
                     // add a trailing slash if the dirname/match is a directory
                     debug('complete as directory')
                     prompt.value = prompt.value + completion + '/'
@@ -59,10 +88,9 @@ const complete = (match, prompt, { temporaryContainer, partial=temporaryContaine
                     debug('complete as scalar')
                     prompt.value = prompt.value + completion
                 }
-            } else {
+            }).catch(err => {
                 console.error(err)
-            }
-        })
+            })
 
     } else {
         // otherwise, just add the completion to the prompt
@@ -398,14 +426,18 @@ const suggestLocalFile = (last, block, prompt, temporaryContainer, lastIdx) => {
                         const { option, optionInner } = addSuggestion(temporaryContainer, dirname, prompt)(match, idx)
 
                         // see if the match is a directory, so that we add a trailing slash
-                        fs.lstat(expandHomeDir(path.join(dirname, match)), (err, stats) => {
-                            if (!err && stats.isDirectory()) {
-                                optionInner.innerText = match + '/'
-                            } else {
-                                optionInner.innerText = match
-                            }
-                            option.setAttribute('data-value', optionInner.innerText)
-                        })
+                        const filepath = path.join(dirname, match)
+                        isDirectory(filepath)
+                            .then(isDir => {
+                                if (isDir) {
+                                    optionInner.innerText = match + '/'
+                                } else {
+                                    optionInner.innerText = match
+                                }
+                                option.setAttribute('data-value', optionInner.innerText)
+                            }).catch(err => {
+                                console.error(err)
+                            })
                     })
                 }
             }

dist/package.json

@@ -5,7 +5,7 @@
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "postinstall": "if [ `uname` == Darwin ]; then brew install fakeroot dpkg mono; fi"
+    "postinstall": "if [ `uname` == Darwin ]; then brew list | grep '^mono$'; if [ $? == 1 ]; then brew install mono; fi; brew list | grep '^dpkg$'; if [ $? == 1 ]; then brew install dpkg; fi; brew list | grep '^fakeroot$'; if [ $? == 0 ]; then brew install fakeroot; fi; fi"
   },
   "author": "",
   "license": "Apache-2.0",

tests/bin/corral.sh

@@ -0,0 +1,87 @@
+#
+# Copyright 2018 IBM Corporation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+#!/usr/bin/env bash
+
+#
+# Find plugin-hosted tests
+#
+
+# are we setting up links or tearing them down (a.k.a. clean)?
+if [ "$1" == "clean" ]; then
+    CLEAN=true
+fi
+
+# make sure we are independent of the working directory
+SCRIPTDIR=$(cd $(dirname "$0") && pwd)
+ROOTDIR="$SCRIPTDIR/../.."
+cd "$SCRIPTDIR/.."
+
+# scan for tests
+TESTS=`find "$ROOTDIR/app/plugins/modules" -maxdepth 2 -name tests`
+
+# set up (or tear down) links
+for test in $TESTS; do
+    echo "Scanning $test"
+
+    if [ -d "$test/data" ]; then
+        echo
+        echo "  - found test input data"
+
+        for data in "$test"/data/*; do
+            base=`basename $data`
+            if [ -n "$CLEAN" ]; then
+                echo "    * unlinking data $base"
+                (cd data && rm -f $base)
+            else
+                echo "    * linking data $base"
+                (cd data && ln -s "$data" .)
+            fi
+        done
+    fi
+
+    if [ -d "$test/lib" ]; then
+        echo
+        echo "  - found test library files"
+
+        for lib in "$test"/lib/*; do
+            base=`basename $lib`
+            if [ -n "$CLEAN" ]; then
+                echo "    * unlinking lib $base"
+                (cd lib && rm -f $base)
+            else
+                echo "    * linking lib $base"
+                (cd lib && ln -s "$lib" .)
+            fi
+        done
+    fi
+
+    if [ -d "$test/tests/passes" ]; then
+        echo
+        echo "  - found tests"
+
+        for pass in "$test"/tests/passes/*; do
+            base=`basename $pass`
+            if [ -n "$CLEAN" ]; then
+                echo "    * unlinking pass $base"
+                (cd tests/passes && rm -f $base)
+            else
+                echo "    * linking pass $base"
+                (cd tests/passes && ln -s "$pass" .)
+            fi
+        done
+    fi
+done

tests/bin/runLocal.sh

@@ -16,6 +16,9 @@
 
 #!/usr/bin/env bash
 
+SCRIPTDIR=$(cd $(dirname "$0") && pwd)
+export TEST_ROOT="$SCRIPTDIR/.."
+
 # the | tee should fail if runTest fails
 set -o pipefail