Build - Bug Fix for issue #71.

tomohulk · Mar 29, 2018 · f78a354 · f78a354
1 parent 28fe89d
commit f78a354
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 22 deletions.
diff --git a/Tests/Receive-WinSCPItem.Tests.ps1 b/Tests/Receive-WinSCPItem.Tests.ps1
@@ -17,7 +17,7 @@ Describe "Receive-WinSCPItem" {
         $results = Receive-WinSCPItem -Path "/TextFile.txt" -Destination $temp.FullName
         Remove-WinSCPSession
 
-        It "Results of Get-WinSCPItem should not be null." {
+        It "Results of Receive-WinSCPItem should not be null." {
             $results |
                 Should Not Be Null
         }
@@ -38,6 +38,37 @@ Describe "Receive-WinSCPItem" {
         }
     }
 
+    Context "New-WinSCPSession -SessionOption ( New-WinSCPSessionOption -Credential `$credential -HostName $env:COMPUTERNAME -Protocol Ftp ); Receive-WinSCPItem -Path `"/SubDirectory`" -Destination `"$($temp.FullName)`"; Remove-WinSCPSession" {
+        New-WinSCPSession -SessionOption ( New-WinSCPSessionOption -Credential $credential -HostName $env:COMPUTERNAME -Protocol Ftp )
+        $results = Receive-WinSCPItem -Path "/SubDirectory" -Destination $temp.FullName
+        Remove-WinSCPSession
+
+        It "Results of Receive-WinSCPItem should not be null." {
+            $results |
+                Should Not Be Null
+        }
+
+        It "Results of transfer should be success." {
+            $results.IsSuccess |
+                Should Be $true
+        }
+
+        It "SubDirectory should exist in $temp." {
+            Test-Path -Path "$($temp.FullName)\SubDirectory" |
+                Should Be $true
+        }
+
+        It "SubDirectoryTextFile.txt should exist in $temp\SubDirectory." {
+            Test-Path -Path "$($temp.FullName)\SubDirectory\SubDirectoryTextFile.txt" |
+                Should Be $true
+        }
+
+        It "WinSCP process should not exist." {
+            Get-Process -Name WinSCP -ErrorAction SilentlyContinue |
+                Should BeNullOrEmpty
+        }
+    }
+
     Context "Invoke-ScriptAnalyzer -Path `"$((Get-Module -Name WinSCP).ModuleBase)\Public\Receive-WinSCPItem.ps1`"" {
         $results = Invoke-ScriptAnalyzer -Path "$((Get-Module -Name WinSCP).ModuleBase)\Public\Receive-WinSCPItem.ps1"
 

diff --git a/Update-WinSCPCore.ps1 b/Update-WinSCPCore.ps1
@@ -1,3 +1,5 @@
+#requires -Modules platyPS
+
 [CmdletBinding()]
 [OutputType()]
 
@@ -55,6 +57,11 @@ if ($publishedVersion -gt $currentVersion) {
     Remove-Item -Path "${env:TEMP}\$payloadName" -Force -Confirm:$false
     Remove-Item -Path "${env:TEMP}\WinSCP" -Recurse -Force -Confirm:$false
 
+    # Recompile the Help file(s).
+    Import-Module -Path "${pwd}\WinSCP"
+    Update-MarkdownHelpModule -Path "..\Wiki"
+    New-ExternalHelp -Path ..\Wiki -OutputPath "${pwd}\WinSCP\en-US" -Force
+
     try {
         git add .
         git commit -a -m "Build - Updating WinSCP Core to $publishedVersion."

diff --git a/WinSCP/Public/Receive-WinSCPItem.ps1 b/WinSCP/Public/Receive-WinSCPItem.ps1
@@ -12,10 +12,10 @@
             Mandatory = $true,
             ValueFromPipeline = $true
         )]
-        [ValidateScript({ 
-            if ($_.Opened) { 
-                return $true 
-            } else { 
+        [ValidateScript({
+            if ($_.Opened) {
+                return $true
+            } else {
                 throw "The WinSCP Session is not in an Open state."
             }
         })]
@@ -45,25 +45,13 @@
 
         [Parameter()]
         [WinSCP.TransferOptions]
-        $TransferOptions = (New-Object -TypeName WinSCP.TransferOptions)
+        $TransferOptions = ( New-Object -TypeName WinSCP.TransferOptions )
     )
 
     process {
-        foreach ($remotePathValue in (Format-WinSCPPathString -Path $($RemotePath))) {
-            $localPathEndsWithBackSlash = $LocalPath.EndsWith(
-                "\"
-            )
-            if (-not $localPathEndsWithBackSlash) {
-                $LocalPath += "\"
-            }
-
-            $remotePathValueEndsWithForwardSlash = $remotePathValue.EndsWith(
-                "/"
-            )
-            if (-not $remotePathValueEndsWithForwardSlash) {
-                if ((Get-WinSCPItem -WinSCPSession $WinSCPSession -Path $remotePathValue -ErrorAction SilentlyContinue).IsDirectory) {
-                    $remotePathValue += "/"
-                }
+        foreach ($remotePathValue in ( Format-WinSCPPathString -Path $($RemotePath) )) {
+            if ((Get-Item -Path $LocalPath).PSIsContainer -and -not $LocalPath.EndsWith( [System.IO.Path]::DirectorySeparatorChar )) {
+                $LocalPath += [System.IO.Path]::DirectorySeparatorChar
             }
 
             try {
@@ -74,7 +62,7 @@
                 if ($result.IsSuccess) {
                     Write-Output -InputObject $result
                 } else {
-                    $result.Failures[0] | 
+                    $result.Failures[0] |
                         Write-Error
                 }
             } catch {