Merge pull request #80 from ThinkR-open/sub-cran

dagousket · web-flow · commit 8a3df2450d4b · 2024-08-12T10:46:29.000+02:00
chore: clean roxygen doc and test tempfiles
diff --git 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
@@ -3,3 +3,5 @@
 .RData
 inst/doc
 revdep/
+/doc/
+/Meta/
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -16,7 +16,7 @@ knitr::opts_chunk$set(
 
 <!-- badges: start -->
 [![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)
 <!-- badges: end -->
 
 
diff --git 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)
 <!-- badges: end -->
 
 # `{dockerfiler}`
diff --git 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
diff --git 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
@@ -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)
+

-Original file line number
+Diff line change
 .RData
 inst/doc
 revdep/
 +/doc/
 +/Meta/
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`# WARNING - Generated by {fusen} from dev/flat_dock_from_renv.Rmd: do not edit by hand`
`2`	`2`
`3`	`3`	`#' @importFrom memoise memoise`
	`4`	`+#' @noRd`
`4`	`5`	`pkg_sysreqs_mem <- memoise::memoise(`
`5`	`6`	`pak::pkg_sysreqs`
`6`	`7`	`)`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@ set_name <- function(x, y) {`
`4`	`4`	`}`
`5`	`5`
`6`	`6`	`#' @importFrom cli cat_bullet`
	`7`	`+#' @noRd`
`7`	`8`	`cat_green_tick <- function(...) {`
`8`	`9`	`cat_bullet(`
`9`	`10`	`...,`
`@@ -13,6 +14,7 @@ cat_green_tick <- function(...) {`
`13`	`14`	`}`
`14`	`15`
`15`	`16`	`#' @importFrom cli cat_bullet`
	`17`	`+#' @noRd`
`16`	`18`	`cat_red_bullet <- function(...) {`
`17`	`19`	`cat_bullet(`
`18`	`20`	`...,`
`@@ -22,6 +24,7 @@ cat_red_bullet <- function(...) {`
`22`	`24`	`}`
`23`	`25`
`24`	`26`	`#' @importFrom cli cat_bullet`
	`27`	`+#' @noRd`
`25`	`28`	`cat_info <- function(...) {`
`26`	`29`	`cat_bullet(`
`27`	`30`	`...,`
Original file line number	Diff line number	Diff line change
`@@ -109,8 +109,12 @@ withr::with_dir(`
`109`	`109`	`)`
`110`	`110`	`)`
`111`	`111`
	`112`	`+ unlink(tpf, recursive = TRUE)`
	`113`	`+`
`112`	`114`
`113`	`115`
`114`	`116`	`})`
`115`	`117`	`}`
`116`	`118`	`)`
	`119`	`+`
	`120`	`+unlink(descdir, recursive = TRUE)`