vagrant-windows 0.0.3 → 0.1.0

data/README.md

@@ -47,6 +47,11 @@ Example:
 ```ruby
 Vagrant::Config.run do |config|
 
+  #The following timeout configuration is option, however if have
+  #any large remote_file resources in your chef recipes, you may
+  #experience timeouts (reported as 500 responses)
+  config.winrm.timeout = 1800     #Set WinRM Timeout in seconds (Default 30)
+
   # Configure base box parameters
   config.vm.box = "windows2008r2"
   config.vm.box_url = "./windows-2008-r2.box"
@@ -75,7 +80,8 @@ What has not been tested
 
 What does not work
 ==================
-- Complex networking setups
+- <s>Complex networking setups</s> - Fixed in 0.0.3
+  - Note that I have not tested the Virtual Box 4.0 Driver, all _should_ work. Can someone please confirm?
 
 What Can I do to help?
 ======================

data/lib/vagrant-windows/communication/winrm.rb

@@ -37,7 +37,7 @@ module Vagrant
         # If we reached this point then we successfully connected
         logger.info("WinRM is ready!")
         true
-      rescue Timeout::Error => e
+      rescue Timeout::Error, HTTPClient::KeepAliveDisconnected => e
         #, Errors::SSHConnectionRefused, Net::SSH::Disconnect => e
         # The above errors represent various reasons that WinRM may not be
         # ready yet. Return false.
@@ -93,10 +93,12 @@ module Vagrant
           :pass => vm.config.winrm.password,
           :host => vm.config.winrm.host,
           :port => vm.winrm.info[:port],
+          :operation_timeout => vm.config.winrm.timeout,
           :basic_auth_only => true
         }.merge ({})
 
         # create a session
+        logger.info("Attempting WinRM session with options: #{opts}")
         begin
           endpoint = "http://#{opts[:host]}:#{opts[:port]}/wsman"
           client = ::WinRM::WinRMWebService.new(endpoint, :plaintext, opts)
@@ -167,14 +169,17 @@ module Vagrant
           end
         else
           raise Vagrant::Errors::WinRMInvalidShell, "#{shell} is not a valid type of shell"
-        end   
+        end
+
         
         exit_status = output[:exitcode]
         logger.debug exit_status.inspect
 
         # Return the final exit status
         return exit_status
-      end
+      rescue ::WinRM::WinRMHTTPTransportError => e
+          raise Vagrant::Errors::WinRMTimeout, e.message
+      end  
     end
   end
 end

data/lib/vagrant-windows/config/winrm.rb

@@ -15,7 +15,7 @@ module Vagrant
         @guest_port = 5985
         @host = "localhost"
         @max_tries = 12
-        @timeout = 30
+        @timeout = 1800
       end
 
       def validate(env, errors)

data/lib/vagrant-windows/errors.rb

@@ -13,5 +13,10 @@ module Vagrant
       status_code(552)
       error_key(:winrm_upload_error)
     end
+    class WinRMTimeout < VagrantError
+      status_code(553)
+      error_key(:winrm_timeout)
+    end
+
   end
 end

data/lib/vagrant-windows/scripts/mount_volume.ps1.erb

@@ -4,9 +4,15 @@ function Test-ReparsePoint([string]$path) {
   return [bool]($file.Attributes -band [IO.FileAttributes]::ReparsePoint)
 }
 
+
 $MountPoint = [System.IO.Path]::GetFullPath("<%= options[:mount_point] %>")
 $ShareName = "<%= options[:name] %>"
 
+# https://github.com/BIAINC/vagrant-windows/issues/4
+# Not sure why this works, but it does.
+
+& net use $ShareName
+
 Write-Host "Attempting to mount $ShareName to $MountPoint"
 if( (Test-Path "$MountPoint") -and (Test-ReparsePoint "$MountPoint") )
 {

data/lib/vagrant-windows/version.rb

@@ -1,3 +1,3 @@
 module VagrantWindows
-  VERSION = "0.0.3"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-windows
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-08 00:00:00.000000000 Z
+date: 2012-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: winrm