Merge branch 'canary'

Author: knalli

.gitignore

@@ -4,6 +4,7 @@ components
 bower_components
 temp
 *.iml
+/build
 
 # Integration stuff
 /test/e2e/vertx/app/mods/io.vertx~mod-auth-mgr~2.0.0-final

.npmignore

@@ -7,3 +7,4 @@ temp
 # Test Stuff
 /test/
 /test_scopes/
+/build

.travis.yml

@@ -2,13 +2,20 @@ language: node_js
 node_js:
   - "0.10"
 
+addons:
+  code_climate:
+    repo_token: 94ea5ac76984c311dcbadb53a52dd219400775e20402587a0063d8b9d3a66bca
+
 before_install:
-  - npm install -g grunt-cli
+  - npm install -g 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
+
 env:
   - TEST_SCOPE=
   - TEST_SCOPE=angular_1.2.x

Gruntfile.js

@@ -146,7 +146,10 @@ module.exports = function (grunt) {
         dest: 'CHANGELOG.md'
       }
     },
-    ngmin: {
+    ngAnnotate: {
+      options: {
+        singleQuotes: true
+      },
       src: {
         src: '<%= concat.src.dest %>',
         dest: '<%= concat.src.dest %>'
@@ -165,6 +168,6 @@ module.exports = function (grunt) {
   grunt.registerTask('test', ['coffee', 'jshint', 'karma:unit']);
   grunt.registerTask('install-test', ['bower-install-simple']);
   grunt.registerTask('test-server', ['karma:server']);
-  grunt.registerTask('build', ['clean', 'coffee', 'jshint', 'karma:unit', 'concat', 'ngmin', 'uglify']);
+  grunt.registerTask('build', ['clean', 'coffee', 'jshint', 'karma:unit', 'concat', 'ngAnnotate', 'uglify']);
   grunt.registerTask('release', ['changelog', 'build']);
 };

README.md

@@ -170,9 +170,7 @@ vertxEventBusService.addListener('address', funcHolder.handler);
 
 Note: Check that dependencies are be installed (`npm install`).
 
-The *unit tests* are available with `npm test`. It performs tests under the current primary target version of AngularJS and other scoped versions as well. Under the hood, this calls `grunt test` for the primary target and for each scope.
-
-Testing only the primary target AngularJS version, simply invoke `grunt test`.
+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-script test-scopes` for testing other scoped versions as well.
 
 ### E2E tests (manually)
 

bower.json

@@ -2,7 +2,7 @@
   "author": "Jan Philipp",
   "name": "angular-vertxbus",
   "description": "AngularJS facade and service acting as a Vert.x SockJS client",
-  "version": "0.9.0",
+  "version": "0.10.0",
   "homepage": "http://github.com/knalli/angular-vertxbus",
   "main": "./dist/angular-vertxbus.js",
   "ignore": [
@@ -12,18 +12,20 @@
     "karma.conf.js",
     "/temp/",
     "/test/",
-    "/test_scopes/"
+    "/test_scopes/",
+    "/build/"
   ],
   "repository": {
     "type": "git",
     "url": "git://github.com/knalli/angular-vertxbus"
   },
   "dependencies": {
-    "angular": "~1.2.0",
+    "angular": ">=1.2 <=1.4",
     "sockjs-client": "~0.3.4",
     "vertxbus.js": "http://cdnjs.cloudflare.com/ajax/libs/vertx/2.0.0/vertxbus.js"
   },
   "devDependencies": {
-    "angular-mocks": "~1.2.3"
+    "angular": "~1.2.27",
+    "angular-mocks": "~1.2.27"
   }
 }

component.json

@@ -8,7 +8,7 @@
     "dist/angular-vertxbus.js"
   ],
   "dependencies": {
-    "components/angular.js": "~1.2.0"
+    "components/angular.js": ">=1.2 <=1.4"
   },
   "license": "MIT"
 }

karma.conf.js

@@ -2,7 +2,7 @@
 
 var fs = require('fs');
 
-var AVAILABLE_SCOPES = [], isValidScope, injectByScope, getAffectiveScope;
+var AVAILABLE_SCOPES = [], isValidScope, injectByScope, getAffectiveScope, isDefaultScope;
 
 (function(undefined){
   AVAILABLE_SCOPES = fs.readdirSync('./test_scopes').filter(function (filename) {
@@ -25,6 +25,9 @@ var AVAILABLE_SCOPES = [], isValidScope, injectByScope, getAffectiveScope;
       prefix = 'test_scopes/' + scope + '/';
     }
     return prefix + 'bower_components/' + path;
+  },
+  isDefaultScope = function (scope) {
+    return !isValidScope(scope);
   };
 })();
 
@@ -60,7 +63,15 @@ module.exports = function(config) {
 
     // test results reporter to use
     // possible values: 'dots', 'progress', 'junit'
-    reporters: ['progress'],
+    reporters: isDefaultScope(scope) ? ['progress', 'coverage'] : ['progress'],
+
+    preprocessors: isDefaultScope(scope) ? { 'temp/src/*.js': ['coverage'] } : undefined,
+
+    coverageReporter: isDefaultScope(scope) ? {
+      dir: 'build/coverage',
+      subdir: 'report',
+      type: 'lcov'
+    } : undefined,
 
     // web server port
     port: 9876,
@@ -93,7 +104,6 @@ module.exports = function(config) {
     // - IE (only Windows)
     browsers: [process.env.TRAVIS ? 'Firefox' : 'Chrome'],
 
-
     // If browser does not capture in given timeout [ms], kill it
     captureTimeout: 60000,
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "angular-vertxbus",
-  "version": "0.9.0",
+  "version": "0.10.0",
   "description": "AngularJS facade and service acting as a Vert.x SockJS client",
   "main": "dist/angular-vertxbus.js",
   "scripts": {
@@ -22,28 +22,30 @@
   },
   "license": "MIT",
   "devDependencies": {
-    "bower": "~1.3.2",
-    "coffee-script": "~1.6.3",
-    "express": "~4.4.5",
-    "grunt": "~0.4.2",
+    "bower": "~1.3.12",
+    "coffee-script": "~1.8.0",
+    "express": "~4.10.4",
+    "grunt": "~0.4.5",
     "grunt-bower-install-simple": "^1.0.3",
-    "grunt-contrib-clean": "~0.5.0",
-    "grunt-contrib-coffee": "~0.7.0",
-    "grunt-contrib-concat": "~0.3.x",
-    "grunt-contrib-jshint": "~0.4.x",
-    "grunt-contrib-uglify": "~0.2.x",
-    "grunt-contrib-watch": "~0.5.3",
-    "grunt-conventional-changelog": "~1.0.x",
-    "grunt-karma": "~0.8.0",
-    "grunt-ngmin": "~0.0.3",
-    "karma": "~0.12.0",
-    "karma-chrome-launcher": "~0.1.2",
+    "grunt-contrib-clean": "~0.6.0",
+    "grunt-contrib-coffee": "~0.12.0",
+    "grunt-contrib-concat": "~0.5.x",
+    "grunt-contrib-jshint": "~0.10.x",
+    "grunt-contrib-uglify": "~0.6.x",
+    "grunt-contrib-watch": "~0.6.1",
+    "grunt-conventional-changelog": "~1.1.x",
+    "grunt-karma": "~0.9.0",
+    "grunt-ng-annotate": "^0.8.0",
+    "istanbul": "^0.3.5",
+    "karma": "~0.12.28",
+    "karma-chrome-launcher": "~0.1.5",
+    "karma-coverage": "^0.2.7",
     "karma-expect": "~1.1.0",
     "karma-firefox-launcher": "~0.1.3",
-    "karma-mocha": "~0.1.3",
-    "karma-phantomjs-launcher": "~0.1.2",
-    "load-grunt-tasks": "~0.2.0",
+    "karma-mocha": "~0.1.9",
+    "karma-phantomjs-launcher": "~0.1.4",
+    "load-grunt-tasks": "~1.0.0",
     "lodash": "~2.4.x",
-    "mocha": "~1.18.0"
+    "mocha": "~2.0.1"
   }
 }