Merge pull request #94 from watson-developer-cloud/updates

feat: Add IAM support

.env.example

@@ -3,19 +3,32 @@ WORKSPACE_ID=
 # You need to provide either username and password
 ASSISTANT_USERNAME=
 ASSISTANT_PASSWORD=
-# OR IAM API key and URL
+# OR IAM API key
 ASSISTANT_IAM_APIKEY=
 ASSISTANT_IAM_URL=
+# assistant url
 ASSISTANT_URL=https://gateway.watsonplatform.net/assistant/api
 
 ###################################################
 # Optional params, delete any which are not used! #
 ###################################################
 
-# Params to enable Text to Speech
+########## TEXT TO SPEECH #########################
 TEXT_TO_SPEECH_USERNAME=
 TEXT_TO_SPEECH_PASSWORD=
 
-# Params to enable Speech to Text
+# OR IAM API key
+TEXT_TO_SPEECH_IAM_APIKEY=
+TEXT_TO_SPEECH_IAM_URL=
+# TEXT_TO_SPEECH service url
+TEXT_TO_SPEECH_URL=https://gateway.watsonplatform.net/assistant/api
+
+########## SPEECH TO TEXT #########################
 SPEECH_TO_TEXT_USERNAME=
 SPEECH_TO_TEXT_PASSWORD=
+
+# OR IAM API key
+TEXT_TO_SPEECH_IAM_APIKEY=
+TEXT_TO_SPEECH_IAM_URL=
+# TEXT_TO_SPEECH service url
+TEXT_TO_SPEECH_URL=https://gateway.watsonplatform.net/assistant/api

.eslintrc.yml

@@ -18,4 +18,4 @@ rules:
     - error
     - always
   no-console:
-    - warn
+    - off

.travis.yml

@@ -1,7 +1,7 @@
 language: node_js
 dist: trusty
 sudo: required
-node_js: 6
+node_js: 8
 script:
 - npm run test
 
@@ -16,12 +16,15 @@ env:
   - BX_SPACE=demos
 before_deploy: npm install -g bx-blue-green
 deploy:
-  provider: script
+- provider: script
+  skip_cleanup: true
   script:
   - bx-blue-green-travis
   on:
     branch: master
     repo: watson-developer-cloud/car-dashboard
+- provider: script
   skip_cleanup: true
-notifications:
-  email: false
+  script: npx semantic-release
+  on:
+    node: 8

CONTRIBUTING.MD

@@ -1,19 +1,64 @@
 # Questions
 
-If you are having difficulties running the app or have a question about the service, please ask a question on [dW Answers](https://developer.ibm.com/answers/questions/ask/?topics=watson) or [Stack Overflow](http://stackoverflow.com/questions/ask?tags=ibm-watson).
+If you are having problems using the APIs or have a question about the IBM
+Watson Services, please ask a question on
+[dW Answers](https://developer.ibm.com/answers/questions/ask/?topics=watson)
+or [Stack Overflow](http://stackoverflow.com/questions/ask?tags=ibm-watson).
 
-# Issues
+# Code
+
+* Our style guide is based on [Google's](https://google.github.io/styleguide/jsguide.html), most of it is automaticaly enforced (and can be automatically applied with `npm run autofix`)
+* Commits should follow the [Angular commit message guidelines](https://github.com/angular/angular/blob/master/CONTRIBUTING.md#-commit-message-guidelines). This is because our release tool uses this format for determining release versions and generating changelogs. To make this easier, we recommend using the [Commitizen CLI](https://github.com/commitizen/cz-cli) with the `cz-conventional-changelog` adapter.
 
-If you encounter an issue with this sample app, you are welcome to submit a bug report. Before that, please search for similar issues. It's possible somebody has encountered this issue already.
+# Issues
 
+If you encounter an issue with the Node.js library, you are welcome to submit
+a [bug report](https://github.com/watson-developer-cloud/car-dashboard/issues).
+Before that, please search for similar issues. It's possible somebody has
+already encountered this issue.
 
 # Pull Requests
 
-If you want to contribute to the repository, here's a quick guide:
+If you want to contribute to the repository, follow these steps:
+
+1. Fork the repo.
+2. Develop and test your code changes: `npm install -d && npm test`.
+3. Travis-CI will run the tests for all services once your changes are merged.
+4. Add a test for your changes. Only refactoring and documentation changes require no new tests.
+5. Make the test pass.
+6. Commit your changes.
+7. Push to your fork and submit a pull request.
+
+# Developer's Certificate of Origin 1.1
+
+By making a contribution to this project, I certify that:
+
+(a) The contribution was created in whole or in part by me and I
+   have the right to submit it under the open source license
+   indicated in the file; or
+
+(b) The contribution is based upon previous work that, to the best
+   of my knowledge, is covered under an appropriate open source
+   license and I have the right under that license to submit that
+   work with modifications, whether created in whole or in part
+   by me, under the same open source license (unless I am
+   permitted to submit under a different license), as indicated
+   in the file; or
+
+(c) The contribution was provided directly to me by some other
+   person who certified (a), (b) or (c) and I have not modified
+   it.
+
+(d) I understand and agree that this project and the contribution
+   are public and that a record of the contribution (including all
+   personal information I submit with it, including my sign-off) is
+   maintained indefinitely and may be redistributed consistent with
+   this project or the open source license(s) involved.
+
+## Tests
+
+Ideally, we'd like to see both unit and innervation tests on each method.
+(Unit tests do not actually connect to the Watson service, integration tests do.)
 
-1. Fork the repo
-1. Develop your code changes
-1. Ensure `eslint` is happy: `npm run lint`
-1. Ensure the tests pass: `npm test`
-1. Commit your changes
-1. Push to your fork and submit a pull request
+Out of the box, `npm test` runs linting and unit tests, but skips the integration tests,
+because they require credentials.

README.md

@@ -134,12 +134,3 @@ See [CONTRIBUTING](CONTRIBUTING.MD).
 
 Find more open source projects on the
 [IBM Github Page](http://ibm.github.io/).
-
-
-[demo_url]: http://conversation-simple.ng.bluemix.net/
-[doc_intents]: (https://console.bluemix.net/docs/services/conversation/intents-entities.html#planning-your-entities)
-[docs]: https://console.bluemix.net/docs/services/conversation/index.html
-[docs_landing]: (https://console.bluemix.net/docs/services/conversation/index.html)
-[node_link]: (http://nodejs.org/)
-[npm_link]: (https://www.npmjs.com/)
-[sign_up]: bluemix.net/registration

config/error-handler.js

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
- /* eslint no-unused-vars: "off" */
+/* eslint no-unused-vars: "off" */
 
 
 module.exports = function (app) {

gulpfile.js

@@ -19,7 +19,7 @@ const $ = require('gulp-load-plugins')({
   pattern: [
     'gulp-*', 'gulp.*'
   ],
-  replaceString: /\bgulp[\-.]/
+  replaceString: /\bgulp[-.]/
 });
 const appDev = './ui/';
 const appProd = './dist/';

manifest.yml

@@ -1,14 +1,3 @@
----
-declared-services:
-  my-watson-assistant-service:
-    label: conversation
-    plan: free
-  speech-to-text-service:
-    label: speech_to_text
-    plan: standard
-  text-to-speech-service:
-    label: text_to_speech
-    plan: standard
 applications:
 - name: car-dashboard
   command: npm start