Merge remote-tracking branch 'origin/master' into KUZ-305-update

Author: scottinet

.gitignore

@@ -15,5 +15,4 @@ examples/node_modules/
 *~
 
 # Compiled files
-browser/
 coverage/

.travis.yml

@@ -14,19 +14,19 @@ script:
 - grunt && npm test && cat ./coverage/lcov.info | ./node_modules/.bin/codecov
 before_install: npm install -g grunt-cli
 install: npm install
-after_deploy:
-- if [ "${TRAVIS_BRANCH}" = "master" ]; then git config --global user.email "[email protected]";
-  fi
-- if [ "${TRAVIS_BRANCH}" = "master" ]; then git config --global user.name "Travis
-  CI"; fi
-- if [ "${TRAVIS_BRANCH}" = "master" ]; then  git clone --quiet --branch=browser https://${GH_TOKEN}@github.com/${TRAVIS_REPO_SLUG}
-  travis-build > /dev/null; fi
-- if [ "${TRAVIS_BRANCH}" = "master" ]; then  cp -rp browser/* travis-build/ && cd
-  travis-build ; fi
-- if [ "${TRAVIS_BRANCH}" = "master" ]; then  git commit -am "Travis CI auto-merge
-  from travis build ${TRAVIS_BUILD_NUMBER}"; fi
-- if [ "${TRAVIS_BRANCH}" = "master" ]; then  git push -fq origin browser > /dev/null;
-  fi
+
+after_success:
+  - echo "Push generated dist folder"
+  - git config --global user.email "[email protected]"
+  - git config --global user.name "Travis CI"
+  - git clone --quiet --branch=${TRAVIS_BRANCH} https://${GH_TOKEN}@github.com/${TRAVIS_REPO_SLUG} travis-build
+  - cd travis-build
+  - npm install
+  - grunt
+  - git add dist/
+  - git commit -am "Travis CI - [ci skip] - automatic dist folder"
+  - git push origin ${TRAVIS_BRANCH}
+
 env:
   global:
     secure: EZ+XXJFDtehmag7wt8JbutqgzpkkJUCzkEWw6W+p7MIxWenLyuGv/RUu7KGqAloOud1cZbmZGSfRx/vsPvxRjo+ZC7aaPqb74qRvfctGdlJTtEffS2jFno1pEppJzCR4n7vocSfMVYtOD6oHP67lXwn/Qnh++WUkZaV137m5+7rqiYgJ+JTeSs5jBRZ6X7VNoNz8tZXejQ+FOymCFQTS2JM/rSZX9NEK+OwUEhEjRcxqWMm2avk6NAQNAL3WQuIBJQH8lxEJxOXkMc0rQZZ09AoLpqJKzsaicaZMInt5JstPo2e9vJfhi+PpRSNhErIff36aCHWRYYDPKl5x6IelZpBfZeTdrs4V2TbRi1y0ELbgMG1FHS4HAw3vTnh4/49g01lAJed4UguFRc6MzwTLAL8uPG/zFe8snm9+kaf4pL7yO89Hf3eltE03+N//tyVv+X/jdSca2dBZ9FMeLE5pJ2jlRiKitCLjXmLUEMMxEwNF7K/IvOrD9wue3JXK0UogOpcXfppk++pNTijsZluU1Yj7k3fGFeS8d6rIU0Yj40y6/VMaJeL4EXlARRsGLigUKVjQL6+/N5xudlsCng+EG+WVIy4wEEPH0QgjUkPTgWx1NrUlTwjskE0cdqDOBu39WkRFJHHECYFPTfTuDJ7xxuuibFTQmUFu2zjbYfYKhPE=

Gruntfile.js

@@ -8,6 +8,7 @@ module.exports = function(grunt) {
 
 
   grunt.initConfig({
+    pkg: grunt.file.readJSON('package.json'),
     jshint: {
       all: ['Gruntfile.js', 'src/**/*.js']
     },
@@ -17,18 +18,24 @@ module.exports = function(grunt) {
     browserify: {
       kuzzle: {
         src: ['src/kuzzle.js'],
-        dest: 'browser/kuzzle.js'
+        dest: 'dist/kuzzle.js',
+        options: {
+          exclude: ['socket.io-client'],
+          browserifyOptions: {
+            noParse: [require.resolve('node-uuid')]
+          }
+        }
       }
     },
     uglify: {
       kuzzle: {
         options: {
           'sourceMap': true,
-          'sourceMapName': 'browser/kuzzle.min.map',
-          'banner': '// This is the Kuzzle SDK version 1.0 - Licenced under the Apache 2.0 Licence'
+          'sourceMapName': 'dist/kuzzle.min.map',
+          'banner': '// <%= pkg.description %> v<%= pkg.version %> - License: <%= pkg.license %>'
         },
         files: {
-          'browser/kuzzle.min.js': ['browser/kuzzle.js']
+          'dist/kuzzle.min.js': ['dist/kuzzle.js']
         }
       }
     }

bower.json

@@ -0,0 +1,20 @@
+{
+  "name": "kuzzle",
+  "description": "Official Javascript SDK for Kuzzle",
+  "main": "dist/kuzzle.js",
+  "authors": [
+    "The Kuzzle Team <[email protected]>"
+  ],
+  "license": "Apache-2.0",
+  "keywords": [
+    "kuzzle",
+    "sdk",
+    "baas",
+    "backend",
+    "realtime",
+    "advanced",
+    "search",
+    "bulk"
+  ],
+  "homepage": "https://github.com/kuzzleio/sdk-javascript"
+}