Merge pull request #627 from DyfanJones/paws-pkg-list

tidy up how paws packages are listed

make.paws/R/sdk_helper.R

@@ -501,8 +501,18 @@ check_pkgs <- function(pkgs, keep_notes = FALSE){
 
 # list paws packages
 list_paws_pkgs <- function(in_dir = "../cran", pkg_list = list()){
-  pkgs <- list.dirs(in_dir, recursive = FALSE)
-  pkgs <- pkgs[grepl("paws", pkgs)]
+  all_pkgs <- list.files(in_dir)
+
+  # list active files
+  lines <- readLines(file.path(in_dir, "paws", "DESCRIPTION"))
+  pkgs <- lines[grepl("paws\\.[a-z\\.]", lines, perl = T)]
+  pkgs <- trimws(gsub("\\([^)]*\\).*", "", pkgs))
+
+  # pick up any sub categories
+  active_pkgs <- all_pkgs[unlist(lapply(pkgs, grep, x= all_pkgs))]
+  pkgs <- file.path(in_dir,c("paws", active_pkgs))
+
+  # filter on pkg list
   if(any(nzchar(pkg_list))) pkgs <- pkgs[basename(pkgs) %in% pkg_list]
   return(pkgs)
 }

make.paws/tests/testthat/dummy/pkg3/paws/DESCRIPTION

@@ -0,0 +1,20 @@
+Package: pkg1
+Title: dummy
+Version: 0.1.0
+Authors@R: c(
+    person("David", "Kretch", , "david.kretch@gmail.com", role = "aut"),
+    person("Adam", "Banker", , "adam.banker39@gmail.com", role = "aut"),
+    person("Dyfan", "Jones", , "dyfan.r.jones@gmail.com", role = "cre"),
+    person("Amazon.com, Inc.", role = "cph")
+  )
+Description: Dummy package
+License: Apache License (>= 2.0)
+Imports:
+    paws.cat1 (>= 0.1.0),
+    paws.cat2 (>= 0.1.0),
+    fake
+Suggests:
+    testthat
+Encoding: UTF-8
+Roxygen: list(markdown = TRUE, roclets = c("rd", "namespace", "collate"))
+RoxygenNote: 7.2.3

make.paws/tests/testthat/dummy/pkg4/paws/DESCRIPTION

@@ -0,0 +1,20 @@
+Package: pkg1
+Title: dummy
+Version: 0.1.0
+Authors@R: c(
+    person("David", "Kretch", , "david.kretch@gmail.com", role = "aut"),
+    person("Adam", "Banker", , "adam.banker39@gmail.com", role = "aut"),
+    person("Dyfan", "Jones", , "dyfan.r.jones@gmail.com", role = "cre"),
+    person("Amazon.com, Inc.", role = "cph")
+  )
+Description: Dummy package
+License: Apache License (>= 2.0)
+Imports:
+    paws.cat1 (>= 0.1.0),
+    paws.cat2 (>= 0.1.0),
+    fake
+Suggests:
+    testthat
+Encoding: UTF-8
+Roxygen: list(markdown = TRUE, roclets = c("rd", "namespace", "collate"))
+RoxygenNote: 7.2.3