Merge pull request #83 from rsquaredacademy/develop

Develop

Author: aravindhebbali

.travis.yml

@@ -10,12 +10,17 @@ addons:
     packages:
       - libnlopt-dev
 
-r:  
-    - 3.3
-    - 3.4
-    - release
-    - devel
-
+matrix:
+  include:
+  - r: oldrel 
+  - r: release
+  - r: release
+    os: osx
+    osx_image: xcode7.3
+    before_install:
+      - sudo tlmgr install framed titling
+  - r: devel
+  
 r_packages:
   - covr
 

DESCRIPTION

@@ -29,7 +29,8 @@ Imports:
     scales,
     stats,
     tibble,
-    utils
+    utils,
+    xplorerr
 Suggests: 
     covr,
     ineq,

NAMESPACE

@@ -227,4 +227,7 @@ importFrom(tibble,as_data_frame)
 importFrom(tibble,as_tibble)
 importFrom(tibble,tibble)
 importFrom(utils,data)
+importFrom(utils,install.packages)
+importFrom(utils,menu)
+importFrom(utils,packageVersion)
 useDynLib(blorr, .registration = TRUE)

R/blr-launch-app.R

@@ -7,7 +7,23 @@
 #' @export
 #'
 blr_launch_app <- function() {
-  rlang::abort("The shiny app has been moved to a new package, `xplorerr`. To launch the app, run the below code:\n 
-	- install.packages('xplorerr')\n - xplorerr::app_logistic_regression()")
+
+	rlang::inform("`blr_launch_app()` has been soft-deprecated and will be removed in the next release. In future, to launch the app, run the below code:\n 
+	- install.packages('xplorerr')\n - xplorerr::app_logistic_regression()\n")
+
+	check_suggests('descriptr')
+	check_suggests('jsonlite')
+	check_suggests('haven')
+	check_suggests('lubridate')
+	check_suggests('readr')
+	check_suggests('readxl')
+	check_suggests('shinyBS')
+	check_suggests('shinycssloaders')
+	check_suggests('shinythemes')
+	check_suggests('stringr')
+	check_suggests('tidyr')
+	
+	xplorerr::app_logistic_regression()
+
 }
 

R/blr-utils.R

@@ -281,3 +281,26 @@ mod_sel_data <- function(model) {
   model %>%
     use_series(data)
 }
+
+#' @importFrom utils packageVersion menu install.packages
+check_suggests <- function(pkg) {
+  
+  pkg_flag <- tryCatch(utils::packageVersion(pkg), error = function(e) NA)
+  
+  if (is.na(pkg_flag)) {
+    
+    msg <- message(paste0('\n', pkg, ' must be installed for this functionality.'))
+    
+    if (interactive()) {
+      message(msg, "\nWould you like to install it?")
+      if (utils::menu(c("Yes", "No")) == 1) {
+        utils::install.packages(pkg)
+      } else {
+        stop(msg, call. = FALSE)
+      }
+    } else {
+      stop(msg, call. = FALSE)
+    } 
+  }
+
+}