v2.6.0

jdhitsolutions · Nov 17, 2021 · 5659577 · 5659577
1 parent 5afe270
commit 5659577
Show file tree

Hide file tree

Showing 8 changed files with 85 additions and 38 deletions.
diff --git a/PSCalendar.psd1 b/PSCalendar.psd1
@@ -4,7 +4,7 @@
 
 
     RootModule           = 'PSCalendar.psm1'
-    ModuleVersion        = '2.5.0'
+    ModuleVersion        = '2.6.0'
     CompatiblePSEditions = @("Desktop", "Core")
     GUID                 = '222beda0-cdb5-464d-bf49-7ab701da86c9'
     Author               = 'Jeff Hicks'
@@ -20,11 +20,11 @@
     FormatsToProcess     = @('formats\pscalendarconfiguration.format.ps1xml')
     FunctionsToExport    = if ($PSEdition -eq 'Desktop') {
         "Get-Calendar", "Show-Calendar", "Get-NCalendar", "Show-GuiCalendar", "Show-PSCalendarHelp",
-        "Get-PSCalendarConfiguration", "Set-PSCalendarConfiguration"
+        "Get-PSCalendarConfiguration", "Set-PSCalendarConfiguration","Get-MonthName"
     }
     else {
         "Get-Calendar", "Show-Calendar", "Get-NCalendar", "Show-PSCalendarHelp",
-        "Get-PSCalendarConfiguration", "Set-PSCalendarConfiguration"
+        "Get-PSCalendarConfiguration", "Set-PSCalendarConfiguration","Get-MonthName"
     }
     VariablesToExport    = @()
     AliasesToExport      = @('ncal', 'cal', 'gcal', 'scal')

diff --git a/PSCalendarManual.pdf b/PSCalendarManual.pdf
diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,12 @@
 # Change Log for PSCalendar
 
+## v2.6.0
+
++ Updates to `Get-NCalendar` [Issue #25](https://github.com/jdhitsolutions/PSCalendar/issues/25).
++ Exported `Get-MonthName` in the module manifest.
++ Added missing online help links.
++ Help updates.
+
 ## v2.5.0
 
 + Updated commands to work in PowerShell 7.2. [Issue #28](https://github.com/jdhitsolutions/PSCalendar/issues/28).

diff --git a/docs/Get-MonthName.md b/docs/Get-MonthName.md
@@ -1,7 +1,7 @@
 ---
 external help file: PSCalendar-help.xml
 Module Name: PSCalendar
-online version:
+online version: https://bit.ly/3qPYLaH
 schema: 2.0.0
 ---
 

diff --git a/docs/Get-NCalendar.md b/docs/Get-NCalendar.md
@@ -1,15 +1,15 @@
 ---
 external help file: PSCalendar-help.xml
 Module Name: PSCalendar
-online version:
+online version: https://bit.ly/2YWjIFn
 schema: 2.0.0
 ---
 
 # Get-NCalendar
 
 ## SYNOPSIS
 
-Display a Linux-style ncal calendar
+Display a Linux-style ncal calendar.
 
 ## SYNTAX
 

diff --git a/docs/Show-GuiCalendar.md b/docs/Show-GuiCalendar.md
@@ -9,7 +9,7 @@ schema: 2.0.0
 
 ## SYNOPSIS
 
-Display a WPF-based calendar
+Display a WPF-based calendar.
 
 ## SYNTAX
 

diff --git a/en-us/PSCalendar-help.xml b/en-us/PSCalendar-help.xml
@@ -451,6 +451,10 @@ Dec</dev:code>
       </command:example>
     </command:examples>
     <command:relatedLinks>
+      <maml:navigationLink>
+        <maml:linkText>Online Version:</maml:linkText>
+        <maml:uri>https://bit.ly/3qPYLaH</maml:uri>
+      </maml:navigationLink>
       <maml:navigationLink>
         <maml:linkText>Get-Culture</maml:linkText>
         <maml:uri></maml:uri>
@@ -463,7 +467,7 @@ Dec</dev:code>
       <command:verb>Get</command:verb>
       <command:noun>NCalendar</command:noun>
       <maml:description>
-        <maml:para>Display a Linux-style ncal calendar</maml:para>
+        <maml:para>Display a Linux-style ncal calendar.</maml:para>
       </maml:description>
     </command:details>
     <maml:description>
@@ -655,6 +659,10 @@ Sat      6 13 20 27
       </command:example>
     </command:examples>
     <command:relatedLinks>
+      <maml:navigationLink>
+        <maml:linkText>Online Version:</maml:linkText>
+        <maml:uri>https://bit.ly/2YWjIFn</maml:uri>
+      </maml:navigationLink>
       <maml:navigationLink>
         <maml:linkText>Get-Calendar</maml:linkText>
         <maml:uri></maml:uri>
@@ -1156,7 +1164,7 @@ Highlight : `e[92m</dev:code>
       <command:verb>Show</command:verb>
       <command:noun>GuiCalendar</command:noun>
       <maml:description>
-        <maml:para>Display a WPF-based calendar</maml:para>
+        <maml:para>Display a WPF-based calendar.</maml:para>
       </maml:description>
     </command:details>
     <maml:description>

diff --git a/functions/public.ps1 b/functions/public.ps1
@@ -574,23 +574,30 @@ Function Get-NCalendar {
     [Outputtype("String")]
 
     Param(
-        [Parameter(Position = 0, ValueFromPipeline, ValueFromPipelineByPropertyName,
-            HelpMessage = "Enter the full month name. The default is the current month.")]
+        [Parameter(
+            Position = 0,
+            ValueFromPipeline,
+            ValueFromPipelineByPropertyName,
+            HelpMessage = "Enter the full month name. The default is the current month."
+            )]
         [ValidateNotNullOrEmpty()]
         [ValidateScript( {
-                #sometimes this returns an extra and blank entry
-                $m = [system.globalization.cultureinfo]::CurrentCulture.DateTimeFormat.MonthNames | Where-Object { $_ }
-                if ( $m -contains $_) {
-                    $True
-                }
-                Else {
-                    Throw "You must enter one of these values: $($m -join ',')"
-                    $False
-                }
-            })]
+            #sometimes this returns an extra and blank entry
+            $m = [system.globalization.cultureinfo]::CurrentCulture.DateTimeFormat.MonthNames | Where-Object { $_ }
+            if ( $m -contains $_) {
+                $True
+            }
+            Else {
+                Throw "You must enter one of these values: $($m -join ',')"
+                $False
+            }
+        })]
         [string]$Month = (Get-Date -Format MMMM),
-        [Parameter(Position = 1, ValueFromPipelineByPropertyName,
-            HelpMessage = "Enter the 4 digit year. The default is the current year.")]
+        [Parameter(
+            Position = 1,
+            ValueFromPipelineByPropertyName,
+            HelpMessage = "Enter the 4 digit year. The default is the current year."
+            )]
         [ValidatePattern("\d{4}")]
         [ValidateRange(1000, 9999)]
         [int]$Year = (Get-Date).Year,
@@ -644,34 +651,58 @@ Function Get-NCalendar {
             $dayname = "{0:ddd}" -f $day
             if ((-NOT $HideHighlight) -AND ($day -eq $today)) {
                 $dom = "$([char]27)[7m$($day.day)$([char]27)[0m"
-                $dayLength = $day.day.ToString()
+                $dayLength = $day.day.ToString().length
             }
             else {
                 $dom = $day.day
             }
             $dayhash[$dayname] += $dom
         }
 
+        $dayhash | Out-String | Write-Verbose
         #make sure month is in title case
         $head = "$($currculture.TextInfo.toTitleCase($Month)) $Year"
         $maxDayLength = $dayhash.keys.length | Sort-Object | Select-Object -Last 1
         Write-Verbose "Building day hashtable"
         $out = $dayhash.GetEnumerator() |
         ForEach-Object {
-            "{0}{1}" -f $_.name.Padright(4), ($_.value.foreach( {
-                        $str = $_.tostring()
-                        if ($str -match [char]27) {
-                            #add extra padding to account for ANSI escape sequence
-                            Write-Verbose "Adjusting for ANSI sequence"
-                            $ansipad = $str.length - $daylength  #8
-                            Write-Verbose "Padding $ansipad"
-                            $str = "     $str"
-                        }
-                        else {
-                            $ansipad = 0
-                        }
-                        $str.padleft(2 + $ansipad)
-                    }) -join " ").padleft($maxDayLength + 12 + $ansipad)
+            Write-Verbose $_.name
+            #build a value string
+            $vstring = $_.value.foreach( {
+                $str = $_.tostring()
+                Write-Verbose "Day: $str"
+                if ($str -match [char]27) {
+                    #add extra padding to account for ANSI escape sequence
+                    Write-Verbose "Adjusting for ANSI sequence"
+                    Write-Verbose "String length = $($str.length)"
+                    Write-Verbose "Saved length $ANSILength"
+                    Write-Verbose "Day length = $daylength"
+                    if ($daylength -le $str.length) {
+                        $ansipad = $str.length - $daylength #8
+                        #save ANSI length
+                        $ANSILength = $str.length - $daylength
+                    }
+                    else {
+                        $ansipad = 0
+                    }
+                    Write-Verbose "Padding $ansipad"
+                }
+                else {
+                    $ansipad = 0
+
+                }
+                $str.padleft(1 + $ansipad)
+            })
+            Write-Verbose "Does day string contain ANSI?"
+            Write-Verbose (($vstring -join ' ') -match [char]27)
+            if ((($vstring -join ' ') -match [char]27)) {
+                Write-Verbose "Adding $ANSILength to AnsiPad value"
+                   $ansipad+= $ANSILength
+            }
+            Write-Verbose "Using days $($vstring -join ' ')"
+            # Write-Verbose "Padding left $MaxDayLength + 12 + $ANSIPad"
+            "{0}{1}" -f $_.name.Padright(4), $($vstring -join " ").padleft($maxDayLength + 12 + $ansipad)
+            $ANSILength=0
         }
         Write-Verbose "display length = $($out[0].length)"
         #write-Verbose "head length = $($head.length)"
@@ -689,6 +720,7 @@ Function Get-NCalendar {
 
 Function Get-MonthName {
     [cmdletbinding()]
+    [outputtype("string")]
     Param(
         [Parameter(HelpMessage = "Get short month names")]
         [switch]$Short