Merge branch 'rubenv/master'

# Conflicts:
#	dist/angular-gettext.js
#	dist/angular-gettext.min.js
#	src/catalog.js

Author: pokono

.gitignore

@@ -6,3 +6,4 @@
 /e2e-results.xml
 /.idea
 *.iml
+.DS_Store

.jshintrc

@@ -22,6 +22,7 @@
         "before",
         "beforeEach",
         "browser",
+        "by",
         "describe",
         "element",
         "expect",

.travis.yml

@@ -1,6 +1,7 @@
 language: node_js
 node_js:
-  - "0.10"
+  - "node"
+sudo: false
 before_install:
   - npm install -g grunt-cli bower
   - bower install

Gruntfile.js

@@ -1,4 +1,7 @@
+var serveStatic = require("serve-static");
+
 module.exports = function (grunt) {
+    grunt.loadNpmTasks("dgeni-alive");
     grunt.loadNpmTasks("grunt-bump");
     grunt.loadNpmTasks("grunt-contrib-clean");
     grunt.loadNpmTasks("grunt-contrib-concat");
@@ -9,8 +12,12 @@ module.exports = function (grunt) {
     grunt.loadNpmTasks("grunt-jscs");
     grunt.loadNpmTasks("grunt-karma");
     grunt.loadNpmTasks("grunt-ng-annotate");
+    grunt.loadNpmTasks("grunt-protractor-runner");
+    grunt.loadNpmTasks("grunt-shell");
 
     grunt.initConfig({
+        pkg: grunt.file.readJSON("package.json"),
+
         jshint: {
             all: ["Gruntfile.js", "{src,test}/**/*.js", "!src/plural.js"],
             options: {
@@ -55,15 +62,15 @@ module.exports = function (grunt) {
             },
             all: {
                 files: ["src/**.js", "test/*/*"],
-                tasks: ["build", "karma:unit:run", "karma:unit_nojquery:run", "karma:e2e:run"]
+                tasks: ["build", "karma:unit:run", "karma:unit_nojquery:run", "protractor:dev"]
             },
             unit: {
                 files: ["src/**.js", "test/unit/*"],
                 tasks: ["build", "karma:unit:run", "karma:unit_nojquery:run"]
             },
             e2e: {
                 files: ["src/**.js", "test/{e2e,fixtures}/*"],
-                tasks: ["build", "karma:e2e:run"]
+                tasks: ["build", "protractor:dev"]
             }
         },
 
@@ -80,10 +87,8 @@ module.exports = function (grunt) {
                 options: {
                     port: 9000,
                     hostname: "0.0.0.0",
-                    middleware: function (connect) {
-                        return [
-                            connect["static"](__dirname)
-                        ];
+                    middleware: function () {
+                        return [serveStatic(__dirname)];
                     }
                 }
             }
@@ -104,32 +109,34 @@ module.exports = function (grunt) {
                 configFile: "test/configs/unit.conf.js",
                 browsers: ["Firefox", "PhantomJS"],
                 singleRun: true,
-                reporters: ["dots", "junit"],
-                junitReporter: {
-                    outputFile: "unit-results.xml"
-                }
+                reporters: ["dots"]
             },
             unitci_nojquery: {
                 configFile: "test/configs/unit-nojquery.conf.js",
                 browsers: ["Firefox", "PhantomJS"],
                 singleRun: true,
-                reporters: ["dots", "junit"],
-                junitReporter: {
-                    outputFile: "unit-results.xml"
-                }
+                reporters: ["dots"]
+            }
+        },
+
+        protractor: {
+            options: {
+                noColor: false,
+                configFile: "test/configs/e2e.conf.js"
             },
-            e2e: {
-                configFile: "test/configs/e2e.conf.js",
-                browsers: ["PhantomJS"],
-                background: true
+            dev: {
+                options: {
+                    keepAlive: true,
+                    args: {
+                        directConnect: true
+                    }
+                }
             },
-            e2eci: {
-                configFile: "test/configs/e2e.conf.js",
-                browsers: ["Firefox", "PhantomJS"],
-                singleRun: true,
-                reporters: ["dots", "junit"],
-                junitReporter: {
-                    outputFile: "e2e-results.xml"
+            ci: {
+                options: {
+                    args: {
+                        browser: "firefox"
+                    }
                 }
             }
         },
@@ -140,13 +147,41 @@ module.exports = function (grunt) {
                 commitFiles: ["-a"],
                 pushTo: "origin"
             }
+        },
+
+        shell: {
+            protractor_update: {
+                command: "./node_modules/.bin/webdriver-manager update",
+                options: {
+                    stdout: true
+                }
+            }
+        },
+
+        "dgeni-alive": {
+            options: {
+                serve: {
+                    port: "10000",
+                    openBrowser: true
+                }
+            },
+            api: {
+                title: "<%= pkg.title %>",
+                version: "<%= pkg.version %>",
+                expand: false,
+                src: [
+                    "src/**/*.js",
+                    "docs/**/*.ngdoc"
+                ],
+                dest: "dist/docs"
+            }
         }
     });
 
     grunt.registerTask("default", ["test"]);
     grunt.registerTask("build", ["clean", "jshint", "jscs", "concat", "ngAnnotate", "uglify"]);
-    grunt.registerTask("test", ["build", "connect:e2e", "karma:unit", "karma:unit_nojquery", "karma:e2e", "watch:all"]);
-    grunt.registerTask("test_unit", ["build", "karma:unit", "karma:unit_nojquery", "watch:unit"]);
-    grunt.registerTask("test_e2e", ["build", "connect:e2e", "karma:e2e", "watch:e2e"]);
-    grunt.registerTask("ci", ["build", "karma:unitci", "karma:unitci_nojquery", "connect:e2e", "karma:e2eci"]);
+    grunt.registerTask("test", ["build", "shell:protractor_update", "connect:e2e", "karma:unit", "karma:unit_nojquery", "protractor:dev", "watch:all"]);
+    grunt.registerTask("test_unit", ["build", "shell:protractor_update", "karma:unit", "karma:unit_nojquery", "watch:unit"]);
+    grunt.registerTask("test_e2e", ["build", "shell:protractor_update", "connect:e2e", "protractor:dev", "watch:e2e"]);
+    grunt.registerTask("ci", ["build", "shell:protractor_update", "karma:unitci", "karma:unitci_nojquery", "connect:e2e", "protractor:ci"]);
 };

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "angular-gettext",
-  "version": "2.1.0",
+  "version": "2.3.8",
   "main": "dist/angular-gettext.js",
   "ignore": [
     "**/.*",