Skip to content

Commit 5876757

Browse files
FriedrichWeinmannFriedrichWeinmann
committed
updates
1 parent cbe2e94 commit 5876757

8 files changed

+197
-17
lines changed

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

+4-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
function Publish-PSFModule {
2-
[CmdletBinding(DefaultParameterSetName = 'ToRepository')]
2+
[CmdletBinding(DefaultParameterSetName = 'ToRepository', SupportsShouldProcess = $true)]
33
Param (
44
[Parameter(Mandatory = $true)]
55
[PsfPath]
@@ -53,7 +53,7 @@
5353

5454
begin {
5555
#region Setup
56-
$killIt = $ErrorActionPreference = 'Stop'
56+
$killIt = $ErrorActionPreference -eq 'Stop'
5757
if ($Repository) {
5858
# Resolve Repositories
5959
Search-PSFPowerShellGet
@@ -63,10 +63,8 @@
6363
}
6464
# Create Temp Directories
6565
$workingDirectory = New-PSFTempDirectory -ModuleName PSFramework.NuGet -Name Publish.Work
66-
$stagingDirectory = New-PSFTempDirectory -ModuleName PSFramework.NuGet -Name Publish.Staging
6766

6867
$commonPublish = @{
69-
StagingDirectory = $stagingDirectory
7068
Cmdlet = $PSCmdlet
7169
Continue = $true
7270
ContinueLabel = 'repo'
@@ -93,10 +91,10 @@
9391
:repo foreach ($repositoryObject in $repositories) {
9492
switch ($repositoryObject.Type) {
9593
V2 {
96-
Publish-ModuleV2 @commonPublish -Module $moduleData -Repository $repositoryObject.Name
94+
Publish-ModuleV2 @commonPublish -Module $moduleData -Repository $repositoryObject
9795
}
9896
V3 {
99-
Publish-ModuleV3 @commonPublish -Module $moduleData -Repository $repositoryObject.Name
97+
Publish-ModuleV3 @commonPublish -Module $moduleData -Repository $repositoryObject
10098
}
10199
default {
102100
Stop-PSFFunction -String 'Publish-PSFModule.Error.UnexpectedRepositoryType' -StringValues $repositoryObject.Name, $repositoryObject.Type -Continue -Cmdlet $PSCmdlet -EnableException $killIt

‎PSFramework.NuGet/internal/functions/Get/Publish/Assert-V2Publishing.ps1

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
function Assert-V2Publishing {
2+
[CmdletBinding()]
3+
param (
4+
$Cmdlet = $PSCmdlet
5+
)
6+
process {
7+
if ($script:psget.v2CanPublish) { return }
8+
Write-PSFMessage -Level Warning -String 'Assert-V2Publishing.CannotPublish' -PSCmdlet $Cmdlet -Once GetV2Publish
9+
}
10+
}

‎PSFramework.NuGet/internal/functions/Get/Publish/Publish-ModuleToPath.ps1

+55-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
function Publish-ModuleToPath {
2-
[CmdletBinding()]
2+
[CmdletBinding(SupportsShouldProcess = $true)]
33
param (
44
$Module,
55

@@ -12,15 +12,67 @@
1212
$Cmdlet = $PSCmdlet
1313
)
1414
begin {
15+
$killIt = $ErrorActionPreference -eq 'Stop'
1516
$useV3 = $script:psget.V3 -or $ForceV3
1617
if (-not $useV3) {
1718
Assert-V2Publishing -Cmdlet $Cmdlet
1819
}
20+
$stagingDirectory = New-PSFTempDirectory -ModuleName PSFramework.NuGet -Name Publish.StagingLocalCopy
1921
}
2022
process {
21-
#TODO: Implement
22-
throw "Not Implemented Yet"
23+
#region Verify Existing Module in Repository
24+
$fileName = '{0}.{1}.nupkg' -f $Module.Name, $Module.Version
25+
$destinationFile = Join-Path -Path $Path -ChildPath $fileName
2326

27+
if (Test-Path -Path $destinationFile) {
28+
Stop-PSFFunction -String 'Publish-ModuleToPath.Error.AlreadyPublished' -StringValues $Module.Name, $Module.Version, $Path -EnableException $killIt -Category InvalidOperation
29+
return
30+
}
31+
#endregion Verify Existing Module in Repository
32+
33+
$repoName = "PSF_Temp_$(Get-Random)"
34+
#region V3
35+
if ($useV3) {
36+
try {
37+
Register-PSResourceRepository -Name $repoName -Uri $stagingDirectory -Trusted
38+
Publish-PSResource -Path $Module.Path -Repository $repoName -SkipDependenciesCheck
39+
}
40+
catch {
41+
Stop-PSFFunction -String 'Publish-ModuleToPath.Error.FailedToStaging.V3' -StringValues $module.Name, $module.Version -Cmdlet $Cmdlet -ErrorRecord $_ -EnableException $killIt
42+
return
43+
}
44+
finally {
45+
Unregister-PSResourceRepository -Name $repoName
46+
}
47+
}
48+
#endregion V3
2449

50+
#region V2
51+
else {
52+
try {
53+
Register-PSRepository -Name $repoName -SourceLocation $stagingDirectory -PublishLocation $stagingDirectory -InstallationPolicy Trusted
54+
Disable-ModuleCommand -Name 'Get-ModuleDependencies' -ModuleName 'PowerShellGet'
55+
Publish-Module -Path $Module.Path -Repository $repoName
56+
}
57+
catch {
58+
Stop-PSFFunction -String 'Publish-ModuleToPath.Error.FailedToStaging.V2' -StringValues $module.Name, $module.Version -Cmdlet $Cmdlet -ErrorRecord $_ -EnableException $killIt
59+
return
60+
}
61+
finally {
62+
Enable-ModuleCommand -Name 'Get-ModuleDependencies' -ModuleName 'PowerShellGet'
63+
Unregister-PSRepository -Name $repoName
64+
}
65+
}
66+
#endregion V2
67+
68+
#region Copy New Package
69+
$sourcePath = Join-Path -Path $stagingDirectory -ChildPath $fileName
70+
Invoke-PSFProtectedCommand -ActionString 'Publish-ModuleToPath.Publishing' -ActionStringValues $module.Name, $module.Version -Target $Path -ScriptBlock {
71+
Copy-Item -Path $sourcePath -Destination $Path -Force -ErrorAction Stop -Confirm:$false
72+
} -PSCmdlet $Cmdlet -EnableException $killIt
73+
#endregion Copy New Package
74+
}
75+
end {
76+
Remove-PSFTempItem -ModuleName PSFramework.NuGet -Name Publish.StagingLocalCopy
2577
}
2678
}

‎PSFramework.NuGet/internal/functions/Get/Publish/Publish-ModuleV2.ps1

+50-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,56 @@
11
function Publish-ModuleV2 {
2-
[CmdletBinding()]
2+
[CmdletBinding(SupportsShouldProcess = $true)]
33
param (
4-
4+
$Module,
5+
6+
$Repository,
7+
8+
[string]
9+
$ApiKey,
10+
11+
[PSCredential]
12+
$Credential,
13+
14+
[switch]
15+
$SkipDependenciesCheck,
16+
17+
[switch]
18+
$Continue,
19+
20+
[string]
21+
$ContinueLabel,
22+
23+
$Cmdlet = $PSCmdlet
524
)
625
process {
7-
#TODO: Implement
8-
throw "Not Implemented Yet"
26+
<#
27+
TODO:
28+
+ Implement SkipModuleManifestValidate?
29+
+ Test Publish to local with & without dependencies
30+
+ Test publish with fake dependencies
31+
#>
32+
$killIt = $ErrorActionPreference -eq 'Stop'
33+
$commonPublish = @{
34+
Repository = $Repository.Name
35+
Confirm = $false
36+
}
37+
if ($Repository.Credential) { $commonPublish.Credential = $Credential }
38+
if ($Credential) { $commonPublish.Credential = $Credential }
39+
if ($ApiKey) { $commonPublish.NuGetApiKey = $ApiKey }
40+
41+
if ($SkipDependenciesCheck) {
42+
Disable-ModuleCommand -Name 'Get-ModuleDependencies' -ModuleName 'PowerShellGet'
43+
}
44+
45+
try {
46+
Invoke-PSFProtectedCommand -ActionString 'Publish-ModuleV2.Publish' -ActionStringValues $Module.Name, $Module.Version, $Repository -ScriptBlock {
47+
Publish-Module @commonPublish -Path $Module.Path -ErrorAction Stop
48+
} -Target "$($Module.Name) ($($Module.Version))" -PSCmdlet $Cmdlet -EnableException $killIt -Continue:$Continue -ContinueLabel $ContinueLabel
49+
}
50+
finally {
51+
if ($SkipDependenciesCheck) {
52+
Enable-ModuleCommand -Name 'Get-ModuleDependencies' -ModuleName 'PowerShellGet'
53+
}
54+
}
955
}
1056
}

‎PSFramework.NuGet/internal/functions/Get/Publish/Publish-ModuleV3.ps1

+39-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,45 @@
11
function Publish-ModuleV3 {
2-
[CmdletBinding()]
2+
[CmdletBinding(SupportsShouldProcess = $true)]
33
param (
4-
4+
$Module,
5+
6+
$Repository,
7+
8+
[string]
9+
$ApiKey,
10+
11+
[PSCredential]
12+
$Credential,
13+
14+
[switch]
15+
$SkipDependenciesCheck,
16+
17+
[switch]
18+
$Continue,
19+
20+
[string]
21+
$ContinueLabel,
22+
23+
$Cmdlet = $PSCmdlet
524
)
625
process {
7-
#TODO: Implement
8-
throw "Not Implemented Yet"
26+
<#
27+
TODO:
28+
+ Implement SkipModuleManifestValidate?
29+
+ Test Publish to local with & without dependencies
30+
#>
31+
$killIt = $ErrorActionPreference -eq 'Stop'
32+
$commonPublish = @{
33+
Repository = $Repository.Name
34+
Confirm = $false
35+
}
36+
if ($Repository.Credential) { $commonPublish.Credential = $Credential }
37+
if ($Credential) { $commonPublish.Credential = $Credential }
38+
if ($ApiKey) { $commonPublish.ApiKey = $ApiKey }
39+
if ($SkipDependenciesCheck) { $commonPublish.SkipDependenciesCheck = $SkipDependenciesCheck }
40+
41+
Invoke-PSFProtectedCommand -ActionString 'Publish-ModuleV3.Publish' -ActionStringValues $Module.Name, $Module.Version, $Repository -ScriptBlock {
42+
Publish-PSResource @commonPublish -Path $Module.Path -ErrorAction Stop
43+
} -Target "$($Module.Name) ($($Module.Version))" -PSCmdlet $Cmdlet -EnableException $killIt -Continue:$Continue -ContinueLabel $ContinueLabel
944
}
1045
}

‎PSFramework.NuGet/internal/functions/Other/Disable-ModuleCommand.ps1

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
function Disable-ModuleCommand {
2+
[CmdletBinding()]
3+
param (
4+
[Parameter(Mandatory = $true)]
5+
[string]
6+
$Name,
7+
8+
[Parameter(Mandatory = $true)]
9+
[string]
10+
$ModuleName
11+
)
12+
process {
13+
Import-Module $ModuleName
14+
& (Get-Module $ModuleName) {
15+
function script:psfFunctionOverride { }
16+
Set-Alias -Name $args[0] -Value psfFunctionOverride -Scope Script
17+
} $Name
18+
}
19+
}

‎PSFramework.NuGet/internal/functions/Other/Enable-ModuleCommand.ps1

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
function Enable-ModuleCommand {
2+
[CmdletBinding()]
3+
param (
4+
[Parameter(Mandatory = $true)]
5+
[string]
6+
$Name,
7+
8+
[Parameter(Mandatory = $true)]
9+
[string]
10+
$ModuleName
11+
)
12+
process {
13+
Import-Module $ModuleName
14+
$module = Get-Module -Name $ModuleName
15+
16+
$internal = [PSFramework.Utility.UtilityHost]::GetPrivateProperty('Internal', $module.SessionState)
17+
$mscope = [PSFramework.Utility.UtilityHost]::GetPrivateProperty('ModuleScope', $internal)
18+
[PSFramework.Utility.UtilityHost]::InvokePrivateMethod("RemoveAlias", $mscope, @($Name, $true))
19+
}
20+
}

‎PSFramework.NuGet/internal/functions/Resolve-AkaMsLink.ps1 ‎PSFramework.NuGet/internal/functions/Other/Resolve-AkaMsLink.ps1

File renamed without changes.

0 commit comments

Comments
 (0)