Merge branch 'r-1.3-2' into production

Author: krlmlr

.travis.yml

@@ -1,25 +1,40 @@
 # R for travis: see documentation at https://docs.travis-ci.com/user/languages/r
+# Default configuration for use with tic package
+# Usually you shouldn't need to change the first part of the file
+
+# DO NOT CHANGE THE CODE BELOW
+before_install: R -q -e 'install.packages(c("remotes", "curl")); remotes::install_github("ropenscilabs/tic"); tic::prepare_all_stages(); tic::before_install()'
+install: R -q -e 'tic::install()'
+after_install: R -q -e 'tic::after_install()'
+before_script: R -q -e 'tic::before_script()'
+script: R -q -e 'tic::script()'
+after_success: R -q -e 'tic::after_success()'
+after_failure: R -q -e 'tic::after_failure()'
+before_deploy: R -q -e 'tic::before_deploy()'
+deploy:
+  provider: script
+  script: R -q -e 'tic::deploy()'
+  on:
+    all_branches: true
+after_deploy: R -q -e 'tic::after_deploy()'
+after_script: R -q -e 'tic::after_script()'
+# DO NOT CHANGE THE CODE ABOVE
+
+# Custom parts:
 
 # Header
 language: r
 sudo: false
 dist: trusty
 cache: packages
-warnings_are_errors: true
+latex: false
 
 #env
 env:
   global:
   - _R_CHECK_FORCE_SUGGESTS_=false
   - MAKEFLAGS="-j 2"
 
-#addons
-addons:
-  apt:
-    packages:
-    - libmagick++-dev
-    - libssh2-1-dev
-
 #matrix: 3x Linux, 1x OS X
 matrix:
   include:
@@ -33,37 +48,6 @@ matrix:
     r: release
     latex: false
 
-#notifications
-notifications:
-  email:
-    on_success: change
-    on_failure: change
-
-#before_script
-before_script:
-- R -q -e 'devtools::install_github("ropenscilabs/tic"); tic::prepare_all_stages()'
-
-#after_success
-after_success:
-- R -q -e 'tic::after_success()'
-
-#deploy // https://github.com/travis-ci/travis-build/blob/85ef7108/lib/travis/build/addons/deploy/script.rb#L100-L107
-deploy:
-  provider: script
-  script: R -q -e 'tic::deploy()'
-  on:
-    all_branches: true
-
-# Custom parts:
-
-#r_github_packages
-r_github_packages:
-
-#r_packages
-r_packages:
 
 #services
 services:
-
-#before_install
-before_install:

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: rprojroot
 Title: Finding Files in Project Subdirectories
-Version: 1.3-1
+Version: 1.3-2
 Authors@R: person(given = "Kirill", family = "Müller", role = c("aut",
         "cre"), email = "krlmlr+r@mailbox.org")
 Description: Robust, reliable and flexible paths to files below a

NEWS.md

@@ -1,3 +1,8 @@
+## rprojroot 1.3-2 (2017-12-22)
+
+- Availability of suggested packages knitr and rmarkdown, and pandoc, is now checked before running the corresponding tests.
+
+
 # rprojroot 1.3-1 (2017-12-18)
 
 - Adapt to testthat 2.0.0.

README.md

@@ -1,6 +1,8 @@
 <!-- README.md is generated from README.Rmd. Please edit that file -->
-[rprojroot](https://krlmlr.github.io/rprojroot) [![Travis-CI Build Status](https://travis-ci.org/krlmlr/rprojroot.svg?branch=master)](https://travis-ci.org/krlmlr/rprojroot) [![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/github/krlmlr/rprojroot?branch=master&svg=true)](https://ci.appveyor.com/project/krlmlr/rprojroot) [![codecov.io](https://codecov.io/github/krlmlr/rprojroot/coverage.svg?branch=master)](https://codecov.io/github/krlmlr/rprojroot?branch=master) [![CRAN\_Status\_Badge](http://www.r-pkg.org/badges/version/rprojroot)](https://cran.r-project.org/package=rprojroot)
-=============================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================================
+[rprojroot](https://krlmlr.github.io/rprojroot)
+===============================================
+
+[![Travis-CI Build Status](https://travis-ci.org/krlmlr/rprojroot.svg?branch=master)](https://travis-ci.org/krlmlr/rprojroot) [![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/github/krlmlr/rprojroot?branch=master&svg=true)](https://ci.appveyor.com/project/krlmlr/rprojroot) [![codecov.io](https://codecov.io/github/krlmlr/rprojroot/coverage.svg?branch=master)](https://codecov.io/github/krlmlr/rprojroot?branch=master) [![CRAN\_Status\_Badge](http://www.r-pkg.org/badges/version/rprojroot)](https://cran.r-project.org/package=rprojroot)
 
 This package helps accessing files relative to a *project root* to [stop the working directory insanity](https://gist.github.com/jennybc/362f52446fe1ebc4c49f).
 
@@ -18,12 +20,13 @@ How do we access the package root? In a robust fashion? Easily:
 
 ``` r
 dir(rprojroot::find_root("DESCRIPTION"))
-#>  [1] "appveyor.yml"     "cran-comments.md" "DESCRIPTION"     
-#>  [4] "docs"             "inst"             "Makefile"        
-#>  [7] "man"              "NAMESPACE"        "NEWS.md"         
-#> [10] "_pkgdown.yml"     "R"                "readme"          
-#> [13] "README.md"        "rprojroot.Rproj"  "scripts"         
-#> [16] "tests"            "vignettes"
+#>  [1] "_pkgdown.yml"     "API"              "appveyor.yml"    
+#>  [4] "cran-comments.md" "DESCRIPTION"      "docs"            
+#>  [7] "inst"             "Makefile"         "man"             
+#> [10] "NAMESPACE"        "NEWS.md"          "R"               
+#> [13] "readme"           "README.md"        "revdep"          
+#> [16] "rprojroot.Rproj"  "tests"            "tic.R"           
+#> [19] "vignettes"
 ```
 
 Installation and further reading

cran-comments.md

@@ -1,4 +1,4 @@
-Resumbission upon CRAN's request, to fix brittle tests.
+Resumbission upon CRAN's request, to fix brittle tests (again).
 
 ## Test environments
 * local Ubuntu install, R 3.4.3

readme/README.Rmd

@@ -18,8 +18,9 @@ knitr::opts_chunk$set(
 )
 ```
 
-[rprojroot](https://krlmlr.github.io/rprojroot) [![Travis-CI Build Status](https://travis-ci.org/krlmlr/rprojroot.svg?branch=master)](https://travis-ci.org/krlmlr/rprojroot) [![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/github/krlmlr/rprojroot?branch=master&svg=true)](https://ci.appveyor.com/project/krlmlr/rprojroot) [![codecov.io](https://codecov.io/github/krlmlr/rprojroot/coverage.svg?branch=master)](https://codecov.io/github/krlmlr/rprojroot?branch=master) [![CRAN_Status_Badge](http://www.r-pkg.org/badges/version/rprojroot)](https://cran.r-project.org/package=rprojroot)
-=================================================================================================================================================================================================================================================================================================================================================
+# [rprojroot](https://krlmlr.github.io/rprojroot)
+
+[![Travis-CI Build Status](https://travis-ci.org/krlmlr/rprojroot.svg?branch=master)](https://travis-ci.org/krlmlr/rprojroot) [![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/github/krlmlr/rprojroot?branch=master&svg=true)](https://ci.appveyor.com/project/krlmlr/rprojroot) [![codecov.io](https://codecov.io/github/krlmlr/rprojroot/coverage.svg?branch=master)](https://codecov.io/github/krlmlr/rprojroot?branch=master) [![CRAN_Status_Badge](http://www.r-pkg.org/badges/version/rprojroot)](https://cran.r-project.org/package=rprojroot)
 
 This package helps accessing files relative to a *project root* to [stop the working directory insanity](https://gist.github.com/jennybc/362f52446fe1ebc4c49f).
 

tests/testthat/test-thisfile.R

@@ -1,25 +1,29 @@
 context("thisfile")
 
 test_that("thisfile works with source", {
+  skip_on_cran()
   res <- source("scripts/thisfile.R")
   expect_true(grepl("thisfile.R$", res$value))
 })
 
 test_that("thisfile works with Rscript", {
+  skip_on_cran()
   p <- pipe("Rscript scripts/thisfile-cat.R")
   on.exit(close(p))
   res <- readLines(p)
   expect_equal("scripts/thisfile-cat.R", res[[length(res)]])
 })
 
 test_that("thisfile works with R", {
+  skip_on_cran()
   p <- pipe("R --slave --vanilla --no-save -f scripts/thisfile-cat.R")
   on.exit(close(p))
   res <- readLines(p)
   expect_equal("scripts/thisfile-cat.R", res[[length(res)]])
 })
 
 test_that("thisfile works with knitr", {
+  skip_if_not_installed("knitr")
   out <- tempfile(pattern = "rprojroot", fileext = ".md")
   expect_message(
     knitr::knit("scripts/thisfile.Rmd", output = out, quiet = TRUE),
@@ -29,6 +33,9 @@ test_that("thisfile works with knitr", {
 })
 
 test_that("thisfile works with rmarkdown", {
+  skip_if_not_installed("rmarkdown")
+  skip_if_not(rmarkdown::pandoc_available())
+
   out <- tempfile(pattern = "rprojroot", fileext = ".md")
   expect_message(
     rmarkdown::render(

tic.R

@@ -1,14 +1,18 @@
-get_stage("after_success") %>%
-  add_step(step_hello_world()) %>%
-  add_step(step_run_code(covr::codecov()))
+add_package_checks()
 
-get_stage("deploy") %>%
-  add_step(step_add_to_known_hosts("github.com")) %>%
-  add_step(step_install_ssh_keys()) %>%
-  add_step(step_test_ssh())
+if (inherits(ci(), "TravisCI") && Sys.getenv("BUILD_PKGDOWN") != "" && Sys.getenv("id_rsa") != "") {
+  # pkgdown documentation can be built optionally. Other example criteria:
+  # - `inherits(ci(), "TravisCI")`: Only for Travis CI
+  # - `ci()$is_tag()`: Only for tags, not for branches
+  # - `Sys.getenv("BUILD_PKGDOWN") != ""`: If the env var "BUILD_PKGDOWN" is set
+  # - `Sys.getenv("TRAVIS_EVENT_TYPE") == "cron"`: Only for Travis cron jobs
+  get_stage("before_deploy") %>%
+    add_step(step_setup_ssh())
 
-if (ci()$get_branch() == "production" && Sys.getenv("BUILD_PKGDOWN") != "") {
   get_stage("deploy") %>%
     add_step(step_build_pkgdown(examples = FALSE)) %>%
-    add_step(step_push_deploy(path = "docs", branch = "gh-pages"))
+    add_step(step_push_deploy(
+      path = "docs",
+      branch = if (ci()$get_branch() == "master") "gh-pages" else paste0("gh-pages-", ci()$get_branch())
+    ))
 }