- Encrypt credentials file
- Add uninstall script
diff --git a/.travis.yml b/.travis.yml
index 6448e89..15dbdff 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,21 +1,27 @@
sudo: required
+
language: scala
+
scala:
-- 2.11.6
+ - 2.11.6
+
services:
-- docker
+ - docker
+
env:
global:
- - TERM=dumb
+ - TERM=dumb
+
notifications:
email: false
+
install: true
+
before_install:
-- openssl aes-256-cbc -K $encrypted_72eb7f877861_key -iv $encrypted_72eb7f877861_iv
- -in tests/credentials.json.enc -out tests/credentials.json -d
-- chmod +x ./tools/travis/build.sh
-- git clone https://github.com/openwhisk/openwhisk.git
-- cd openwhisk
-- ./tools/travis/setup.sh
+ - openssl aes-256-cbc -K $encrypted_ff5bbb6225c5_key -iv $encrypted_ff5bbb6225c5_iv -in tests/credentials.json.enc -out tests/credentials.json -d
+ - git clone https://github.com/openwhisk/openwhisk.git
+ - cd openwhisk
+ - ./tools/travis/setup.sh
+
script:
-- ../tools/travis/build.sh
+ - ../tools/travis/build.sh
diff --git a/install.sh b/install.sh
index f21a0dd..fc93fc9 100644
--- a/install.sh
+++ b/install.sh
@@ -1,37 +1,43 @@
#!/bin/bash
+
+#/
+# Copyright 2015-2016 IBM Corporation
#
-# use the command line interface to install standard actions deployed
-# automatically
+# 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
#
-# To run this command
-# ./install.sh <apihost> <authkey> <pathtowskcli>
-# ./install.sh APIHOST="$EDGE_HOST" AUTH="$AUTH_KEY" WSK_CLI="$OPENWHISK_HOME/bin/wsk"
-# API_HOST and AUTH_KEY are found in $HOME/.wskprops
+# 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.
+#/
set -e
set -x
if [ $# -eq 0 ]
then
-echo "Usage: ./install.sh <apihost> <authkey> <pathtowskcli>"
+ echo "Usage: ./install.sh <apihost> <authkey> <pathtowskcli>"
fi
-APIHOST="$1"
-AUTH="$2"
-WSK_CLI="$3"
+APIHOST=$1
+AUTH=$2
+WSK_CLI=$3
PACKAGE_HOME="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-# pushnotifications actions
-
echo Installing pushnotifications package.
-$WSK_CLI --apihost "$APIHOST" package update --auth "$AUTH" --shared yes pushnotifications \
+$WSK_CLI --apihost $APIHOST package update --auth $AUTH --shared yes pushnotifications \
-a description "This package supports sending push notifications to your mobile device, using the IBM Bluemix Push Notifications service." \
-a parameters '[ {"name":"appId", "required":true, "description":"Bluemix application GUID"}, {"name":"appSecret", "required":true, "bindTime":true, "type":"password", "description":"Bluemix Push Service Secret"}]' \
-a prettyName "Push Notifications"
-$WSK_CLI --apihost "$APIHOST" action update --auth "$AUTH" --shared yes pushnotifications/webhook "$PACKAGE_HOME/feeds/webhook.js" \
+$WSK_CLI --apihost $APIHOST action update --auth $AUTH --shared yes pushnotifications/webhook $PACKAGE_HOME/feeds/webhook.js \
-a feed true \
-a description 'pushnotifications feed' \
-a parameters '[ {"name":"appId", "required":true, "description":"Bluemix application GUID"}, {"name":"appSecret", "required":true, "bindTime":true, "type":"password", "description":"Bluemix Push Service Secret"},{"name":"events", "required":true, "description":"Name of the event user want to subscribe"} ]' \
@@ -39,7 +45,7 @@
-a sampleOutput '{"tagName": "tagName","eventType": "onDeviceRegister","applicationId": "xxx-xxx-xx"}'
-$WSK_CLI --apihost "$APIHOST" action update --auth "$AUTH" --shared yes pushnotifications/sendMessage "$PACKAGE_HOME/actions/sendMessage.js" \
+$WSK_CLI --apihost $APIHOST action update --auth $AUTH --shared yes pushnotifications/sendMessage $PACKAGE_HOME/actions/sendMessage.js \
-a description 'Send push notification to all application users or to a specific set of devices' \
-a parameters '[ {"name":"appId", "required":true, "description":"Bluemix application GUID"}, {"name":"appSecret", "required":true, "bindTime":true, "type":"password", "description":"Bluemix Push Service Secret"}, {"name":"text", "required":true, "description":"The notification message to be shown to the user"}, {"name":"url", "required":false, "description":"An optional URL that can be sent along with the alert"}, {"name":"deviceIds", "required":false, "description":"Array of device IDs"}, {"name":"platforms", "required":false, "description":"Array of device platform"},{"name":"tagNames", "required":false, "description":"Array of tag names"},{"name":"gcmPayload", "required":false, "description":"Additional payload"},{"name":"gcmSound", "required":false, "description":"Sound file name"},{"name":"gcmCollapseKey", "required":false, "description":"This parameter identifies a group of messages"},{"name":"gcmDelayWhileIdle", "required":false, "description":"Send message when device is active"}, {"name":"gcmPriority", "required":false, "description":"Sets the priority of the message"}, {"name":"gcmTimeToLive", "required":false, "description":"Time limit for message to be delievered"}, {"name":"apnsBadge", "required":false, "description":"Value for Badge"}, {"name":"apnsCategory", "required":false, "description":"The category name"}, {"name":"apnsIosActionKey", "required":false, "description":"Title for the push notification action Key"},{"name":"apnsPayload", "required":false, "description":"Additional payload"},{"name":"apnsType", "required":false, "description":"Push notification type name"},{"name":"apnsSound", "required":false, "description":"APNS sound name"}]' \
-a sampleInput '{"appId":"xxx-xxx-xx", "appSecret":"yyy-yyy-yyy", "text":"hi there"}' \
diff --git a/tests/credentials.json.enc b/tests/credentials.json.enc
index 49a5574..6d1d605 100644
--- a/tests/credentials.json.enc
+++ b/tests/credentials.json.enc
Binary files differ
diff --git a/tools/travis/build.sh b/tools/travis/build.sh
old mode 100644
new mode 100755
diff --git a/uninstall.sh b/uninstall.sh
new file mode 100755
index 0000000..2f6ee35
--- /dev/null
+++ b/uninstall.sh
@@ -0,0 +1,39 @@
+#!/bin/bash
+
+#/
+# Copyright 2015-2016 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.
+#/
+
+set -e
+set -x
+
+if [ $# -eq 0 ]
+then
+ echo "Usage: ./uninstall.sh <apihost> <authkey> <pathtowskcli>"
+fi
+
+APIHOST=$1
+AUTH=$2
+WSK_CLI=$3
+
+PACKAGE_HOME="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+echo Uninstalling pushnotifications package \
+
+$WSK_CLI --apihost $APIHOST action delete --auth $AUTH pushnotifications/webhook
+
+$WSK_CLI --apihost $APIHOST action delete --auth $AUTH pushnotifications/sendMessage
+
+$WSK_CLI --apihost $APIHOST package delete --auth $AUTH pushnotifications
