Merge pull request #188 from StartAutomating/ugit-an-update

ugit 0.4.1

.github/workflows/SendPSA.yml

@@ -0,0 +1,17 @@
+
+name: ugit-psa
+on: 
+  workflow_dispatch: 
+jobs: 
+  SendPSA: 
+    runs-on: ubuntu-latest
+    if: ${{ success() }}
+    steps: 
+      - name: Check out repository
+        uses: actions/checkout@v2
+      - name: PSA
+        uses: StartAutomating/PSA@main
+        id: PSA
+env: 
+  AT_PROTOCOL_HANDLE: mrpowershell.bsky.social
+  AT_PROTOCOL_APP_PASSWORD: ${{ secrets.AT_PROTOCOL_APP_PASSWORD }}

.github/workflows/TestAndPublish.yml

@@ -591,4 +591,9 @@ jobs:
       - name: Run HelpOut
         uses: StartAutomating/HelpOut@master
         id: HelpOut
-
+      - name: PSA
+        uses: StartAutomating/PSA@main
+        id: PSA
+env: 
+  AT_PROTOCOL_HANDLE: mrpowershell.bsky.social
+  AT_PROTOCOL_APP_PASSWORD: ${{ secrets.AT_PROTOCOL_APP_PASSWORD }}

CHANGELOG.md

@@ -1,3 +1,17 @@
+## 0.4.1:
+
+* New Git Command Support:
+  * git submodule status (#183)
+* New Git ScriptMethods:
+  * git.branch.diff (#187)
+  * git.branch.rename (#86)
+* Easier Input:
+  * git commit -CommitDate (#184)
+  * git log -CurrentBranch (fixing forks, #179)
+* Announcing Releases with [PSA](https://github.com/StartAutomating/PSA)
+
+---
+
 ## 0.4:
 
 * Adding Sponsorship! (#174)

Extensions/Git.Commit.Input.UGit.Extension.ps1

@@ -33,7 +33,13 @@ $Trailers,
 
 # If set, will amend an existing commit.
 [switch]
-$Amend
+$Amend,
+
+# The commit date.
+[Parameter(ValueFromPipelineByPropertyName)]
+[Alias('Date','Time','DateTime','Timestamp')]
+[datetime]
+$CommitDate
 )
 
 
@@ -63,4 +69,9 @@ if ($Trailers) {
 
 if ($amend) {
     "--amend"   
+}
+
+if ($CommitDate) {
+    "--date"        
+    $CommitDate.ToString("o")
 }

Extensions/Git.Log.Input.UGit.Extension.ps1

@@ -84,7 +84,7 @@ foreach ($dashToDoubleDash in 'after', 'before', 'author') {
 }
 
 if ($CurrentBranch) {        
-    $headbranch        = git remote | git remote show | Select-Object -ExpandProperty HeadBranch
+    $headbranch        = git remote | git remote show | Select-Object -ExpandProperty HeadBranch -First 1
     $currentBranchName = git branch | Where-Object IsCurrentBranch
     if ($currentBranchName -ne $headbranch) {
         "$headbranch..$currentBranchName"

Extensions/Git.SubModule.Status.ugit.extension.ps1

@@ -0,0 +1,37 @@
+<#
+.Synopsis
+    Git Submodule Extension
+.Description
+    Git Submodule as objects.
+.EXAMPLE
+    git submodule
+#>
+[Management.Automation.Cmdlet("Out","Git")]                         # It's an extension for Out-Git
+[ValidatePattern("^(?:git)\s(?:submodule)\s(?:status)?$")]          # that is run when git submodule is run (with no other options (except for status)).
+param()
+
+begin {
+    $submoduleLines = @()
+}
+
+process {
+    $submoduleLines += $gitOut
+}
+
+end {
+    if ($gitArgument -match '--(?>n|dry-run)') {
+        return $submoduleLines
+    }
+
+    foreach ($line in $submoduleLines) {
+        if ($line -match '^\s{0,}[\+]?(?<CommitHash>[0-9a-f]{10,})\s(?<SubModule>\S+)\s\((?<Reference>[^\)]+)\)') {
+            $Matches.Remove(0)
+            $toObject = [Ordered]@{
+                PSTypeName = 'git.submodule.status'
+                GitOutputLines = $submoduleLines
+                GitRoot = $gitRoot                
+            } + $Matches                            
+            [PSCustomObject]$toObject
+        }
+    }
+}

Formatting/Git.Submodule.format.ps1

@@ -0,0 +1 @@
+Write-FormatView -TypeName git.submodule.status -Property Submodule, Reference, CommitHash

Get-UGitExtension.ps1

@@ -1,4 +1,4 @@
-#region Piecemeal [ 0.3.10 ] : Easy Extensible Plugins for PowerShell
+#region Piecemeal [ 0.4.1 ] : Easy Extensible Plugins for PowerShell
 # Install-Module Piecemeal -Scope CurrentUser 
 # Import-Module Piecemeal -Force 
 # Install-Piecemeal -ExtensionModule 'ugit' -ExtensionModuleAlias 'git' -ExtensionNoun 'UGitExtension' -ExtensionTypeName 'ugit.extension' -OutputPath '.\Get-UGitExtension.ps1'
@@ -614,6 +614,8 @@ function Get-UGitExtension
 
                     $ExtensionDynamicParameters = [Management.Automation.RuntimeDefinedParameterDictionary]::new()
                     $Extension = $this
+                    $ExtensionMetadata = $Extension -as [Management.Automation.CommandMetaData]
+                    if (-not $ExtensionMetadata) { return $ExtensionDynamicParameters }
 
                     :nextDynamicParameter foreach ($in in @(($Extension -as [Management.Automation.CommandMetaData]).Parameters.Keys)) {
                         $attrList = [Collections.Generic.List[Attribute]]::new()
@@ -1042,12 +1044,16 @@ function Get-UGitExtension
 
         if ($Force) {
             $script:UGitExtensions  = $null
+            $script:UGitExtensionsByName    = $null
             $script:AllCommands = @()
         }
         if (-not $script:UGitExtensions)
         {
-            $script:UGitExtensionsFromFiles = [Ordered]@{}
-            $script:UGitExtensionsFileTimes = [Ordered]@{}
+            $script:UGitExtensionsFromFiles     = [Ordered]@{}
+            $script:UGitExtensionsFileTimes     = [Ordered]@{}
+            $script:UGitExtensionsByName        = [Ordered]@{}
+            $script:UGitExtensionsByDisplayName = [Ordered]@{}
+            $script:UGitExtensionsByPattern     = [Ordered]@{}
             $script:UGitExtensions =
                 @(@(
                 #region Find UGitExtension in Loaded Modules
@@ -1093,14 +1099,54 @@ function Get-UGitExtension
                 $ExecutionContext.SessionState.InvokeCommand.GetCommands('*', 'Function,Alias',$true) -match $extensionFullRegex
                 #endregion Find UGitExtension in Loaded Commands
                 ) | Select-Object -Unique | Sort-Object Rank, Name)
+
+            foreach ($extCmd in $script:UGitExtensions) {
+                if (-not $script:UGitExtensionsByName[$extCmd.Name]) {
+                    $script:UGitExtensionsByName[$extCmd.Name] = $extCmd
+                }
+                else {
+                    $script:UGitExtensionsByName[$extCmd.Name] = @($script:UGitExtensionsByName[$extCmd.Name]) + $extCmd
+                }
+                if ($extCmd.DisplayName) {
+                    if (-not $script:UGitExtensionsByDisplayName[$extCmd.DisplayName]) {
+                        $script:UGitExtensionsByDisplayName[$extCmd.DisplayName] = $extCmd
+                    }
+                    else {
+                        $script:UGitExtensionsByDisplayName[$extCmd.DisplayName] = @($script:UGitExtensionsByDisplayName[$extCmd.DisplayName]) + $extCmd
+                    }   
+                }
+                $ExtensionCommandAliases = @($extCmd.Attributes.AliasNames)
+                $ExtensionCommandAliasRegexes  = @($ExtensionCommandAliases -match '^/' -match '/$')
+                $ExtensionCommandNormalAliases = @($ExtensionCommandAliases -notmatch '^/')
+                if ($ExtensionCommandAliasRegexes) {
+                    foreach ($extensionAliasRegex in $ExtensionCommandAliasRegexes) {
+                        $regex = [Regex]::New($extensionAliasRegex -replace '^/' -replace '/$', 'IgnoreCase,IgnorePatternWhitespace')
+                        if (-not $script:UGitExtensionsByPattern[$regex]) {
+                            $script:UGitExtensionsByPattern[$regex] = $extCmd
+                        } else {
+                            $script:UGitExtensionsByPattern[$regex] = @($script:UGitExtensionsByPattern[$regex]) + $extCmd
+                        }
+                    }
+                }
+                if ($ExtensionCommandNormalAliases) {
+                    foreach ($extensionAlias in $ExtensionCommandNormalAliases) {
+                        if (-not $script:UGitExtensionsByName[$extensionAlias]) {
+                            $script:UGitExtensionsByName[$extensionAlias] = $extCmd
+                        } else {
+                            $script:UGitExtensionsByName[$extensionAlias] = @($script:UGitExtensionsByName[$extensionAlias]) + $extCmd
+                        }
+                    }
+                }
+
+            }
         }
         #endregion Find Extensions
     }
 
     process {
 
         if ($UGitExtensionPath) {
-            @(foreach ($_ in Get-ChildItem -Recurse -Path $UGitExtensionPath -File) {
+            @(foreach ($_ in Get-ChildItem -Recurse:$($UGitExtensionPath -notmatch '^\.[\\/]') -Path $UGitExtensionPath -File) {
                 if ($_.Name -notmatch $extensionFullRegex) { continue }
                 if ($CommandName -or $UGitExtensionName) {
                     ConvertToExtension $_ |
@@ -1118,14 +1164,34 @@ function Get-UGitExtension
                 # This section can be updated by using Install-Piecemeal -ForeachObject
                 #endregion Install-Piecemeal -ForeachObject
         } elseif ($CommandName -or $UGitExtensionName) {
-            $script:UGitExtensions |
-                . WhereExtends $CommandName |                
-                OutputExtension
+            if (-not $CommandName -and -not $like -and -not $Match) {
+                foreach ($exn in $UGitExtensionName) {
+                    if ($script:UGitExtensionsByName[$exn]) {
+                        $script:UGitExtensionsByName[$exn] | OutputExtension
+                    }
+                    if ($script:UGitExtensionsByDisplayName[$exn]) {
+                        $script:UGitExtensionsByDisplayName[$exn] | OutputExtension
+                    }
+                    if ($script:UGitExtensionsByPattern.Count) {
+                        foreach ($patternAndValue in $script:UGitExtensionsByPattern.GetEnumerator()) {
+                            if ($patternAndValue.Key.IsMatch($exn)) {
+                                $patternAndValue.Value | OutputExtension
+                            }
+                        }
+                        $script:UGitExtensionsByDisplayName[$exn]
+                    }
+                }                
+            } else {
+                $script:UGitExtensions |
+                    . WhereExtends $CommandName |
+                    OutputExtension
+            }
+
         } else {
             $script:UGitExtensions | 
                 OutputExtension
         }
     }
 }
-#endregion Piecemeal [ 0.3.10 ] : Easy Extensible Plugins for PowerShell
+#endregion Piecemeal [ 0.4.1 ] : Easy Extensible Plugins for PowerShell
 

GitHub/Jobs/SendPSA.psd1

@@ -0,0 +1,15 @@
+@{
+    "runs-on" = "ubuntu-latest"    
+    if = '${{ success() }}'
+    steps = @(
+        @{
+            name = 'Check out repository'
+            uses = 'actions/checkout@v2'
+        },        
+        @{
+            name = 'PSA'
+            uses = 'StartAutomating/PSA@main'
+            id = 'PSA'
+        }        
+    )
+}

GitHub/Jobs/buildugit.psd1

@@ -6,14 +6,28 @@
             name = 'Check out repository'
             uses = 'actions/checkout@v2'
         },
+        @{
+            name = 'GitLogger'
+            uses = 'GitLogging/GitLoggerAction@main'
+            id = 'GitLogger'
+        },
         @{
             name = 'Use PSSVG Action'
             uses = 'StartAutomating/PSSVG@main'
             id = 'PSSVG'
         },
         'RunPipeScript',
         'RunPiecemeal',
-        'RunEZOut',        
-        'RunHelpOut'
+        'RunEZOut',
+        @{
+            name = 'Run HelpOut'
+            uses = 'StartAutomating/HelpOut@master'
+            id = 'HelpOut'
+        },
+        @{
+            name = 'PSA'
+            uses = 'StartAutomating/PSA@main'
+            id = 'PSA'
+        }        
     )
 }

README.md

@@ -378,6 +378,13 @@ You might want to try giving some of these a try.
     git status | Select-Object -ExpandProperty Untracked
 ~~~
 
+### Git.SubModule.Status Example 1
+
+
+~~~PowerShell
+    git submodule
+~~~
+
 ## Out-Git Extensions
 
 ### Git Commands
@@ -441,6 +448,9 @@ Most extensions handle output from a single git command.
 
 * [Git Status](docs/Git.Status-Extension.md)
 
+
+* [Git SubModule Status](docs/Git.SubModule.Status-Extension.md)
+
 
 
 ### Additional Output Extensions

Types/git.branch/Alias.psd1

@@ -1,3 +1,4 @@
 @{
     HasUpstream = 'IsTracked'
+    Compare = 'Diff'
 }

Types/git.branch/Diff.ps1

@@ -0,0 +1,15 @@
+param()
+
+$firstArg, $restOfArgs =
+if (-not $args) {
+    git remote | git remote show | Select-Object -ExpandProperty HeadBranch -First 1  
+} else {
+    $args | Select-Object -First 1
+    $args | Select-Object -Skip 1
+}
+
+$restOfArgs = @($restOfArgs)
+
+Push-Location $this.GitRoot
+git diff "$($firstArg)..$($this.BranchName)" @restOfArgs
+Pop-Location

Types/git.branch/Rename.ps1

@@ -0,0 +1,6 @@
+if (-not $args) {
+    throw "Must provide a new branch name"
+}
+Push-Location $this.GitRoot
+git branch '-m' $this.BranchName @args
+Pop-Location

docs/CHANGELOG.md

@@ -1,3 +1,17 @@
+## 0.4.1:
+
+* New Git Command Support:
+  * git submodule status (#183)
+* New Git ScriptMethods:
+  * git.branch.diff (#187)
+  * git.branch.rename (#86)
+* Easier Input:
+  * git commit -CommitDate (#184)
+  * git log -CurrentBranch (fixing forks, #179)
+* Announcing Releases with [PSA](https://github.com/StartAutomating/PSA)
+
+---
+
 ## 0.4:
 
 * Adding Sponsorship! (#174)

docs/Get-UGitExtension.md

@@ -28,13 +28,13 @@ UGitExtension can be found in:
 
 
 ### Examples
-#### EXAMPLE 1
+> EXAMPLE 1
+
 ```PowerShell
 Get-UGitExtension
 ```
 
 
-
 ---