Merge pull request #2 from Tirsvad/main

Add 'namespace'

Author: Tirsvad

src/logging.ps1 src/TirsvadScript.Logging.ps1src/logging.ps1 renamed to src/TirsvadScript.Logging.ps1

@@ -1,35 +1,50 @@
 # Guard: this file is intended to be dot-sourced (included) by the main script.
-# If executed directly, warn and exit to avoid unintended behavior.
+# If executed directly, warn but continue so tests and other runspaces that dot-source still get the definitions.
 if ($MyInvocation.InvocationName -ne '.') {
-    Write-Host "This script is a library and must be dot-sourced from the main script (e.g. `. .\Create-VSSolution.ps1`). Exiting." -ForegroundColor Yellow
-    exit 1
+    Write-Host "This script is a library and is intended to be dot-sourced (e.g. `. .\Create-VSSolution.ps1`). Continuing anyway." -ForegroundColor Yellow
 }
 
-# Ensure a script-scoped container object exists for module-level flags
-if (-not (Test-Path variable:script:TirsvadScript)) {
-    $script:TirsvadScript = [PSCustomObject]@{}
-}
-# Mark logging as loaded in a safe way
-if ($script:TirsvadScript -is [System.Management.Automation.PSCustomObject]) {
-    $script:TirsvadScript | Add-Member -NotePropertyName LoggingLoaded -NotePropertyValue $true -Force
+# Mark that logging was loaded in a global helper object. Be defensive: the global may not exist or may be a primitive.
+$existingVar = Get-Variable -Name TirsvadScript -Scope Global -ErrorAction SilentlyContinue
+if ($null -eq $existingVar) {
+    # Create a PSCustomObject container to hold markers
+    $global:TirsvadScript = [PSCustomObject]@{ LoggingLoaded = $true }
 }
 else {
-    # Fallback: attempt safe assignment
-    try { $script:TirsvadScript.LoggingLoaded = $true } catch { }
+    $container = $existingVar.Value
+    if ($container -is [System.Collections.Hashtable]) {
+        $container['LoggingLoaded'] = $true
+    }
+    elseif ($container -is [System.Management.Automation.PSCustomObject]) {
+        # Add or update property
+        if ($container.PSObject.Properties.Match('LoggingLoaded').Count -eq 0) {
+            $container | Add-Member -NotePropertyName LoggingLoaded -NotePropertyValue $true
+        }
+        else {
+            $container.LoggingLoaded = $true
+        }
+    }
+    else {
+        # Primitive or other type: preserve original value under 'OriginalValue' and replace global with a hashtable
+        $global:TirsvadScript = @{ OriginalValue = $container; LoggingLoaded = $true }
+    }
 }
 
-# Respect an existing caller-set `VerboseMode`; only set a default if it's not already defined
-if (-not $script:VerboseMode) {
-    $script:VerboseMode = 2  # Default verbosity level
+# Ensure a reasonable default verbosity when the caller hasn't set one.
+# When this file is dot-sourced it runs in the caller's script scope, so
+# checking for a script-scoped variable lets callers pre-set it (test expects that).
+if (-not (Get-Variable -Name VerboseMode -Scope Script -ErrorAction SilentlyContinue)) {
+    $script:VerboseMode = 2
 }
 
 # Write helpers respect numeric verbosity:0 = silent,1 = errors/warnings only,2 = errors+warnings+ok+info,3+ = debug
-function Write-Info { if ($script:VerboseMode -ge 2) { Write-Host "[INFO]  " -ForegroundColor Cyan -NoNewline; Write-Host " $args" } }
-function Write-Ok { if ($script:VerboseMode -ge 2) { Write-Host "[OK]    " -ForegroundColor Green -NoNewline; Write-Host " $args" } }
-function Write-Err { if ($script:VerboseMode -ge 1) { Write-Host "[ERR]   " -ForegroundColor Red -NoNewline; Write-Host " $args" } }
-function Write-Warn { if ($script:VerboseMode -ge 1) { Write-Host "[WARN]  " -ForegroundColor Magenta -NoNewline; Write-Host " $args" } }
+function Write-Info { if ($script:VerboseMode -ge 2) { Write-Host "[INFO] " -ForegroundColor Cyan -NoNewline; Write-Host " $args" } }
+function Write-Ok { if ($script:VerboseMode -ge 2) { Write-Host "[OK] " -ForegroundColor Green -NoNewline; Write-Host " $args" } }
+function Write-Err { if ($script:VerboseMode -ge 1) { Write-Host "[ERR] " -ForegroundColor Red -NoNewline; Write-Host " $args" } }
+function Write-Warn { if ($script:VerboseMode -ge 1) { Write-Host "[WARN] " -ForegroundColor Magenta -NoNewline; Write-Host " $args" } }
 function Write-Debug { if ($script:VerboseMode -ge 3) { Write-Host "[DEBUG] " -ForegroundColor Yellow -NoNewline; Write-Host " $args" } }
-function Write-Run { if ($script:VerboseMode -ge 2) { Write-Host "[RUN]   " -ForegroundColor DarkGray -NoNewline; Write-Host " $args" } }
+function Write-Run { if ($script:VerboseMode -ge 2) { Write-Host "[RUN] " -ForegroundColor DarkGray -NoNewline; Write-Host " $args" } }
+
 function Write-RunDone {
     param (
         [bool]$Success = $true
@@ -49,7 +64,7 @@ function Write-RunDone {
             $pos = $raw.CursorPosition
             if ($pos.Y -gt 0) {
                 # Move cursor to the start of the previous line
-                $up = New-Object System.Management.Automation.Host.Coordinates(0, ($pos.Y -1))
+                $up = New-Object System.Management.Automation.Host.Coordinates(0, ($pos.Y - 1))
                 $raw.CursorPosition = $up
                 # Overwrite the [RUN] marker
                 Write-Host "[$msg] " -ForegroundColor $msgColor -NoNewline
@@ -77,32 +92,34 @@ function Write-Header {
     if ($script:VerboseMode -lt 1) { return }
 
     # Determine maximum content width (consider submessages)
-    $maxLength =0
+    $maxLength = 0
     if ($Message) { $maxLength = $Message.Length }
     foreach ($subMsg in $SubMessages) {
         if ($subMsg.Length -gt $maxLength) { $maxLength = $subMsg.Length }
     }
 
     # Add extra whitespace padding around the message for visual separation
-    $innerWidth = $maxLength +4 # two spaces on each side when centered
+    $innerWidth = $maxLength + 4 # two spaces on each side when centered
 
     # Build top/bottom rule length: '===' + ' ' + inner + ' ' + '===' -> innerWidth +8
-    $ruleLength = $innerWidth +8
+    $ruleLength = $innerWidth + 8
     $line = '=' * $ruleLength
     Write-Host $line -ForegroundColor DarkCyan
 
     # Center the main message within the inner width
     if ($Message) {
-        $leftPadding = [int](([double]($innerWidth - $Message.Length) /2.0) + $Message.Length)
+        $leftPadding = [int](([double]($innerWidth - $Message.Length) / 2.0) + $Message.Length)
         if ($leftPadding -lt $Message.Length) { $leftPadding = $Message.Length }
         $centered = $Message.PadLeft($leftPadding).PadRight($innerWidth)
-        Write-Host "===$([char]27)[1m $centered $([char]27)[22m===" -ForegroundColor DarkCyan
+        Write-Host "=== " -NoNewline -ForegroundColor DarkCyan
+        Write-Host "$centered" -NoNewline -ForegroundColor white
+        Write-Host " ===" -ForegroundColor DarkCyan
     }
 
     # Optionally print sub-messages centered as well
-    if ($SubMessages -and $SubMessages.Count -gt0) {
+    if ($SubMessages -and $SubMessages.Count -gt 0) {
         foreach ($sub in $SubMessages) {
-            $leftPadding = [int](([double]($innerWidth - $sub.Length) /2.0) + $sub.Length)
+            $leftPadding = [int](([double]($innerWidth - $sub.Length) / 2.0) + $sub.Length)
             if ($leftPadding -lt $sub.Length) { $leftPadding = $sub.Length }
             $centeredSub = $sub.PadLeft($leftPadding).PadRight($innerWidth)
             Write-Host "=== $centeredSub ===" -ForegroundColor DarkCyan

src/TirsvadScript.Logging.zip

@@ -1,8 +1,8 @@
-# Pester tests for src/logging.ps1
+# Pester tests for src/TirsvadScript.Logging.ps1
 # Requires Pester (commonly preinstalled in PowerShell)
 
-Describe 'Logging.ps1' {
-	$scriptPath = Resolve-Path (Join-Path $PSScriptRoot '..\src\logging.ps1')
+Describe 'TirsvadScript.Logging.ps1' {
+	$scriptPath = Resolve-Path (Join-Path $PSScriptRoot '..\src\TirsvadScript.Logging.ps1')
 
 	It 'defines expected logging functions and defaults VerboseMode to 2 when not set' {
 		$job = Start-Job -ScriptBlock {