From 6d901e46c6cb8ece91615c173b2590324c6ba9e2 Mon Sep 17 00:00:00 2001
From: Jim Nicholson <thejimnicholson@gmail.com>
Date: Wed, 14 Feb 2024 00:34:59 -0800
Subject: [PATCH] Refactor some console messages

---
 vars/findVersionFromNexusRepo.groovy |  6 +++---
 vars/packageStage.groovy             |  2 +-
 vars/pythonVenvStage.groovy          | 12 ++++++------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/vars/findVersionFromNexusRepo.groovy b/vars/findVersionFromNexusRepo.groovy
index 7e23883..46a24d4 100644
--- a/vars/findVersionFromNexusRepo.groovy
+++ b/vars/findVersionFromNexusRepo.groovy
@@ -45,10 +45,10 @@ Map call(Map config = [:], Map queryParams = [:]) {
             plugin. */
         /* groovylint-disable-next-line Instanceof */
         if (latest.version instanceof net.sf.json.JSONNull && latest.name) {
-            echo 'Search result version field was null, looking in name field for a version'
+            echo 'Info: Search result version field was null, looking in name field for a version'
             java.util.regex.Matcher match = (latest.name =~ /(?<=-)(\d+\.\d+\.\d+)(?=[\.-].*)/)
             if (!match) {
-                echo "Match: ${match}"
+                echo "Error: Match: ${match}"
                 error("Regular expression match failed for latest.name: ${latest.name}")
             }
             version = match[0][1]
@@ -57,7 +57,7 @@ Map call(Map config = [:], Map queryParams = [:]) {
         }
     } else {
         version = '0.0.0'
-        echo 'INFO: No matching assets found, assuming this is the first version.'
+        echo 'Info: No matching assets found, assuming this is the first version.'
     }
     return version
 }
diff --git a/vars/packageStage.groovy b/vars/packageStage.groovy
index 4aed96f..241e72b 100644
--- a/vars/packageStage.groovy
+++ b/vars/packageStage.groovy
@@ -24,7 +24,7 @@ void call(Map config = [:], Closure body = { }) {
             runConfig.separator +
             runConfig.extension
 
-        echo "Will tag result as: ${archiveName}"
+        echo "Info: Will archive results as: ${archiveName}."
 
         sh """
             if command -v "${runConfig.archiveCmd}"; then
diff --git a/vars/pythonVenvStage.groovy b/vars/pythonVenvStage.groovy
index ecba3ad..dd31aa5 100644
--- a/vars/pythonVenvStage.groovy
+++ b/vars/pythonVenvStage.groovy
@@ -27,36 +27,36 @@ void call(Map config = [:], Closure body) {
         printBanner(runConfig.stepName)
         ansiColor('css') {
             if (fileExists(runConfig.venvDir) && runConfig.recreateVenv)  {
-                echo 'INFO: Removing old venv from workspace.'
+                echo 'Info: Removing old venv from workspace.'
                 dir(runConfig.venvDir) {
                     deleteDir()
                 }
             }
 
             if (!fileExists(runConfig.venvDir)) {
-                echo "INFO: Creating new venv in ${runConfig.venvDir}."
+                echo "Info: Creating new venv in ${runConfig.venvDir}."
                 sh "${runConfig.pythonPath} -m venv ${runConfig.venvDir}"
             }
 
             withEnv(venvEnv) {
                 List setupCmds = []
                 if (runConfig.updatePip) {
-                    echo 'INFO: Will update pip if an update is available.'
+                    echo 'Info: Will update pip if an update is available.'
                     updateCmd = "${venvPython.join('/')} -m pip install --upgrade pip"
                     setupCmds.add(updateCmd)
                 }
                 if (runConfig.installPipTools) {
-                    echo 'INFO: Will install pip-tools.'
+                    echo 'Info: Will install pip-tools.'
                     installCmd = "${venvPython.join('/')} -m pip install pip-tools"
                     setupCmds.add(installCmd)
                 }
                 if (fileExists(runConfig.requirementsFile)) {
-                    echo "INFO: Will resolve requirements from ${runConfig.requirementsFile}."
+                    echo "Info: Will resolve requirements from ${runConfig.requirementsFile}."
                     reqCmd = "pip-compile ${runConfig.requirementsFile}"
                     setupCmds.add(reqCmd)
                 }
                 if (!setupCmds.isEmpty()) {
-                    echo 'INFO: Beginning venv setup.'
+                    echo 'Info: Beginning venv setup.'
                     sh setupCmds.join('\n')
                 }
                 echo 'Executing closure...'