From 8e5862cb4111bcb8acdbe7ce80f0eb119b9c7a52 Mon Sep 17 00:00:00 2001
From: Ramon Wijnands <rayman747@hotmail.com>
Date: Wed, 9 Sep 2015 15:52:29 +0200
Subject: [PATCH 1/3] add more node versions to travis.yml, fix #192

Make sure to only update npm in the 0.8 and 0.10 versions to not run
into this issue: https://github.com/nodejs/node/issues/433
---
 .travis.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 0694c5208..a785c38d7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,8 @@
 language: node_js
 node_js:
   - "0.10"
+  - "0.12"
+  - "4"
 addons:
   firefox: "31.0" # 3.4->31.0
 os:
@@ -24,7 +26,10 @@ before_install:
   - cd ../
   - rosdep install --from-paths src --ignore-src --rosdistro hydro -y
   - cd /tmp/ws/roslibjs
-  - npm install -g npm
+
+  # 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
   - npm install -g grunt-cli karma-cli
 
   # Set up Xfvb for Firefox headless testing

From 74fb65480bfc7e22c693057fdc4f1ca2082ea302 Mon Sep 17 00:00:00 2001
From: Ramon Wijnands <rayman747@hotmail.com>
Date: Thu, 10 Sep 2015 14:07:04 +0200
Subject: [PATCH 2/3] cleanup .travis.yml

---
 .travis.yml  | 31 ++++++-------------------------
 package.json |  1 +
 2 files changed, 7 insertions(+), 25 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a785c38d7..b26eabd76 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,45 +3,26 @@ node_js:
   - "0.10"
   - "0.12"
   - "4"
-addons:
-  firefox: "31.0" # 3.4->31.0
-os:
-  - linux
+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
+  - 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
-  - npm install -g grunt-cli karma-cli
 
   # 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
diff --git a/package.json b/package.json
index 17d87a24a..50c133816 100644
--- a/package.json
+++ b/package.json
@@ -16,6 +16,7 @@
   "devDependencies": {
     "grunt": "~0.4.1",
     "grunt-browserify": "^3.0.1",
+    "grunt-cli": "^0.1.13",
     "grunt-contrib-clean": "~0.4.0",
     "grunt-contrib-jshint": "^0.10.0",
     "grunt-contrib-uglify": "~0.2.0",

From 2cbd3a4593c9c980ae65babb647d3a1024a9fa24 Mon Sep 17 00:00:00 2001
From: Ramon Wijnands <rayman747@hotmail.com>
Date: Tue, 29 Sep 2015 21:20:34 +0200
Subject: [PATCH 3/3] dependency version bump

---
 package.json | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/package.json b/package.json
index 50c133816..2c9cbf2ba 100644
--- a/package.json
+++ b/package.json
@@ -14,29 +14,30 @@
     "./src/util/decompressPng.js": "./src/util/shim/decompressPng.js"
   },
   "devDependencies": {
-    "grunt": "~0.4.1",
-    "grunt-browserify": "^3.0.1",
+    "grunt": "^0.4.1",
+    "grunt-browserify": "^4.0.1",
     "grunt-cli": "^0.1.13",
-    "grunt-contrib-clean": "~0.4.0",
-    "grunt-contrib-jshint": "^0.10.0",
-    "grunt-contrib-uglify": "~0.2.0",
-    "grunt-contrib-watch": "~0.3.1",
-    "grunt-jsdoc": "~0.6.0",
+    "grunt-contrib-clean": "^0.6.0",
+    "grunt-contrib-jshint": "^0.11.3",
+    "grunt-contrib-uglify": "^0.9.2",
+    "grunt-contrib-watch": "^0.6.1",
+    "grunt-jsdoc": "^1.0.0",
     "grunt-karma": "^0.12.0",
-    "grunt-mocha-test": "^0.11.0",
+    "grunt-mocha-test": "^0.12.7",
     "karma": "^0.13.9",
     "karma-chai": "^0.1.0",
-    "karma-firefox-launcher": "~0.1.3",
-    "karma-mocha": "^0.1.9",
     "chai": "*",
-    "load-grunt-tasks": "^0.6.0",
+    "karma-firefox-launcher": "^0.1.3",
+    "karma-mocha": "^0.2.0",
+    "load-grunt-tasks": "^3.3.0",
+    "mocha": "^2.3.3",
     "time-grunt": "^1.0.0"
   },
   "dependencies": {
-    "eventemitter2": "~0.4.13",
-    "object-assign": "^2.0.0",
+    "eventemitter2": "^0.4.13",
+    "object-assign": "^4.0.1",
     "pngparse": "^2.0.1",
-    "ws": "^0.4.32",
+    "ws": "^0.8.0",
     "xmldom": "^0.1.19"
   },
   "directories": {