Merge pull request #138 from ropensci-review-tools/models-data

finally include metrics & models data for #124 in main output

Author: mpadge

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: repometrics
 Title: Metrics for Your Code Repository
-Version: 0.1.6.145
+Version: 0.2.0
 Authors@R: 
     person("Mark", "Padgham", , "[email protected]", role = c("aut", "cre"),
            comment = c(ORCID = "0000-0003-2172-5265"))

R/data-repo.R

@@ -72,8 +72,8 @@ repometrics_data <- function (path, step_days = 1L, num_cores = -1L,
 
     data$contributors <- data_ctbs
 
-    # dataa$cm_metrics <- collate_all_metrics (path, end_date = end_date)
-    # dataa$cm_models <- collate_all_models (path, end_date = end_date)
+    data$cm_metrics <- collate_all_metrics (path, end_date = end_date)
+    data$cm_models <- collate_all_models (path, end_date = end_date)
 
     return (data)
 }

codemeta.json

@@ -8,7 +8,7 @@
   "codeRepository": "https://github.com/ropensci-review-tools/repometrics",
   "issueTracker": "https://github.com/ropensci-review-tools/repometrics/issues",
   "license": "https://spdx.org/licenses/GPL-3.0",
-  "version": "0.1.6.145",
+  "version": "0.2.0",
   "programmingLanguage": {
     "@type": "ComputerLanguage",
     "name": "R",
@@ -331,18 +331,11 @@
       "name": "pkgstats",
       "sameAs": "https://github.com/ropensci-review-tools/pkgstats"
     },
-    "SystemRequirements": {}
+    "SystemRequirements": null
   },
-  "fileSize": "24724.111KB",
+  "fileSize": "24739.199KB",
   "readme": "https://github.com/ropensci-review-tools/repometrics/blob/main/README.md",
-  "contIntegration": [
-    "https://github.com/ropensci-review-tools/repometrics/actions?query=workflow%3AR-CMD-check",
-    "https://app.codecov.io/gh/ropensci-review-tools/repometrics"
-  ],
+  "contIntegration": ["https://github.com/ropensci-review-tools/repometrics/actions?query=workflow%3AR-CMD-check", "https://app.codecov.io/gh/ropensci-review-tools/repometrics"],
   "developmentStatus": "https://www.repostatus.org/#active",
-  "keywords": [
-    "dashboard",
-    "r",
-    "software-metrics"
-  ]
+  "keywords": ["dashboard", "r", "software-metrics"]
 }

tests/testthat/test-data-rm.R

@@ -19,6 +19,9 @@ test_that ("repometrics data full", {
     })
     names (data_ctbs) <- logins
 
+    cm_metrics <- collate_all_metrics (path, end_date = end_date)
+    cm_models <- collate_all_models (path, end_date = end_date)
+
     data <- repometrics_data (
         path,
         num_cores = 1L,
@@ -29,9 +32,17 @@ test_that ("repometrics data full", {
     fs::dir_delete (path)
 
     expect_type (data, "list")
-    expect_named (data, c ("pkgstats", "rm", "contributors"))
+    expect_named (
+        data,
+        c ("pkgstats", "rm", "contributors", "cm_metrics", "cm_models")
+    )
 
-    dat_constructed <- c (data_repo, contributors = list (data_ctbs))
+    dat_constructed <- c (
+        data_repo,
+        contributors = list (data_ctbs),
+        cm_metrics = list (cm_metrics),
+        cm_models = list (cm_models)
+    )
     expect_identical (data, dat_constructed)
 })