Merge pull request #27 from vielmetti/patch-1

[ready to merge] test in both linux and osx on travis

.travis.yml

@@ -1,17 +1,42 @@
-language: node_js
+# back to language cpp to try to bypass osx node failure
+language: cpp
+sudo: false
 env:
-  - CXX="g++-4.8"
-node_js:
-  - "0.12"
-  - "0.10"
-  - "iojs-v1"
-  - "iojs-v2"
-  - "iojs-v3"
-  - "4"
+  - export NODE_VERSION="0.10"
+  - export NODE_VERSION="0.12"
+  - export NODE_VERSION="iojs-v1.0"
+  - export NODE_VERSION="iojs-v1"
+  - export NODE_VERSION="iojs-v2"
+  - export NODE_VERSION="iojs-v3"
+  - export NODE_VERSION="4"
+os:
+  - linux
+  - osx
+# pre-install to bring in the correct version of node via nvm
+before_install:
+  - git submodule update --init --recursive
+  - git clone https://github.com/creationix/nvm.git ./.nvm
+  - source ./.nvm/nvm.sh
+  - nvm install $NODE_VERSION
+  - nvm use $NODE_VERSION
+  - npm config set python `which python`
+  - if [ $TRAVIS_OS_NAME == "linux" ]; then
+      export CC="gcc-4.8";
+      export CXX="g++-4.8";
+      export LINK="gcc-4.8";
+      export LINKXX="g++-4.8";
+    fi
+  - gcc --version
+  - g++ --version
+# node 4 depends on gcc 4.8
 addons:
   apt:
     sources:
     - ubuntu-toolchain-r-test
     packages:
     - g++-4.8
     - gcc-4.8
+# script needed to test, because defaults don't work on osx
+script:
+  - npm install
+  - npm test