Merge branch 'r-1.1.0.9002' into production

krlmlr · krlmlr · commit 6b70c6770539 · 2018-03-24T09:32:42.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 .Rproj.user
 .Rhistory
 .RData
+/.drake
diff --git a/API b/API
@@ -21,8 +21,4 @@ c.blob(x, ...)
 format.blob(x, ...)
 is.na.blob(x)
 is.na<-.blob(x, value)
-is_vector_s3.blob(x)
-obj_sum.blob(x)
-pillar_shaft.blob(x, ...)
 print.blob(x, ...)
-type_sum.blob(x)
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: blob
 Title: A Simple S3 Class for Representing Vectors of Binary Data ('BLOBS')
-Version: 1.1.0.9001
+Version: 1.1.0.9002
 Authors@R: c(
     person("Hadley", "Wickham", role = c("aut")),
     person("Kirill", "Müller", , "krlmlr+r@mailbox.org", role = c("cre")),
@@ -10,17 +10,17 @@ Description: R's raw vector is useful for storing a single binary object.
     What if you want to put a vector of them in a data frame? The 'blob'
     package provides the blob object, a list of raw vectors, suitable for
     use as a column in data frame.
-Imports:
+License: GPL-3
+URL: https://github.com/tidyverse/blob
+BugReports: https://github.com/tidyverse/blob/issues
+Imports: 
     methods,
-    pillar,
     prettyunits
-License: GPL-3
+Suggests: 
+    covr,
+    pillar (>= 1.2.1),
+    testthat
 Encoding: UTF-8
 LazyData: true
-URL: https://github.com/hadley/blob
-BugReports: https://github.com/hadley/blob/issues
-Suggests:
-    testthat,
-    covr
 Roxygen: list(markdown = TRUE, roclets = c("collate", "namespace", "rd", "pkgapi::api_roclet"))
-RoxygenNote: 6.0.1
+RoxygenNote: 6.0.1.9000
diff --git a/NAMESPACE b/NAMESPACE
@@ -13,16 +13,8 @@ S3method(as.data.frame,blob)
 S3method(c,blob)
 S3method(format,blob)
 S3method(is.na,blob)
-S3method(is_vector_s3,blob)
-S3method(obj_sum,blob)
-S3method(pillar_shaft,blob)
 S3method(print,blob)
-S3method(type_sum,blob)
 export(as.blob)
 export(blob)
 export(new_blob)
 importFrom(methods,setOldClass)
-importFrom(pillar,is_vector_s3)
-importFrom(pillar,obj_sum)
-importFrom(pillar,pillar_shaft)
-importFrom(pillar,type_sum)
diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,7 @@
+### blob 1.1.0.9002 (2018-03-24)
+
+- The *pillar* package is now suggested only, using dynamic method registration (#9).
+
 ### blob 1.1.0.9001 (2017-11-30)
 
 - Now using the prettyunits package to format data sizes.
diff --git a/R/format.R b/R/format.R
@@ -15,29 +15,25 @@ print.blob <- function(x, ...) {
   }
 }
 
-#' @export
-#' @importFrom pillar type_sum
+# Dynamically exported, see zzz.R
 type_sum.blob <- function(x) {
   "blob"
 }
 
-#' @export
-#' @importFrom pillar obj_sum
+# Dynamically exported, see zzz.R
 obj_sum.blob <- function(x) {
   format(x, trim = FALSE)
 }
 
-#' @export
-#' @importFrom pillar is_vector_s3
+# Dynamically exported, see zzz.R
 is_vector_s3.blob <- function(x) TRUE
 
 blob_size <- function(x, digits = 3, trim = TRUE, ...) {
   x <- vapply(x, length, numeric(1))
   prettyunits::pretty_bytes(x)
 }
 
-#' @importFrom pillar pillar_shaft
-#' @export
+# Dynamically exported, see zzz.R
 pillar_shaft.blob <- function(x, ...) {
   out <- ifelse(
     is.na(x),
diff --git a/R/zzz.R b/R/zzz.R
@@ -0,0 +1,34 @@
+# nocov start
+.onLoad <- function(...) {
+  register_s3_method("pillar", "pillar_shaft", "blob")
+  register_s3_method("pillar", "is_vector_s3", "blob")
+  register_s3_method("pillar", "type_sum", "blob")
+  register_s3_method("pillar", "obj_sum", "blob")
+
+  invisible()
+}
+
+register_s3_method <- function(pkg, generic, class, fun = NULL) {
+  stopifnot(is.character(pkg), length(pkg) == 1)
+  stopifnot(is.character(generic), length(generic) == 1)
+  stopifnot(is.character(class), length(class) == 1)
+
+  if (is.null(fun)) {
+    fun <- get(paste0(generic, ".", class), envir = parent.frame())
+  } else {
+    stopifnot(is.function(fun))
+  }
+
+  if (pkg %in% loadedNamespaces()) {
+    registerS3method(generic, class, fun, envir = asNamespace(pkg))
+  }
+
+  # Always register hook in case package is later unloaded & reloaded
+  setHook(
+    packageEvent(pkg, "onLoad"),
+    function(...) {
+      registerS3method(generic, class, fun, envir = asNamespace(pkg))
+    }
+  )
+}
+# nocov end
diff --git a/revdep/.gitignore b/revdep/.gitignore
@@ -0,0 +1,3 @@
+/.cache.rds
+/libs
+/download
diff --git a/revdep/drake-base.R b/revdep/drake-base.R
@@ -0,0 +1,42 @@
+library(drake)
+library(tidyverse)
+library(glue)
+
+options(repos = revdepcheck:::get_repos(TRUE))
+
+get_this_pkg <- function() {
+  desc::desc_get("Package") %>% unname()
+}
+
+get_base_pkgs <- function() {
+  rownames(installed.packages(priority = "base"))
+}
+
+flatten <- . %>% unname() %>% unlist() %>% unique()
+
+retry <- function(code, N = 1) {
+  quo <- rlang::enquo(code)
+
+  for (i in seq_len(N)) {
+    ret <- tryCatch(rlang::eval_tidy(quo), error = identity)
+    if (!inherits(ret, "error")) return(ret)
+    Sys.sleep(runif(1) * 2)
+  }
+
+  stop(ret)
+}
+
+get_plan_deps <- function() {
+  plan_deps <- drake_plan(
+    available = available.packages(),
+    this_pkg = get_this_pkg(),
+    revdeps = tools::package_dependencies(this_pkg, available, 'most', reverse = TRUE) %>% flatten(),
+    first_level_deps = tools::package_dependencies(revdeps, available, 'most'),
+    all_level_deps = tools::package_dependencies(first_level_deps %>% flatten(), available, recursive = TRUE),
+    base_pkgs = get_base_pkgs(),
+    deps = c(revdeps, first_level_deps, all_level_deps) %>% flatten() %>% tools::package_dependencies(recursive = TRUE) %>% .[!(names(.) %in% base_pkgs)],
+    strings_in_dots = "literals"
+  )
+
+  plan_deps
+}
diff --git a/revdep/drake.R b/revdep/drake.R
diff --git a/tests/testthat/test-format.R b/tests/testthat/test-format.R

-Original file line number
+Diff line change
@@ @@ -1,3 +1,4 @@ @@
 .Rproj.user
 .Rhistory
 .RData
 +/.drake
Original file line number	Diff line number	Diff line change
`@@ -15,29 +15,25 @@ print.blob <- function(x, ...) {`
`15`	`15`	`}`
`16`	`16`	`}`
`17`	`17`
`18`		`-#' @export`
`19`		`-#' @importFrom pillar type_sum`
	`18`	`+# Dynamically exported, see zzz.R`
`20`	`19`	`type_sum.blob <- function(x) {`
`21`	`20`	`"blob"`
`22`	`21`	`}`
`23`	`22`
`24`		`-#' @export`
`25`		`-#' @importFrom pillar obj_sum`
	`23`	`+# Dynamically exported, see zzz.R`
`26`	`24`	`obj_sum.blob <- function(x) {`
`27`	`25`	`format(x, trim = FALSE)`
`28`	`26`	`}`
`29`	`27`
`30`		`-#' @export`
`31`		`-#' @importFrom pillar is_vector_s3`
	`28`	`+# Dynamically exported, see zzz.R`
`32`	`29`	`is_vector_s3.blob <- function(x) TRUE`
`33`	`30`
`34`	`31`	`blob_size <- function(x, digits = 3, trim = TRUE, ...) {`
`35`	`32`	`x <- vapply(x, length, numeric(1))`
`36`	`33`	`prettyunits::pretty_bytes(x)`
`37`	`34`	`}`
`38`	`35`
`39`		`-#' @importFrom pillar pillar_shaft`
`40`		`-#' @export`
	`36`	`+# Dynamically exported, see zzz.R`
`41`	`37`	`pillar_shaft.blob <- function(x, ...) {`
`42`	`38`	`out <- ifelse(`
`43`	`39`	`is.na(x),`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+/.cache.rds`
	`2`	`+/libs`
	`3`	`+/download`