winrm-transport 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8fceb01bb304b3dbde260f959336ea7dc319dd81
-  data.tar.gz: 35dfc04b0d86e4ec094e6646b2e0ffc34224e623
+  metadata.gz: ed77e7070e00d3297d006565411a84fa4c7599b9
+  data.tar.gz: 0d6ae6a15fb437ed6bb691cc937fe0d5125b08d2
 SHA512:
-  metadata.gz: 5ea5f23b2e9bc90cd2fe5c8db87b18fed3b5061e9b4858160cef498583b07c0ca7fc47da1a22f33e244b17a17bef653233070456fc953afa1f27bcfac1b2a0d0
-  data.tar.gz: d2ac24211bd20bc50cfaae3c5c02c430293bf5701975072fb50cb429948db816551aa9a486ee136b69193c475f17665e9455ee30eaf566c22e078a012ff4be4b
+  metadata.gz: 34d86ef488009afa559bed219b460745f2b74838b94eff8aca67ed225dd8ac1c84f65f56a18ac9a10e908b25cc7db9b039494f36d3c53da07195c470a1b78a9a
+  data.tar.gz: 12891bec59e93d70c6d0b85e9d368c3a2598977a9200c16fd86fb85390d7835f1b2b9e2df07db6131d29a236d0ffa86a81b57c67b3ccd4294a24c5db1c1548bf

data/CHANGELOG.md

@@ -1,3 +1,23 @@
+## 1.0.1 / 2015-05-20
+
+### Bug fixes
+
+* Pull request [#4][]: Fix unpacking process for the compressed folders. ([@smurawski][])
+
+### Improvements
+
+* Pull request [#6][]: Minor grammatical update to the README. ([@jmccann][])
+* Pull request [#5][]: Remove fakefs as a development dependency. ([@fnichol][])
+
+
 ## 1.0.0 / 2015-03-29
 
 The initial release.
+
+<!--- The following link definition list is generated by PimpMyChangelog --->
+[#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
+[@fnichol]: https://github.com/fnichol
+[@jmccann]: https://github.com/jmccann
+[@smurawski]: https://github.com/smurawski

data/README.md

@@ -27,7 +27,7 @@ Or install it yourself as:
 
 ## Usage
 
-This a library gem and doesn't have any CLI commands. There are 2 primary object classes:
+This is a library gem and doesn't have any CLI commands. There are 2 primary object classes:
 
 * [WinRM::Transport::CommandExecutor][command_executor]: an object which can
   execute multiple commands and PowerShell script in one shared remote shell

data/lib/winrm/transport/file_transporter.rb

@@ -178,7 +178,6 @@ module WinRM
         debug { "Running check_files.ps1" }
         hash_file = create_remote_hash_file(check_files_ps_hash(files))
         vars = %{$hash_file = "#{hash_file}"\n}
-
         output = service.run_powershell_script(
           [vars, check_files_script].join("\n")
         )
@@ -253,7 +252,10 @@ module WinRM
           vars = %{$hash_file = "#{hash_file}"\n}
 
           output = service.run_powershell_script(
-            [vars, decode_files_script].join("\n")
+            [vars,
+             ". #{decode_files_script}",
+             "Decode-Files (Invoke-Input $hash_file) | ConvertTo-Csv -NoTypeInformation"
+            ].join("\n")
           )
           parse_response(output)
         end
@@ -376,7 +378,7 @@ module WinRM
         if obj.is_a?(Hash)
           obj.map { |k, v|
             %{#{pad(depth + 2)}#{ps_hash(k)} = #{ps_hash(v, depth + 2)}}
-          }.join("\n").insert(0, "@{\n").insert(-1, "\n#{pad(depth)}}")
+          }.join(";\n").insert(0, "@{\n").insert(-1, "\n#{pad(depth)}}")
         else
           %{"#{obj}"}
         end

data/lib/winrm/transport/version.rb

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

data/support/decode_files.ps1

@@ -1,60 +1,50 @@
-Function Cleanup($o) { if (($o -ne $null) -and ($o.GetType().GetMethod("Dispose") -ne $null)) { $o.Dispose() } }
-
-Function Decode-Base64File($src, $dst) {
-  Try {
-    $in = (Get-Item $src).OpenRead()
-    $b64 = New-Object -TypeName System.Security.Cryptography.FromBase64Transform
-    $m = [System.Security.Cryptography.CryptoStreamMode]::Read
-    $d = New-Object -TypeName System.Security.Cryptography.CryptoStream $in,$b64,$m
-    echo $null > $dst
-    Copy-Stream $d ($out = [System.IO.File]::OpenWrite($dst))
-  } Finally { Cleanup $in; Cleanup $out; Cleanup $d }
-}
-
+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) } }
+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 Test-IOCompression {($PSVersionTable.PSVersion.Major -ge 3) -and (Test-NETStack '4.5')}
+set-alias RPP -Value Resolve-ProviderPath
 
 Function Decode-Files($hash) {
-  $hash.GetEnumerator() | ForEach-Object {
-    $tmp = Unresolve-Path $_.Key
+  foreach ($key in $hash.keys) {
+    $value = $hash[$key]
+    $tmp, $tzip, $dst = $Key, $Value["tmpzip"], $Value["dst"]
     $sMd5 = (Get-Item $tmp).BaseName.Replace("b64-", "")
-    $tzip, $dst = (Unresolve-Path $_.Value["tmpzip"]), (Unresolve-Path $_.Value["dst"])
     $decoded = if ($tzip -ne $null) { $tzip } else { $dst }
     Decode-Base64File $tmp $decoded
     Remove-Item $tmp -Force
     $dMd5 = Get-MD5Sum $decoded
-    $verifies = if ($sMd5 -eq $dMd5) { $true } else { $false }
-    if ($tzip) { Unzip-File $tzip $dst; Remove-Item $tzip -Force }
+    $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 }
-  } | Select-Object -Property dst,verifies,src_md5,dst_md5,tmpfile,tmpzip
+  }
 }
 
 Function Get-MD5Sum($src) {
   Try {
-    $c = New-Object -TypeName System.Security.Cryptography.MD5CryptoServiceProvider
+    $c = New-Object -TypeName Security.Cryptography.MD5CryptoServiceProvider
     $bytes = $c.ComputeHash(($in = (Get-Item $src).OpenRead()))
-    return ([System.BitConverter]::ToString($bytes)).Replace("-", "").ToLower()
-  } Finally { Cleanup $c; Cleanup $in }
+    ([BitConverter]::ToString($bytes)).Replace("-", "").ToLower()
+  } catch [exception]{throw $_} finally { Cleanup $c; Cleanup $in }
 }
 
 Function Invoke-Input($in) {
-  $in = Unresolve-Path $in
+  $in = $in | rpp
   Decode-Base64File $in ($decoded = "$($in).ps1")
   $expr = Get-Content $decoded | Out-String
   Remove-Item $in,$decoded -Force
-  return Invoke-Expression "$expr"
+  Invoke-Expression "$expr"
 }
 
-Function Release-COM($o) { if ($o -ne $null) { [void][System.Runtime.Interopservices.Marshal]::ReleaseComObject($o) } }
-
-Function Unresolve-Path($p) { if ($p -eq $null) { return $null } else { return $ExecutionContext.SessionState.Path.GetUnresolvedProviderPathFromPSPath($p) } }
-
 Function Unzip-File($src, $dst) {
-  $r = "HKLM:\Software\Microsoft\NET Framework Setup\NDP\v4"
-  if (($PSVersionTable.PSVersion.Major -ge 3) -and ((gp "$r\Full").Version -like "4.5*" -or (gp "$r\Client").Version -like "4.5*")) {
-    [System.Reflection.Assembly]::LoadWithPartialName("System.IO.Compression.FileSystem") | Out-Null; [System.IO.Compression.ZipFile]::ExtractToDirectory("$src", "$dst")
-  } else {
-    Try { $s = New-Object -ComObject Shell.Application; ($dp = $s.NameSpace($dst)).CopyHere(($z = $s.NameSpace($src)).Items(), 0x610) } Finally { Release-Com $s; Release-Com $z; Release-COM $dp }
+  $unpack = $src -replace '\.zip'
+  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 }
+  dir $unpack | cp -dest "$dst/" -force -recurse
+  rm $unpack -recurse -force
 }
-
-Decode-Files (Invoke-Input $hash_file) | ConvertTo-Csv -NoTypeInformation

data/winrm-transport.gemspec

@@ -35,7 +35,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler",    "~> 1.9"
   spec.add_development_dependency "rake",       "~> 10.0"
 
-  spec.add_development_dependency "fakefs",     "~> 0.4"
   spec.add_development_dependency "minitest"
   spec.add_development_dependency "mocha",      "~> 1.1"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: winrm-transport
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-03-29 00:00:00.000000000 Z
+date: 2015-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: winrm
@@ -86,20 +86,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: fakefs
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement