Merge branch 'master' of https://github.com/PowerShell/PSResourceGet into update-dep

Author: anamnavi

src/code/CompressPSResource.cs

@@ -3,7 +3,6 @@
 
 using Microsoft.PowerShell.PSResourceGet.UtilClasses;
 using System.IO;
-using System.Linq;
 using System.Management.Automation;
 
 namespace Microsoft.PowerShell.PSResourceGet.Cmdlets
@@ -15,6 +14,7 @@ namespace Microsoft.PowerShell.PSResourceGet.Cmdlets
         "PSResource",
         SupportsShouldProcess = true)]
     [Alias("cmres")]
+    [OutputType(typeof(FileInfo))]
     public sealed class CompressPSResource : PSCmdlet
     {
         #region Parameters

src/code/PublishHelper.cs

@@ -296,6 +296,11 @@ out string[] _
                     }
                 }
 
+                if (_callerCmdlet == CallerCmdlet.CompressPSResource)
+                {
+                    outputNupkgDir = DestinationPath;
+                }
+
                 // pack into .nupkg
                 if (!PackNupkg(outputDir, outputNupkgDir, nuspec, out ErrorRecord packNupkgError))
                 {
@@ -566,7 +571,8 @@ private bool PackNupkg(string outputDir, string outputNupkgDir, string nuspecFil
                 {
                     if (PassThru)
                     {
-                        _cmdletPassedIn.WriteObject(System.IO.Path.Combine(outputNupkgDir, _pkgName + "." + _pkgVersion.ToNormalizedString() + ".nupkg"));
+                        var nupkgPath = System.IO.Path.Combine(outputNupkgDir, _pkgName + "." + _pkgVersion.ToNormalizedString() + ".nupkg");
+                        _cmdletPassedIn.WriteObject(new FileInfo(nupkgPath));
                     }
                     _cmdletPassedIn.WriteVerbose("Successfully packed the resource into a .nupkg");
                 }

src/code/V2ServerAPICalls.cs

@@ -901,7 +901,7 @@ private string FindAllFromTypeEndPoint(bool includePrerelease, bool isSearchingM
             } else {
                 filterBuilder.AddCriterion("IsLatestVersion");
             }
-            var requestUrlV2 = $"{Repository.Uri}{typeEndpoint}/Search()?$filter={queryBuilder.BuildQueryString()}";
+            var requestUrlV2 = $"{Repository.Uri}{typeEndpoint}/Search()?{queryBuilder.BuildQueryString()}";
             return HttpRequestCall(requestUrlV2, out errRecord);
         }
 

test/FindPSResourceTests/FindPSResourceV2Server.Tests.ps1

@@ -5,7 +5,7 @@ $modPath = "$psscriptroot/../PSGetTestUtils.psm1"
 Import-Module $modPath -Force -Verbose
 
 $psmodulePaths = $env:PSModulePath -split ';'
-Write-Verbose -Verbose "Current module search paths: $psmodulePaths"
+Write-Verbose -Verbose -Message "Current module search paths: $psmodulePaths"
 
 Describe 'Test HTTP Find-PSResource for V2 Server Protocol' -tags 'CI' {
 
@@ -56,6 +56,11 @@ Describe 'Test HTTP Find-PSResource for V2 Server Protocol' -tags 'CI' {
         $foundScript | Should -BeTrue
     }
 
+    It "find all resources when wildcard only for Name" {
+        $res = Find-PSResource -Name '*' -Repository $PSGalleryName
+        $res.Count | Should -BeGreaterThan 0
+    }
+
     $testCases2 = @{Version="[5.0.0.0]";           ExpectedVersions=@("5.0.0.0");                                  Reason="validate version, exact match"},
                   @{Version="5.0.0.0";             ExpectedVersions=@("5.0.0.0");                                  Reason="validate version, exact match without bracket syntax"},
                   @{Version="[1.0.0.0, 5.0.0.0]";  ExpectedVersions=@("1.0.0.0", "3.0.0.0", "5.0.0.0");            Reason="validate version, exact range inclusive"},

test/PublishPSResourceTests/CompressPSResource.Tests.ps1

@@ -154,14 +154,68 @@ Describe "Test Compress-PSResource" -tags 'CI' {
         Test-Path -Path (Join-Path -Path $unzippedPath -ChildPath $testFile) | Should -Be $True
     }
 
-    It "Compress-PSResource -PassThru returns the path to the nupkg" {
+    It "Compresses a script" {
+        $scriptName = "PSGetTestScript"
+        $scriptVersion = "1.0.0"
+
+        $params = @{
+            Version = $scriptVersion
+            GUID = [guid]::NewGuid()
+            Author = 'Jane'
+            CompanyName = 'Microsoft Corporation'
+            Copyright = '(c) 2020 Microsoft Corporation. All rights reserved.'
+            Description = "Description for the $scriptName script"
+            LicenseUri = "https://$scriptName.com/license"
+            IconUri = "https://$scriptName.com/icon"
+            ProjectUri = "https://$scriptName.com"
+            Tags = @('Tag1','Tag2', "Tag-$scriptName-$scriptVersion")
+            ReleaseNotes = "$scriptName release notes"
+            }
+
+        $scriptPath = (Join-Path -Path $script:tmpScriptsFolderPath -ChildPath "$scriptName.ps1")
+        New-PSScriptFileInfo @params -Path $scriptPath
+
+        Compress-PSResource -Path $scriptPath -DestinationPath $script:repositoryPath
+
+        $expectedPath = Join-Path -Path $script:repositoryPath  -ChildPath "$scriptName.$scriptVersion.nupkg"
+        (Get-ChildItem $script:repositoryPath).FullName | Should -Be $expectedPath
+    }
+
+    It "Compress-PSResource -DestinationPath works for relative paths" {
+        $version = "1.0.0"
+        $relativePath = ".\RelativeTestModule"
+        $relativeDestination = ".\RelativeDestination"
+
+        # Create relative paths
+        New-Item -Path $relativePath -ItemType Directory -Force
+        New-Item -Path $relativeDestination -ItemType Directory -Force
+
+        # Create module manifest in the relative path
+        New-ModuleManifest -Path (Join-Path -Path $relativePath -ChildPath "$script:PublishModuleName.psd1") -ModuleVersion $version -Description "$script:PublishModuleName module"
+
+        # Compress using relative paths
+        Compress-PSResource -Path $relativePath -DestinationPath $relativeDestination
+
+        $expectedPath = Join-Path -Path $relativeDestination -ChildPath "$script:PublishModuleName.$version.nupkg"
+        $fileExists = Test-Path -Path $expectedPath
+        $fileExists | Should -Be $True
+
+        # Cleanup
+        Remove-Item -Path $relativePath -Recurse -Force
+        Remove-Item -Path $relativeDestination -Recurse -Force
+    }
+    
+    It "Compress-PSResource -PassThru returns a FileInfo object with the correct path" {
         $version = "1.0.0"
         New-ModuleManifest -Path (Join-Path -Path $script:PublishModuleBase -ChildPath "$script:PublishModuleName.psd1") -ModuleVersion $version -Description "$script:PublishModuleName module"
 
-        $nupkgPath = Compress-PSResource -Path $script:PublishModuleBase -DestinationPath $script:repositoryPath -PassThru
+        $fileInfoObject = Compress-PSResource -Path $script:PublishModuleBase -DestinationPath $script:repositoryPath -PassThru
 
         $expectedPath = Join-Path -Path $script:repositoryPath -ChildPath "$script:PublishModuleName.$version.nupkg"
-        $nupkgPath | Should -Be $expectedPath
+        $fileInfoObject | Should -BeOfType 'System.IO.FileSystemInfo'
+        $fileInfoObject.FullName | Should -Be $expectedPath
+        $fileInfoObject.Extension | Should -Be '.nupkg'
+        $fileInfoObject.Name | Should -Be "$script:PublishModuleName.$version.nupkg"
     }
 
 <# Test for Signing the nupkg. Signing doesn't work