Merge branch 'canary'

Author: knalli

.babelrc

@@ -1,3 +1,5 @@
 {
-  "presets": ["es2015"]
+  "presets": [
+    "es2015"
+  ]
 }

.codeclimate.yml

@@ -0,0 +1,10 @@
+engines:
+  eslint:
+    enabled: true
+ratings:
+  paths:
+  - src/**
+exclude_paths:
+- build/**/*
+- dist/**/*
+- docs/**/*

.eslintignore

@@ -0,0 +1,4 @@
+build/**
+dist/**
+docs/**
+test/**

.eslintrc

@@ -1,15 +1,9 @@
 {
   "root": true,
   "extends": "eslint:recommended",
-  "ecmaFeatures": {
-    "arrowFunctions": true,
-    "blockBindings": true,
-    "classes": true,
-    "defaultParams": true,
-    "destructuring": true,
-    "modules": true,
-    "forOf": true,
-    "templateStrings": true
+  "parserOptions": {
+    "ecmaVersion": 6,
+    "sourceType": "module"
   },
   "rules": {
     "no-console": 1,
@@ -29,13 +23,13 @@
     "comma-style": [1, "last"],
     "eol-last": 1,
     "indent": [1, 2, {"SwitchCase": 1}],
-    "space-before-blocks": 1,
-    "space-after-keywords": 1,
+    "keyword-spacing": 1,
     "semi": 2,
     "quotes": [1, "single"]
   },
   "env": {
-    "browser": true
+    "browser": true,
+    "es6": true
   },
   "globals": {
     "angular": false,

.gitignore

@@ -12,3 +12,4 @@ temp
 /test/e2e/vertx/app/mods/io.vertx~mod-auth-mgr~2.0.0-final
 /test/e2e/vertx/app/mods/io.vertx~mod-web-server~2.0.0-final
 /test/e2e/vertx/vert.x-*
+/test/e2e/vertx/runtime

.hound.yml

@@ -1,5 +1,5 @@
-coffee_script:
-  enabled: true
 java_script:
+  enabled: false
+eslint:
   enabled: true
-  config_file: .jshintrc
+  config_file: .eslintrc

.nvmrc

@@ -1 +1 @@
-4.2
+4.3

.travis.yml

@@ -1,30 +1,25 @@
 sudo: false
 language: node_js
 node_js:
-  - "4.2"
+  - "4.3"
 
 addons:
   code_climate:
     repo_token: 94ea5ac76984c311dcbadb53a52dd219400775e20402587a0063d8b9d3a66bca
 
 before_install:
   - npm install -qg npm
-  - npm install -qg grunt-cli codeclimate-test-reporter
 
 before_script:
   - export DISPLAY=:99.0
   - sh -e /etc/init.d/xvfb start
 
 after_script:
-  - if [ "$TEST_SCOPE" == "" ]; then cat build/coverage/report/lcov.info | codeclimate; fi
+  - 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
-
-matrix:
-  allow_failures:
-    - env: TEST_SCOPE=angular_1.5.x

Gruntfile.eslint.json

@@ -1,16 +1,12 @@
-var fs = require('fs');
+/*eslint-env node, commonjs */
+/*eslint comma-dangle:0 */
+
+const fs = require('fs');
 
 module.exports = function (grunt) {
   'use strict';
 
   require('load-grunt-tasks')(grunt);
-  var _ = require('lodash');
-
-  var karmaConfig = function (configFile, customOptions) {
-    var options = {configFile : configFile, keepalive : true};
-    var travisOptions = process.env.TRAVIS && {browsers : ['Firefox'], reporters : 'dots'};
-    return _.extend(options, customOptions, travisOptions);
-  };
 
   // Returns configuration for bower-install plugin
   var loadTestScopeConfigurations = function () {
@@ -65,122 +61,21 @@ module.exports = function (grunt) {
         src : ['test/unit/*.js']
       }
     },
-    babel : {
-      options : {
-        sourceMap : false,
-        sourceType : 'module'
-      },
-      src : {
-        expand : true,
-        cwd : 'src/',
-        src : ['**/*.js'],
-        dest : 'temp/',
-        ext : '.js'
-      }
-    },
-    karma : {
-      unit : {
-        options : karmaConfig('karma.conf.js', {
-          singleRun : true
-        })
-      },
-      headless : {
-        options : karmaConfig('karma.conf.js', {
-          singleRun : true,
-          browsers : ['PhantomJS']
-        })
-      },
-      server : {
-        options : karmaConfig('karma.conf.js', {
-          singleRun : false
-        })
-      }
-    },
-    watch : {
-      scripts : {
-        files : ['Gruntfile.js', 'src/**/*.js', 'test/**/*.js'],
-        tasks : ['karma:unit']
-      },
-      lint_chore : {
-        files : ['Gruntfile.js'],
-        tasks : ['eslint:chore']
-      },
-      lint_src : {
-        files : ['src/**/*.js'],
-        tasks : ['eslint:src']
-      },
-      lint_test : {
-        files : ['test/**/*.js'],
-        tasks : ['eslint:test']
-      },
-      ngdocs : {
-        files : ['src/**/*.js'],
-        tasks : ['ngdocs:api']
-      }
-    },
-    browserify : {
-      dist : {
-        options : {
-          browserifyOptions : {
-            fullPaths : false,
-            debug : false // TODO enable sourcemaps
-          },
-          transform : ['babelify', require('browserify-ngannotate')],
-          banner : '<%= meta.banner %>',
-          watch : true
-        },
-        files : {
-          'dist/angular-vertxbus.js' : [
-            'src/index.js'
-          ]
-        }
-      }
-    },
-    extract_sourcemap : {
-      dist : {
-        files : {
-          'dist' : ['dist/angular-vertxbus.js']
-        }
-      },
-      'dist-withpolyfill' : {
-        files : {
-          'dist' : ['dist/angular-vertxbus.withpolyfill.js']
-        }
-      }
-    },
-    uglify : {
-      options : {
-        preserveComments : 'some',
-        sourceMap : false, // TODO enable sourcemaps
-        sourceMapIn : 'dist/angular-vertxbus.js.map'
-      },
-      dist : {
-        files : {
-          'dist/angular-vertxbus.min.js' : 'dist/angular-vertxbus.js'
-        }
-      },
-      'dist-withPolyfill' : {
-        files : {
-          'dist/angular-vertxbus.withpolyfill.min.js' : 'dist/angular-vertxbus.withpolyfill.js'
-        }
-      }
-    },
     concat : {
-      options : {
-        stripBanners : true,
-        banner : '/*! <%= pkg.title || pkg.name %> - v<%= pkg.version %> - ' +
-        '<%= grunt.template.today("yyyy-mm-dd") %>\n' +
-        '<%= pkg.homepage ? "* " + pkg.homepage + "\\n" : "" %>' +
-        '* Copyright (c) <%= grunt.template.today("yyyy") %> <%= pkg.author.name %>;' +
-        ' Licensed <%= pkg.license %> */\n'
-      },
-      'dist-withPolyfill' : {
+      'dist.polyfill' : {
         src : [
           'node_modules/babel-polyfill/dist/polyfill.js',
           'dist/angular-vertxbus.js'
         ],
         dest : 'dist/angular-vertxbus.withpolyfill.js'
-      }
+      },
+      'dist.min.polyfill' : {
+        src : [
+          'node_modules/babel-polyfill/dist/polyfill.min.js',
+          'dist/angular-vertxbus.min.js'
+        ],
+        dest : 'dist/angular-vertxbus.withpolyfill.min.js'
+      },
     },
     conventionalChangelog : {
       options : {
@@ -210,8 +105,6 @@ module.exports = function (grunt) {
 
   });
 
-  grunt.loadNpmTasks('gruntify-eslint');
-
   // Compile and test (use "build" for dist/*)
   grunt.registerTask('default', [
     'clean',
@@ -224,42 +117,20 @@ module.exports = function (grunt) {
     'eslint'
   ]);
 
-  // Testing
-  grunt.registerTask('test', [
-    'eslint',
-    'karma:unit'
-  ]);
   grunt.registerTask('install-test', [
     'bower-install-simple'
   ]);
-  grunt.registerTask('test-server', [
-    'karma:server'
-  ]);
 
   grunt.registerTask('docs', [
     'ngdocs:api'
   ]);
 
-  grunt.registerTask('watch-docs', [
-    'docs', 'watch:ngdocs'
-  ]);
-
   // Building & releasing
-  grunt.registerTask('compile', [
-    'browserify:dist',
-    'concat:dist-withPolyfill',
-    // 'extract_sourcemap:dist',// TODO enable sourcemaps
-    // 'extract_sourcemap:dist-withPolyfill',// TODO enable sourcemaps
-    'uglify:dist',
-    'uglify:dist-withPolyfill'
-  ]);
-  grunt.registerTask('build', [
-    'clean',
-    'test',
-    'compile'
+  grunt.registerTask('build-post', [
+    'concat:dist.polyfill',
+    'concat:dist.min.polyfill',
   ]);
   grunt.registerTask('release', [
     'conventionalChangelog',
-    'build'
   ]);
 };