Merge branch 'master' of https://github.com/ropensci/plotly into carson-ribbon

Author: cpsievert

.push_test_table.sh

@@ -42,7 +42,7 @@ touch table.R
 make
 
 # add, commit, push to gh-pages branch of plotly-test-table
-git add tables/*/*.html data/*/*.png
+./git-add.sh
 git commit -a -m "Travis build number ${TRAVIS_BUILD_NUMBER} of ${TRAVIS_REPO_SLUG}"
 # This post explains how this works -- http://rmflight.github.io/posts/2014/11/travis_ci_gh_pages.html
 GH_REPO="@github.com/ropensci/plotly-test-table.git"

.travis.yml

@@ -1,18 +1,22 @@
-language: c
+language: r
+
 env:
   global:
     - secure: "cJ1bDRrAdIRjG+JnsQI9CdA4wQJhJJ2DdCNQ3frl8dotk69z61EiGCFW1Ir1cAY5V/NbHvFHp91HDiSo28ggwqRkEPBOGE44ico5gtVaELu3M/EnkWc2ZwQoN1273Vfdm26QYidqrvWrpLZ0XkFl7Q8xgvBswx30MF7y61+0Hv4="
+
+r_packages:
+  - RCurl
+  - RJSONIO
+  - lattice
+  - xtable
+  - httr 
+
 before_script:
-- curl -OL http://raw.github.com/craigcitro/r-travis/master/scripts/travis-tool.sh
-- chmod 755 ./travis-tool.sh
-- chmod 755 ./.push_test_table.sh
-- ./travis-tool.sh bootstrap
-- ./travis-tool.sh install_deps 
-- ./travis-tool.sh install_r RCurl RJSONIO lattice xtable
-script: 
-- ./travis-tool.sh run_tests
+  - chmod 755 ./.push_test_table.sh
+
 after_success:
-- ./.push_test_table.sh
+  - ./.push_test_table.sh
+
 notifications:
   slack:
     secure: YvyGtGRFC4HJGD4d2Vx6fHU93EliJCHbcf/k9/Rbpl3wtYFZfWKbKL1FHvPw/g3auVebonz8hScnYzR0uYnR3dHSlmj3QrJ3NOePv5QAZRHy7aY/XKRr5JR1Ji/vX1yfbrJDmiYuGMxJVE8l/kbu0TxwDdLletY5nJpwlkHfaW8=