Merge pull request #545 from ropensci/fixes_544

fixes #544

Author: b-rodrigues

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: rix
 Title: Reproducible Data Science Environments with 'Nix'
-Version: 0.17.2
+Version: 0.17.3
 Authors@R: c(
     person(given = "Bruno", family = "Rodrigues", email = "[email protected]", role = c("aut", "cre"),
            comment = c(ORCID = "0000-0002-3211-3689")),

NEWS.md

@@ -1,3 +1,7 @@
+# rix 0.17.3 (2025-09-30)
+
+- Fixes for issue #544
+
 # rix 0.17.2 (2025-09-11)
 
 - Changed the matrix channel url that was causing a NOTE and added a final

R/fetchers.R

@@ -282,13 +282,19 @@ get_imports <- function(path, commit_date, ...) {
   # Get imports from NAMESPACE
   namespace_path <- gsub("DESCRIPTION", "NAMESPACE", desc_path)
   namespace_raw <- readLines(namespace_path)
-  namespace_imports <- namespace_raw[grepl("importFrom", namespace_raw)]
+  # Keep only lines that start with "import(" or "importFrom("
+  namespace_imports <- grep(
+    "^(import|importFrom)\\(",
+    namespace_raw,
+    value = TRUE
+  )
 
   if (length(namespace_imports) > 0) {
-    # Get package names from `importFrom` statements
-    namespace_imports_pkgs <- gsub(
-      "importFrom\\(([^,]+).*",
-      "\\1",
+    # Extract the package name (first argument inside parentheses)
+    namespace_imports_pkgs <- sub(
+      # capture word or quoted string before first comma or closing paren
+      '^import(?:From)?\\(([^,\\)]+).*',
+      '\\1',
       namespace_imports
     )
     # Remove quotes, which is sometimes necessary
@@ -388,8 +394,11 @@ fetchgits <- function(git_pkgs, ...) {
   # Check if ignore_remotes_cache was passed
   # If not passed, ignore_remotes_cache is FALSE
   args <- list(...)
-  ignore_remotes_cache <- if (!is.null(args$ignore_remotes_cache))
-    args$ignore_remotes_cache else FALSE
+  ignore_remotes_cache <- if (!is.null(args$ignore_remotes_cache)) {
+    args$ignore_remotes_cache
+  } else {
+    FALSE
+  }
 
   if (!ignore_remotes_cache) {
     cache_file <- get_cache_file()
@@ -471,8 +480,11 @@ fetchzips <- function(archive_pkgs) {
 #' @noRd
 fetchpkgs <- function(git_pkgs, archive_pkgs, ...) {
   args <- list(...)
-  ignore_remotes_cache <- if (!is.null(args$ignore_remotes_cache))
-    args$ignore_remotes_cache else FALSE
+  ignore_remotes_cache <- if (!is.null(args$ignore_remotes_cache)) {
+    args$ignore_remotes_cache
+  } else {
+    FALSE
+  }
 
   # Initialize cache if git packages are present and not ignoring cache
   if (!is.null(git_pkgs) && !ignore_remotes_cache) {
@@ -592,11 +604,15 @@ download_all_commits <- function(repo, date) {
         }
 
         commits <- fromJSON(rawToChar(response$content))
-        if (!is.list(commits) || length(commits) == 0) break
+        if (!is.list(commits) || length(commits) == 0) {
+          break
+        }
 
         # if no commits are found, break the loop
         n_commits <- length(commits$sha)
-        if (n_commits == 0) break
+        if (n_commits == 0) {
+          break
+        }
 
         idx <- (commit_count + 1):(commit_count + n_commits)
         all_commits$sha[idx] <- commits$sha
@@ -661,8 +677,11 @@ resolve_package_commit <- function(
 
   # Check if ignore_remotes_cache was passed, otherwise set to FALSE
   args <- list(...)
-  ignore_remotes_cache <- if (!is.null(args$ignore_remotes_cache))
-    args$ignore_remotes_cache else FALSE
+  ignore_remotes_cache <- if (!is.null(args$ignore_remotes_cache)) {
+    args$ignore_remotes_cache
+  } else {
+    FALSE
+  }
 
   # Check if package is already in cache
   if (!ignore_remotes_cache) {

R/tar_nix_ga.R

@@ -41,6 +41,7 @@ tar_nix_ga <- function() {
     message("GitHub Actions workflow file saved to: ", path)
   }
 
-  if (identical(Sys.getenv("TESTTHAT"), "true"))
+  if (identical(Sys.getenv("TESTTHAT"), "true")) {
     paste0(path, "/run-pipeline.yaml")
+  }
 }

R/with_nix_helpers.R

@@ -341,7 +341,9 @@ classify_globals <- function(globals_expr, args_vec) {
     pkgs = pkgs_to_attach
   )
   globs_null <- all(vapply(globs_classified, is.null, logical(1L)))
-  if (globs_null) globs_classified <- NULL
+  if (globs_null) {
+    globs_classified <- NULL
+  }
 
   return(globs_classified)
 }