Merge pull request #20 from SteveL-MSFT/master

Addresses issue #12 where archives contains items with trailing whitespace

Author: Andrew

Microsoft.PowerShell.Archive/Microsoft.PowerShell.Archive.psm1

@@ -414,7 +414,7 @@ function Expand-Archive
                     {
                         # delete the expanded file/directory as the archive 
                         # file was not completly expanded.
-                        $expandedItems | % { Remove-Item $_ -Force -Recurse }
+                        $expandedItems | % { Remove-Item "$_" -Force -Recurse }
                     }
                 }
                 elseif ($PassThru -and $expandedItems.Count -gt 0)
@@ -1007,6 +1007,9 @@ function ExpandArchiveHelper
                     # If the Parent directory of the current entry in the archive file does not exist, then create it. 
                     if($parentDirExists -eq $false)
                     {
+                        # note that if any ancestor of this directory doesn't exist, we don't recursively create each one as New-Item
+                        # takes care of this already, so only one DirectoryInfo is returned instead of one for each parent directory 
+                        # that only contains directories
                         New-Item $currentArchiveEntryFileInfo.DirectoryName -Type Directory -Confirm:$isConfirm | Out-Null
 
                         if(!(Test-Path -LiteralPath $currentArchiveEntryFileInfo.DirectoryName -PathType Container))
@@ -1056,6 +1059,11 @@ function ExpandArchiveHelper
 
                     if(!$hasNonTerminatingError)
                     {
+                        # The ExtractToFile() method doesn't handle whitespace correctly, strip whitespace which is consistent with how Explorer handles archives
+                        # There is an edge case where an archive contains files whose only difference is whitespace, but this is uncommon and likely not legitimate
+                        [string[]] $parts = $currentArchiveEntryPath.Split([System.IO.Path]::DirectorySeparatorChar) | % { $_.Trim() }
+                        $currentArchiveEntryPath = [string]::Join([System.IO.Path]::DirectorySeparatorChar, $parts)
+
                         [System.IO.Compression.ZipFileExtensions]::ExtractToFile($currentArchiveEntry, $currentArchiveEntryPath, $false)
 
                         # Add the expanded file path to the $expandedItems array, 

Tests/Pester.Commands.Cmdlets.Archive.Tests.ps1

@@ -26,6 +26,9 @@ Describe "Test suite for Microsoft.PowerShell.Archive module" -Tags "BVT" {
 
         $preCreatedArchivePath = Join-Path $script:TestSourceRoot "SamplePreCreatedArchive.archive"
         Copy-Item $preCreatedArchivePath $TestDrive\SamplePreCreatedArchive.zip -Force
+
+        $preCreatedArchivePath = Join-Path $script:TestSourceRoot "TrailingSpacer.archive"
+        Copy-Item $preCreatedArchivePath $TestDrive\TrailingSpacer.zip -Force
     }
 
     function Add-CompressionAssemblies {
@@ -1058,5 +1061,20 @@ Describe "Test suite for Microsoft.PowerShell.Archive module" -Tags "BVT" {
 
             Compare-Object -ReferenceObject $extractedList -DifferenceObject $sourceList -PassThru | Should Be $null
         }
+
+        It "Validate Expand-Archive works with zip files where the contents contain trailing whitespace" {
+            $archivePath = "$TestDrive\TrailingSpacer.zip"
+            $destinationPath = "$TestDrive\TrailingSpacer"
+            # we can't just compare the output and the results as you only get one DirectoryInfo for directories that only contain directories
+            $expectedPaths = "$TestDrive\TrailingSpacer\Inner\TrailingSpace","$TestDrive\TrailingSpacer\Inner\TrailingSpace\test.txt"
+
+            $contents = Expand-Archive -Path $archivePath -DestinationPath $destinationPath -PassThru
+
+            $contents.Count | Should Be $expectedPaths.Count
+
+            for ($i = 0; $i -lt $expectedPaths.Count; $i++) {
+                $contents[$i].FullName | Should Be $expectedPaths[$i]
+            }
+        }
     }
 }