prepare for CRAN

Author: JohnMount

DESCRIPTION

@@ -2,7 +2,7 @@ Package: wrapr
 Type: Package
 Title: Wrap R Tools for Debugging and Parametric Programming
 Version: 1.5.1
-Date: 2018-07-04
+Date: 2018-07-07
 Authors@R: c(
     person("John", "Mount", email = "[email protected]", role = c("aut", "cre")),
     person("Nina", "Zumel", email = "[email protected]", role = c("aut")),

NEWS.md

@@ -1,5 +1,5 @@
 
-# wrapr 1.5.1 2018-07-04
+# wrapr 1.5.1 2018-07-07
 
  * make pipe_impl public (but keyworld internal).
  * fix draw_frame quoting.

R/cf.R

@@ -172,6 +172,7 @@ build_frame <- function(..., cf_eval_environment = parent.frame()) {
 #' print(x)
 #' cat(draw_frame(x))
 #'
+#'
 #' @export
 #'
 draw_frame <- function(x,
@@ -192,22 +193,30 @@ draw_frame <- function(x,
                       preserve.width = "individual",
                       zero.print = NULL,
                       drop0trailing = FALSE)
+  x_s <- substitute(x)
   for(oi in names(formatC_options)) {
     formatC_args[[oi]] <- formatC_options[[oi]]
   }
+  if(!is.data.frame(x)) {
+    stop("draw_frame x needs to be a data.frame")
+  }
   nrow <- nrow(x)
   if(nrow<1) {
-    stop("draw_frame need at least 1 row")
+    stop("draw_frame x needs at least 1 row")
   }
   ncol <- ncol(x)
   if(ncol<1) {
-    stop("draw_frame need at least 1 column")
+    stop("draw_frame x needs at least 1 column")
   }
   # convert to character matrix
   xq <- x
   qts <- function(v) {
-    # could also try capturing dput() output
-    shQuote(v)
+    # wayts to quote: dput(), shQuote(), deparse()
+    vapply(as.character(v),
+           function(vi) {
+             deparse(vi)
+           },
+           character(1))
   }
   for(ci in colnames(x)) {
     if("POSIXt" %in% class(x[[ci]])) {
@@ -272,6 +281,9 @@ draw_frame <- function(x,
   rlist <- paste0("   ", rlist)
   res <- paste(rlist, collapse = "\n")
   res <- paste0("wrapr::build_frame(\n", res, "\n")
+  if(is.name(x_s)) {
+    res <- paste0(as.character(x_s), " <- ", res)
+  }
   res
 }
 

cran-comments.md

@@ -3,6 +3,8 @@
 ## Test environments
 
   * Windows
+  * using R Under development (unstable) (2018-07-01 r74950)
+  * using platform: x86_64-w64-mingw32 (64-bit)
 
   * OSX 
   * using R version 3.5.0 (2018-04-23)
@@ -15,11 +17,9 @@
   * checking extension type ... Package
   * this is package ‘wrapr’ version ‘1.5.1’
   * package encoding: UTF-8
-  * checking CRAN incoming feasibility ... NOTE
+  * checking CRAN incoming feasibility ... Note_to_CRAN_maintainers
   Maintainer: ‘John Mount <[email protected]>’
-
-  Number of updates in past 6 months: 7
-  Status: 1 NOTE
+  Status: OK
 
 ## Downstream dependencies