Merge pull request #48 from tdhock/fix-colors

color fix attempt

NEWS

@@ -1,6 +1,7 @@
 Changes in version 2024.4.16
 
 - If result is data frame with 1 row, save more.units.
+- atime_pkg version names HEAD/base/CRAN defined in R color names are now translated to their expanded names on the plot (CRAN=1.15.0 etc), and default colors were added for Slow and Fast.
 
 Changes in version 2024.4.12
 

R/versions.R

@@ -79,7 +79,14 @@ atime_versions_install <- function(Package, pkg.path, new.Package.vec, sha.vec,
  new.Package=new.Package,
  sha=sha, 
  new.pkg.path=sha.path)
- INSTALL.cmd <- paste("R CMD INSTALL", sha.path)
+ INSTALL.cmd <- paste(
+ shQuote(file.path(
+ Sys.getenv("R_HOME"),
+ "bin",
+ "R")),
+ 'CMD INSTALL -l',
+ shQuote(.libPaths()[1]),
+ sha.path)
  status.int <- system(INSTALL.cmd)
  if(status.int != 0){
  stop(INSTALL.cmd, " returned error status code ", status.int)
@@ -215,11 +222,27 @@ atime_pkg <- function(pkg.path=".", tests.dir="inst"){
  test.env <- new.env()
  tests.parsed <- parse(tests.R)
  eval(tests.parsed, test.env)
- color.vec <- if(is.null(test.env$version.colors)){
- structure(c(#RColorBrewer::brewer.pal(7, "Dark2")
- "#1B9E77", "#D95F02", "#7570B3", "#E7298A", "#66A61E", "#E6AB02", "#A6761D"),
- names=c(HEAD.name, base.name, "merge-base", CRAN.name, "Before", "Regression", "Fixed"))
- }else test.env$version.colors
+ color.vec <- if(is.character(test.env$version.colors)){
+ test.env$version.colors
+ }else{
+ c(#RColorBrewer::brewer.pal(7, "Dark2")
+ HEAD="#1B9E77",
+ base="#D95F02",
+ "merge-base"="#7570B3",
+ CRAN="#E7298A",
+ Before="#66A61E",
+ Regression="#E6AB02", Slow="#E6AB02",
+ Fixed="#A6761D", Fast="#A6761D"
+ )
+ }
+ abbrev2name <- c(
+ HEAD=HEAD.name,
+ base=base.name,
+ CRAN=CRAN.name)
+ names(color.vec) <- ifelse(
+ names(color.vec) %in% names(abbrev2name),
+ abbrev2name[names(color.vec)],
+ names(color.vec))
  pkg.results <- list()
  blank.dt.list <- list()
  bench.dt.list <- list()

man/atime_pkg.Rd

@@ -25,7 +25,9 @@
  merge-base is most recent common ancestor commit between base and
  HEAD.
  The \code{tests.R} code file can define \code{version.colors} which should be
- a character vector (names for versions, values for colors).
+ a character vector (names for versions, values for colors; names/versions are
+ HEAD, base, CRAN, merge-base, and any others you may define such as
+ Before, Regression, Slow, Fixed, Fast).
 }
 \value{Named list, names come from names of \code{test.list}, and values
  come from results of \code{atime_versions}. Side effect is that

tests/testthat/test-versions.R

@@ -17,3 +17,13 @@ test_that("error if no versions specified", {
  "need to specify at least one git SHA, in either sha.vec, or ...",
  fixed=TRUE)
 })
+
+test_that("atime_pkg produces tests_all_facet.png", {
+ repo <- git2r::repository(tdir)
+ git2r::checkout(repo, branch="another-branch")
+ inst.atime <- file.path(tdir, "inst", "atime")
+ options(repos="http://cloud.r-project.org")#required to check CRAN version.
+ result.list <- atime::atime_pkg(tdir)
+ tests_all_facet.png <- file.path(inst.atime, "tests_all_facet.png")
+ expect_true(file.exists(tests_all_facet.png))
+})