TST: Add R devel to build matrix

.Rbuildignore

@@ -2,6 +2,7 @@
 ^\.Rproj\.user$
 ^\.travis\.yml$
 ^README\.rst$
+^install_rdevel\.sh$
 ^vignettes/rsconnect/.*$
 ^\.httr-oauth$
 ^NEWS\.rst$

.travis.yml

@@ -2,13 +2,16 @@ language: r
 warnings_are_errors: true
 sudo: required
 
-env:
-  - GGPLOT=DEV
-  - GGPLOT=STD
+matrix:
+  include:
+    - env: RVER=STD GGPLOT=DEV
+    - env: RVER=STD GGPLOT=STD
+    - env: RVER=DEV GGPLOT=STD
 
 r_binary_packages:
   - dplyr
   - tidyr
+  - proto
   - ggplot2
   - testthat
   - changepoint
@@ -29,6 +32,9 @@ r_github_packages:
   - jimhester/covr
 
 before_install:
+  - if [[ "$RVER" == "DEV" ]]; then
+      sh install_rdevel.sh;
+    fi
   - echo "options(repos = c(CRAN='http://cran.rstudio.com'))" >> ~/.Rprofile
   - if [[ "$GGPLOT" == "DEV" ]]; then
       Rscript -e 'install.packages("devtools")';
@@ -39,3 +45,5 @@ before_install:
 
 after_success:
   - Rscript -e 'library(covr);coveralls()'
+  - R --version
+  - Rscript -e 'library("ggplot2"); packageVersion("ggplot2")'

R/fortify_base.R

@@ -93,12 +93,14 @@ autoplot.matrix <- function (object, original = NULL, geom = 'tile',
       message <- paste0("Argument 'scale' is being deprecated. Use + operator to returned ggplot instance.")
       warning(message, call. = FALSE)
     }
-    ylim <- rev(levels(as.factor(gathered$Index)))
+    if (is.null(ylim)) {
+      ylim <- rev(levels(as.factor(gathered$Index)))
+    }
     mapping <- ggplot2::aes_string(x = 'variable', y = 'Index', fill = 'value')
     p <- ggplot2::ggplot(mapping = mapping) +
       geom_factory(geom_tile, gathered, alpha = alpha) +
       scale +
-      xlab('Columns') + ylab('Rows') + ylim(ylim)
+      xlab('Columns') + ylab('Rows')
   } else if (geom == 'point') {
     if (ncol(object) != 2) {
       stop("Number of columns must be 2 to plot with 'geom = point'")

install_rdevel.sh

@@ -0,0 +1,35 @@
+sudo apt-get -y build-dep r-base;
+sudo add-apt-repository -y ppa:ubuntu-lxc/buildd-backports;
+sudo apt-get update;
+sudo apt-get install -y curl libcurl4-openssl-dev;
+# zlib
+wget http://zlib.net/zlib-1.2.8.tar.gz;
+tar zxf zlib-1.2.8.tar.gz;
+cd zlib-1.2.8;
+./configure;
+make;
+sudo make install;
+cd ../
+rm -rf zlib-1.2.8;
+rm zlib-1.2.8.tar.gz;
+# PCRE
+# ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.38.tar.gz;
+# tar zxf pcre-8.38.tar.gz;
+# cd pcre-8.38;
+# ./configure;
+# make;
+# sudo make install;
+# cd ../;
+# rm pcre-8.38.tar.gz;
+# rm -rf pcre-8.38;
+# R-devel
+wget --no-check-certificate https://stat.ethz.ch/R/daily/R-devel.tar.gz;
+tar zxf R-devel.tar.gz;
+cd R-devel;
+./configure --with-x=no --without-system-pcre;
+make;
+sudo make install;
+cd ../
+rm -rf R-devel;
+rm R-devel.tar.gz;
+Rscript -e 'install.packages("ggfortify", dependencies=c("Depends", "Imports", "Suggests")';

vignettes/plot_dist.Rmd

@@ -1,6 +1,6 @@
 ---
 title: "Plotting Probability Distributions with ggplot2 and ggfortify"
-output: pdf_document
+output: html_document
 ---
 
 <!--

vignettes/plot_pca.Rmd

@@ -167,3 +167,4 @@ Passing `shape = FALSE` makes plot without points. In this case, `label` is turn
 ```{r, message = FALSE}
 autoplot(sammon(eurodist), shape = FALSE, label.colour = 'blue', label.size = 3)
 ```
+