Changes for CRAN (#4)

* add logs folder to .Rbuildignore

* update test connection

* spelling

* don't change working directory in test connection

* fix typo in description

* don't run tests on CRAN

* remove jars dependencies

* qualify sparkly function calls in test initialization

* update description

* add cran comments

Author: kevinykuo

.Rbuildignore

@@ -8,6 +8,7 @@
 ^configure\.win$
 ^configure\.R$
 ^examples/
+^logs
 ^demo\.R$
 ^docs/
 ^internal/
@@ -21,3 +22,4 @@
 ^.classpath$
 ^.project$
 ^codecov\.yml$
+^cran-comments\.md$

DESCRIPTION

@@ -1,11 +1,11 @@
 Package: graphframes
 Type: Package
-Title: R interface for GraphFrames
+Title: R Interface for GraphFrames
 Version: 0.1.0
 Authors@R: person("Kevin", "Kuo", email = "kevin.kuo@rstudio.com", role = c("aut", "cre"))
 Maintainer: Kevin Kuo <kevin.kuo@rstudio.com>
-Description: R interface for GraphFrames, a package for Apache Spark which provides
-  DataFrame-based graphs, see <https://graphframes.github.io/>.
+Description: A sparklyr <https://spark.rstudio.com/> extension that provides an R 
+  interface for GraphFrames <https://graphframes.github.io/>.
 License: Apache License 2.0 | file LICENSE
 Encoding: UTF-8
 LazyData: true

R/dependencies.R

@@ -1,11 +1,6 @@
 spark_dependencies <- function(spark_version, scala_version, ...) {
   spark_dependency(
-    jars = c(
-      system.file(
-        sprintf("java/graphframes-%s-%s.jar", spark_version, scala_version),
-        package = "graphframes"
-      )
-    ),
+    jars = NULL,
     packages = c(
       sprintf("graphframes:graphframes:0.5.0-spark%s-s_%s", spark_version, scala_version)
     )

cran-comments.md

@@ -0,0 +1,16 @@
+## Test environments
+* local OS X install, R 3.4.4
+* ubuntu 14.04 (on travis-ci), R 3.4.4
+* win-builder (devel)
+
+## R CMD check results
+There were no ERRORs or WARNINGs.
+
+There was 1 NOTE:
+
+* New submission
+* Possibly mis-spelled words in DESCRIPTION:
+  GraphFrames (3:24, 8:17)
+  sparklyr (7:16)
+  
+This is a new submission. Spelling is correct.

inst/java/graphframes-2.0-2.11.jar

@@ -1,4 +1,7 @@
 library(testthat)
 library(graphframes)
 
-test_check("graphframes")
+if (identical(Sys.getenv("NOT_CRAN"), "true")) {
+  test_check("graphframes")
+  on.exit({spark_disconnect_all()})
+}

inst/java/graphframes-2.1-2.11.jar

@@ -4,7 +4,16 @@
 
 # helper functions from sparklyr tests
 # https://github.com/rstudio/sparklyr/blob/master/tests/testthat/helper-initialize.R
-testthat_spark_connection <- function(version = NULL) {
+testthat_spark_connection <- function() {
+  version <- Sys.getenv("SPARK_VERSION", unset = "2.1.0")
+
+  spark_installed <- sparklyr::spark_installed_versions()
+  if (nrow(spark_installed[spark_installed$spark == version, ]) == 0) {
+    options(sparkinstall.verbose = TRUE)
+    sparklyr::spark_install(version)
+  }
+
+  expect_gt(nrow(sparklyr::spark_installed_versions()), 0)
 
   # generate connection if none yet exists
   connected <- FALSE
@@ -14,9 +23,14 @@ testthat_spark_connection <- function(version = NULL) {
   }
 
   if (!connected) {
-    version <- version %||% Sys.getenv("SPARK_VERSION", unset = "2.1.0")
-    setwd(tempdir())
-    sc <- sparklyr::spark_connect(master = "local", version = version)
+    config <- sparklyr::spark_config()
+
+    options(sparklyr.sanitize.column.names.verbose = TRUE)
+    options(sparklyr.verbose = TRUE)
+    options(sparklyr.na.omit.verbose = TRUE)
+    options(sparklyr.na.action.verbose = TRUE)
+
+    sc <- sparklyr::spark_connect(master = "local", version = version, config = config)
     assign(".testthat_spark_connection", sc, envir = .GlobalEnv)
   }
 
@@ -52,11 +66,3 @@ test_requires <- function(...) {
 
   invisible(TRUE)
 }
-
-sc <- tryCatch(
-  testthat_spark_connection(version = "2.0.0"),
-  error = function(e) {
-    sparklyr::spark_install(version = "2.0.0")
-    testthat_spark_connection(version = "2.0.0")
-  }
-)