From 038b037e90ba53e3d8a25bf0e6477f57639f3d68 Mon Sep 17 00:00:00 2001
From: Craig Williams <craig@avsdev.uk>
Date: Thu, 16 Jun 2022 13:13:18 +0100
Subject: [PATCH] Tweaked function variable names

---
 R/list_depends.R | 10 +++++-----
 R/list_imports.R | 13 +++++++------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/R/list_depends.R b/R/list_depends.R
index f7297d2..59aa19e 100644
--- a/R/list_depends.R
+++ b/R/list_depends.R
@@ -16,11 +16,11 @@
   packages$imports <- gsub(packages$imports, pattern = " \\([^)]*\\)", replacement = "")
   packages$generation <- gen
 
-  depends_next <- packages$imports[!is.na(packages$imports)]
-  depends_next <- sort(unique(depends_next))
-  if (length(depends_next) > 0) {
-    packages_next <- list_imports(depends_next, gen + 1)
-    packages <- rbind(packages, packages_next)
+  dependsNext <- packages$imports[!is.na(packages$imports)]
+  dependsNext <- sort(unique(dependsNext))
+  if (length(dependsNext) > 0) {
+    packagesNext <- list_imports(dependsNext, gen + 1)
+    packages <- rbind(packages, packagesNext)
   }
 
   return(packages)
diff --git a/R/list_imports.R b/R/list_imports.R
index 3afcb11..a89658e 100644
--- a/R/list_imports.R
+++ b/R/list_imports.R
@@ -5,13 +5,14 @@
 #' @return A data frame with the directly required packages
 #' @export
 list_imports <- function() {
-  packages <- sort(unique(renv::dependencies(progress = FALSE)$Package))
-  all_packages <- installed.packages()
-  all_packages <- as.data.frame(all_packages)
-  all_packages <- all_packages[all_packages$Package %in% packages,]
+  packages <- renv::dependencies(progress = FALSE)$Package
+  packages <- sort(unique(packages))
+  allPackages <- installed.packages()
+  allPackages <- as.data.frame(allPackages)
+  allPackages <- allPackages[allPackages$Package %in% packages,]
   packages <- data.frame(
-    package = all_packages$Package,
-    version = all_packages$Version
+    package = allPackages$Package,
+    version = allPackages$Version
   )
   return(packages)
 }
\ No newline at end of file