Merge pull request #76 from ropensci-review-tools/authors

fix primary maintainer identification for #68

Author: mpadge

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: orgmetrics
 Title: Metrics for Your GitHub Organization
-Version: 0.1.2.103
+Version: 0.1.2.106
 Authors@R: 
     person("Mark", "Padgham", , "[email protected]", role = c("aut", "cre"),
            comment = c(ORCID = "0000-0003-2172-5265"))

R/data-cm-orgs.R

@@ -8,6 +8,7 @@ models_over_end_dates <-
 orgmetrics_collate_org_data <- function (pkgs_json, end_date = Sys.Date (), num_years = 3) {
 
     requireNamespace ("jsonlite", quietly = TRUE)
+    requireNamespace ("desc", quietly = TRUE)
 
     # Suppress no visible binding notes:
     is_r_pkg <- NULL
@@ -39,6 +40,7 @@ orgmetrics_collate_org_data <- function (pkgs_json, end_date = Sys.Date (), num_
             )
             dat_i <- list (
                 repo = dat_repo_to_end_date (dat_repo, end_date = end_date),
+                authors = dat_repo_authors (dat_repo),
                 metrics = metrics_over_end_dates (
                     pkgs_dat$path [i],
                     end_date = end_date,
@@ -105,6 +107,31 @@ rm_tmp_pkg_files <- function (pkgs) {
     }
 }
 
+dat_repo_authors <- function (dat_repo) {
+
+    auts <- NULL
+    desc_path <- fs::path (repo$pkgcheck$pkg$path, "DESCRIPTION")
+
+    if (fs::file_exists (desc_path)) {
+        auts <- tryCatch (
+            desc::desc_get_authors (desc_path),
+            error = function (e) NULL
+        )
+        if (is.null (auts)) {
+            auts <- tryCatch (
+                desc::desc_get_maintainer (desc_path),
+                error = function (e) NULL
+            )
+        }
+    }
+
+    if (!is.null (auts)) {
+        dat_repo$authors <- auts
+    }
+
+    return (dat_repo)
+}
+
 dat_repo_to_end_date <- function (dat_repo, end_date = Sys.Date ()) {
 
     # Suppress no visible binding notes:

R/quarto-dashboard-org.R

@@ -160,18 +160,42 @@ dashboard_data_repo_metrics <- function (data_metrics, dates) {
     return (repo_metrics)
 }
 
-dashboard_data_contributors <- function (data_org) {
+match_names <- utils::getFromNamespace ("match_names", "repometrics")
+
+dashboard_data_contributors <- function (data_org, desc_name_match = 0.8) {
 
     # Suppress no visible binding notes:
     name <- login <- contributions <- NULL
 
     data_contributors <- lapply (data_org$repos, function (repo) {
-        ctbs_gh <- repo$rm$contribs_from_gh_api |>
-            dplyr::select (login, name, contributions)
-        repo$rm$contributors |>
-            dplyr::left_join (ctbs_gh, by = c ("gh_handle" = "login", "name")) |>
-            dplyr::filter (!name == "GitHub Actions") |>
-            dplyr::arrange (dplyr::desc (contributions))
+
+        auts <- gsub ("(\\s?)(\\[|<).*$", "", repo$authors)
+        ctbs <- repo$rm$contribs_from_gh_api |>
+            dplyr::select (login, name, contributions) |>
+            dplyr::filter (!grepl ("github\\-actions|\\[bot\\]", login))
+        aut_matches <- do.call (rbind, lapply (
+            auts,
+            function (a) {
+                rbind (
+                    cbind (match_names (a, ctbs$name) [1, ], what = "name"),
+                    cbind (match_names (a, ctbs$login) [1, ], what = "login")
+                )
+            }
+        ))
+        login_matches <- dplyr::filter (aut_matches, what == "login")
+        aut_matches <- aut_matches |>
+            dplyr::filter (what == "name") |>
+            dplyr::filter (match >= desc_name_match)
+        if (nrow (aut_matches) == 0) {
+            desc_name_match <- desc_name_match * max (login_matches$match)
+        }
+        login_matches <- login_matches |>
+            dplyr::filter (match >= desc_name_match)
+
+        ctbs$is_author <- ctbs$name %in% aut_matches$name |
+            ctbs$login %in% login_matches
+
+        return (ctbs)
     })
     names (data_contributors) <- gsub ("^.*\\/", "", names (data_contributors))
 

codemeta.json

@@ -8,7 +8,7 @@
   "codeRepository": "https://github.com/ropensci-review-tools/orgmetrics",
   "issueTracker": "https://github.com/ropensci-review-tools/orgmetrics/issues",
   "license": "https://spdx.org/licenses/GPL-3.0",
-  "version": "0.1.2.103",
+  "version": "0.1.2.106",
   "programmingLanguage": {
     "@type": "ComputerLanguage",
     "name": "R",

inst/extdata/quarto/repo.qmd

@@ -424,12 +424,21 @@ repoMetrics = {
         ...row,
     }))
 }
-ctbs = {
+ctbs_all = {
     return transpose(ctbs_in[repo]).map(row => ({
         ...row,
     }))
 }
-ctbs_gh = ctbs.map((ctb) => ctb['gh_handle']).filter(item => item != null);
+
+auts = ctbs_all.filter(function(ctb) {
+    return ctb.is_author
+})
+ctbs = ctbs_all.filter(function(ctb) {
+    return !ctb.is_author
+})
+
+ctbs_gh = ctbs.map((ctb) => ctb['login']).filter(item => item != null);
+auts_gh = auts.map((aut) => aut['login']).filter(item => item != null);
 ```
 
 
@@ -482,30 +491,26 @@ htl.html`${releases[0].total} releases (latest: ${release_latest}), ${releases[0
 gitlog_txt_total = htl.html`${gitlog_total_commits} commits since ${gitlog_first_commit}`;
 gitlog_txt_recent = htl.html`${gitlog_recent_commits} commits in past year`;
 
-maintainer_count = repoMetrics.filter(function(m) {
-    return m.name == "maintainer_count"
-})[0].value;
-maintainer_count_txt = pluraliseObjects(maintainer_count, "primary maintainer");
+author_count = auts_gh.length;
+author_count_txt = pluraliseObjects(author_count, "primary author");
 
-maintainer_gh = [].concat(ctbs_gh.slice(0, maintainer_count) || []);
-maintainer_gh_list = maintainer_gh.length == 0 ? undefined:
-    (maintainer_gh.length == 1 ? htl.html`
-<div onclick=${() => localStorage.setItem('orgmetricsMaintainer', maintainer_gh)}>
-<li><a href='/contributor.html'>${maintainer_gh}</a></li>
+author_gh_list = auts_gh.length == 0 ? undefined:
+    (auts_gh.length == 1 ? htl.html`
+<div onclick=${() => localStorage.setItem('orgmetricsMaintainer', auts_gh)}>
+<li><a href='/contributor.html'>${auts_gh}</a></li>
 </div>
-` : maintainer_gh.map(m => htl.html`
+` : auts_gh.map(m => htl.html`
 <div onclick=${() => localStorage.setItem('orgmetricsMaintainer', m)}>
 <li><a href='/contributor.html'>${m}</a></li>
 </div>
 `));
-maintainer_gh_list_txt = maintainer_gh.length > 0 ? htl.html`<ul>${maintainer_gh_list}</ul>` : undefined;
+author_gh_list_txt = auts_gh.length > 0 ? htl.html`<ul>${author_gh_list}</ul>` : undefined;
 
-ctb_gh = [].concat(ctbs_gh.slice(maintainer_count) || []);
-ctb_count = ctb_gh.length;
+ctb_count = ctbs_gh.length;
 ctb_count_txt = pluraliseObjects(ctb_count, "additional contributor");
-ctb_count_list = ctb_gh.map((item, i) => htl.html`
+ctb_count_list = ctbs_gh.map((item, i) => htl.html`
 <span onclick=${() => localStorage.setItem('orgmetricsMaintainer', item)}>
-<a href='/contributor.html'>${item}</a>${i < ctb_gh.length - 1 ? ", " : ""}</span>`);
+<a href='/contributor.html'>${item}</a>${i < ctbs_gh.length - 1 ? ", " : ""}</span>`);
 ctb_count_html = ctb_count == 0 ? htl.html`<div>No additional contributors</div>` :
     htl.html`<div>${ctb_count_txt}: ${ctb_count_list}</div>`;
 
@@ -604,7 +609,7 @@ htl.html`<ul>
     <li>${releases_txt_total}</li>
     <li>${gitlog_txt_total}</li>
     <li>${gitlog_txt_recent}</li>
-    <li>${maintainer_count_txt}${maintainer_gh_list_txt}</li>
+    <li>${author_count_txt}${author_gh_list_txt}</li>
     <li>${ctb_count_html}</li>
     <li>${test_coverage_txt}</li>
 </ul>`