Merge pull request #1461 from dbetebenner/master

Perfecting startup message

Author: dbetebenner

CITATION.cff

@@ -11,7 +11,7 @@ authors:
 - family-names: "Shang"
   given-names: "Yi"
 title: "SGP: Student Growth Percentiles & Percentile Growth Trajectories"
-version: 2.2-0.8
+version: 2.2-1.0
 doi: 10.5281/zenodo.13921157
-date-released: 2024-12-3
+date-released: 2024-12-4
 url: "https://sgp.io"

DESCRIPTION

@@ -1,8 +1,8 @@
 Package: SGP
 Type: Package
 Title: Student Growth Percentiles & Percentile Growth Trajectories
-Version: 2.2-0.8
-Date: 2024-12-3
+Version: 2.2-1.0
+Date: 2024-12-4
 Authors@R: c(person(given=c("Damian", "W."), family="Betebenner", email="[email protected]", role=c("aut", "cre"), comment=c(ORCID = "0000-0003-0476-5599")),
 		person(given=c("Adam", "R."), family="Van Iwaarden", email="[email protected]", role="aut"),
 		person(given="Ben", family="Domingue", email="[email protected]", role="aut"),
@@ -76,7 +76,7 @@ Authors@R: c(person(given=c("Damian", "W."), family="Betebenner", email="dbetebe
 Maintainer: Damian W. Betebenner <[email protected]>
 Depends: R (>= 4.1.0)
 Suggests: SGPdata (>= 28.0-0), knitr, rmarkdown
-Imports: Cairo, callr, collapse, colorspace, crayon, datasets, data.table (>= 1.14.0), digest, doParallel, equate (>= 2.0-5), foreach, graphics, grid, grDevices, gridBase, iterators, gtools, jsonlite, matrixStats, methods, parallel, quantreg, randomNames (>= 0.0-5), rngtools (>= 1.5), RSQLite, sn (>= 1.0-0), splines, stats, svglite, toOrdinal, utils
+Imports: Cairo, callr, collapse, colorspace, crayon, datasets, data.table (>= 1.14.0), digest, doParallel, equate (>= 2.0-5), foreach, graphics, grid, grDevices, gridBase, iterators, gtools, jsonlite, matrixStats, methods, parallel, pkgsearch, quantreg, randomNames (>= 0.0-5), rngtools (>= 1.5), RSQLite, sn (>= 1.0-0), splines, stats, svglite, toOrdinal, utils
 Description: An analytic framework for the calculation of norm- and criterion-referenced academic growth estimates using large scale, longitudinal education assessment data as developed in Betebenner (2009) <doi:10.1111/j.1745-3992.2009.00161.x>.
 SystemRequirements: (PDF)LaTeX (https://www.latex-project.org/) with 'pdfpages' package for studentGrowthPlot option in visualizeSGP to bind together student growth plots into school catalogs
 URL: https://sgp.io, https://github.com/CenterForAssessment/SGP, https://CRAN.R-project.org/package=SGP

NAMESPACE

@@ -37,7 +37,7 @@ importFrom(Cairo,Cairo,CairoSVG)
 importFrom(callr,r_bg)
 importFrom(collapse, add_stub, add_vars, collapv, ffirst, fmean, fmedian, fnrow, fsd, ftransform, ftransformv, fvar, get_vars, join, na_omit, pivot, .quantile, replace_outliers, roworderv, rm_stub)
 importFrom(colorspace,rainbow_hcl,diverge_hcl)
-importFrom(crayon,bold,green,magenta,red,yellow)
+importFrom(crayon,bold,cyan,green,magenta,red,yellow)
 importFrom(digest,digest)
 importFrom(doParallel,registerDoParallel)
 importFrom(equate,freqtab,equate)

R/zzz.R

@@ -5,20 +5,51 @@ function(libname, pkgname) {
 	utils::globalVariables(c("."))
 }
 
-.onAttach <- function(libname, pkgname) {
+`.onAttach` <- function(libname, pkgname) {
     if (interactive()) {
+
+		        # Function to get the development version
+        get_dev_version <- function(package) {
+            url <- paste0("https://raw.githubusercontent.com/CenterForAssessment/", package, "/refs/heads/master/DESCRIPTION")
+            tryCatch({
+                lines <- readLines(url, warn = FALSE)
+                version_line <- grep("^Version:", lines, value = TRUE)
+                if (length(version_line) > 0) {
+                    return(strsplit(version_line, ": ")[[1]][2])
+                } else {
+                    return("Unavailable")
+                }
+            }, error = function(e) {
+                return("Unavailable")
+            }, warning = function(w) {
+                return("Unavailable")
+            })
+        }
+
+
         # Extract version information
-        version <- utils::packageVersion("SGP")
+        installed.version <- utils::packageDescription("SGP")[['Version']]
+        cran.version <- tryCatch(
+            pkgsearch::cran_package("SGP")[['Version']],
+            error = function(e) "Unavailable",
+            warning = function(w) "Unavailable"
+        )
+        dev.version <- get_dev_version("SGP")
 
         # Define a friendly startup message
 	message_text <- paste0(
-	    magenta(bold("\uD83C\uDF89 SGP v", version)), " - ", toOrdinal::toOrdinalDate("2024-12-3"), "\n",
-	    "\U1F4A1 Tip: ", magenta(bold("> help(\"SGP\")")), "\n",
+	    magenta(bold("\uD83C\uDF89 SGP v", installed.version, sep="")), " - ", toOrdinal::toOrdinalDate("2024-12-4"), "\n",
+		strrep("\u2501", 40), "\n",
+        bold("\U1F4E6 CRAN: "), green("v", cran.version, sep=""), "\n",
+        bold("\U1F527 Dev: "), cyan("v", dev.version, sep=""), "\n",
+		strrep("\u2501", 40), "\n",
+	    "\U1F4A1 Tip: ", magenta(bold("> help(package=\"SGP\")")), "\n",
 	    "\U1F310 Docs: ", magenta(bold("https://sgp.io/")), "\n",
+		strrep("\u2501", 40), "\n",
 	    "\u2728 Happy SGPing!"
 	)
 
         # Display the startup message
         packageStartupMessage(message_text)
     }
-}
+}

README.md

@@ -5,7 +5,7 @@ SGP
 [![R-CMD-check](https://github.com/CenterForAssessment/SGP/workflows/R-CMD-check/badge.svg)](https://github.com/CenterForAssessment/SGP/actions)
 [![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/github/centerforassessment/SGP?branch=master&svg=true)](https://ci.appveyor.com/project/centerforassessment/SGP)
 [![CRAN_Status_Badge](https://www.r-pkg.org/badges/version/SGP)](https://cran.r-project.org/package=SGP)
-[![Development Version](https://img.shields.io/badge/devel-2.2--0.6-brightgreen.svg)](https://github.com/CenterForAssessment/SGP)
+[![Development Version](https://img.shields.io/badge/devel-2.2--0.8-brightgreen.svg)](https://github.com/CenterForAssessment/SGP)
 [![Rstudio mirror downloads](https://cranlogs.r-pkg.org/badges/grand-total/SGP)](https://github.com/metacran/cranlogs.app)
 [![License](https://img.shields.io/badge/license-GPL%203-brightgreen.svg?style=flat)](https://github.com/CenterForAssessment/SGP/blob/master/LICENSE.md)
 [![Join the chat at https://gitter.im/CenterForAssessment/SGP](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/CenterForAssessment/SGP?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

inst/CITATION

@@ -9,12 +9,12 @@ bibentry(
                     person(given = c("Yi"), family = "Shang")
                    ),
     year         = "2024",
-    note         = "R package version 2.2-0.8",
+    note         = "R package version 2.2-1.0",
     url          = "https://sgp.io",
     textVersion  = paste(
                     "Damian W. Betebenner, Adam R. Van Iwaarden, Benjamin Domingue and Yi Shang (2024).",
                     "SGP: Student Growth Percentiles & Percentile Growth Trajectories.",
-                    "(R package version 2.2-0.8)",
+                    "(R package version 2.2-1.0)",
                     "URL: https://sgp.io"
                   )
 )

man/SGP-package.Rd

@@ -19,8 +19,8 @@ growth projections to be calculated across assessment transitions by equating th
 \tabular{ll}{
 Package: \tab SGP\cr
 Type: \tab Package\cr
-Version: \tab 2.2-0.8\cr
-Date: \tab 2024-12-3\cr
+Version: \tab 2.2-1.0\cr
+Date: \tab 2024-12-4\cr
 License: \tab GPL-3\cr
 LazyLoad: \tab yes\cr
 }