Skip to content

Commit e392daa

Browse files
Test for requires (#25)
## Description - `RequiredModule` now supports hashtable. ## Type of change <!-- Use the check-boxes [x] on the options that are relevant. --> - [ ] 📖 [Docs] - [x] 🪲 [Fix] - [ ] 🩹 [Patch] - [ ] ⚠️ [Security fix] - [ ] 🚀 [Feature] - [ ] 🌟 [Breaking change] ## Checklist <!-- Use the check-boxes [x] on the options that are relevant. --> - [x] I have performed a self-review of my own code - [x] I have commented my code, particularly in hard-to-understand areas
1 parent 30e034e commit e392daa

File tree

1 file changed

+3
-10
lines changed

1 file changed

+3
-10
lines changed

scripts/helpers/Build/Build-PSModuleManifest.ps1

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -155,21 +155,17 @@ function Build-PSModuleManifest {
155155
if ($file.extension -in '.psm1', '.ps1') {
156156
$fileContent = Get-Content -Path $file
157157

158+
## TESTING THIS
158159
switch -Regex ($fileContent) {
159160
# RequiredModules -> REQUIRES -Modules <Module-Name> | <Hashtable>, @() if not provided
160161
'^\s*#Requires -Modules (.+)$' {
161162
# Add captured module name to array
162163
$capturedMatches = $matches[1].Split(',').trim()
163164
$capturedMatches | ForEach-Object {
164-
Write-Verbose " - [#Requires -Modules] - [$_]"
165-
$hashtable = '\@\s*\{[^\}]*\}'
165+
$hashtable = '@\{[^}]*\}'
166166
if ($_ -match $hashtable) {
167-
$modules = ConvertTo-Hashtable -InputString $_
168167
Write-Verbose " - [#Requires -Modules] - [$_] - Hashtable"
169-
$modules.Keys | ForEach-Object {
170-
Write-Verbose "$($modules[$_])]"
171-
}
172-
$capturedModules += $modules
168+
$capturedModules += ConvertTo-Hashtable -InputString $_
173169
} else {
174170
Write-Verbose " - [#Requires -Modules] - [$_] - String"
175171
$capturedModules += $_
@@ -179,21 +175,18 @@ function Build-PSModuleManifest {
179175
# PowerShellVersion -> REQUIRES -Version <N>[.<n>], $null if not provided
180176
'^\s*#Requires -Version (.+)$' {
181177
Write-Verbose " - [#Requires -Version] - [$($matches[1])]"
182-
# Add captured module name to array
183178
$capturedVersions += $matches[1]
184179
}
185180
#CompatiblePSEditions -> REQUIRES -PSEdition <PSEdition-Name>, $null if not provided
186181
'^\s*#Requires -PSEdition (.+)$' {
187182
Write-Verbose " - [#Requires -PSEdition] - [$($matches[1])]"
188-
# Add captured module name to array
189183
$capturedPSEdition += $matches[1]
190184
}
191185
}
192186
}
193187
}
194188

195189
Write-Verbose '[RequiredModules]'
196-
$capturedModules = $capturedModules
197190
$manifest.RequiredModules = $capturedModules
198191
$manifest.RequiredModules | ForEach-Object { Write-Verbose "[RequiredModules] - [$_]" }
199192

0 commit comments

Comments
 (0)