Add integration tests, fixes watson-developer-cloud#63 (watson-developer-cloud#64)

* Add encrypted credentials fixes watson-developer-cloud#63

* add a version to nano

* Remove clouding, update travis and more cleanup

* [ci skip] fix README badge

* Add gif to README

Author: germanattanasio

.cfignore

@@ -2,3 +2,5 @@ node_modules/
 .idea/
 coverage
 npm-debug.log
+readme_images
+test

.env.example

@@ -1,13 +1,4 @@
 # Environment variables
-WORKSPACE_ID=
-CONVERSATION_USERNAME=
-CONVERSATION_PASSWORD=
-#Optional params, delete any which are not used!
-#Optional params to enable Speech to text
-STT_USERNAME=
-STT_PASSWORD=
-#Optional cloudant URL for loggin
-CLOUDANT_URL=
-#If cloudant url is specified a user name and password must be specified to secure the logging endpoints
-LOG_USER=
-LOG_PASS=
+WORKSPACE_ID=<workspace-id>
+CONVERSATION_USERNAME=<conversation-username>
+CONVERSATION_PASSWORD=<conversation-password>

.eslintrc

@@ -0,0 +1,18 @@
+env:
+  browser: true
+  node: true
+  mocha: true
+extends: 'eslint:recommended'
+rules:
+  indent:
+    - error
+    - 2
+  linebreak-style:
+    - error
+    - unix
+  quotes:
+    - error
+    - single
+  semi:
+    - error
+    - always

.eslintrc.yml

@@ -1,20 +1,25 @@
 language: node_js
-sudo: true
+dist: trusty
+sudo: required
+node_js: 6
+script:
+- npm run test
+
 cache:
   directories:
   - node_modules
-node_js: stable
-script:
-  - npm run lint
-  - npm run codecov
+env:
+  global:
+  - CF_APP=conversation-simple
+  - CF_API=https://api.ng.bluemix.net
+  - CF_ORGANIZATION=WatsonPlatformServices
+  - CF_SPACE=appgallery
+before_deploy: npm install -g cf-blue-green
 deploy:
-  provider: cloudfoundry
-  api: https://api.ng.bluemix.net
-  username: $CF_USERNAME
-  password: $CF_PASSWORD
-  name: conversation-simple
-  organization: WatsonPlatformServices
-  space: demos
+  provider: script
+  script:
+  - cf-blue-green-travis
   on:
+    branch: master
     repo: watson-developer-cloud/conversation-simple
-    branch: release
+  skip_cleanup: true

.travis.yml

@@ -0,0 +1 @@
+web: npm start

Procfile

@@ -1,9 +1,9 @@
-# Conversation Sample Application
-[![Build Status](https://travis-ci.org/watson-developer-cloud/conversation-simple.svg?branch=master)](http://travis-ci.org/watson-developer-cloud/conversation-simple)
-[![codecov.io](https://codecov.io/github/watson-developer-cloud/conversation-simple/coverage.svg?branch=master)](https://codecov.io/github/watson-developer-cloud/conversation-simple?branch=master)
+# Conversation Sample Application [![Build Status](https://travis-ci.org/watson-developer-cloud/conversation-simple.svg?branch=master)](http://travis-ci.org/watson-developer-cloud/conversation-simple) [![codecov.io](https://codecov.io/github/watson-developer-cloud/conversation-simple/coverage.svg?branch=master)](https://codecov.io/github/watson-developer-cloud/conversation-simple?branch=master)
 
 This Node.js app demonstrates the Conversation service in a simple chat interface simulating a cognitive car dashboard.
 
+![Demo](readme_images/demo.gif)
+
 You can view a [demo][demo_url] of this app.
 
 ## Before you begin
@@ -31,7 +31,7 @@ Use GitHub to clone the repository locally, or [download the .zip file](https://
 1. Create an instance of the Conversation service in Bluemix. For example:
 
     ```bash
-    cf create-service Conversation free conversation-simple-demo-test1
+    cf create-service conversation free my-conversation-service
     ```
 
 ### Importing the Conversation workspace
@@ -57,13 +57,13 @@ Use GitHub to clone the repository locally, or [download the .zip file](https://
 1. Create a service key in the format `cf create-service-key <service_instance> <service_key>`. For example:
 
     ```bash
-    cf create-service-key conversation-simple-demo-test1 conversation-simple-demo-test1-key1
+    cf create-service-key my-conversation-service myKey
     ```
 
 1. Retrieve the credentials from the service key using the command `cf service-key <service_instance> <service_key>`. For example:
 
     ```bash
-    cf service-key conversation-simple-demo-test1 conversation-simple-demo-test1-key1
+    cf service-key my-conversation-service myKey
     ```
 
    The output from this command is a JSON object, as in this example:
@@ -126,7 +126,7 @@ The chat interface is on the left, and the JSON that the JavaScript code receive
     capabilities
     greetings
     goodbyes
-    
+
 Type a request, such as `music on` or `I want to turn on the windshield wipers`. The system understands your intent and responds. You can see the details of how your input was understood by examining the JSON data in the `Watson understands` section on the right side.
 
 For example, if you type `Turn on some music`, the JSON data shows that the system understood the `turn_on` intent with a high level of confidence, along with the `appliance` entity with a value of `music`.
@@ -142,67 +142,65 @@ After you have the app deployed and running, you can explore the source files an
 * Modify the .js files to change the app logic.
 * Modify the .html file to change the appearance of the app page.
 * Use the Conversation tool to train the service for new intents, or to modify the dialog flow. For more information, see the [Conversation service documentation][docs_landing].
-    
+
 ## Deploying to Bluemix
 
 You can use Cloud Foundry to deploy your local version of the app to Bluemix.
 
 1. In the project root directory, open the `manifest.yml` file:
 
-    * In the `applications` section of the `manifest.yml` file, change the `name` value to a unique name for your version of the demo app.
-    * In the `services` section, specify the name of the Conversation service instance you created for the demo app. If you do not remember the service name, use the `cf services` command to list all services you have created.
-    * In the `env` section, add `WORKSPACE_ID` and specify the value from the `.env` file.
-
-    The following example shows a modified `manifest.yml` file:
-
-    ```YAML
-    ---
-    declared-services:
-     conversation-service:
-       label: conversation
-       plan: free
-    applications:
-    - name: conversation-simple-app-test1
-     command: npm start
-     path: .
-     memory: 256M
-     instances: 1
-     services:
-     - conversation-simple-demo-test1
-     env:
-       NPM_CONFIG_PRODUCTION: false
-       WORKSPACE_ID: fdeab5e4-0ebe-4183-8d10-6e5557a6d842
-    ```
+  * In the `applications` section of the `manifest.yml` file, change the `name` value to a unique name for your version of the demo app.
+  * In the `services` section, specify the name of the Conversation service instance you created for the demo app. If you do not remember the service name, use the `cf services` command to list all services you have created.
+
+  The following example shows a modified `manifest.yml` file:
+
+  ```yml
+  ---
+  declared-services:
+   conversation-service:
+     label: conversation
+     plan: free
+  applications:
+  - name: conversation-simple-app-test1
+   command: npm start
+   path: .
+   memory: 256M
+   instances: 1
+   services:
+   - my-conversation-service
+   env:
+     NPM_CONFIG_PRODUCTION: false
+  ```
 
 1. Push the app to Bluemix:
 
-    ```bash
-    cf push
-    ```
+  ```bash
+  cf push
+  ```
 
-    Access your app on Bluemix at the URL specified in the command output.
+  Access your app on Bluemix at the URL specified in the command output.
 
 ## Troubleshooting
 
 If you encounter a problem, you can check the logs for more information. To see the logs, run the `cf logs` command:
 
-```bash
+```none
 cf logs <application-name> --recent
 ```
 
 ## License
 
-  This sample code is licensed under Apache 2.0.
-  Full license text is available in [LICENSE](LICENSE).
+This sample code is licensed under Apache 2.0.
+Full license text is available in [LICENSE](LICENSE).
 
 ## Contributing
 
-  See [CONTRIBUTING](CONTRIBUTING.md).
+See [CONTRIBUTING](CONTRIBUTING.md).
 
 ## Open Source @ IBM
 
-  Find more open source projects on the
-  [IBM Github Page](http://ibm.github.io/).
+Find more open source projects on the
+[IBM Github Page](http://ibm.github.io/).
 
 
 [cf_docs]: (https://www.ibm.com/watson/developercloud/doc/getting_started/gs-cf.shtml)
@@ -213,4 +211,4 @@ cf logs <application-name> --recent
 [docs_landing]: (http://www.ibm.com/watson/developercloud/doc/conversation/index.shtml)
 [node_link]: (http://nodejs.org/)
 [npm_link]: (https://www.npmjs.com/)
-[sign_up]: https://apps.admin.ibmcloud.com/manage/trial/bluemix.html?cm_mmc=WatsonDeveloperCloud-_-LandingSiteGetStarted-_-x-_-CreateAnAccountOnBluemixCLI
+[sign_up]: bluemix.net/registration