diff --git a/.Rbuildignore b/.Rbuildignore index 3cd82b8..4bf3d92 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -19,3 +19,5 @@ tests/testthat/.dockerignore ^cran-comments\.md$ ^CRAN-SUBMISSION$ ^revdep$ +^doc$ +^Meta$ diff --git a/.gitignore b/.gitignore index 7255156..05aa6ff 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,5 @@ .RData inst/doc revdep/ +/doc/ +/Meta/ diff --git a/DESCRIPTION b/DESCRIPTION index cac2c54..131ab1a 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -43,4 +43,4 @@ Config/testthat/edition: 3 Encoding: UTF-8 LazyData: true Roxygen: list(markdown = TRUE) -RoxygenNote: 7.3.1 +RoxygenNote: 7.3.2 diff --git a/R/add.R b/R/add.R index 14a0484..c463047 100644 --- a/R/add.R +++ b/R/add.R @@ -1,6 +1,6 @@ #' @importFrom glue glue #' @importFrom attempt warn_if_not - +#' @noRd create_dockerfile <- function( FROM = "rocker/r-base", AS = NULL diff --git a/R/dock_from_desc.R b/R/dock_from_desc.R index 4a62c90..1a20a63 100644 --- a/R/dock_from_desc.R +++ b/R/dock_from_desc.R @@ -63,7 +63,7 @@ quote_not_na <- function(x){ #' @importFrom usethis use_build_ignore #' @importFrom pkgbuild build #' -#' @export +#' @return Dockerfile dock_from_desc <- function( path = "DESCRIPTION", FROM = paste0( diff --git a/R/dock_from_renv.R b/R/dock_from_renv.R index 50fe4ca..e2168fe 100644 --- a/R/dock_from_renv.R +++ b/R/dock_from_renv.R @@ -1,6 +1,7 @@ # WARNING - Generated by {fusen} from dev/flat_dock_from_renv.Rmd: do not edit by hand #' @importFrom memoise memoise +#' @noRd pkg_sysreqs_mem <- memoise::memoise( pak::pkg_sysreqs ) diff --git a/R/parse-dockerfile.R b/R/parse-dockerfile.R index 29e289f..46a71b2 100644 --- a/R/parse-dockerfile.R +++ b/R/parse-dockerfile.R @@ -4,7 +4,7 @@ #' Create a Dockerfile object from a Dockerfile. #' #' @param path path to the Dockerfile -#' @returns A Dockerfile object +#' @return A Dockerfile object #' @export #' @examples #' parse_dockerfile(system.file("Dockerfile", package = "dockerfiler")) diff --git a/R/utils.R b/R/utils.R index 26fb5a0..c49fa0e 100644 --- a/R/utils.R +++ b/R/utils.R @@ -4,6 +4,7 @@ set_name <- function(x, y) { } #' @importFrom cli cat_bullet +#' @noRd cat_green_tick <- function(...) { cat_bullet( ..., @@ -13,6 +14,7 @@ cat_green_tick <- function(...) { } #' @importFrom cli cat_bullet +#' @noRd cat_red_bullet <- function(...) { cat_bullet( ..., @@ -22,6 +24,7 @@ cat_red_bullet <- function(...) { } #' @importFrom cli cat_bullet +#' @noRd cat_info <- function(...) { cat_bullet( ..., diff --git a/README.Rmd b/README.Rmd index a3ea7ba..a9ff00e 100644 --- a/README.Rmd +++ b/README.Rmd @@ -16,7 +16,7 @@ knitr::opts_chunk$set( [![R-CMD-check](https://github.com/ThinkR-open/dockerfiler/workflows/R-CMD-check/badge.svg)](https://github.com/ThinkR-open/dockerfiler/actions) -[![Coverage status](https://codecov.io/gh/ThinkR-open/dockerfiler/branch/master/graph/badge.svg)](https://codecov.io/github/ThinkR-open/dockerfiler?branch=master) +[![Coverage status](https://codecov.io/gh/ThinkR-open/dockerfiler/branch/master/graph/badge.svg)](https://app.codecov.io/github/ThinkR-open/dockerfiler?branch=master) diff --git a/README.md b/README.md index 96a2768..3417e26 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ [![R-CMD-check](https://github.com/ThinkR-open/dockerfiler/workflows/R-CMD-check/badge.svg)](https://github.com/ThinkR-open/dockerfiler/actions) [![Coverage -status](https://codecov.io/gh/ThinkR-open/dockerfiler/branch/master/graph/badge.svg)](https://codecov.io/github/ThinkR-open/dockerfiler?branch=master) +status](https://codecov.io/gh/ThinkR-open/dockerfiler/branch/master/graph/badge.svg)](https://app.codecov.io/github/ThinkR-open/dockerfiler?branch=master) # `{dockerfiler}` diff --git a/dev/flat_dock_from_renv.Rmd b/dev/flat_dock_from_renv.Rmd index c730452..6c4d18a 100644 --- a/dev/flat_dock_from_renv.Rmd +++ b/dev/flat_dock_from_renv.Rmd @@ -45,6 +45,7 @@ if (!is.null(distro)){ ```{r function-dock_from_renv} #' @importFrom memoise memoise +#' @noRd pkg_sysreqs_mem <- memoise::memoise( pak::pkg_sysreqs ) @@ -411,10 +412,6 @@ skip_if(is_rdevel, "skip on R-devel") - - -unlink(dir_build) - # repos_as_character ---- test_that("repos_as_character works", { out <- dockerfiler:::repos_as_character( @@ -498,6 +495,8 @@ socle_install_version <- "remotes::install_version\\(\"renv\", version = \"" }) +unlink(dir_build, recursive = TRUE) + ``` diff --git a/man/dockerfiles.Rd b/man/dockerfiles.Rd index 7aaf546..d092c9a 100644 --- a/man/dockerfiles.Rd +++ b/man/dockerfiles.Rd @@ -39,6 +39,9 @@ the Dockerfile directly mount the source folder.} \item{extra_sysreqs}{character vector. Extra debian system requirements. Will be installed with apt-get install.} } +\value{ +Dockerfile +} \description{ Create a Dockerfile from a DESCRIPTION } diff --git a/tests/testthat/test-dock_from_desc.R b/tests/testthat/test-dock_from_desc.R index effc6eb..cf28b81 100644 --- a/tests/testthat/test-dock_from_desc.R +++ b/tests/testthat/test-dock_from_desc.R @@ -109,8 +109,12 @@ withr::with_dir( ) ) + unlink(tpf, recursive = TRUE) + }) } ) + +unlink(descdir, recursive = TRUE) diff --git a/tests/testthat/test-dock_from_renv.R b/tests/testthat/test-dock_from_renv.R index f38a8b0..f2316e4 100644 --- a/tests/testthat/test-dock_from_renv.R +++ b/tests/testthat/test-dock_from_renv.R @@ -116,10 +116,6 @@ skip_if(is_rdevel, "skip on R-devel") - - -unlink(dir_build) - # repos_as_character ---- test_that("repos_as_character works", { out <- dockerfiler:::repos_as_character( @@ -203,3 +199,5 @@ socle_install_version <- "remotes::install_version\\(\"renv\", version = \"" }) +unlink(dir_build, recursive = TRUE) +