No subprocess

.Rbuildignore

@@ -54,3 +54,11 @@
 ^src/library/ps/src/px$
 ^src/library/zip/src/tools/cmdunzip$
 ^src/library/zip/src/tools/cmdzip$
+^[.]vscode$
+^[.]covrignore$
+[.]gcda$
+[.]gcno$
+[.]gcov$
+^tests/startup.Rs$
+^tests/.*[.]Rout$
+^tests/.*[.]Rout[.]fail$

.covrignore

@@ -0,0 +1,25 @@
+R/aaa-rstudio-detect.R
+R/build-pak-binary.R
+R/dev-mode.R
+R/embed.R
+R/embed-ca-certs.R
+R/errors.R
+R/git-app.R
+R/pak-sitrep-data.R
+R/push-packages.R
+R/system-requirements.R
+src/library/R6/
+src/library/callr/
+src/library/cli/
+src/library/curl/
+src/library/desc/
+src/library/filelock/
+src/library/jsonlite/
+src/library/lpSolve/
+src/library/pkgbuild/
+src/library/processx/
+src/library/ps/
+src/library/zip/
+src/library/pkgcache/R/aaa-rstudio-detect.R
+src/library/pkgdepends/R/aaa-rstudio-detect.R
+src/library/pkgsearch/R/aaa-rstudio-detect.R

.github/workflows/nosuggests.yaml

@@ -0,0 +1,63 @@
+on:
+  push:
+    branches: [main, master]
+  pull_request:
+    branches: [main, master]
+
+name: No suggested packages
+
+jobs:
+  R-CMD-check:
+    runs-on: ${{ matrix.config.os }}
+
+    name: ${{ matrix.config.os }} (${{ matrix.config.r }})
+
+    strategy:
+      fail-fast: false
+      matrix:
+        config:
+          - {os: macos-latest,   r: 'devel'   }
+          - {os: macos-latest,   r: 'release' }
+          - {os: macos-latest,   r: 'oldrel-1'}
+          - {os: macos-latest,   r: 'oldrel-2'}
+          - {os: macos-latest,   r: 'oldrel-3'}
+          - {os: macos-latest,   r: 'oldrel-4'}
+
+          - {os: windows-latest, r: 'devel'   }
+          - {os: windows-latest, r: 'release '}
+          - {os: windows-latest, r: 'oldrel-1'}
+          - {os: windows-latest, r: 'oldrel-2'}
+          - {os: windows-latest, r: 'oldrel-3'}
+          - {os: windows-latest, r: 'oldrel-4'}
+
+          - {os: ubuntu-latest,   r: 'devel'   }
+          - {os: ubuntu-latest,   r: 'release' }
+          - {os: ubuntu-latest,   r: 'oldrel-1'}
+          - {os: ubuntu-latest,   r: 'oldrel-2'}
+          - {os: ubuntu-latest,   r: 'oldrel-3'}
+          - {os: ubuntu-latest,   r: 'oldrel-4'}
+
+    env:
+      GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
+      R_KEEP_PKG_SOURCE: yes
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: r-lib/actions/setup-r@v2
+        with:
+          r-version: ${{ matrix.config.r }}
+          http-user-agent: ${{ matrix.config.http-user-agent }}
+          use-public-rspm: true
+
+      - name: Install package
+        run: R CMD INSTALL --install-tests .
+
+      - name: Run test
+        run: |
+          setwd("tests")
+          tools:::.runPackageTests()
+        shell: Rscript {0}
+        env:
+          PAK_EXTRA_TESTS: true
+          PAK_TESTS: false

.github/workflows/test-coverage.yaml

@@ -23,28 +23,13 @@ jobs:
 
       - uses: r-lib/actions/setup-r-dependencies@v2
         with:
-          extra-packages: any::covr
+          extra-packages: gaborcsardi/covrlabs
           needs: coverage
 
       - name: Test coverage
         run: |
-          covr::codecov(
-            quiet = FALSE,
-            clean = FALSE,
-            install_path = file.path(normalizePath(Sys.getenv("RUNNER_TEMP"), winslash = "/"), "package")
-          )
+          pkgload::load_all()
+          ac <- covr()
         shell: Rscript {0}
-
-      - name: Show testthat output
-        if: always()
-        run: |
-          ## --------------------------------------------------------------------
-          find ${{ runner.temp }}/package -name 'testthat.Rout*' -exec cat '{}' \; || true
-        shell: bash
-
-      - name: Upload test results
-        if: failure()
-        uses: actions/upload-artifact@v4
-        with:
-          name: coverage-test-failures
-          path: ${{ runner.temp }}/package
+        env:
+          TEST_COVERAGE_PAK: true

.gitignore

@@ -26,6 +26,10 @@
 *.o
 *.so
 *.DSYM
+*.gcda
+*.gcno
+*.gcov
+/covr_trace_*
 /src/library/curl/configure.log
 /src/library/curl/src/Makevars
 /src/library/curl/tools/option_table.txt
@@ -45,3 +49,6 @@
 /tools/build/linux/*.done
 /vignettes/internals.html
 /vignettes/internals.md
+/tests/startup.Rs
+/tests/*.Rout
+/tests/*.Rout.fail

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "editor.formatOnSave": true
+}

DESCRIPTION

@@ -38,13 +38,14 @@ Imports:
 Suggests:
     callr (>= 3.7.0),
     cli (>= 3.2.0),
-    covr,
+    codetools,
     curl (>= 4.3.2),
     desc (>= 1.4.1),
     filelock (>= 1.0.2),
     gitcreds,
     glue (>= 1.6.2),
     jsonlite (>= 1.8.0),
+    knitr,
     mockery,
     pingr,
     pkgbuild (>= 1.4.2),
@@ -55,7 +56,9 @@ Suggests:
     ps (>= 1.6.0),
     rstudioapi,
     testthat (>= 3.2.0),
-    withr
+    webfakes,
+    withr,
+    zip
 ByteCompile: true
 Config/build/extra-sources: configure*
 Config/needs/dependencies:

NAMESPACE

@@ -1,16 +1,22 @@
 # Generated by roxygen2: do not edit by hand
 
-S3method("[",pak_search_result)
-S3method("[",pak_sysreqs)
-S3method(format,pak_deps_explain)
-S3method(format,pak_preformatted)
-S3method(format,pak_sysreqs)
-S3method(print,pak_deps_explain)
-S3method(print,pak_error)
-S3method(print,pak_preformatted)
-S3method(print,pak_search_result)
-S3method(print,pak_sysreqs)
-S3method(print,pkg_install_result)
+S3method("[", pak_pkg_deps_tree)
+S3method("[", pak_pkg_search_result)
+S3method("[", pak_pkgcache_repo_status_summary)
+S3method("[", pak_sysreqs)
+S3method(format, pak_deps_explain)
+S3method(format, pak_pkg_deps_tree)
+S3method(format, pak_pkg_name_check)
+S3method(format, pak_sysreqs)
+S3method(print, pak_deps_explain)
+S3method(print, pak_pkg_deps_tree)
+S3method(print, pak_pkg_name_check)
+S3method(print, pak_pkg_search_result)
+S3method(print, pak_pkgcache_repo_status_summary)
+S3method(print, pak_sysreqs)
+S3method(print, pkg_install_result)
+S3method(summary, pak_pkg_search_result)
+S3method(summary, pak_pkgcache_repo_status)
 export(cache_clean)
 export(cache_delete)
 export(cache_list)
@@ -72,3 +78,4 @@ export(sysreqs_list_system_packages)
 export(sysreqs_platforms)
 export(system_r_platform)
 export(system_r_platform_data)
+if (getRversion() >= "4.0.0") importFrom(tools, R_user_dir)

R/aaa-rstudio-detect.R

@@ -1,6 +1,4 @@
-
 rstudio <- local({
-
   standalone_env <- environment()
   parent.env(standalone_env) <- baseenv()
 
@@ -18,7 +16,8 @@ rstudio <- local({
       "RSTUDIO_CONSOLE_COLOR",
       "RSTUDIOAPI_IPC_REQUESTS_FILE",
       "XPC_SERVICE_NAME",
-      "ASCIICAST")
+      "ASCIICAST"
+    )
 
     d <- list(
       pid = Sys.getpid(),
@@ -53,10 +52,12 @@ rstudio <- local({
 
     # Cached?
     if (clear_cache) data <<- NULL
-    if (!is.null(data)) return(get_caps(data))
+    if (!is.null(data)) {
+      return(get_caps(data))
+    }
 
     if ((rspid <- Sys.getenv("RSTUDIO_SESSION_PID")) != "" &&
-        any(c("ps", "cli") %in% loadedNamespaces())) {
+      any(c("ps", "cli") %in% loadedNamespaces())) {
       detect_new(rspid, clear_cache)
     } else {
       detect_old(clear_cache)
@@ -85,35 +86,30 @@ rstudio <- local({
     pane <- Sys.getenv("RSTUDIO_CHILD_PROCESS_PANE")
 
     # this should not happen, but be defensive and fall back
-    if (pane == "") return(detect_old(clear_cache))
+    if (pane == "") {
+      return(detect_old(clear_cache))
+    }
 
     # direct subprocess
     new$type <- if (rspid == parentpid) {
-
       if (pane == "job") {
         "rstudio_job"
-
       } else if (pane == "build") {
         "rstudio_build_pane"
-
       } else if (pane == "render") {
         "rstudio_render_pane"
-
       } else if (pane == "terminal" && new$tty &&
-                 new$envs["ASCIICAST"] != "true") {
+        new$envs["ASCIICAST"] != "true") {
         # not possible, because there is a shell in between, just in case
         "rstudio_terminal"
-
       } else {
         # don't know what kind of direct subprocess
         "rstudio_subprocess"
       }
-
     } else if (pane == "terminal" && new$tty &&
-               new$envs[["ASCIICAST"]] != "true") {
+      new$envs[["ASCIICAST"]] != "true") {
       # not a direct subproces, so check other criteria as well
       "rstudio_terminal"
-
     } else {
       # don't know what kind of subprocess
       "rstudio_subprocess"
@@ -123,58 +119,49 @@ rstudio <- local({
   }
 
   detect_old <- function(clear_cache = FALSE) {
-
     # Cache unless told otherwise
     cache <- TRUE
     new <- get_data()
 
     new$type <- if (new$envs[["RSTUDIO"]] != "1") {
       # 1. Not RStudio at all
       "not_rstudio"
-
     } else if (new$gui == "RStudio" && new$api) {
       # 2. RStudio console, properly initialized
       "rstudio_console"
-
-    } else if (! new$api && basename(new$args[1]) == "RStudio") {
+    } else if (!new$api && basename(new$args[1]) == "RStudio") {
       # 3. RStudio console, initializing
       cache <- FALSE
       "rstudio_console_starting"
-
     } else if (new$gui == "Rgui") {
       # Still not RStudio, but Rgui that was started from RStudio
       "not_rstudio"
-
     } else if (new$tty && new$envs[["ASCIICAST"]] != "true") {
       # 4. R in the RStudio terminal
       # This could also be a subprocess of the console or build pane
       # with a pseudo-terminal. There isn't really a way to rule that
       # out, without inspecting some process data with ps::ps_*().
       # At least we rule out asciicast
       "rstudio_terminal"
-
-    } else if (! new$tty &&
-               new$envs[["RSTUDIO_TERM"]] == "" &&
-               new$envs[["R_BROWSER"]] == "false" &&
-               new$envs[["R_PDFVIEWER"]] == "false" &&
-               is_build_pane_command(new$args)) {
+    } else if (!new$tty &&
+      new$envs[["RSTUDIO_TERM"]] == "" &&
+      new$envs[["R_BROWSER"]] == "false" &&
+      new$envs[["R_PDFVIEWER"]] == "false" &&
+      is_build_pane_command(new$args)) {
       # 5. R in the RStudio build pane
       # https://github.com/rstudio/rstudio/blob/master/src/cpp/session/
       # modules/build/SessionBuild.cpp#L231-L240
       "rstudio_build_pane"
-
     } else if (new$envs[["RSTUDIOAPI_IPC_REQUESTS_FILE"]] != "" &&
-               grepl("rstudio", new$envs[["XPC_SERVICE_NAME"]])) {
+      grepl("rstudio", new$envs[["XPC_SERVICE_NAME"]])) {
       # RStudio job, XPC_SERVICE_NAME=0 in the subprocess of a job
       # process. Hopefully this is reliable.
       "rstudio_job"
-
     } else if (new$envs[["RSTUDIOAPI_IPC_REQUESTS_FILE"]] != "" &&
-               any(grepl("SourceWithProgress.R", new$args))) {
+      any(grepl("SourceWithProgress.R", new$args))) {
       # Or we can check SourceWithProgress.R in the command line, see
       # https://github.com/r-lib/cli/issues/367
       "rstudio_job"
-
     } else {
       # Otherwise it is a subprocess of the console, terminal or
       # build pane, and it is hard to say which, so we do not try.
@@ -296,3 +283,5 @@ rstudio <- local({
     class = c("standalone_rstudio_detect", "standalone")
   )
 })
+
+rstudio_detect <- rstudio$detect