version 0.8.12

DESCRIPTION

@@ -2,7 +2,7 @@ Package: rsconnect
 Type: Package
 Title: Deployment Interface for R Markdown Documents and Shiny
         Applications
-Version: 0.8.11
+Version: 0.8.12
 Author: JJ Allaire
 Maintainer: Jonathan McPherson <jonathan@rstudio.com>
 Description: Programmatic deployment interface for 'RPubs', 'shinyapps.io', and
@@ -16,6 +16,6 @@ Suggests: knitr, testthat, rmarkdown (>= 1.1), plumber (>= 0.3.2),
 License: GPL-2
 RoxygenNote: 6.1.0
 NeedsCompilation: no
-Packaged: 2018-11-12 19:05:57 UTC; jmcphers
+Packaged: 2018-12-04 20:52:56 UTC; jmcphers
 Repository: CRAN
-Date/Publication: 2018-11-12 19:40:03 UTC
+Date/Publication: 2018-12-05 07:50:03 UTC

MD5

@@ -1,9 +1,9 @@
-b7f8f5e5391eee8c953e08c2047211e0 *DESCRIPTION
+c04041ca5c8ee9276dc01b38d0e7fd01 *DESCRIPTION
 ff8502e41fbef2213433fb97ba754d0c *NAMESPACE
-4761a22482d11824f4a395f25ab3701e *R/accounts.R
+693803d3edf7f19ea372ca97c392e962 *R/accounts.R
 35ae515bb0474ef6836e6286f7c28ee2 *R/applications.R
 a1aaeca4d7fcf15edfbbc947551f8327 *R/auth.R
-8f38ab59fabd27c944c853fc5fffc4fc *R/bundle.R
+e22200a377329dd1404c044af06f7b43 *R/bundle.R
 8564d685931adf9c1ea44e0311fc4592 *R/certificates.R
 8543573f8d3cc329a2e2be7798b4b31e *R/client.R
 ccf610ca13f5a95e85878b68b58fb49b *R/config.R
@@ -16,7 +16,7 @@ cf3187801a3d676f9b85a46f4c81bf19 *R/deployApp.R
 9d4b8474055fcb5f990d696a96634b45 *R/deploySite.R
 9025e64e76db33e202480af6817f14df *R/deployTFModel.R
 24f21df71885b01500efd6509f25662d *R/deployments.R
-c3d5fd3dd4e16d4bbc5949b08f6936fd *R/http.R
+be6b1ccb756572eb72bb80a4cc30b7a9 *R/http.R
 65ec80ffda290b6b627fa9e0c1bc47a8 *R/ide.R
 0ecdadec7963772e91df8e3b42f50f09 *R/imports.R
 9d5cff4065ea9758a72bdc44a3086e02 *R/json.R
@@ -68,7 +68,7 @@ ad03a8ca78e730ebc791fcdaa4445edf *man/deploySite.Rd
 73c3fcf9bed2e25139d1dbd178eecc05 *man/linter.Rd
 3b791447f87478863bcb4db77782737d *man/listBundleFiles.Rd
 145f6299d0d23a5bfe5c4d0065356802 *man/makeLinterMessage.Rd
-7afbf415ada829b04f80ce971baf78c8 *man/options.Rd
+eec779950aeab83fc42b2425fb9d2e30 *man/options.Rd
 2c83085d5a49831fe110d4e239771caa *man/removeAuthorizedUser.Rd
 53ecaecb030968be567a5338330e3fe2 *man/restartApp.Rd
 c534ae9aafea85af18d13208f8a17e53 *man/rpubsUpload.Rd

R/accounts.R

@@ -237,7 +237,9 @@ removeAccount <- function(name, server = NULL) {
     stop(stringParamErrorMessage("name"))
 
   configFile <- accountConfigFile(name, server)
-  if (!file.exists(configFile))
+  if (length(configFile) > 1)
+    stopWithMultipleAccounts(name)
+  if (length(configFile) == 0 || !file.exists(configFile))
     stop(missingAccountErrorMessage(name))
 
   file.remove(configFile)

R/bundle.R

@@ -461,7 +461,8 @@ createAppManifest <- function(appDir, appMode, contentCategory, hasParameters,
   msg      <- NULL
 
   # get package dependencies for non-static content deployment
-  if (!identical(appMode, "static")) {
+  if (!identical(appMode, "static") &&
+      !identical(appMode, "tensorflow-saved-model")) {
 
     # detect dependencies including inferred dependences
     deps = snapshotDependencies(appDir, inferDependencies(appMode, hasParameters))

R/http.R

@@ -521,6 +521,15 @@ httpRCurl <- function(protocol,
   # establish options
   options <- RCurl::curlOptions(url)
   options$useragent <- userAgent()
+
+  # overlay user-supplied options
+  userOptions <- getOption("rsconnect.rcurl.options")
+  if (is.list(userOptions)) {
+    for (option in names(userOptions)) {
+      options[option] = userOptions[option]
+    }
+  }
+
   if (isTRUE(getOption("rsconnect.check.certificate", TRUE))) {
     options$ssl.verifypeer <- TRUE
 
@@ -605,26 +614,32 @@ httpRCurl <- function(protocol,
     }))
   httpTrace(method, path, time)
 
-  # emit JSON trace if requested
-  if (!is.null(file) && httpTraceJson() &&
-      identical(contentType, "application/json"))
-    cat(paste0("<< ", rawToChar(fileContents), "\n"))
-
-  # return list
+  # get list of HTTP response headers
   headers <- headerGatherer$value()
-  if ("Location" %in% names(headers))
-    location <- headers[["Location"]]
+
+  # lowercase all header names for normalization; HTTP/2 uses lowercase headers
+  # by default but they're typically capitalized in HTTP/1
+  names(headers) <- tolower(names(headers))
+
+  if ("location" %in% names(headers))
+    location <- headers[["location"]]
   else
     location <- NULL
+
   # presume a plain text response unless specified otherwise
-  contentType <- if ("Content-Type" %in% names(headers)) {
-    headers[["Content-Type"]]
+  contentType <- if ("content-type" %in% names(headers)) {
+    headers[["content-type"]]
   } else {
     "text/plain"
   }
 
+  # emit JSON trace if requested
+  if (!is.null(file) && httpTraceJson() &&
+      identical(contentType, "application/json"))
+    cat(paste0("<< ", rawToChar(fileContents), "\n"))
+
   # Parse cookies from header; bear in mind that there may be multiple headers
-  cookieHeaders <- headers[names(headers) == "Set-Cookie"]
+  cookieHeaders <- headers[names(headers) == "set-cookie"]
   storeCookies(list(protocol=protocol, host=host, port=port, path=path), cookieHeaders)
 
   contentValue <- textGatherer$value()

man/options.Rd

@@ -23,6 +23,7 @@ Supported global options include:
    \item{\code{rsconnect.http.trace}}{When \code{TRUE}, trace http calls (prints the method, path, and total milliseconds for each http request)}
    \item{\code{rsconnect.http.trace.json}}{When \code{TRUE}, trace JSON content (shows JSON payloads sent to and received from the server))}
    \item{\code{rsconnect.http.verbose}}{When \code{TRUE}, print verbose output for http connections (useful only for debugging SSL certificate or http connection problems)}
+   \item{\code{rsconnect.rcurl.options}}{A named list of additional cURL options to use when using the RCurl HTTP implementation. Run \code{RCurl::getCurlOptionTypes()} to see available options.}
    \item{\code{rsconnect.error.trace}}{{When \code{TRUE}, print detailed stack traces for errors occurring during deployment.}}
    \item{\code{rsconnect.launch.browser}}{When \code{TRUE}, automatically launch a browser to view applications after they are deployed}
    \item{\code{rsconnect.locale.cache}}{When \code{FALSE}, disable the detected locale cache (Windows only). }