lintr and style

remove previous results

.lintr

@@ -4,4 +4,4 @@ linters: linters_with_defaults(
   indentation_linter = NULL,
   trailing_whitespace_linter = NULL
   )
-exclusions: as.list(setdiff(list.files(".", recursive = T),list.files("R", recursive = T, full.names = T)))
+

inst/validation/run_validation.R

@@ -1,39 +1,40 @@
 local({
-    # This is evaluated inside a local because, otherwise, all the variables created in the chunks of the rendered
-    # document leak into the environment
+  # This is evaluated inside a local because, otherwise, all the variables created in the chunks of the rendered
+  # document leak into the environment
 
-	validation_root <- "./inst/validation"
-  	validation_report_rmd  <- file.path(validation_root, "val_report.Rmd")
-  	validation_report_html  <- "val_report.html"
-  	validation_results <- file.path(validation_root, "results")
-  	val_param_rds <- file.path(validation_results, "val_param.rds")
+  validation_root <- "./inst/validation"
+  validation_report_rmd <- file.path(validation_root, "val_report.Rmd")
+  validation_report_html <- "val_report.html"
+  validation_results <- file.path(validation_root, "results")
+  val_param_rds <- file.path(validation_results, "val_param.rds")
 
-  	stopifnot(dir.exists(validation_root))
-  	stopifnot(file.exists(validation_report_rmd))
+  stopifnot(dir.exists(validation_root))
+  stopifnot(file.exists(validation_report_rmd))
 
-	stopifnot(dir.exists(validation_results))
-  	unlink(list.files(validation_results))
+  stopifnot(dir.exists(validation_results))
+  unlink(list.files(validation_results))
 
-    saveRDS(
-          list(
-              package = pkg_name,
-              tests = test_results,
-              version = pkg_version
-          ),
-          val_param_rds
-      )
+  saveRDS(
+    list(
+      package = pkg_name,
+      tests = test_results,
+      version = pkg_version
+    ),
+    val_param_rds
+  )
 
-	rmarkdown::render(
-        input = validation_report_rmd,
-        params = list(
-            package = pkg_name,
-            tests = test_results,
-            version = pkg_version
-        ),
-        output_dir = validation_results,
-        output_file = validation_report_html
-    )
+  rmarkdown::render(
+    input = validation_report_rmd,
+    params = list(
+      package = pkg_name,
+      tests = test_results,
+      version = pkg_version
+    ),
+    output_dir = validation_results,
+    output_file = validation_report_html
+  )
 
-# We use one of the leaked variables, created inside the validation report to asses if the validation is succesful or not    
-        VALIDATION_PASSED
-})
+  # We use one of the leaked variables, created inside the validation report to asses if the validation is
+  # succesful or not
+  VALIDATION_PASSED
+})

inst/validation/val_report_child.Rmd

@@ -34,8 +34,8 @@ tests[["spec_paste"]] <- vapply(tests[["spec"]], function(x) paste(x, collapse =
 tests[["desc"]] <- paste0("(#", seq_len(nrow(tests)), "): ", tests[["test"]])
 tests[["with_spec"]] <- vapply(tests[["spec_id"]], Negate(is.null), FUN.VALUE = logical(1))
 
-spec_tests <- tests[tests[["with_spec"]],]
-no_spec_tests <- tests[!tests[["with_spec"]],]
+spec_tests <- tests[tests[["with_spec"]], ]
+no_spec_tests <- tests[!tests[["with_spec"]], ]
 
 declared_spec <- vdoc[["spec_id_list"]]
 tested_spec <- unique(unlist(tests[["spec_id"]]))
@@ -55,27 +55,27 @@ n_skip_dec <- sum(mask_skipped & mask_declared)
 n_uncov <- length(uncovered_spec)
 n_undec <- sum(!mask_declared)
 
-render_spec_table <- function(t){
+render_spec_table <- function(t) {
   t <- t[trac_matrix_col]
   colnames(t) <- names(trac_matrix_col)
-  t <- t[order(t[["Spec ID"]]),]
-  DT::datatable(t,  options = list(dom = "ltp"), filter = list(position = "top"))
+  t <- t[order(t[["Spec ID"]]), ]
+  DT::datatable(t, options = list(dom = "ltp"), filter = list(position = "top"))
 }
 
-data_frame_by_row <- function(colnames, data){
+data_frame_by_row <- function(colnames, data) {
   n <- length(data)
   n_cols <- length(colnames)
   stopifnot(n %% n_cols == 0)
   columns <- vector("list", length = n_cols)
-  for(i in 1:n_cols) columns[[i]] <- unlist(data[seq(i, n, n_cols)])
+  for (i in 1:n_cols) columns[[i]] <- unlist(data[seq(i, n, n_cols)])
   do.call(data.frame, setNames(columns, colnames))
 }
 
 # Select columns to be included in the tables ----
 trac_matrix_col <- c("Spec ID" = "spec_id_paste", "Spec" = "spec_paste", "Test Desc" = "desc", "File" = "file")
 
 # Check that validation passes and set title ----
-VALIDATION_PASSED <- n_fail_dec == 0 && n_uncov == 0 && n_undec == 0 && n_uncov == 0
+VALIDATION_PASSED <- n_fail_dec == 0 && n_uncov == 0 && n_undec == 0 && n_uncov == 0 # nolint
 
 result_symbol <- if (VALIDATION_PASSED) "\U02705" else "\U274C"
 title <- paste(result_symbol, params[["package"]], params[["version"]])