chore: improve logs

Author: manolo

scripts/pit/lib/lib-demos.sh

@@ -282,6 +282,7 @@ getTest() {
 ## $1: name of the demo
 ## $2: version to set
 setDemoVersion() {
+  [ -z "$2" ] && return 1
   case "$1" in
     base-starter-flow-quarkus|mpr-demo)
        if setVersion vaadin.version "$2"; then
@@ -346,6 +347,7 @@ runDemo() {
 
   if [ -z "$NOCURRENT" ]
   then
+    bold -n ">>> PiT current $_demo"
     _current=`setDemoVersion $_demo current`
     [ -z "$_current" ] && reportError "Cannot get current version for $_demo"
     # 2
@@ -360,8 +362,9 @@ runDemo() {
     fi
   fi
   # 5
-  if setDemoVersion $_demo $_version >/dev/null || [ -n "$NOCURRENT" ]
+  if setDemoVersion $_demo $_version >/dev/null
   then
+    bold -n ">>> PiT next $_demo"
     applyPatches "$_demo" next "$_version" prod || return 1
     if hasDev $_demo; then
       # 6

scripts/pit/lib/lib-k8s-cc.sh

@@ -145,7 +145,7 @@ waitForCC() {
           log -n "Control Center up and running - Status: $H"
           return 0 ;;
         *)
-          [ "$H" != "$last" ] && ([ -n "$VERBOSE" -a -n "$last" ] && echo "" || true) \
+          [ "$H" != "$last" ] && ([ -n "$VERBOSE" -a -n "$last" ] && printnl || true) \
                               && log "Control center initializing - Status: $H" \
                               || ([ -n "$VERBOSE" ] && printf .)
           last="$H"
@@ -276,7 +276,7 @@ runPwTests() {
 # $2 tag to use for application images
 # $3 whether it is CC snapshot
 runControlCenter() {
-  log -n "----> Running PiT for app: control-center version: '$1' tag: '$2' "
+  bold -n "----> Running PiT for app: control-center version: '$1' tag: '$2' "
 
   ## Check if port 443 is busy
   [ -n "$TEST" ] || checkBusyPort "443" || return 1
@@ -313,7 +313,7 @@ runControlCenter() {
   ## Uninstall the control-center if --keep-cc is not set
   [ -n "$KEEPCC" ] || uninstallCC --wait=false || return 1
 
-  log "----> Tested version '$1' of 'control-center'"
+  bold "----> Tested version '$1' of 'control-center'"
 
   return 0
 }

scripts/pit/lib/lib-k8s-vendor.sh

@@ -221,7 +221,7 @@ patchDeployment() {
 uploadLocalImages() {
   case "$VENDOR" in
     kind)
-      echo "" && log "** Loading images for vendor KinD **"
+      log -n "** Loading images for vendor KinD **"
       for i in bakery bakery-cc cc-starter; do
         runCmd -q "Load docker image $i for Kind" \
           kind load docker-image $REGISTRY/$i:local --name "$CLUSTER" || return 1
@@ -233,7 +233,7 @@ uploadLocalImages() {
       done
       ;;
     do)
-      echo "" && log "** Loading images for vendor DO **"
+      log -n "** Loading images for vendor DO **"
       for i in cbakery bakery-cc cc-starter; do
         runCmd -q "Tag image $i" docker tag $REGISTRY/$i:local $DO_REG_URL/$i:local || return 1
         runCmd -q "PUSH image $i" docker push $DO_REG_URL/$i:local || return 1

scripts/pit/lib/lib-utils.sh

@@ -90,25 +90,32 @@ printnl() {
 }
 
 ## log with some nice color
-log() {
+isnl() {
   expr "$1" : "\-" > /dev/null && _opt=${1#-} && shift || _opt=""
-  [ "$_opt" = n ] && echo ""
+  [ "$_opt" = n ] && echo "" >&2 || return 1
+  true
+}
+log() {
+  isnl $1 && shift
   [ -n "$TEST" ] && cmd "## $*" && return 0
-  _p=`computeTime`
   print '> ' 0 32 "$*"
   printnl '' 2 36 " - "`computeTime`""
 }
 bold() {
-  print '\n> ' 1 32 "$*"
-  printnl '' 2 36 " - "`computeTime`"\n"
+  isnl $1 && shift
+  [ -n "$TEST" ] && cmd "## $*" && return 0
+  print '> ' 1 32 "$*"
+  printnl '' 2 36 " - "`computeTime`""
 }
 err() {
   printnl '> ' 0 31 "$*"
 }
 warn() {
+  isnl $1 && shift
   printnl '> ' 0 33 "$*"
 }
 cmd() {
+  isnl $1 && shift
   cmd_=`printf "$*" | tr -s " " | perl -pe 's|\n|\\\\\\\n|g'`
   printnl '  ' 1 34 " $cmd_"
 }

scripts/pit/lib/lib-validate.sh

@@ -36,10 +36,7 @@ runValidations() {
   [ "$mode" = prod ] && expr "$compile" : "$MVN" >/dev/null && compile="$compile -Dmaven.compiler.showDeprecation"
   [ "$mode" = prod ] && expr "$cmd" : "$MVN" >/dev/null && cmd="$cmd -Dmaven.compiler.showDeprecation"
 
-
-  echo "" >&2
-  [ -z "$TEST" ] && bold "----> Running builds and tests on app $name, mode=$mode, port=$port, version=$version, mvn=$MVN"
-  [ -n "$TEST" ] && cmd "### Run PiT for: app=$name mode=$mode version=$version"
+  bold -n "--> Run PiT for: app=name, mode=$mode, port=$port, version=$version, mvn=$MVN"
   [ -n "$MAVEN_ARGS" ] && cmd "## MAVEN_ARGS='$MAVEN_ARGS'"
   [ -n "$MAVEN_OPTS" ] && cmd "## MAVEN_OPTS='$MAVEN_OPTS'"
 

scripts/pit/run.sh

@@ -26,7 +26,7 @@ DEFAULT_STARTERS=`echo "$PRESETS$DEMOS" | grep ...`
 run() {
   $1 "$2" "$3" "$PORT" "$VERSION" "$OFFLINE"
   _err=$?
-  [ -n "$TEST" ] && cleanAll && echo ""  && return 0
+  [ -n "$TEST" ] && cleanAll && printnl && return 0
   if [ $_err = 0 ]; then
     log "==== '$2' was build and tested successfuly ===="
     success="$success $2"