Make dwapi dependency explicit (#33)

* Make dwapi package dependency explicit (Issue #31)

* Restore prior .onAttach() behavior

DESCRIPTION

@@ -12,7 +12,7 @@ Description: High-level tools for working with 'data.world' data sets. 'data.wor
     charting data on the data.world site, you can access data via 'API' endpoints and 
     integrations. Use this package to access, query and explore data sets, and to 
     publish your insights. Visit <https://data.world>, for additional information.
-Depends: R (>= 3.3.0), dwapi
+Depends: R (>= 3.3.0), dwapi (>= 0.1.3)
 Imports:
     httr,
     ini,

R/zzz.R

@@ -1,5 +1,5 @@
 "data.world-r
-Copyright 2018 data.world, Inc.
+Copyright 2017 data.world, Inc.
 
 Licensed under the Apache License, Version 2.0 (the \"License\");
 you may not use this file except in compliance with the License.
@@ -16,37 +16,45 @@ permissions and limitations under the License.
 This product includes software developed at data.world, Inc.
 https://data.world"
 
+#' Set up default options
+#' @keywords internal
 .onLoad <- function(...) {
-
   op <- options()
   op.dw <-
     list(dw.config_path =
-      file.path(normalizePath("~", winslash = "/"), ".dw", "config"))
+           file.path(normalizePath("~", winslash = "/"), ".dw", "config"))
 
   toset <- !(names(op.dw) %in% names(op))
   if (any(toset))
     options(op.dw[toset])
 
-  set_dw_config()
-
   invisible()
-
 }
 
 #' Apply configuration from file or envvars and load dwapi
 #' @keywords internal
-set_dw_config <- function() {
+.onAttach <- function(...) {
+  # Load dwapi as a result of data.world being attached
+  if (!is_attached("dwapi")) {
+    lapply(c("dwapi"), library, character.only = TRUE, warn.conflicts = FALSE)
+  }
 
   profile <- Sys.getenv("DW_PROFILE", unset = NA)
   if (is.na(profile)) {
     profile <- "DEFAULT"
   }
 
-  cs <- cfg_saved(profile = profile)
-  suppressWarnings(set_config(cs))
+  suppressWarnings(
+    data.world::set_config(
+      data.world::cfg_saved(profile = profile)))
 
-  set_config(cfg_env())
+  data.world::set_config(data.world::cfg_env())
 
   invisible()
+}
 
+#' Determine if library is already attached
+#' @keywords internal
+is_attached <- function(x) {
+  paste0("package:", x) %in% search()
 }

data.world-r.Rproj

@@ -5,7 +5,10 @@ SaveWorkspace: No
 AlwaysSaveHistory: Default
 
 EnableCodeIndexing: Yes
+UseSpacesForTab: Yes
+NumSpacesForTab: 2
 Encoding: UTF-8
+
 RnwWeave: Sweave
 LaTeX: pdfLaTeX