Tidied up function that launches the Shiny app. Dependencies are in suggests, and are installed only when needed.

Author: schuemie

DESCRIPTION

@@ -1,8 +1,8 @@
 Package: SqlRender
 Type: Package
 Title: Rendering Parameterized SQL and Translation to Dialects
-Version: 1.3.7
-Date: 2017-05-03
+Version: 1.4.0
+Date: 2017-05-23
 Author: Martijn J. Schuemie [aut, cre],
     Marc A. Suchard [aut],
 Maintainer: Martijn Schuemie <schuemie@ohdsi.org>
@@ -14,11 +14,12 @@ VignetteBuilder: knitr
 URL: https://github.com/OHDSI/SqlRender
 BugReports: https://github.com/OHDSI/SqlRender/issues
 Imports:
-    rJava,
-    shiny
+    rJava
 Suggests:
     testthat,
     knitr,
-    rmarkdown
+    rmarkdown,
+    shiny,
+    shinydashboard
 LazyData: false
 RoxygenNote: 6.0.1

NAMESPACE

@@ -2,7 +2,7 @@
 
 export(camelCaseToSnakeCase)
 export(createRWrapperForSql)
-export(launchSqlDeveloper)
+export(launchSqlRenderDeveloper)
 export(loadRenderTranslateSql)
 export(readSql)
 export(renderSql)
@@ -13,3 +13,5 @@ export(translateSql)
 export(translateSqlFile)
 export(writeSql)
 import(rJava)
+importFrom(utils,install.packages)
+importFrom(utils,menu)

R/RenderSql.R

@@ -20,6 +20,13 @@
 # @author Martijn Schuemie
 # @author Marc Suchard
 
+#' SqlRender
+#'
+#' @docType package
+#' @name SqlRender
+#' @importFrom utils install.packages menu
+NULL
+
 .onLoad <- function(libname, pkgname) {
   rJava::.jpackage(pkgname, lib.loc = libname)
 }

R/ShinyApps.R

@@ -14,13 +14,41 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-#' Launch the SQL Developer Shiny app
+#' Launch the SqlRender Developer Shiny app
+#' 
+#' @param launch.browser    Should the app be launched in your default browser, or in a Shiny window.
+#'                          Note: copying to clipboard will not work in a Shiny window.
 #' 
 #' @details 
 #' Launches a Shiny app that allows the user to develop SQL and see how it translates to the supported dialects.
 #' 
 #' @export
-launchSqlDeveloper <- function() {
+launchSqlRenderDeveloper <- function(launch.browser = TRUE) {
+  ensure_installed("shinydashboard")
   appDir <- system.file("shinyApps", "SqlDeveloper", package = "SqlRender")
-  shiny::runApp(appDir, display.mode = "normal")
+  shiny::runApp(appDir, display.mode = "normal", launch.browser = launch.browser)
+}
+
+# Borrowed from devtools: https://github.com/hadley/devtools/blob/ba7a5a4abd8258c52cb156e7b26bb4bf47a79f0b/R/utils.r#L44
+is_installed <- function (pkg, version = 0) {
+  installed_version <- tryCatch(utils::packageVersion(pkg), 
+                                error = function(e) NA)
+  !is.na(installed_version) && installed_version >= version
+}
+
+# Borrowed and adapted from devtools: https://github.com/hadley/devtools/blob/ba7a5a4abd8258c52cb156e7b26bb4bf47a79f0b/R/utils.r#L74
+ensure_installed <- function(pkg) {
+  if (!is_installed(pkg)) {
+    msg <- paste0(sQuote(pkg), " must be installed for this functionality.")
+    if (interactive()) {
+      message(msg, "\nWould you like to install it?")
+      if (menu(c("Yes", "No")) == 1) {
+        install.packages(pkg)
+      } else {
+        stop(msg, call. = FALSE)
+      }
+    } else {
+      stop(msg, call. = FALSE)
+    }
+  }
 }

README.md

@@ -73,6 +73,13 @@ library(devtools)
 install_github("ohdsi/SqlRender")
 ```
 
+Once installed, you can try out SqlRender in a Shiny app that comes with the package:
+
+```r
+library(SqlRender)
+launchSqlRenderDeveloper()
+```
+
 ## Java library
 You can fetch the JAR file in the inst/java folder of this repository, or use Maven: