Report conflicts with lazy loaded datasets

Fixes #54

Author: hadley

NEWS.md

@@ -1,5 +1,7 @@
 # conflicted (development version)
 
+* Conflicted involing lazy loaded datasets are now reported (#54).
+
 * Conflicts involving a `standardGeneric` are no longer reported (#47).
 
 * Conflicts involving the superset principle are better handled: if there is

R/package.R

@@ -17,15 +17,9 @@ pkg_ls <- function(pkg) {
 
   names <- intersect(exports, env_names(ns))
   int <- grepl("^.__", names)
-  names[!int]
+  c(names[!int], pkg_data(pkg))
 }
 
-pkg_get <- function(pkg, name) {
-  get(name, envir = ns_env(pkg), inherits = FALSE)
-}
-
-# Not currently used because pkg_get() can't find it, and it seems unlikely
-# to be a common source of conflicts
 pkg_data <- function(x) {
   ns <- ns_env(x)
   lazy_data <- .getNamespaceInfo(ns, "lazydata")

R/utils.R

@@ -41,7 +41,7 @@ map2 <- function(.x, .y, .f, ...) {
 }
 
 unique_obj <- function(name, pkgs) {
-  objs <- lapply(pkgs, pkg_get, name)
+  objs <- lapply(pkgs, getExportedValue, name)
   names(objs) <- pkgs
 
   pkgs[!duplicated(objs)]

tests/testthat/data/DESCRIPTION

@@ -0,0 +1,16 @@
+Package: data
+Title: What the Package Does (One Line, Title Case)
+Version: 0.0.0.9000
+Authors@R: c(
+    person("Hadley", "Wickham", , "hadley@rstudio.com", role = c("aut", "cre")),
+    person("RStudio", role = c("cph", "fnd"))
+  )
+Description: What the package does (one paragraph).
+License: `use_mit_license()`, `use_gpl3_license()` or friends to pick a
+    license
+Encoding: UTF-8
+Roxygen: list(markdown = TRUE)
+RoxygenNote: 7.1.2
+Depends: 
+    R (>= 2.10)
+LazyData: true

tests/testthat/data/NAMESPACE

@@ -29,6 +29,13 @@ test_that("functions aren't conflicts with non-functions", {
   expect_equal(function_lookup("mean", c("base", "funmatch")), character())
 })
 
+test_that("can find conflicts with data", {
+  pkgload::load_all(test_path("data"))
+  on.exit(pkgload::unload("data"))
+
+  expect_named(conflict_scout(c("datasets", "data")), "mtcars")
+})
+
 # moved functions ----------------------------------------------------
 
 test_that(".Deprecated call contains function name", {