winrm-transport 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed77e7070e00d3297d006565411a84fa4c7599b9
-  data.tar.gz: 0d6ae6a15fb437ed6bb691cc937fe0d5125b08d2
+  metadata.gz: 66b0b892802274668ed50e030ce87b881beb8ed5
+  data.tar.gz: 8d8706354672deab32c49a2df17d9e8f3b9b2d79
 SHA512:
-  metadata.gz: 34d86ef488009afa559bed219b460745f2b74838b94eff8aca67ed225dd8ac1c84f65f56a18ac9a10e908b25cc7db9b039494f36d3c53da07195c470a1b78a9a
-  data.tar.gz: 12891bec59e93d70c6d0b85e9d368c3a2598977a9200c16fd86fb85390d7835f1b2b9e2df07db6131d29a236d0ffa86a81b57c67b3ccd4294a24c5db1c1548bf
+  metadata.gz: b5bf53cacd7076b98987a99521a8882a57cade93b7433bb429ddecf5f49143cff19f559d90d10698a430a4e5e131c3e007eb233e73f168f38727dc52dfc5ab8d
+  data.tar.gz: 4d31347e809699128cc47348c59c901fcd07b4b1f7def0150bf46fff499030e4e97048ef3955b9bd2fd9ad5e0cf509840327f10c7cef0eb5436007220e709ba7

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## 1.0.2 / 2015-06-24
+
+### Bug fixes
+
+* Pull request [#8][]: Fix unzipping from COM, fix failed single file copies (when parent directory was not present), adding more tests around decode_files.ps1, cleaner error output. ([@smurawski][], [@xmik][])
+
+### Improvements
+
+* Pull request [#10][]: Fix winrm-transport/issues link in README.md. ([@hh][])
+
+
 ## 1.0.1 / 2015-05-20
 
 ### Bug fixes
@@ -18,6 +29,10 @@ The initial release.
 [#4]: https://github.com/test-kitchen/winrm-transport/issues/4
 [#5]: https://github.com/test-kitchen/winrm-transport/issues/5
 [#6]: https://github.com/test-kitchen/winrm-transport/issues/6
+[#8]: https://github.com/test-kitchen/winrm-transport/issues/8
+[#10]: https://github.com/test-kitchen/winrm-transport/issues/10
 [@fnichol]: https://github.com/fnichol
+[@hh]: https://github.com/hh
 [@jmccann]: https://github.com/jmccann
 [@smurawski]: https://github.com/smurawski
+[@xmik]: https://github.com/xmik

data/README.md

@@ -73,7 +73,7 @@ Apache License, Version 2.0 (see [LICENSE.txt][license])
 [contributors]: https://github.com/test-kitchen/winrm-transport/graphs/contributors
 [file_transporter]: https://github.com/test-kitchen/winrm-transport/blob/master/lib/winrm/transport/file_transporter.rb
 [fnichol]: https://github.com/fnichol
-[issues]: https://github.com/test-kitchen/winrm-transpor/issues
+[issues]: https://github.com/test-kitchen/winrm-transport/issues
 [license]: https://github.com/test-kitchen/winrm-transport/blob/master/LICENSE.txt
 [repo]: https://github.com/test-kitchen/winrm-transport
 [semver]: http://semver.org/

data/lib/winrm/transport/file_transporter.rb

@@ -252,8 +252,8 @@ module WinRM
           vars = %{$hash_file = "#{hash_file}"\n}
 
           output = service.run_powershell_script(
-            [vars,
-             ". #{decode_files_script}",
+            ["#{decode_files_script}",
+             vars,
              "Decode-Files (Invoke-Input $hash_file) | ConvertTo-Csv -NoTypeInformation"
             ].join("\n")
           )
@@ -348,6 +348,20 @@ module WinRM
         " " * depth
       end
 
+      # Parses CLIXML String into regular String (without any XML syntax).
+      # Inspired by https://github.com/WinRb/WinRM/issues/106.
+      #
+      # @param  clixml [String] clixml text
+      # @return [String] parsed clixml into String
+      def clixml_to_s(clixml)
+        doc = REXML::Document.new(clixml)
+        text = doc.get_elements("//S").map(&:text).join
+        text.gsub(/_x(\h\h\h\h)_/) do
+          code = Regexp.last_match[1]
+          code.hex.chr
+        end
+      end
+
       # Parses response of a PowerShell script or CMD command which contains
       # a CSV-formatted document in the standard output stream.
       #
@@ -356,10 +370,24 @@ module WinRM
       # @return [Hash] report hash, keyed by the local MD5 digest
       # @api private
       def parse_response(output)
-        if output[:exitcode] != 0
+        exitcode = output[:exitcode]
+        stderr = output.stderr
+        if stderr.include?("The command line is too long")
+          # The powershell script which should result in `output` parameter
+          # is too long, remove some newlines, comments, etc from it.
+          raise StandardError, "The command line is too long" \
+            " (powershell script is too long)"
+        end
+        pretty_stderr = clixml_to_s(stderr)
+
+        if exitcode != 0
           raise FileTransporterFailed, "[#{self.class}] Upload failed " \
-            "(exitcode: #{output[:exitcode]})\n#{output.stderr}"
+            "(exitcode: #{exitcode})\n#{pretty_stderr}"
+        elsif stderr != '\r\n' && stderr != ""
+          raise FileTransporterFailed, "[#{self.class}] Upload failed " \
+            "(exitcode: 0), but stderr present\n#{pretty_stderr}"
         end
+
         array = CSV.parse(output.stdout, :headers => true).map(&:to_hash)
         array.each { |h| h.each { |key, value| h[key] = nil if value == "" } }
         Hash[array.map { |entry| [entry.fetch("src_md5"), entry] }]

data/lib/winrm/transport/version.rb

@@ -20,6 +20,6 @@ module WinRM
 
   module Transport
 
-    VERSION = "1.0.1"
+    VERSION = "1.0.2"
   end
 end

data/support/decode_files.ps1

@@ -1,50 +1,52 @@
-Function Cleanup($o) { if (($o) -and ($o.GetType().GetMethod("Dispose") -ne $null)) { $o.Dispose() } }
-Function Decode-Base64File($src, $dst) {set-content -Encoding Byte -Path $dst -Value ([Convert]::FromBase64String([IO.File]::ReadAllLines($src)))}
-Function Copy-Stream($src, $dst) { $b = New-Object Byte[] 4096; while (($i = $src.Read($b, 0, $b.Length)) -ne 0) { $dst.Write($b, 0, $i) } }
+trap {$e = $_.Exception; $e.InvocationInfo.ScriptName; do {$e.Message; $e = $e.InnerException} while ($e); break;}
+$progresspreference = 'SilentlyContinue'
+function Decode-Base64File($src, $dst) {folder (split-path $dst);sc -force -Encoding Byte -Path $dst -Value ([Convert]::FromBase64String([IO.File]::ReadAllLines($src)))}
+function Copy-Stream($src, $dst) {$b = New-Object Byte[] 4096; while (($i = $src.Read($b, 0, $b.Length)) -ne 0) { $dst.Write($b, 0, $i) } }
 function Resolve-ProviderPath{ $input | % {if ($_){(Resolve-Path $_).ProviderPath} else{$null}} }
-Function Release-COM($o) { if ($o -ne $null) { [void][Runtime.Interopservices.Marshal]::ReleaseComObject($o) } }
-function Test-NETStack($Version, $r = 'HKLM:\Software\Microsoft\NET Framework Setup\NDP\v4') { [bool]("$r\Full", "$r\Client" | ? {(gp $_).Version -like "$($Version)*"}) }
+function Get-FrameworkVersion { "Full", "Client" | % {([version](gp "HKLM:\Software\Microsoft\NET Framework Setup\NDP\v4\$_").Version)} | select -first 1}
+function Test-NETStack($Version){ Get-FrameworkVersion -ge $Version }
 function Test-IOCompression {($PSVersionTable.PSVersion.Major -ge 3) -and (Test-NETStack '4.5')}
+function folder($path){ $path | ? {-not (test-path $_)} | % {$null = mkdir $_}}
+function disposable($o){($o -is [IDisposable]) -and (($o | gm | %{$_.name}) -contains 'Dispose')}
+function use($obj, [scriptblock]$sb){try {& $sb} catch [exception]{throw $_} finally {if (disposable $obj) {$obj.Dispose()}} }
 set-alias RPP -Value Resolve-ProviderPath
 
 Function Decode-Files($hash) {
   foreach ($key in $hash.keys) {
     $value = $hash[$key]
     $tmp, $tzip, $dst = $Key, $Value["tmpzip"], $Value["dst"]
-    $sMd5 = (Get-Item $tmp).BaseName.Replace("b64-", "")
+    $sMd5 = (gi $tmp).BaseName.Replace("b64-", "")
     $decoded = if ($tzip -ne $null) { $tzip } else { $dst }
     Decode-Base64File $tmp $decoded
-    Remove-Item $tmp -Force
+    rm $tmp -Force
     $dMd5 = Get-MD5Sum $decoded
     $verifies = $sMd5 -like $dMd5
-    if ($tzip) {Unzip-File $tzip $dst;Remove-Item $tzip -Force}
-    New-Object psobject -Property @{ dst = $dst; verifies = $verifies; src_md5 = $sMd5; dst_md5 = $dMd5; tmpfile = $tmp; tmpzip = $tzip }
+    if ($tzip) {Unzip-File $tzip $dst;rm $tzip -Force}
+    New-Object psobject -Property @{dst=$dst;verifies=$verifies;src_md5=$sMd5;dst_md5=$dMd5;tmpfile=$tmp;tmpzip=$tzip}
   }
 }
 
 Function Get-MD5Sum($src) {
-  Try {
-    $c = New-Object -TypeName Security.Cryptography.MD5CryptoServiceProvider
-    $bytes = $c.ComputeHash(($in = (Get-Item $src).OpenRead()))
-    ([BitConverter]::ToString($bytes)).Replace("-", "").ToLower()
-  } catch [exception]{throw $_} finally { Cleanup $c; Cleanup $in }
+  if ($src -and (test-path $src)) {
+  use ($c = New-Object -TypeName Security.Cryptography.MD5CryptoServiceProvider) {
+    use ($in = (gi $src).OpenRead()) {([BitConverter]::ToString($c.ComputeHash($in))).Replace("-", "").ToLower()}}
+  }
 }
 
 Function Invoke-Input($in) {
   $in = $in | rpp
-  Decode-Base64File $in ($decoded = "$($in).ps1")
-  $expr = Get-Content $decoded | Out-String
-  Remove-Item $in,$decoded -Force
-  Invoke-Expression "$expr"
+  $d = "$($in).ps1"
+  Decode-Base64File $in $d
+  $expr = gc $d | Out-String
+  rm $in,$d -Force
+  iex "$expr"
 }
 
 Function Unzip-File($src, $dst) {
   $unpack = $src -replace '\.zip'
+  folder $unpack, $dst
   if (Test-IOCompression) {Add-Type -AN System.IO.Compression.FileSystem; [IO.Compression.ZipFile]::ExtractToDirectory($src, $unpack)}
-  else {
-    Try {$s = New-Object -ComObject Shell.Application; ($dp = $s.NameSpace($unpack)).CopyHere(($z = $s.NameSpace($src)).Items(), 0x610)} Finally {Release-Com $s; Release-Com $z; Release-COM $dp}
-  }
-  if (-not (test-path $dst)) {$null = mkdir $dst }
+  else {Try {$s = New-Object -ComObject Shell.Application; ($s.NameSpace($unpack)).CopyHere(($s.NameSpace($src)).Items(), 0x610)} Finally {[void][Runtime.Interopservices.Marshal]::ReleaseComObject($s)}}
   dir $unpack | cp -dest "$dst/" -force -recurse
   rm $unpack -recurse -force
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: winrm-transport
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-05-20 00:00:00.000000000 Z
+date: 2015-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: winrm