From f26e22467e4ad91b367bd5b15d9f68f304a7a4f9 Mon Sep 17 00:00:00 2001
From: cpsievert <cpsievert1@gmail.com>
Date: Wed, 4 Mar 2015 17:35:42 -0600
Subject: [PATCH 1/3] Native R build on Travis

---
 .travis.yml | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a9f2ce6f97..0f20a8cbaf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,18 +1,21 @@
-language: c
+language: r
+
 env:
   global:
     - secure: "cJ1bDRrAdIRjG+JnsQI9CdA4wQJhJJ2DdCNQ3frl8dotk69z61EiGCFW1Ir1cAY5V/NbHvFHp91HDiSo28ggwqRkEPBOGE44ico5gtVaELu3M/EnkWc2ZwQoN1273Vfdm26QYidqrvWrpLZ0XkFl7Q8xgvBswx30MF7y61+0Hv4="
+
+r_packages:
+  - RCurl
+  - RJSONIO
+  - lattice
+  - xtable 
+
 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=

From 935478cd5bb94cae180024d839153c3ee1b522fd Mon Sep 17 00:00:00 2001
From: Toby Dylan Hocking <tdhock5@gmail.com>
Date: Mon, 9 Mar 2015 18:32:45 -0400
Subject: [PATCH 2/3] add script to add log files

---
 .push_test_table.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.push_test_table.sh b/.push_test_table.sh
index 2b332dfc13..69a23cc32f 100644
--- a/.push_test_table.sh
+++ b/.push_test_table.sh
@@ -41,7 +41,7 @@ cat code_commits.csv
 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"

From dad23b16aac383703867d9aaf5b5e7b399b17155 Mon Sep 17 00:00:00 2001
From: cpsievert <cpsievert1@gmail.com>
Date: Mon, 9 Mar 2015 17:39:34 -0500
Subject: [PATCH 3/3] install httr

---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 0f20a8cbaf..f79a945730 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,8 @@ r_packages:
   - RCurl
   - RJSONIO
   - lattice
-  - xtable 
+  - xtable
+  - httr 
 
 before_script:
   - chmod 755 ./.push_test_table.sh