make check pass and use global env for buffer

MilesMcBain · Mar 3, 2022 · a1e812e · a1e812e
1 parent 9445b91
commit a1e812e
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: paint
 Title: paint data.frames summaries in colour 
-Version: 0.1.3
+Version: 0.1.4
 Authors@R: 
     person(given = "Miles",
            family = "McBain",

diff --git a/R/output.R b/R/output.R
@@ -1,28 +1,31 @@
-OUTPUT_TO_BUFFER <- FALSE
-OUTPUT_BUFFER <- NULL
+utils::globalVariables("PAINT_BUFFER")
+PAINT_BUFFER <- new.env()
+
+PAINT_BUFFER$OUTPUT_TO_BUFFER <- FALSE
+PAINT_BUFFER$OUTPUT_BUFFER <- NULL
 
 output <- function(...) {
-  if (!OUTPUT_TO_BUFFER) {
+  if (!PAINT_BUFFER$OUTPUT_TO_BUFFER) {
     cat(..., sep = "")
   } else {
     append_to_output_buffer(...)
   }
 }
 
 append_to_output_buffer <- function(...) {
-  OUTPUT_BUFFER <<-
+  PAINT_BUFFER$OUTPUT_BUFFER <-
     c(
-      OUTPUT_BUFFER,
+      PAINT_BUFFER$OUTPUT_BUFFER,
       unlist(list(...))
     )
 }
 
 reset_output_buffer <- function() {
-  OUTPUT_BUFFER <<- NULL
+  PAINT_BUFFER$OUTPUT_BUFFER <- NULL
 }
 
 get_output_buffer <- function() {
-  OUTPUT_BUFFER
+  PAINT_BUFFER$OUTPUT_BUFFER
 }
 
 get_output_buffer_rows <- function() {
@@ -40,7 +43,7 @@ get_output_buffer_rows <- function() {
 }
 
 paint_to_output_buffer <- function(...) {
-  OUTPUT_TO_BUFFER <<- TRUE
-  on.exit(OUTPUT_TO_BUFFER <<- FALSE)
+  PAINT_BUFFER$OUTPUT_TO_BUFFER <- TRUE
+  on.exit(PAINT_BUFFER$OUTPUT_TO_BUFFER <- FALSE)
   paint(...)
 }