vagrant-vmm 1.0.10 → 1.0.11

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YzU5Y2Q3OGY4MzYzNzlhNmVhZThkY2FlMzk4MjJiNDMxZjc4YTE1Yw==
+    ZjhmNmQ4N2YwMmFjNmQyYjdlOWRlZTQ1MzFlMmRmZDY4MTAxYzViNw==
   data.tar.gz: !binary |-
-    MTE2ZmQwZWVjYWM5MTI5NDEzMWZkOTA2M2JlNzUyY2ZkZjcxNDUxYw==
+    YWJjNTZmZDZmZjI3YTA1MGMxNmJmYjRkZWQ3NDcwYTQ4YjllMGM1OA==
 SHA512:
   metadata.gz: !binary |-
-    YzBhM2RlYjVhZjAwMjE2Y2ZmZjNhMjMzYmM4ODFjNGNjMmZiYzQ4MDU4YmIw
-    N2FhMDc5OGYyYjExMWEyMjcxMmFlZGFlMTYzNzNhMDJmODNmOTYzNzdmYTMz
-    NjMwNWEwNDNhNTljYzdhZTY3ZGZhNTJjZDk4OWYzYjNlN2EyYWU=
+    YWJiYjBlYjhkN2RlZTllMzM3YTNjMzAzMDIzOWZhMDk4NDFjNWE4ZGRhOWU5
+    YzcyODBhYTMyMjY3ZjA1MGU2YmExYjQ3MGZjNzk4NjQ4MjBmZGZiNDNlYzA4
+    NmRhZGMwMDE2MWMyNzc5MzY0MDk0ZWYwMzQzMGEyZmI3NDcwODU=
   data.tar.gz: !binary |-
-    MGMwNWRhMDJjNDgxYWQ3OWUzYmE5YjAxM2UyNzc2ODgyZjFiZDE5MDk0MTJm
-    YTAzNDI0ZmNlMDUxMmYzMDgyY2VlMTExYjNhOWMxMmRjNDZjMzgzMjFjMDBj
-    OWViYTJlYmFmYWY4MzBkZDM3YWJiMDNjNWFkMjY0NGM0YWU0NjQ=
+    NzY4YzZhMDA2NmFjMTAyYzcxOTQ5N2UxODczMmU5MWEyNGU5MzVjN2E3M2Q4
+    OTEzYTkxYTYxZmMxZDhlYmM5ZWVkMmRmMWIwYTVjZDM3ODRlODlmNGYwZWUy
+    NGMyMGE5ZmFlMjExNTAxYzdmNjUxNWVhYmYzMGI2NmNmNDdhYzc=

data/README.md

@@ -10,7 +10,7 @@ This provider will allow you to create VMs in the remote Virtual Machine Manager
 
 ## Installation
 
-Install Vagrant 1.7.1
+Install Vagrant 1.7.4
 ```
 http://www.vagrantup.com/downloads.html
 ```
@@ -47,7 +47,7 @@ win64_config.vm.guest = :windows
 
 Set communicator to **:winrm**
 ```
-win64_config.vm.communicator = "winrm"
+win64_config.vm.communicator = :winrm
 ```
 
 Set you provider to :vmm and specify at least *vmm_server_address*, *vm_host_group_name* and *vm_template_name* parameters.

data/lib/vagrant-vmm/scripts/sync_folders.ps1

@@ -18,6 +18,7 @@ $Dir = Split-Path $script:MyInvocation.MyCommand.Path
 . ([System.IO.Path]::Combine($Dir, "utils\write_messages.ps1"))
 . ([System.IO.Path]::Combine($Dir, "utils\manage_credentials.ps1"))
 . ([System.IO.Path]::Combine($Dir, "utils\manage_trusted_hosts.ps1"))
+. ([System.IO.Path]::Combine($Dir, "utils\send_file.ps1"))
 
 # Sync flow:
 # get list of files to sync, compare hashes with the remote ones
@@ -131,7 +132,7 @@ foreach ( $hst_path in $folder_mappings.Keys )
 if ( $sync_required )
 {
   # create file share on the remote machine
-  Invoke-Command -Session $(Get-session) -ScriptBlock {
+  $fileshare_dest = Invoke-Command -Session $(Get-session) -ScriptBlock {
     $fileshare_dest = "$($env:SystemDrive)\vagrant-sync"
     if (Test-path $fileshare_dest)
     {
@@ -139,20 +140,14 @@ if ( $sync_required )
     } else {
       $sync_dir = New-item $fileshare_dest -itemtype directory
     }
-    $shr = Get-SmbShare -Name "vagrant-sync" -ErrorAction Ignore
-    if ( $shr -eq $null )
-    {
-      Write-host "$(&hostname) :: Creating fileshare on the remote host in $fileshare_dest, granting access to Everyone"
-      $shr = New-SmbShare -Name "vagrant-sync" -Temporary -Path $fileshare_dest
-    }
-    $g_info = Grant-SmbShareAccess -InputObject $shr -AccountName "$($env:USERDOMAIN)\$($env:USERNAME)" -AccessRight Full -Force
+    return $fileshare_dest
   }
 
   # get access to the fileshare from the current machine
-  Write-host "Getting access from the current machine to the created fileshare (\\$vm_address\vagrant-sync)"
-  $vagrant_sync_drive = New-PSDrive -Name 'V' -PSProvider 'FileSystem' -Root "\\$vm_address\vagrant-sync" -Credential $creds_to_vm
+  Write-host "Prepared folder on $vm_address : $fileshare_dest"
 
   Write-host "Syncing files to fileshare..."
+  $session = $(Get-session)
   foreach ( $hst_path in $copy_files.Keys )
   {
     $current = 0
@@ -163,24 +158,23 @@ if ( $sync_required )
       $current += 1
       $file_path = $hst_path + $file
       $guest_path = Split-Path $folder_mappings[$hst_path] -NoQualifier
-      $guest_path = [System.IO.Path]::GetFullPath("$($vagrant_sync_drive.root)\$guest_path")
-      Write-progress -Activity "Syncing $hst_path with $guest_path" -PercentComplete $($current*100/$total) -Status "Copying $file"
+      $guest_path = [System.IO.Path]::GetFullPath("$fileshare_dest\$guest_path")
+      Write-progress -Activity "Syncing $hst_path with $vm_address :: $guest_path" -PercentComplete $($current*100/$total) -Status "Copying $file"
       if (Test-Path $file_path -pathtype container)
       {
         # folder
-        $out = New-Item $file_path -itemtype directory -ErrorAction Ignore
+        #$out = New-Item $file_path -itemtype directory -ErrorAction Ignore
       } else {
         # file
         $file_dir = split-path $file
-        $out = New-item "$guest_path\$file_dir" -itemtype directory -ErrorAction Ignore
-        Copy-Item $file_path "$guest_path\$file" -recurse
+        Send-File $file_path "$guest_path\$file_dir" $session
       }
     }
   }
 
   # copy from fileshare to the dest locations on the remote machine
   # as well as remove files that shouldn't be there
-  Invoke-Command -Session $(Get-session) -ScriptBlock {
+  Invoke-Command -Session $session -ScriptBlock {
     $remove_files = $using:remove_files
     $fileshare_dest = "$($env:SystemDrive)\vagrant-sync"
     write-host "$(&hostname) :: Distributing files from $fileshare_dest..."

data/lib/vagrant-vmm/scripts/utils/send_file.ps1

@@ -0,0 +1,141 @@
+function Send-File 
+{ 
+    <# 
+    .SYNOPSIS 
+        This function sends a file (or folder of files recursively) to a destination WinRm session. This function was originally 
+        built by Lee Holmes (http://poshcode.org/2216) but has been modified to recursively send folders of files as well 
+        as to support UNC paths. 
+ 
+    .PARAMETER Path 
+        The local or UNC folder path that you'd like to copy to the session. This also support multiple paths in a comma-delimited format. 
+        If this is a UNC path, it will be copied locally to accomodate copying.  If it's a folder, it will recursively copy 
+        all files and folders to the destination. 
+ 
+    .PARAMETER Destination 
+        The local path on the remote computer where you'd like to copy the folder or file.  If the folder does not exist on the remote 
+        computer it will be created. 
+ 
+    .PARAMETER Session 
+        The remote session. Create with New-PSSession. 
+ 
+    .EXAMPLE 
+        $session = New-PSSession -ComputerName MYSERVER 
+        Send-File -Path C:\test.txt -Destination C:\ -Session $session 
+ 
+        This example will copy the file C:\test.txt to be C:\test.txt on the computer MYSERVER 
+ 
+    .INPUTS 
+        None. This function does not accept pipeline input. 
+ 
+    .OUTPUTS 
+        System.IO.FileInfo 
+    #> 
+    [CmdletBinding()] 
+    param 
+    ( 
+        [Parameter(Mandatory)] 
+        [ValidateNotNullOrEmpty()] 
+        [string[]]$Path, 
+         
+        [Parameter(Mandatory)] 
+        [ValidateNotNullOrEmpty()] 
+        [string]$Destination, 
+         
+        [Parameter(Mandatory)] 
+        [System.Management.Automation.Runspaces.PSSession]$Session 
+    ) 
+    process 
+    { 
+        foreach ($p in $Path) 
+        { 
+            try 
+            { 
+                if ($p.StartsWith('\\')) 
+                { 
+                    Write-Verbose -Message "[$($p)] is a UNC path. Copying locally first" 
+                    Copy-Item -Path $p -Destination ([environment]::GetEnvironmentVariable('TEMP', 'Machine')) 
+                    $p = "$([environment]::GetEnvironmentVariable('TEMP', 'Machine'))\$($p | Split-Path -Leaf)" 
+                } 
+                if (Test-Path -Path $p -PathType Container) 
+                { 
+                    Write-Verbose -Message "[$($p)] is a folder. Sending all files" 
+                    $files = Get-ChildItem -Path $p -File -Recurse 
+                    $sendFileParamColl = @() 
+                    foreach ($file in $Files) 
+                    { 
+                        $sendParams = @{ 
+                            'Session' = $Session 
+                            'Path' = $file.FullName 
+                        } 
+                        if ($file.DirectoryName -ne $p) ## It's a subdirectory 
+                        { 
+                            $subdirpath = $file.DirectoryName.Replace("$p\", '') 
+                            $sendParams.Destination = "$Destination\$subDirPath" 
+                        } 
+                        else 
+                        { 
+                            $sendParams.Destination = $Destination 
+                        } 
+                        $sendFileParamColl += $sendParams 
+                    } 
+                    foreach ($paramBlock in $sendFileParamColl) 
+                    { 
+                        Send-File @paramBlock 
+                    } 
+                } 
+                else 
+                { 
+                    Write-Verbose -Message "Starting WinRM copy of [$($p)] to [$($Destination)]" 
+                    # Get the source file, and then get its contents 
+                    $sourceBytes = [System.IO.File]::ReadAllBytes($p); 
+                    $streamChunks = @(); 
+                     
+                    # Now break it into chunks to stream. 
+                    $streamSize = 1MB; 
+                    for ($position = 0; $position -lt $sourceBytes.Length; $position += $streamSize) 
+                    { 
+                        $remaining = $sourceBytes.Length - $position 
+                        $remaining = [Math]::Min($remaining, $streamSize) 
+                         
+                        $nextChunk = New-Object byte[] $remaining 
+                        [Array]::Copy($sourcebytes, $position, $nextChunk, 0, $remaining) 
+                        $streamChunks +=, $nextChunk 
+                    } 
+                    $remoteScript = { 
+                        if (-not (Test-Path -Path $using:Destination -PathType Container)) 
+                        { 
+                            $null = New-Item -Path $using:Destination -Type Directory -Force 
+                        } 
+                        $fileDest = "$using:Destination\$($using:p | Split-Path -Leaf)" 
+                        ## Create a new array to hold the file content 
+                        $destBytes = New-Object byte[] $using:length 
+                        $position = 0 
+                         
+                        ## Go through the input, and fill in the new array of file content 
+                        foreach ($chunk in $input) 
+                        { 
+                            [GC]::Collect() 
+                            [Array]::Copy($chunk, 0, $destBytes, $position, $chunk.Length) 
+                            $position += $chunk.Length 
+                        } 
+                         
+                        [IO.File]::WriteAllBytes($fileDest, $destBytes) 
+                         
+                        #Get-Item $fileDest 
+                        [GC]::Collect() 
+                    } 
+                     
+                    # Stream the chunks into the remote script. 
+                    $Length = $sourceBytes.Length 
+                    $streamChunks | Invoke-Command -Session $Session -ScriptBlock $remoteScript 
+                    Write-Verbose -Message "WinRM copy of [$($p)] to [$($Destination)] complete" 
+                } 
+            } 
+            catch 
+            { 
+                Write-Error $_.Exception.Message 
+            } 
+        } 
+    } 
+     
+}

data/lib/vagrant-vmm/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module VMM
-    VERSION = "1.0.10"
+    VERSION = "1.0.11"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-vmm
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.0.11
 platform: ruby
 authors:
 - jarig
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-05 00:00:00.000000000 Z
+date: 2015-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -83,6 +83,7 @@ files:
 - lib/vagrant-vmm/scripts/sync_folders.ps1
 - lib/vagrant-vmm/scripts/utils/manage_credentials.ps1
 - lib/vagrant-vmm/scripts/utils/manage_trusted_hosts.ps1
+- lib/vagrant-vmm/scripts/utils/send_file.ps1
 - lib/vagrant-vmm/scripts/utils/vmm_executor.ps1
 - lib/vagrant-vmm/scripts/utils/write_messages.ps1
 - lib/vagrant-vmm/synced_folder.rb