From 70f8688f40ef984d5725766a56f13b2ce746a86f Mon Sep 17 00:00:00 2001 From: Pavel Demin Date: Fri, 14 Feb 2025 08:53:38 +0000 Subject: [PATCH 1/3] Update assess_size_codebase.R Addresses #362 ## Description This change only list files with R source code. An example of a "valid" package where this metric fails is [bayesPop](https://cran.r-project.org/web/packages/bayesPop/index.html) because it has an RDA file inside the R directory. --- R/assess_size_codebase.R | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/R/assess_size_codebase.R b/R/assess_size_codebase.R index 24cf384..f75ab49 100644 --- a/R/assess_size_codebase.R +++ b/R/assess_size_codebase.R @@ -41,7 +41,12 @@ assess_size_codebase.pkg_install <- function(x, ...) { assess_size_codebase.pkg_source <- function(x, ...) { pkg_metric_eval(class = "pkg_metric_size_codebase", { # create character vector of function files - files <- list.files(path = file.path(x$path, "R"), full.names = T) + files <- list.files( + path = file.path(x$path, "R"), + pattern = "\\.R$", + full.names = TRUE, + ignore.case = TRUE + ) # define the function for counting code base count_lines <- function(x){ From 6a98d35ca6551e44e255142ccf1a382e0256f057 Mon Sep 17 00:00:00 2001 From: Pavel Demin Date: Fri, 21 Feb 2025 12:35:28 +0000 Subject: [PATCH 2/3] docs: updat the news --- NEWS.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/NEWS.md b/NEWS.md index 30c55b1..f518232 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,7 @@ +# riskmetric (development version) + +- Fix bug with assessing source packages that have non-R files in the R directory ([#362](https://github.com/pharmaR/riskmetric/issues/362)) + # riskmetric 0.2.4 - Fix CRAN errors. From d5bdabc28d60ea31a8058cb0f2eccb5106490501 Mon Sep 17 00:00:00 2001 From: Pavel Demin Date: Fri, 21 Feb 2025 12:35:37 +0000 Subject: [PATCH 3/3] chore: bump version --- DESCRIPTION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index 8130a9b..c7563a6 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -3,7 +3,7 @@ Type: Package Title: Risk Metrics to Evaluating R Packages Description: Facilities for assessing R packages against a number of metrics to help quantify their robustness. -Version: 0.2.4.9000 +Version: 0.2.4.9001 Authors@R: c( person("R Validation Hub", role = c("aut"), email = "psi.aims.r.validation@gmail.com"), person("Doug", "Kelkhoff", role = c("aut"), email = "doug.kelkhoff@gmail.com"),