Allow passing of direct path to app file

R/launch_editor.R

@@ -71,9 +71,15 @@ launch_editor <- function(app_loc,
   # "editing-app". This is used to know what to do on close
   server_mode <- "initializing"
 
+  # Validate that we're pointing to a directory. If the user has supplied a
+  # direct file. E.g. a app.R or app.py file we should back up the app loc to
+  # the parent location
+  app_loc <- validateAppLoc(app_loc)
+
   # Type of app we're in. Can be "SINGLE-FILE", "MULTI-FILE", or "MISSING"
   app_type <- get_app_file_type(app_loc)
 
+
   # ----------------------------------------------------------------------------
   # Initialize classes for controling app preview and polling for updates
   # ----------------------------------------------------------------------------

R/validateAppLoc.R

@@ -0,0 +1,13 @@
+# Validate that we're pointing to a directory. If the user has supplied a
+# direct file. E.g. a app.R or app.py file we should back up the app loc to
+# the parent location
+validateAppLoc <- function(loc) {
+
+    # If the file ends in app.R or ui.R or server.R we should back up the
+    # location to the parent directory
+    if (fs::path_ext(loc) %in% "R") {
+        loc <- fs::path_dir(loc)
+    }
+
+    loc
+}

scratch/start_editor_non_interactive.R

@@ -1,8 +1,8 @@
 devtools::load_all(".")
 
 launch_editor(
-  app_loc =  here::here("scratch/a-brand-new-app3/"),
+  app_loc =  here::here("scratch/a-brand-new-app3"),
   port = 8888,
-  launch_browser = FALSE,
-  stop_on_browser_close = FALSE
+  # launch_browser = FALSE,
+  # stop_on_browser_close = FALSE
 )

tests/testthat/test-app-location-validation.R

@@ -0,0 +1,13 @@
+
+test_that("Handles being passed path directly to app script, or to folder container app", {
+
+  expect_equal(
+    validateAppLoc("my/app/loc/app.R"),
+    validateAppLoc("my/app/loc")
+  )
+
+  expect_equal(
+    validateAppLoc("my/app/loc/ui.R"),
+    validateAppLoc("my/app/loc")
+  )
+})