Current

Author: Robert Holt

tools/ChangelogTools.psm1

@@ -5,6 +5,14 @@
 
 using module .\GitHubTools.psm1
 
+class IgnoreConfiguration
+{
+    [string[]]$User
+    [string[]]$IssueLabel
+    [string[]]$PRLabel
+    [string[]]$CommitLabel
+}
+
 class ChangeInfo
 {
     [GitHubCommitInfo]$Commit
@@ -180,26 +188,48 @@ filter Skip-IgnoredChanges
 
         [Parameter()]
         [string[]]
-        $IgnoreUser,
+        $User,
 
         [Parameter()]
         [string[]]
-        $IgnoreCommitLabel
+        $CommitLabel,
+
+        [Parameter()]
+        [string[]]
+        $IssueLabel,
+
+        [Parameter()]
+        [string[]]
+        $PRLabel
     )
 
-    if ($Change.ContributingUser -in $IgnoreUser)
+    if ($Change.ContributingUser -in $User)
     {
         return
     }
 
-    foreach ($commitLabel in $Change.Commit.CommitLabels)
+    foreach ($changeCommitLabel in $Change.Commit.CommitLabels)
     {
-        if ($commitLabel -in $IgnoreCommitLabel)
+        if ($changeCommitLabel -in $CommitLabel)
         {
             return
         }
     }
 
+    foreach ($changeIssueLabel in $Change.Commit.IssueLabels)
+    {
+        if ($changeIssueLabel -in $IssueLabel)
+        {
+            return
+        }
+    }
+
+    foreach ($changePRLabel in $Change.Commit.PRLabels)
+    {
+        if ()
+    }
+
+
     return $Change
 }
 
@@ -288,19 +318,40 @@ function New-ChangeLogSection
 
             foreach ($item in $category.Value)
             {
-                $project= $item.Change.Commit.Repository
-                $issueNumber = if ($item.Change.IssueNumber -ge 0) { $item.Change.IssueNumber } else { $null }
+                # Set up the pieces needed for a changelog entry
+                $project = $item.Change.Commit.Repository
                 $link = if ($item.PRLink) { $item.PRLink } else { $org = $item.Change.Commit.Organization; "https://github.com/$org/$project" }
                 $thanks = $item.Thanks
 
-                [void]$sb.Append("- [$project")
+                $issueNumber = if ($item.Change.IssueNumber -ge 0)
+                {
+                    $item.Change.IssueNumber
+                }
+                elseif ($item.Change.PRNumber -ge 0)
+                {
+                    $item.Change.PRNumber
+                }
+                else
+                {
+                    $null
+                }
+
+                # Add the list bullet
+                [void]$sb.Append('- ')
+
+                # Start with the tags
+                if ($item.Tags)
+                {
+                    [void]$sb.Append(($item.Tags -join ' ')).Append(' ')
+                }
+
+                # Create a header for the change if there is an issue number
                 if ($issueNumber)
                 {
-                    [void]$sb.Append(" #$issueNumber")
+                    [void]$sb.AppendLine("[$project #$issueNumber]($link) -").Append($Indent)
                 }
-                [void]$sb.AppendLine("]($link) -")
 
-                [void]$sb.Append($Indent).Append($item.Subject)
+                [void]$sb.Append($item.Subject)
                 if ($thanks)
                 {
                     [void]$sb.Append(" (Thanks @$thanks!)")
@@ -311,12 +362,38 @@ function New-ChangeLogSection
 
         if ($Postamble)
         {
-            [void]$sb.AppendLine($Postamble).AppendLine()
+            [void]$sb.AppendLine().AppendLine($Postamble)
         }
 
+        [void]$sb.AppendLine()
+
         return $sb.ToString()
     }
 }
 
+function New-ChangelogRelease
+{
+    param(
+        [Parameter(Mandatory)]
+        [string]
+        $GitHubToken,
+
+        [Parameter(Mandatory)]
+        [string]
+        $RepositoryPath,
+
+        [Parameter(Mandatory)]
+        [string]
+        $SinceRef,
+
+        [Parameter()]
+        [string]
+        $UntilRef = 'HEAD',
+
+        [Parameter()]
+        [IgnoreConfiguration]
+        $Ignore
+    )
+}
 
 Export-ModuleMember -Function Get-ChangeInfoFromCommit,New-ChangelogEntry,Skip-IgnoredChanges,New-ChangeLogSection

tools/GitHubTools.psm1

@@ -295,18 +295,21 @@ function Copy-GitRepository
     {
         Exec { git config core.autocrlf true }
 
-        foreach ($remote in $Remotes.get_Keys())
+        if ($Remotes)
         {
-            Exec { git remote add $remote $Remotes[$remote] }
-        }
-
-        if ($PullUpstream -and $remote['upstream'])
-        {
-            Exec { git pull upstream $CloneBranch }
+            foreach ($remote in $Remotes.get_Keys())
+            {
+                Exec { git remote add $remote $Remotes[$remote] }
+            }
 
-            if ($UpdateOrigin)
+            if ($PullUpstream -and $Remotes['upstream'])
             {
-                Exec { git push origin "+$CloneBranch"}
+                Exec { git pull upstream $CloneBranch }
+
+                if ($UpdateOrigin)
+                {
+                    Exec { git push origin "+$CloneBranch"}
+                }
             }
         }
 

tools/changelog/updateChangelog.ps1

@@ -37,7 +37,11 @@ param(
 
     [Parameter()]
     [string]
-    $FromForm = 'rjmholt',
+    $FromFork = 'rjmholt',
+
+    [Parameter()]
+    [string]
+    $ChangelogName = 'CHANGELOG.md',
 
     [Parameter()]
     [string]
@@ -96,8 +100,8 @@ $clEntryParams = @{
         Issue = $categories[$defaultCategory].Issue
     }
     TagLabels = @{
-        'Issue-Enhancement' = 'Feature'
-        'Issue-Bug' = 'BugFix'
+        'Issue-Enhancement' = '✨'
+        'Issue-Bug' = '🐛'
     }
     NoThanks = @(
         'rjmholt'
@@ -108,6 +112,23 @@ $clEntryParams = @{
     )
 }
 
+function UpdateChangelogFile
+{
+    param(
+        [Parameter(Mandatory)]
+        [string]
+        $NewSection,
+
+        [Parameter(Mandatory)]
+        [string]
+        $Path
+    )
+
+    $changelogLines = Get-Content -Path $Path
+    $newContent = ($changelogLines[0..1] -join "`n`n") + $NewSection + ($changelogLines[2..$changelogLines.Length] -join "`n")
+    Set-Content -Encoding utf8NoBOM -Value $newContent -Path $Path
+}
+
 $clSectionParams = @{
     Categories = $categories.Keys
     DefaultCategory = $defaultCategory
@@ -134,16 +155,16 @@ $cloneParams = @{
 }
 Copy-GitRepository @cloneParams
 
-#UpdateGalleryFile -ExtensionVersion $ExtensionVersion -GalleryFilePath "$repoLocation/$GalleryFileName"
+UpdateChangelogFile -NewSection $newChangelogSection -Path "$repoLocation/$ChangelogName"
 
-Submit-GitChanges -RepositoryLocation $repoLocation -File $GalleryFileName -Branch $branchName -Message "Update PS extension to v$ExtensionVersion"
+Submit-GitChanges -RepositoryLocation $repoLocation -File $GalleryFileName -Branch $branchName -Message "Update CHANGELOG for $ReleaseName"
 
 $prParams = @{
     Organization = $TargetFork
     Repository = $Repository
     Branch = $branchName
     Title = "Update CHANGELOG for $ReleaseName"
     GitHubToken = $GitHubToken
-    FromOrg = 'rjmholt'
+    FromOrg = $FromFork
 }
 New-GitHubPR @prParams