merging conflicts

.jshintrc

@@ -1,6 +1,9 @@
 {
   "globals": {
     "global": true,
+    "Blob": true,
+    "FileReader": true,
+    "bson": true
     "io": true
   },
   "curly": true,

.travis.yml

@@ -1,42 +1,28 @@
 language: node_js
 node_js:
   - "0.10"
-addons:
-  firefox: "31.0" # 3.4->31.0
-os:
-  - linux
+  - "0.12"
+  - "4"
+env:
+  - ROS_DISTRO=hydro
+
 before_install:
   # ROS deps for examples
   - sudo sh -c 'echo "deb http://packages.ros.org/ros/ubuntu precise main" > /etc/apt/sources.list.d/ros-latest.list'
   - wget http://packages.ros.org/ros.key -O - | sudo apt-key add -
   - sudo apt-get update -qq
-  - sudo apt-get install ros-hydro-ros-base
-  # temp local install of tf2_web_republisher
-  # - sudo apt-get install ros-hydro-rosbridge-server ros-hydro-tf2-web-republisher ros-hydro-common-tutorials ros-hydro-rospy-tutorials ros-hydro-actionlib-tutorials
-  - sudo apt-get install ros-hydro-rosbridge-server ros-hydro-common-tutorials ros-hydro-rospy-tutorials ros-hydro-actionlib-tutorials
-  - sudo apt-get install python-catkin-pkg python-rosdep ros-hydro-catkin -qq
-  - sudo rosdep init
-  - rosdep update
-  - mkdir -p /tmp/ws/src
-  - ln -s `pwd` /tmp/ws/roslibjs
-  - cd /tmp/ws/src
-  - git clone https://github.com/RobotWebTools/tf2_web_republisher.git
-  - cd ../
-  - rosdep install --from-paths src --ignore-src --rosdistro hydro -y
-  - cd /tmp/ws/roslibjs
-  - npm install -g npm
-  - npm install -g grunt-cli karma-cli
+  - sudo apt-get install -qq ros-$ROS_DISTRO-ros ros-$ROS_DISTRO-catkin python-catkin-pkg python-rosdep
+  - sudo apt-get install -qq ros-$ROS_DISTRO-rosbridge-server ros-$ROS_DISTRO-tf2-web-republisher ros-$ROS_DISTRO-common-tutorials ros-$ROS_DISTRO-rospy-tutorials ros-$ROS_DISTRO-actionlib-tutorials
+
+  # Only update npm in the 0.8 and 0.10 versions to not run into this issue:
+  #   https://github.com/nodejs/node/issues/433
+  - case ${TRAVIS_NODE_VERSION} in 0.8*|0.10*) npm update -g npm ;; esac
 
   # Set up Xfvb for Firefox headless testing
   - "export DISPLAY=:99.0"
   - "sh -e /etc/init.d/xvfb start"
 before_script:
-  - source /opt/ros/hydro/setup.bash
-  - cd /tmp/ws
-  - catkin_make
-  - catkin_make install
-  - source install/setup.bash
-  - cd /tmp/ws/roslibjs
+  - source /opt/ros/$ROS_DISTRO/setup.bash
   - sh test/examples/setup_examples.sh
 script:
   - rostopic list

CHANGELOG.md

@@ -1,15 +1,27 @@
-2014-02-04 - **0.13.0**
+2015-09-01 - **0.17.0**
+ * Canvas version bump to use for both node version 0.10.34 and 0.12.7 [(jihoonl)](https://github.com/jihoonl/)
+ * Replace xmlshim with xmldom [(Rayman)](https://github.com/Rayman/)
+
+2015-08-14 - **0.16.0**
+ * Adds BSON support [(DLu)](https://github.com/DLu/)
+ * Update failed callback when rosservice is called [(dwlee)](https://github.com/dwlee/)
+
+2015-04-10 - **0.15.0**
+ * Remove the (unused) DOMParser shim [(Rayman)](https://github.com/Rayman/)
+ * Check for install of cairo (removes sudo from npm install) [(rctoris)](https://github.com/rctoris/)
+
+2015-03-09 - **0.13.0**
  * URDF joint added [(DLu)](https://github.com/DLu/)
  * Index components of roslib [(megawac)](https://github.com/megawac/)
  * Add function that find service and topic as specific type [(dwlee)](https://github.com/dwlee/)
  * Allow UrdfLink to have multiple visual elements [(jakobs)](https://github.com/jakobs/)
  * Support queue_length for subscribing [(psoetens)](https://github.com/psoetens/)
  * Quaternion.js has now a norm() function [(b1willaert)](https://github.com/b1willaert/)
 
-2014-02-04 - **0.12.0**
+2015-02-04 - **0.12.0**
  * Reverted to old TF client [(rctoris)](https://github.com/rctoris/)
 
-2014-02-04 - **0.11.0**
+2015-02-04 - **0.11.0**
  * Change TFClient to use the service interface rather than the action one [(T045T)](https://github.com/T045T/)
  * Simplify TFClient and allow unsubscribe by key [(megawac)](https://github.com/megawac/)
  * Add groovyCompatibility option to Ros [(T045T)](https://github.com/T045T/)

CONTRIBUTING.md

@@ -17,8 +17,6 @@ roslibjs Build Setup
 	$ cd /path/to/roslibjs/
    	$ [sudo] npm install
 	```
- 3.5. If that doesn't work, install the [Cairo](http://cairographics.org/) graphics library manually for your os and retry
-   - [System specific instructions](https://github.com/Automattic/node-canvas/wiki/_pages)
 
 ### Build with Grunt
 

Gruntfile.js

@@ -90,7 +90,8 @@ module.exports = function(grunt) {
           './src/**/*.js'
         ],
         options: {
-          destination: './doc'
+          destination: './doc',
+          private: false
         }
       }
     }

bower.json

@@ -1,7 +1,7 @@
 {
   "name": "roslib",
   "description": "roslibjs is the core JavaScript library for interacting with ROS from the browser. It uses WebSockets to connect with rosbridge and provides publishing, subscribing, service calls, actionlib, TF, URDF parsing, and other essential ROS functionality. roslibjs is developed as part of the Robot Web Tools effort.",
-  "version": "0.13.0",
+  "version": "0.18.0-SNAPSHOT",
   "homepage": "https://github.com/RobotWebTools/roslibjs",
   "authors": [
     "Russell Toris<[email protected]>",