Skip to content

Commit e2044bb

Browse files
FriedrichWeinmannFriedrichWeinmann
committed
updates
1 parent 5876757 commit e2044bb

12 files changed

+346
-158
lines changed

‎PSFramework.NuGet/functions/Get/Publish-PSFModule.ps1

+2-22
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
foreach ($sourceModule in $Path) {
8080
# Update Metadata per Parameter
8181
$moduleData = Copy-Module -Path $sourceModule -Destination $workingDirectory -Cmdlet $PSCmdlet -Continue
82-
Update-ModuleInformation -Module $moduleData -Tags $Tags -LicenseUri $LicenseUri -IconUri $IconUri -ProjectUri $ProjectUri -ReleaseNotes $ReleaseNotes -Prerelease $Prerelease -Cmdlet $PSCmdlet -Continue
82+
Update-PSFModuleManifest -Path $moduleData.ManifestPath -Tags $Tags -LicenseUri $LicenseUri -IconUri $IconUri -ProjectUri $ProjectUri -ReleaseNotes $ReleaseNotes -Prerelease $Prerelease -Cmdlet $PSCmdlet -Continue
8383

8484
# Case 1: Publish to Destination Path
8585
if ($DestinationPath) {
@@ -108,24 +108,4 @@
108108
Remove-PSFTempItem -ModuleName PSFramework.NuGet -Name Publish.*
109109
}
110110
}
111-
}
112-
<#
113-
- Path
114-
- DestinationPath (-/V3)
115-
116-
- Repository
117-
- Type
118-
- Credential
119-
- ApiKey
120-
121-
- SkipAutopmaticTags (V2/-) - Disregard
122-
- Force (V2/-) - Disregard
123-
- SkipDependenciesCheck (-/V3) - Partial (only for V3, as V2 does not support)
124-
- SkipModuleManifestValidate (-/V3) - Always. Cheat to make V2 work out.
125-
126-
# Will be implemented outside of the Get Commands
127-
- Tags (V2/-)
128-
- LicenseUri (V2/-)
129-
- IconUri (V2/-)
130-
- ProjectUri (V2/-)
131-
#>
111+
}

‎PSFramework.NuGet/functions/Get/Update-PSFModuleManifest.ps1

+167
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,167 @@
1+
function Update-PSFModuleManifest {
2+
[CmdletBinding()]
3+
param (
4+
$Path,
5+
6+
[string[]]
7+
$Tags,
8+
9+
[string]
10+
$LicenseUri,
11+
12+
[string]
13+
$IconUri,
14+
15+
[string]
16+
$ProjectUri,
17+
18+
[string]
19+
$ReleaseNotes,
20+
21+
[string]
22+
$Prerelease,
23+
24+
[switch]
25+
$PassThru,
26+
27+
$Cmdlet = $PSCmdlet,
28+
29+
[switch]
30+
$Continue
31+
)
32+
begin {
33+
#region Utility Functions
34+
function Update-ManifestProperty {
35+
[OutputType([System.Management.Automation.Language.Ast])]
36+
[CmdletBinding()]
37+
param (
38+
[Parameter(Mandatory = $true)]
39+
[System.Management.Automation.Language.Ast]
40+
$Ast,
41+
42+
[Parameter(Mandatory = $true)]
43+
[string]
44+
$Property,
45+
46+
[Parameter(Mandatory = $true)]
47+
$Value,
48+
49+
[Parameter(Mandatory = $true)]
50+
[ValidateSet('String', 'StringArray', 'HashtableArray')]
51+
[string]
52+
$Type
53+
)
54+
55+
$mainHash = $Ast.FindAll({
56+
$args[0] -is [System.Management.Automation.Language.HashtableAst] -and
57+
$args[0].KeyValuePairs.Item1.Value -contains 'RootModule' -and
58+
$args[0].KeyValuePairs.Item1.Value -Contains 'ModuleVersion'
59+
}, $true)
60+
61+
$entry = $mainhash.KeyValuePairs | Where-Object { $_.Item1.Value -eq $Property }
62+
$stringValue = switch ($Type) {
63+
'String' { $Value | ConvertTo-Psd1 }
64+
'StringArray' { , @(, @($Value)) | ConvertTo-Psd1 }
65+
'HashtableArray' { , @(, @($Value)) | ConvertTo-Psd1 }
66+
}
67+
$format = '{0}'
68+
#region Case: Key Already Exists
69+
if ($entry) {
70+
$start = $entry.Item2.Extent.StartOffset
71+
$end = $entry.Item2.Extent.EndOffset
72+
}
73+
#endregion Case: Key Already Exists
74+
75+
#region Case: Key Does not exist
76+
else {
77+
$line = $Ast.Extent.Text -split "`n" | Where-Object { $_ -match "#\s+$Property = " }
78+
# Entry already exists but is commented out
79+
if ($line) {
80+
$format = "$Property = {0}"
81+
$index = $Ast.Extent.Text.IndexOf($line)
82+
$start = $index + $line.Length - $line.TrimStart().Length
83+
$end = $index + $line.Length
84+
}
85+
# Entry does not exist already
86+
else {
87+
$indent = ($Ast.Extent.Text -split "`n" | Where-Object { $_ -match "^\s+ModuleVersion" }) -replace '^(\s*).+$', '$1'
88+
$format = "$($indent)$($Property) = {0}`n"
89+
$start = $mainHash.Extent.EndOffset - 1
90+
$end = $mainHash.Extent.EndOffset - 1
91+
}
92+
}
93+
#endregion Case: Key Does not exist
94+
95+
$newText = $Ast.Extent.Text.SubString(0,$start) + ($format -f $stringValue) + $Ast.Extent.SubString($end)
96+
[System.Management.Automation.Language.Parser]::ParseInput($newText, [ref]$null, [ref]$null)
97+
}
98+
#endregion Utility Functions
99+
}
100+
process {
101+
# If Nothing to do, do nothing
102+
if (-not ($Tags -or $LicenseUri -or $IconUri -or $ProjectUri -or $ReleaseNotes -or $Prerelease)) { return }
103+
104+
$killIt = $ErrorActionPreference -eq 'Stop'
105+
106+
$ast = [System.Management.Automation.Language.Parser]::ParseFile($Path, [ref]$null, [ref]$null)
107+
108+
$mainHash = $ast.FindAll({
109+
$args[0] -is [System.Management.Automation.Language.HashtableAst] -and
110+
$args[0].KeyValuePairs.Item1.Value -contains 'RootModule' -and
111+
$args[0].KeyValuePairs.Item1.Value -Contains 'ModuleVersion'
112+
}, $true)
113+
114+
if (-not $mainHash) {
115+
Stop-PSFFunction -String 'Update-PSFModuleManifest.Error.BadManifest' -StringValues (Get-Item -Path $Path).BaseName, $Path -Cmdlet $Cmdlet -EnableException $killIt -Continue:$Continue
116+
return
117+
}
118+
119+
#region PrivateData Content
120+
$privateData = [ordered]@{
121+
PSData = [ordered]@{ }
122+
}
123+
$replacements = @{ }
124+
125+
$privateDataAst = $mainHash.KeyValuePairs | Where-Object { $_.Item1.Value -eq 'PrivateData' } | ForEach-Object { $_.Item2.PipelineElements[0].Expression }
126+
127+
if ($privateDataAst) {
128+
foreach ($pair in $privateDataAst.KeyValuePairs) {
129+
if ($pair.Item1.Value -ne 'PSData') {
130+
$id = "%PSF_$(Get-Random)%"
131+
$privateData[$pair.Item1.Value] = $id
132+
$replacements[$id] = $pair.Item2.Extent.Text
133+
continue
134+
}
135+
136+
foreach ($subPair in $pair.Item2.PipelineElements[0].Expression.KeyValuePairs) {
137+
$id = "%PSF_$(Get-Random)%"
138+
$privateData.PSData[$subPair.Item1.Value] = $id
139+
$replacements[$id] = $subPair.Item2.Extent.Text
140+
}
141+
}
142+
}
143+
144+
if ($Tags) { $privateData.PSData['Tags'] = $Tags }
145+
if ($LicenseUri) { $privateData.PSData['LicenseUri'] = $LicenseUri }
146+
if ($IconUri) { $privateData.PSData['IconUri'] = $IconUri }
147+
if ($ProjectUri) { $privateData.PSData['ProjectUri'] = $ProjectUri }
148+
if ($ReleaseNotes) { $privateData.PSData['ReleaseNotes'] = $ReleaseNotes }
149+
if ($Prerelease) { $privateData.PSData['Prerelease'] = $Prerelease }
150+
151+
$privateDataString = $privateData | ConvertTo-Psd1 -Depth 5
152+
foreach ($pair in $replacements.GetEnumerator()) {
153+
$privateDataString = $privateDataString -replace "'$($pair.Key)'", $pair.Value
154+
}
155+
156+
if (-not $privateDataAst) {
157+
$newManifest = $ast.Extent.Text.Insert(($mainHash.Extent.EndOffset - 1), "PrivateData = $privateDataString`n")
158+
}
159+
else {
160+
$newManifest = $ast.Extent.Text.SubString(0, $privateDataAst.Extent.StartOffset) + $privateDataString + $ast.Extent.Text.SubString($privateDataAst.Extent.EndOffset)
161+
}
162+
#endregion PrivateData Content
163+
164+
if ($PassThru) { $newManifest }
165+
else { $newManifest | Set-Content -Path $Path }
166+
}
167+
}

‎PSFramework.NuGet/functions/Resource/Publish-PSFResourceModule.ps1

+84-13
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,91 @@
1-
function Publish-PSFResourceModule
2-
{
1+
function Publish-PSFResourceModule {
32
[CmdletBinding()]
43
Param (
5-
4+
[PsfValidateScript('PSFramework.Validate.SafeName', ErrorString = 'PSFramework.Validate.SafeName')]
5+
[string]
6+
$Name,
7+
8+
[string]
9+
$Version = '1.0.0',
10+
11+
[Parameter(Mandatory = $true)]
12+
[PsfPath]
13+
$Path,
14+
15+
[Parameter(Mandatory = $true, ParameterSetName = 'ToRepository')]
16+
[PsfValidateSet(TabCompletion = 'PSFramework.NuGet.Repository')]
17+
[PsfArgumentCompleter('PSFramework.NuGet.Repository')]
18+
[string[]]
19+
$Repository,
20+
21+
[Parameter(ParameterSetName = 'ToRepository')]
22+
[ValidateSet('All', 'V2', 'V3')]
23+
[string]
24+
$Type = 'All',
25+
26+
[Parameter(ParameterSetName = 'ToRepository')]
27+
[PSCredential]
28+
$Credential,
29+
30+
[Parameter(ParameterSetName = 'ToRepository')]
31+
[string]
32+
$ApiKey,
33+
34+
[Parameter(ParameterSetName = 'ToRepository')]
35+
[switch]
36+
$SkipDependenciesCheck,
37+
38+
[Parameter(Mandatory = $true, ParameterSetName = 'ToPath')]
39+
[PsfDirectory]
40+
$DestinationPath,
41+
42+
[object[]]
43+
$RequiredModules,
44+
45+
[string]
46+
$Description = '<Dummy Description>',
47+
48+
[string]
49+
$Author,
50+
51+
[string[]]
52+
$Tags,
53+
54+
[string]
55+
$LicenseUri,
56+
57+
[string]
58+
$IconUri,
59+
60+
[string]
61+
$ProjectUri,
62+
63+
[string]
64+
$ReleaseNotes,
65+
66+
[string]
67+
$Prerelease
668
)
769

8-
begin
9-
{
10-
11-
}
12-
process
13-
{
14-
#TODO: Implement
70+
begin {
71+
$killIt = $ErrorActionPreference -eq 'Stop'
72+
$stagingDirectory = New-PSFTempDirectory -ModuleName 'PSFramework.NuGet' -Name Publish.ResourceModule -DirectoryName $Name
73+
$publishParam = $PSBoundParameters | ConvertTo-PSFHashtable -ReferenceCommand Publish-PSFModule -Exclude Path, ErrorAction
1574
}
16-
end
17-
{
18-
75+
process {
76+
try {
77+
New-DummyModule -Path $stagingDirectory -Name $Name -Version $Version -RequiredModules $RequiredModules -Description $Description -Author $Author -Cmdlet $PSCmdlet
78+
$resources = New-Item -Path $stagingDirectory -Name Resources -ItemType Directory -Force
79+
$Path | Copy-Item -Destination $resources.FullName -Recurse -Force -Confirm:$false -WhatIf:$false
80+
81+
Publish-PSFModule @publishParam -Path $stagingDirectory -ErrorAction Stop
82+
}
83+
catch {
84+
Stop-PSFFunction -String 'Publish-PSFResourceModule.Error' -StringValues $Name -EnableException $killIt -ErrorRecord $_ -Cmdlet $PSCmdlet
85+
return
86+
}
87+
finally {
88+
Remove-PSFTempItem -ModuleName 'PSFramework.NuGet' -Name Publish.ResourceModule
89+
}
1990
}
2091
}

‎PSFramework.NuGet/functions/Resource/Save-PSFResourceModule.ps1

+8-8
Original file line numberDiff line numberDiff line change
@@ -136,30 +136,30 @@
136136
try {
137137
$saveParam = $PSBoundParameters | ConvertTo-PSFHashtable -ReferenceCommand Save-PSFModule -Exclude Path, ErrorAction
138138
Invoke-PSFProtectedCommand -ActionString 'Save-PSFResourceModule.Downloading' -ActionStringValues ($Name -join ', ') -ScriptBlock {
139-
Save-PSFModule @saveParam -Path $tempDirectory -ErrorAction Stop -WhatIf:$false -Confirm:$false
139+
$null = Save-PSFModule @saveParam -Path $tempDirectory -ErrorAction Stop -WhatIf:$false -Confirm:$false
140140
} -PSCmdlet $PSCmdlet -EnableException $killIt -WhatIf:$false -Confirm:$false
141141
if (Test-PSFFunctionInterrupt) { return }
142142

143143
foreach ($pathEntry in $Path) {
144144
foreach ($module in Get-ChildItem -Path $tempDirectory) {
145-
foreach ($version in Get-ChildItem -LiteralPath $module.FullName) {
146-
$dataPath = Join-Path -Path $version.FullName -ChildPath 'Resources'
145+
foreach ($versionFolder in Get-ChildItem -LiteralPath $module.FullName) {
146+
$dataPath = Join-Path -Path $versionFolder.FullName -ChildPath 'Resources'
147147
if (-not (Test-Path -Path $dataPath)) {
148-
Write-PSFMessage -String 'Save-PSFResourceModule.Skipping.InvalidResource' -StringValues $module.Name, $version.Name
148+
Write-PSFMessage -String 'Save-PSFResourceModule.Skipping.InvalidResource' -StringValues $module.Name, $versionFolder.Name
149149
continue
150150
}
151-
if (-not $PSCmdlet.ShouldProcess("$($module.Name) ($($version.Name))", "Deploy to $pathEntry")) {
151+
if (-not $PSCmdlet.ShouldProcess("$($module.Name) ($($versionFolder.Name))", "Deploy to $pathEntry")) {
152152
continue
153153
}
154154

155-
foreach ($item in Get-ChildItem -LiteralPath $version.FullName) {
155+
foreach ($item in Get-ChildItem -LiteralPath $dataPath) {
156156
$targetPath = Join-Path -Path $pathEntry -ChildPath $item.Name
157157
if (-not $Force -and (Test-path -Path $targetPath)) {
158-
Write-PSFMessage -String 'Save-PSFResourceModule.Skipping.AlreadyExists' -StringValues $module.Name, $version.Name, $item.Name, $pathEntry
158+
Write-PSFMessage -String 'Save-PSFResourceModule.Skipping.AlreadyExists' -StringValues $module.Name, $versionFolder.Name, $item.Name, $pathEntry
159159
continue
160160
}
161161

162-
Invoke-PSFProtectedCommand -ActionString 'Save-PSFResourceModule.Deploying' -ActionStringValues $module.Name, $version.Name, $item.Name, $pathEntry -ScriptBlock {
162+
Invoke-PSFProtectedCommand -ActionString 'Save-PSFResourceModule.Deploying' -ActionStringValues $module.Name, $versionFolder.Name, $item.Name, $pathEntry -ScriptBlock {
163163
Move-Item -LiteralPath $item.FullName -Destination $pathEntry -Force -ErrorAction Stop -Confirm:$false -WhatIf:$false
164164
} -Target $item.Name -PSCmdlet $PSCmdlet -EnableException $killIt -Continue -Confirm:$false -WhatIf:$false
165165
}

‎PSFramework.NuGet/internal/functions/Get/Publish/Copy-Module.ps1

+3-2
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
}
5959

6060
$destinationPath = Join-Path -Path $Destination -ChildPath $moduleName
61-
try { Copy-Item -Path "$($sourceDirectoryPath.Trim('\/'))\*" Destination $destinationPath -Recurse -Force -ErrorAction Stop }
61+
try { Copy-Item -Path "$($sourceDirectoryPath.Trim('\/'))\*" -Destination $destinationPath -Recurse -Force -ErrorAction Stop }
6262
catch {
6363
Stop-PSFFunction -String 'Copy-Module.Error.StagingFolderCopy' -StringValues $Path -Target $Path @stopCommon -ErrorRecord $_
6464
return
@@ -67,8 +67,9 @@
6767

6868
$hashtableAst = $ast.EndBlock.Statements[0].PipelineElements[0].Expression
6969
[PSCustomObject]@{
70-
Name = $moduleNamee
70+
Name = $moduleName
7171
Path = $destinationPath
72+
ManifestPath = Join-Path -Path $destinationPath -ChildPath "$moduleName.psd1"
7273
SourcePath = $sourceDirectoryPath
7374
Author = @($hashtableAst.KeyValuePairs).Where{ $_.Item1.Value -eq 'Author' }.Item2.PipelineElements.Expression.Value
7475
Version = @($hashtableAst.KeyValuePairs).Where{ $_.Item1.Value -eq 'ModuleVersion' }.Item2.PipelineElements.Expression.Value

0 commit comments

Comments
 (0)