Merge branch 'canary'

Author: knalli

.babelrc

@@ -1,9 +1,17 @@
 {
   "presets": [
     [
-      "es2015",
+      "env",
       {
-        "modules": false
+        "debug": true,
+        "modules": false,
+        "targets": {
+          "browsers": [
+            "> 1%",
+            "last 3 versions",
+            "Firefox ESR"
+          ]
+        }
       }
     ]
   ]

ISSUE_TEMPLATE.md renamed to .github/ISSUE_TEMPLATE.md

@@ -1,3 +1,5 @@
+.idea
+
 .DS_Store
 node_modules
 npm-debug.log

PULL_REQUEST_TEMPLATE.md renamed to .github/PULL_REQUEST_TEMPLATE.md

@@ -5,6 +5,10 @@ bower_components
 temp
 dist/docs
 
+.github
+.idea
+.vertx
+
 # Test Stuff
 /test/
 /test_scopes/

.gitignore

@@ -1 +1 @@
-6.9
+6.10

.jshintrc

@@ -1,7 +1,7 @@
 sudo: false
 language: node_js
 node_js:
-  - "6.9"
+  - "6.10"
 
 addons:
   code_climate:
@@ -15,9 +15,32 @@ after_script:
   - if [ "$TEST_SCOPE" == "" ]; then npm install -g codeclimate-test-reporter && codeclimate-test-reporter < build/coverage/report/lcov.info; fi
 
 env:
-  - TEST_SCOPE=
-  - TEST_SCOPE=angular_1.2.x
-  - TEST_SCOPE=angular_1.3.x
-  - TEST_SCOPE=angular_1.4.x
-  - TEST_SCOPE=angular_1.5.x
-  - TEST_SCOPE=angular_1.6.x
+  matrix:
+    - TEST_SCOPE=
+    - TEST_SCOPE= SAUCE_ENABLED=$_SAUCE_ENABLED SAUCE_USERNAME=$_SAUCE_USERNAME SAUCE_ACCESS_KEY=$_SAUCE_ACCESS_KEY
+    - TEST_SCOPE=angular_1.2.x
+    - TEST_SCOPE=angular_1.3.x
+    - TEST_SCOPE=angular_1.4.x
+    - TEST_SCOPE=angular_1.5.x
+    - TEST_SCOPE=angular_1.6.x
+    - TEST_SCOPE=sockjs-client_1.0.x
+    - TEST_SCOPE=sockjs-client_1.1.x
+    - TEST_SCOPE=vertx-bus_3.2.x
+    - TEST_SCOPE=vertx-bus_3.3.x
+    - TEST_SCOPE=vertx-bus_3.4.x
+  global:
+    - CXX=g++-4.8
+    - secure: "BQeu14UTGr7gWrEz9O2NSDb4g4F40dWw2QKgglkLX58VmJYZn6anQLIavotmNr9XEG7car8lWkxuDrcQEbUvp/nunhSd2EvDn3fZwI5lLAfuWwvGgAd37SRbD4xKykrzqmSNfH6jHAB+Zm5UcYPr127OzrEUY08ArEDj9lyhnkY="
+    - secure: "clpyd43PGosqt4eig31MMoDHOBoHRKHM+sx25GP8bWIw7ixp46z9yb00cOibHEwvbTW/reBiEmb3giDk0AHyduxDPJaK5uTKe/XjQNH+0fxilCvq9sY1bjhH95h7VV8TacASwTrhswgEMnALvTWxonNzsMgU5iTvrsGqXOVX4Z4="
+    - secure: "KnYZgICysNrYQFBavQ3IQU6oUGCHabawI6aDlAtSUvi6O5g6GOvbTcU7XFlFU8OVNaujgRPDSSuSsHcv4Dmz8hKKIQ94G54qL1ZaxmLOP/PluItnGRQI8+jAsL8qoBCXfw/0ce0DBKi2QEwSxkNsv3uxlAg57d/L3YDrGUiYSp8="
+
+matrix:
+  allow_failures:
+    - env: TEST_SCOPE= SAUCE_ENABLED=$_SAUCE_ENABLED SAUCE_USERNAME=$_SAUCE_USERNAME SAUCE_ACCESS_KEY=$_SAUCE_ACCESS_KEY
+
+addons:
+  apt:
+    sources:
+      - ubuntu-toolchain-r-test
+    packages:
+      - g++-4.8

.npmignore

@@ -1,26 +1,20 @@
 # Contributing Guide
-
 Contributing to this repo is fairly easy. This document shows you how to
 get the project, run all provided tests and generate a production ready build.
 
 It also covers provided grunt tasks, that help you developing on this repo.
 
 ## Dependencies
-
-To make sure, that the following instructions work, please install the following dependencies
+To make sure the following instructions work, please install the following dependencies
 on you machine:
 
 - Node.js
 - npm
 - Git
 
 If you install node through the binary installation file, **npm** will be already there.
-When **npm** is installed, use it to install the needed npm packages:
-
-- grunt-cli <code>npm install -g grunt-cli</code>
 
 ## Installation
-
 To get the source of this project clone the git repository via:
 
 ````
@@ -36,42 +30,67 @@ $ npm install
 
 (This will invoke a `bower install` automatically.)
 
-The project is now installed and ready to be built.
+This commands installs everything which is required for building and testing the project.
 
-## Building
-
-This repo comes with a few **grunt tasks** which help you to automate
-the development process. The following grunt tasks are provided:
+## Testing
+Internally `angular-vertxbus` depends on **Grunt** and **Webpack**, however there have been been masked all steps behind 
+simple tasks processed by **npm**.
 
-#### <code>grunt</code>
+### Source linting: `npm run lint`
+`npm run lint` performs a lint for all (also part of `test`).
 
-Running <code>grunt</code> without any parameters, will actually execute the registered
-default task. This includes a default linter and CoffeeScript transpiling.
+### Unit testing: `npm run test`
+`npm run test` executes (as you might think) the unit tests, which are located
+in `test/unit`. The task uses **karma**, the spectacular test runner, to execute the tests with 
+the **jasmine testing framework**.
 
-#### <code>grunt test</code>
+#### Testing of different scopes: `npm run test-scopes`
+Because `angular-vertxbus` supports multiple different versions of AngularJS 1.x, you should run the tests the code against these also.
 
-<code>grunt test</code> executes (as you might thought) the unit tests, which are located
-in <code>test/unit</code>. The task uses **karma** the spectacular test runner to executes
-the tests with the **jasmine testing framework**.
+`npm run test-scopes` performs a `npm run test` against each registered scope which can be found at `/test_scopes/*`.
 
-#### <code>grunt build</code>
+#### Testing headless: `npm run test-headless`
+Just like `npm run test`, the command `npm run test-headless` performs the test against a headless PhantomJS. Maybe 
+useful in case of automatic tests.
 
-You only have to use this task, if you want to generate a production ready build of
-this project. This task will also **lint**, **test** and **minify** the
+## Building
+### Standard build
+You will probably being never required using the command `npm run build`, because it will create a production-ready 
+build of `angular-vertxbus`. This task will also **lint**, **test** and **minify** the
 source. After running this task, you'll find the following files in a generated
-<code>dist</code> folder:
+`/dist`folder:
+
+````
+dist/angular-vertxbus.js
+dist/angular-vertxbus.min.js
+dist/angular-vertxbus.withpolyfill.js
+dist/angular-vertxbus.withpolyfill.min.js
+````
+
+### Compile only
+The command `npm run compile` creates production-ready files at `/dist`, also part of `npm run build`.
 
 ````
 dist/angular-vertxbus.js
 dist/angular-vertxbus.min.js
+dist/angular-vertxbus.withpolyfill.js
+dist/angular-vertxbus.withpolyfill.min.js
 ````
 
-#### <code>grunt watch</code>
+## Developing
+The *local test environment* starts and utilizes a full Vert.x node and a NodeJS based web server.
+
+**Easy:** Just run `npm run -s start-server` and open `http://localhost:3000/` in your preferred browser.
+
+If you have changed something, just invoke `npm run -s compile` in parallel and refresh the browser.
+
+Alternatively:
 
-This task will watch all relevant files. When it notice a change, it'll run the
-**lint** and **test** task. Use this task while developing on the source
-to make sure, everytime you make a change you get notified if your code is incosistent
-or doesn't pass the tests.
+1. `npm run install-it-vertx-server` downloads and installs a Vert.x locally. This will store a cached download artifact at `test/e2e//vertx/`.
+2. `npm run start-it-vertx-server` starts an Vert.x on port `8080`.
+3. `npm run start-it-web-server` starts a web server on port `3000`.
+4. Ensure at least `npm run -s compile` has been invoked so there is a `dist/angular-vertxbus.js`.
+5. Open http://localhost:3000/ in your browser.
 
 ## Contributing/Submitting changes
 

.nvmrc

@@ -1,6 +1,6 @@
 # angular-vertxbus
 
-![Bower version](https://img.shields.io/bower/v/angular-vertxbus.svg) [![npm version](https://img.shields.io/npm/v/angular-vertxbus.svg)](https://www.npmjs.com/package/angular-vertxbus) [![cdnjs](https://img.shields.io/cdnjs/v/angular-vertxbus.svg)](https://cdnjs.com/libraries/angular-vertxbus) [![Build Status](https://img.shields.io/travis/knalli/angular-vertxbus.svg)](https://travis-ci.org/knalli/angular-vertxbus) [![Built with Grunt](https://cdn.gruntjs.com/builtwith.svg)](http://gruntjs.com/)
+![Bower version](https://img.shields.io/bower/v/angular-vertxbus.svg) [![npm version](https://img.shields.io/npm/v/angular-vertxbus.svg)](https://www.npmjs.com/package/angular-vertxbus) [![cdnjs](https://img.shields.io/cdnjs/v/angular-vertxbus.svg)](https://cdnjs.com/libraries/angular-vertxbus) [![Build Status](https://img.shields.io/travis/knalli/angular-vertxbus.svg)](https://travis-ci.org/knalli/angular-vertxbus) [![Sauce Test Status](https://saucelabs.com/buildstatus/knalli-angular-vertxbus)](https://saucelabs.com/u/angular-vertxbus) [![Built with Grunt](https://cdn.gruntjs.com/builtwith.svg)](http://gruntjs.com/) [![Greenkeeper badge](https://badges.greenkeeper.io/knalli/angular-vertxbus.svg)](https://greenkeeper.io/)
 
 Client side library using VertX Event Bus as an Angular Service module
 
@@ -11,6 +11,10 @@ Client side library using VertX Event Bus as an Angular Service module
 | Canary | unstable | [![Build Status](https://travis-ci.org/knalli/angular-vertxbus.svg?branch=canary)](https://travis-ci.org/knalli/angular-vertxbus) |
 | Master | stable | [![Build Status](https://travis-ci.org/knalli/angular-vertxbus.svg?branch=master)](https://travis-ci.org/knalli/angular-vertxbus) |
 
+Automatic tests running against the latest version of the major browsers:
+
+[![Sauce Test Status](https://saucelabs.com/browser-matrix/angular-vertxbus.svg)](https://saucelabs.com/)
+
 
 ## How to get
 
@@ -24,7 +28,7 @@ Alternatively you can use the cdnjs: [cdnjs.com/libraries/angular-vertxbus](http
 
 ### JavaScript (Polyfill)
 
-The source code is written using newer JavaScript 2015 (partly) and is using the JavaScript transpiler [BabelJS](https://babeljs.io).
+The source code is written using newer JavaScript ([ECMAScript 2015+](https://babeljs.io/learn-es2015/))and is using the JavaScript transpiler [BabelJS](https://babeljs.io).
 
 Depending on your target clients, you probably need to include a browser polyfill (for ES5 clients). BabelJS itself
 recommends the [requirement of its own polyfill](https://babeljs.io/docs/usage/polyfill/). Either you use the explained
@@ -175,16 +179,23 @@ Note: Check that dependencies are be installed (`npm install`).
 
 The *unit tests* are available with `npm test` which is actually a shortcut for `grunt test`. It performs tests under the current primary target version of AngularJS. Use `npm run test-scopes` for testing other scoped versions as well.
 
-### E2E tests (manually)
+### Local test environment
 
 Note: Check that dependencies are be installed (`npm install`).
 
-The *end-to-end tests* start and utilize a full Vert.x node and a NodeJS based web server.
+The *local test environment* starts and utilizes a full Vert.x node and a NodeJS based web server.
+
+**Easy:** Just run `npm run -s start-server` and open `http://localhost:3000/` in your preferred browser.
+
+If you have changed something, just invoke `npm run -s compile` in parallel and refresh the browser.
+
+Alternatively:
 
-1. `npm run install-it-vertx-server` downloads and installs a Vert.x locally.
-2. `npm run start-it-vertx-server` starts Vert.x on port `8080`.
+1. `npm run install-it-vertx-server` downloads and installs a Vert.x locally. This will store a cached download artifact at `test/e2e//vertx/`.
+2. `npm run start-it-vertx-server` starts an Vert.x on port `8080`.
 3. `npm run start-it-web-server` starts a web server on port `3000`.
-4. Open http://localhost:3000/ in your browser.
+4. Ensure at least `npm run -s compile` has been invoked so there is a `dist/angular-vertxbus.js`.
+5. Open http://localhost:3000/ in your browser.
 
 ## License