vagrant-windows 1.2.0 → 1.2.1

data/CHANGELOG.md

@@ -0,0 +1,38 @@
+## Changelog
+
+0.1.1
+
+- Remove extra debug information from command output.
+
+0.1.2
+
+- Added virtual box 4.2 support.
+
+0.1.3 
+
+- Added puppet provisioner.
+
+1.0.0 
+
+- Converted to Vagrant 1.1.x plugin architecture.
+
+1.0.1 
+
+- Fix #29 Monkey Patch the 4.2 driver to include read_mac_addresses. 
+  - use read_mac_addresses in all cases.
+
+1.0.3 
+
+- Added vagrant shell provisioner. The built-in shell provisioner tried to chmod the target script which doesn't make sense on windows.
+- Can now run the vagrant-windows plugin via bundle exec instead of vagrant plugin install (for plugin dev).The vagrant src root finding logic didn't work from a bundle, but the native Vagrant src root does.
+- Readme fixes/updates.
+
+1.2.0
+
+- Converted to Vagrant 1.2.x plugin architecture.
+- Various networking fixes.
+- Chef provisioner runs through the Windows task scheduler instead of ps_runas power shell script.
+
+1.2.1
+
+- Fixed issue 91, drive mapping was failing on Vagrant 1.1.

data/Gemfile

@@ -8,4 +8,5 @@ group :development do
   # gem dependency because we expect to be installed within the
   # Vagrant environment itself using `vagrant plugin`.
   gem "vagrant", :git => "git://github.com/mitchellh/vagrant.git", :tag => 'v1.2.2'
+  gem "mocha", :require => false
 end

data/README.md

@@ -1,80 +1,64 @@
-Installing Vagrant-Windows
-==========================
+# Vagrant-Windows
+[![Build Status](https://travis-ci.org/WinRb/vagrant-windows.png)](https://travis-ci.org/WinRb/vagrant-windows)
+[![Code Climate](https://codeclimate.com/github/WinRb/vagrant-windows.png)](https://codeclimate.com/github/WinRb/vagrant-windows)
+[![Gem Version](https://badge.fury.io/rb/vagrant-windows.png)](http://badge.fury.io/rb/vagrant-windows)
 
-For Vagrant 1.1.x and 1.2.x execute `vagrant plugin install vagrant-windows`.
-For Vagrant 1.0.x execute `vagrant plugin install vagrant-windows --plugin-version 0.1.2`.
+Use Windows guests with Vagrant
 
-### Installing Vagrant-Windows From Source
-If you want to install from source, use the following method (this would be for 1.2.0):
+## Getting Started
+1. Install the vagrant-windows plugin.
+2. Create and configure a Windows guest base box.
+3. Create a Vagrantfile.
+4. vagrant up
 
-```
- bundle install
- bundle exec rake
- vagrant plugin install pkg/vagrant-windows-1.2.0.gem
-```
+## Installation
 
-Keep in mind you should have Ruby 1.9.3 and Ruby DevKit installed. Check out the following gist that can get you what you need (from blank system to fully ready): [Install Vagrant Windows Plugin From Source Gist](https://gist.github.com/ferventcoder/6251225).
+- For Vagrant 1.1 and 1.2 execute `vagrant plugin install vagrant-windows`.
+- For Vagrant 1.0 execute `vagrant plugin install vagrant-windows --plugin-version 0.1.2`.
 
-Supported Guest Operating Systems (Your VM)
-===========================================
-_Does NOT work with Windows 2003 or XP_
+## Creating a Base Box
 
+Supported Guest Operating Systems:
 - Windows 7
 - Windows 2008
 - Windows 2008 R2
 - Windows 2012
 - Windows 8
 
-Building a Base Box
-===================
+Windows Server 2003 and Windows XP are not supported.
 
-All Windows Machines
--------------------- 
-#### Prerequisites
-
-Box setup:
+You'll need to create a new Vagrant base box. Create a new Windows VM in VirtualBox, configure some Windows settings (see below) then follow the [Vagrant packaging instructions](http://docs.vagrantup.com/v2/cli/package.html).
 
   - Create a vagrant user, for things to work out of the box username and password should both be "vagrant".
   - Turn off UAC (Msconfig)
   - Disable complex passwords
+  - [Disable Shutdown Tracker](http://www.jppinto.com/2010/01/how-to-disable-the-shutdown-event-tracker-in-server-20032008/) on Windows 2008/2012 Servers (except Core).
+  - [Disable "Server Manager" Starting at login](http://www.elmajdal.net/win2k8/How_to_Turn_Off_The_Automatic_Display_of_Server_Manager_At_logon.aspx) on Windows 2008/2012 Servers (except Core).
+  - Enable and configure WinRM (see below)
 
-Prior to enabling WinRM, you must ensure the following services are enabled:
+### WinRM Configuration
 
-  - Base Filtering Engine
-    - Remote Procedure Call (RPC)
-      - DCOM Server Process Launcher
-      - RPC Endpoint Mapper
-  - Windows Firewall
-  - Windows Remote Management (WS-Management)
-
-#### Enable WinRM
+These commands assume you're running from a regular command window and not PowerShell.
 ```
    winrm quickconfig -q
    winrm set winrm/config/winrs @{MaxMemoryPerShellMB="512"}
    winrm set winrm/config @{MaxTimeoutms="1800000"}
    winrm set winrm/config/service @{AllowUnencrypted="true"}
    winrm set winrm/config/service/auth @{Basic="true"}
+   sc config WinRM start= auto
 ```
-* note
-If you want to run the winrm commands from PowerShell you need to put ```@{MaxMemoryPerShellMB="512"}``` etc in single quotes:
-
-```
-   winrm set winrm/config/winrs '@{MaxMemoryPerShellMB="512"}'
-```
-
-#### Last steps 
+### Required Windows Services
 
-  - Optional: Start WinRM a few minutes faster by running: "sc config WinRM start= auto" (default is delayed-auto)
-    - _Note:_ When you use the `winrm` command line tool it will always ask to set the startup to Delayed, so you may find yourself performing this a few times.
+If you like to turn off optional Windows services you'll need to ensure you leave these services enabled for vagrant-windows to continue to work:
 
+  - Base Filtering Engine
+    - Remote Procedure Call (RPC)
+      - DCOM Server Process Launcher
+      - RPC Endpoint Mapper
+  - Windows Firewall
+  - Windows Remote Management (WS-Management)
   
-Windows 2008/2012 Servers (except Core)
----------------------------------------
-  - [Disable Shutdown Tracker](http://www.jppinto.com/2010/01/how-to-disable-the-shutdown-event-tracker-in-server-20032008/)
-  - [Disable "Server Manager" Starting at login](http://www.elmajdal.net/win2k8/How_to_Turn_Off_The_Automatic_Display_of_Server_Manager_At_logon.aspx)
-  
-The Vagrant File
-================
+## The Vagrant File
 
 Add the following to your Vagrantfile
 
@@ -122,41 +106,39 @@ Available Config Parameters:
 * ```config.winrm.max_tries``` - The number of retries to connect to WinRM, defaults to 20.
 * ```config.winrm.timeout``` - The max number of seconds to wait for a WinRM response, defaults to 1800 seconds.
 
-Note - You need to ensure you specify a config.windows and a config.winrm in your Vagrantfile. Currently there's a problem where
-Vagrant will not load the plugin config even with defaults if at least one of its values doesn't exist in the Vagrantfile.
+Note - You need to ensure you specify a config.windows and a config.winrm in your Vagrantfile. Currently there's a problem where Vagrant will not load the plugin config even with defaults if at least one of its values doesn't exist in the Vagrantfile.
+
 
 
-What Works?
-===========
+------------------------------------------------------------
+
+## What Works?
+
 - vagrant up|halt|reload|provision
 - Chef Vagrant Provisioner
 - Puppet Vagrant Provisioner
 - Shell Vagrant provisioner. Batch files or PowerShell (ps1) scripts are supported as well as inline scripts.
 
-TODOs
-=========
-1. Test it! We need to test on more hosts, guests, and VBox versions. Help wanted.
-2. Chef-Client support.
-3. Unit tests. 
-4. Better docs.
 
-Troubleshooting
-===============
+## Troubleshooting
 
-I get a 401 auth error from WinRM
----------------------------------
+#### When I run the winrm command I get: "Error: Invalid use of command line. Type "winrm -?" for help."
+- You're running the winrm command from powershell. You need to put ```@{MaxMemoryPerShellMB="512"}``` etc in single quotes:
+```
+   winrm set winrm/config/winrs '@{MaxMemoryPerShellMB="512"}'
+```
+
+#### I get a 401 auth error from WinRM
 - Ensure you've followed the WinRM configuration instructions above.
 - Ensure you can manually login using the specified config.winrm.username you've specified in your Vagrantfile.
 - Ensure your password hasn't expired.
 - Ensure your password doesn't need to be changed because of policy.
 
-I get a non-401 error from WinRM waiting for the VM to boot
------------------------------------------------------------
+#### I get a non-401 error from WinRM waiting for the VM to boot
 - Ensure you've properly setup port forwarding of WinRM
 - Make sure your VM can boot manually through VBox.
 
-SQL Server cookbook fails to install through Vagrant
-----------------------------------------------------
+#### SQL Server cookbook fails to install through Vagrant
 - Ensure UAC is turned off
 - Ensure your vagrant user is an admin on the guest
 - The SQL Server installer uses a lot of resources, ensure WinRM Quota Management is properly configured to give it enough resources.
@@ -165,21 +147,17 @@ SQL Server cookbook fails to install through Vagrant
 If all else fails try running [vagrant with debug logging](http://docs.vagrantup.com/v2/debugging.html), perhaps that will give
 you enough insight to fix the problem or file an issue.
 
-What Can I do to help?
-======================
-1. Contribute Code (See Below)
-2. Test Various Scenarios and file bugs for things that dont work
 
-Contributing
-============
+## Contributing
+
 1. Fork it.
 2. Create a branch (git checkout -b my_feature_branch)
 3. Commit your changes (git commit -am "Added a sweet feature")
 4. Push to the branch (git push origin my_feature_branch)
 5. Create a pull requst from your branch into master (Please be sure to provide enough detail for us to cipher what this change is doing)
 
-Development
-=============
+### Development
+
 Clone this repository and use [Bundler](http://gembundler.com) to get the dependencies:
 
 ```
@@ -202,9 +180,20 @@ use bundler to execute Vagrant:
 $ bundle exec vagrant up
 ```
 
+### Installing Vagrant-Windows From Source
+
+If you want to globally install your locally built plugin from source, use the following method (this would be for 1.2.0):
+
+```
+ bundle install
+ bundle exec rake build
+ vagrant plugin install pkg/vagrant-windows-1.2.0.gem
+```
+
+Keep in mind you should have Ruby 1.9.3 and Ruby DevKit installed. Check out the following gist that can get you what you need (from blank system to fully ready): [Install Vagrant Windows Plugin From Source Gist](https://gist.github.com/ferventcoder/6251225).
+
+## References and Shout Outs
 
-References and Shout Outs
-=========================
 - Chris McClimans - Vagrant Branch (https://github.com/hh/vagrant/blob/feature/winrm/)
 - Dan Wanek - WinRM GEM (https://github.com/zenchild/WinRM)
   - +1 For being super responsive to pull requests.
@@ -215,38 +204,4 @@ References and Shout Outs
 - Rob Reynolds - Updated readme installation and box configuration notes
 - stonith - Updated readme winrm config notes
 - wenns - Updated readme to advise against forwarding RDP
-
-Changelog
-=========
-0.1.1
-
-- Remove extra debug information from command output.
-
-0.1.2
-
-- Added virtual box 4.2 support.
-
-0.1.3 
-
-- Added puppet provisioner.
-
-1.0.0 
-
-- Converted to Vagrant 1.1.x plugin architecture.
-
-1.0.1 
-
-- Fix #29 Monkey Patch the 4.2 driver to include read_mac_addresses. 
-  - use read_mac_addresses in all cases.
-
-1.0.3 
-
-- Added vagrant shell provisioner. The built-in shell provisioner tried to chmod the target script which doesn't make sense on windows.
-- Can now run the vagrant-windows plugin via bundle exec instead of vagrant plugin install (for plugin dev).The vagrant src root finding logic didn't work from a bundle, but the native Vagrant src root does.
-- Readme fixes/updates.
-
-1.2.0
-
-- Converted to Vagrant 1.2.x plugin architecture.
-- Various networking fixes.
-- Chef provisioner runs through the Windows task scheduler instead of ps_runas power shell script.
+- Joe Fitzgerald - Added VMWare support and improved retry logic.

data/lib/vagrant-windows/guest/cap/configure_networks.rb

@@ -2,6 +2,7 @@ require 'log4r'
 require_relative '../../communication/guestnetwork'
 require_relative '../../communication/winrmshell'
 require_relative '../../errors'
+require_relative '../../helper'
 
 module VagrantWindows
   module Guest
@@ -14,8 +15,7 @@ module VagrantWindows
           @@logger.debug("networks: #{networks.inspect}")
           
           guest_network = ::VagrantWindows::Communication::GuestNetwork.new(machine.communicate.winrmshell)
-
-          if (machine.provider_name != :vmware_fusion) && (machine.provider_name != :vmware_workstation)
+          unless VagrantWindows::Helper.is_vmware(machine) 
             vm_interface_map = create_vm_interface_map(machine, guest_network)
           end
           
@@ -53,7 +53,7 @@ module VagrantWindows
             naked_mac = nic[:mac_address].gsub(':','')
             if driver_mac_address[naked_mac]
               vm_interface_map[driver_mac_address[naked_mac]] = {
-                :name => nic[:net_connection_id],
+                :net_connection_id => nic[:net_connection_id],
                 :mac_address => naked_mac,
                 :interface_index => nic[:interface_index],
                 :index => nic[:index] }

data/lib/vagrant-windows/guest/cap/mount_shared_folder.rb

@@ -0,0 +1,31 @@
+require_relative '../../helper'
+
+module VagrantWindows
+  module Guest
+    module Cap
+      class MountSharedFolder
+        
+        def self.mount_virtualbox_shared_folder(machine, name, guestpath, options)
+          mount_shared_folder(machine, name, guestpath, "\\\\vboxsrv\\")
+        end
+        
+        def self.mount_vmware_shared_folder(machine, name, guestpath, options)
+          mount_shared_folder(machine, name, guestpath, "\\\\vmware-host\\Shared Folders\\")
+        end
+        
+        protected
+        
+        def self.mount_shared_folder(machine, name, guestpath, vm_provider_unc_base)
+          share_name = VagrantWindows::Helper.win_friendly_share_id(name)
+          options = {
+            :mount_point => guestpath,
+            :share_name => share_name,
+            :vm_provider_unc_path => vm_provider_unc_base + share_name}
+          mount_script = VagrantWindows.load_script_template("mount_volume.ps1", :options => options)
+          machine.communicate.execute(mount_script, {:shell => :powershell})
+        end
+        
+      end
+    end
+  end
+end

data/lib/vagrant-windows/guest/windows.rb

@@ -1,9 +1,9 @@
 require "vagrant"
+require "vagrant-windows/helper"
 require "vagrant-windows/guest/cap/change_host_name"
 require "vagrant-windows/guest/cap/configure_networks"
 require "vagrant-windows/guest/cap/halt"
-require "vagrant-windows/guest/cap/mount_virtualbox_shared_folder"
-require "vagrant-windows/guest/cap/mount_vmware_shared_folder"
+require "vagrant-windows/guest/cap/mount_shared_folder"
 
 module VagrantWindows
   module Guest
@@ -31,14 +31,14 @@ module VagrantWindows
         VagrantWindows::Guest::Cap::Halt.halt(@machine)
       end
       
-      def mount_virtualbox_shared_folder(name, guestpath, options)
-        VagrantWindows::Guest::Cap::MountVirtualBoxSharedFolder.mount_virtualbox_shared_folder(
-          @machine, name, guestpath, options)
-      end
-
-      def mount_vmware_shared_folder(name, guestpath, options)
-        VagrantWindows::Guest::Cap::MountVMwareBoxSharedFolder.mount_vmware_shared_folder(
+      def mount_shared_folder(name, guestpath, options)
+        if VagrantWindows::Helper.is_vmware(@machine) then
+          VagrantWindows::Guest::Cap::MountSharedFolder.mount_vmware_shared_folder(
+            @machine, name, guestpath, options)
+        else
+          VagrantWindows::Guest::Cap::MountSharedFolder.mount_virtualbox_shared_folder(
             @machine, name, guestpath, options)
+        end
       end
       
       def configure_networks(networks)

data/lib/vagrant-windows/helper.rb

@@ -2,6 +2,10 @@ module VagrantWindows
   module Helper
     extend self
     
+    # Makes a path Windows guest friendly.
+    # Turns '/vagrant' into 'c:\vagrant'
+    #
+    # @return [String]
     def win_friendly_path(path)
       if path
         new_path = path.gsub('/', '\\')
@@ -10,10 +14,20 @@ module VagrantWindows
       new_path
     end
 
-    # turns '/vagrant' into 'vagrant' or turns ''/a/b/c/d/e' into 'a_b_c_d_e'
+    # Makes Vagrant share names Windows guest friendly.
+    # Turns '/vagrant' into 'vagrant' or turns ''/a/b/c/d/e' into 'a_b_c_d_e'
+    #
+    # @return [String]
     def win_friendly_share_id(shared_folder_name)
       return shared_folder_name.gsub(/[\/\/]/,'_').sub(/^_/, '')
     end
     
+    # Checks to see if the specified machine is using VMWare Fusion or Workstation.
+    #
+    # @return [Boolean]
+    def is_vmware(machine)
+      machine.provider_name.to_s().start_with?('vmware')
+    end
+    
   end
 end

data/lib/vagrant-windows/plugin.rb

@@ -76,13 +76,13 @@ module VagrantWindows
       end
 
       guest_capability(:windows, :mount_virtualbox_shared_folder) do
-        require_relative "guest/cap/mount_virtualbox_shared_folder"
-        VagrantWindows::Guest::Cap::MountVirtualBoxSharedFolder
+        require_relative "guest/cap/mount_shared_folder"
+        VagrantWindows::Guest::Cap::MountSharedFolder
       end
 
       guest_capability(:windows, :mount_vmware_shared_folder) do
-        require_relative "guest/cap/mount_vmware_shared_folder"
-        VagrantWindows::Guest::Cap::MountVMwareSharedFolder
+        require_relative "guest/cap/mount_shared_folder"
+        VagrantWindows::Guest::Cap::MountSharedFolder
       end
     
     end

data/lib/vagrant-windows/scripts/{mount_volume.vmware.ps1.erb → mount_volume.ps1.erb}

@@ -7,6 +7,7 @@ function Test-ReparsePoint([string]$path) {
 
 $MountPoint = [System.IO.Path]::GetFullPath("<%= options[:mount_point] %>")
 $ShareName = "<%= options[:share_name] %>"
+$VmProviderUncPath = "<%= options[:vm_provider_unc_path] %>"
 
 # https://github.com/BIAINC/vagrant-windows/issues/4
 # Not sure why this works, but it does.
@@ -41,7 +42,7 @@ if (-not (Test-Path $BaseDirectory))
   New-Item $BaseDirectory -Type Directory -Force | Out-Null
 }
 
-cmd /c mklink /D "$MountPoint" "\\vmware-host\Shared Folders\$ShareName" | out-null
+cmd /c mklink /D "$MountPoint" "$VmProviderUncPath" | out-null
 
 if ( $LASTEXITCODE -ne 0 )
 {

data/lib/vagrant-windows/version.rb

@@ -1,3 +1,3 @@
 module VagrantWindows
-  VERSION = "1.2.0"
+  VERSION = "1.2.1"
 end

data/spec/vagrant-windows/guestnetwork_spec.rb

@@ -35,8 +35,20 @@ describe VagrantWindows::Communication::GuestNetwork , :integration => true do
     
     it "should configure static IP for adapter" do
       nics = @guestnetwork.network_adapters()
-      @guestnetwork.configure_static_interface(nics[1][:index], nics[1][:net_connection_id], "192.168.0.100", "255.255.255.0")
+      @guestnetwork.configure_static_interface(
+        nics[1][:index],
+        nics[1][:net_connection_id],
+        "192.168.0.121",
+        "255.255.255.0")
+        
       expect(@guestnetwork.is_dhcp_enabled(nics[1][:index])).to be_false
+      
+      # ensure the right IP was set by looking through all the output of ipconfig
+      ipconfig_out = ''
+      @shell.powershell('ipconfig /all') do |_, line|
+        ipconfig_out = ipconfig_out + "#{line}"
+      end
+      expect(ipconfig_out).to include('192.168.0.121')
     end
     
     it "should configure all networks to work mode" do

data/spec/vagrant-windows/helper_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'mocha/api'
 
 describe VagrantWindows::Helper , :unit => true do
   
@@ -34,5 +35,23 @@ describe VagrantWindows::Helper , :unit => true do
     end
 
   end
+  
+  describe "is_vmware" do
+    it "should be true for vmware_fusion" do
+      machine = stub(:provider_name => :vmware_fusion)
+      expect(@dummy.is_vmware(machine)).to be_true
+    end
+    
+    it "should be true for vmware_workstation" do
+      machine = stub(:provider_name => :vmware_workstation)
+      expect(@dummy.is_vmware(machine)).to be_true
+    end
+    
+    it "should be false for virtual_box" do
+      machine = stub(:provider_name => :virtual_box)
+      expect(@dummy.is_vmware(machine)).to be_false
+    end
+
+  end
 
 end

data/spec/vagrant-windows/mount_shared_folder_spec.rb

@@ -0,0 +1,34 @@
+require 'spec_helper'
+require 'mocha/api'
+require 'vagrant-windows/guest/cap/mount_shared_folder'
+
+describe VagrantWindows::Guest::Cap::MountSharedFolder, :unit => true do
+  
+  before(:each) do
+    @communicator = mock()
+    @machine = stub(:communicate => @communicator)
+  end
+
+  describe "mount_virtualbox_shared_folder" do
+    it "should run script with vbox paths"  do
+      @communicator.expects(:execute).with do |script, options|
+        expect(script).to include("$VmProviderUncPath = \"\\\\vboxsrv\\vagrant\"")
+      end      
+
+      VagrantWindows::Guest::Cap::MountSharedFolder.mount_virtualbox_shared_folder(
+        @machine, "vagrant", "/tmp/vagrant", {})
+    end
+  end
+    
+  describe "mount_vmware_shared_folder" do
+    it "should run script with vmware paths"  do
+      @communicator.expects(:execute).with do |script, options|
+        expect(script).to include("$VmProviderUncPath = \"\\\\vmware-host\\Shared Folders\\vagrant\"")
+      end
+      
+      VagrantWindows::Guest::Cap::MountSharedFolder.mount_vmware_shared_folder(
+        @machine, "vagrant", "/tmp/vagrant", {})
+    end
+  end
+  
+end

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-windows
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
+  prerelease: 
 platform: ruby
 authors:
 - Paul Morton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-12 00:00:00.000000000 Z
+date: 2013-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: winrm
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -27,20 +30,23 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-core
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -55,6 +62,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,6 +70,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -69,6 +78,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -76,6 +86,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -83,15 +94,17 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Windows Guest Support for Vagrant
@@ -101,6 +114,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
 - coverage/assets/0.7.1/application.css
 - coverage/assets/0.7.1/application.js
 - coverage/assets/0.7.1/fancybox/blank.gif
@@ -153,8 +167,7 @@ files:
 - lib/vagrant-windows/guest/cap/change_host_name.rb
 - lib/vagrant-windows/guest/cap/configure_networks.rb
 - lib/vagrant-windows/guest/cap/halt.rb
-- lib/vagrant-windows/guest/cap/mount_virtualbox_shared_folder.rb
-- lib/vagrant-windows/guest/cap/mount_vmware_shared_folder.rb
+- lib/vagrant-windows/guest/cap/mount_shared_folder.rb
 - lib/vagrant-windows/guest/windows.rb
 - lib/vagrant-windows/helper.rb
 - lib/vagrant-windows/monkey_patches/lib/vagrant/machine.rb
@@ -170,8 +183,7 @@ files:
 - lib/vagrant-windows/scripts/cheftask.xml.erb
 - lib/vagrant-windows/scripts/cheftaskrun.ps1.erb
 - lib/vagrant-windows/scripts/command_alias.ps1
-- lib/vagrant-windows/scripts/mount_volume.virtualbox.ps1.erb
-- lib/vagrant-windows/scripts/mount_volume.vmware.ps1.erb
+- lib/vagrant-windows/scripts/mount_volume.ps1.erb
 - lib/vagrant-windows/scripts/set_work_network.ps1
 - lib/vagrant-windows/scripts/winrs_v3_get_adapters.ps1
 - lib/vagrant-windows/version.rb
@@ -183,34 +195,43 @@ files:
 - spec/vagrant-windows/config_spec.rb
 - spec/vagrant-windows/guestnetwork_spec.rb
 - spec/vagrant-windows/helper_spec.rb
+- spec/vagrant-windows/mount_shared_folder_spec.rb
 - spec/vagrant-windows/winrmcommunicator_spec.rb
 - vagrant-windows.gemspec
+- .DS_Store
 - .gitignore
 - .travis.yml
 - coverage/.last_run.json
 - coverage/.resultset.json
 homepage: ''
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1712186085374339877
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1712186085374339877
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: A small gem that adds windows guest support to vagrant, uses WinRM as the
   Communication Channel
 test_files:
@@ -218,4 +239,5 @@ test_files:
 - spec/vagrant-windows/config_spec.rb
 - spec/vagrant-windows/guestnetwork_spec.rb
 - spec/vagrant-windows/helper_spec.rb
+- spec/vagrant-windows/mount_shared_folder_spec.rb
 - spec/vagrant-windows/winrmcommunicator_spec.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: cecfc851c351d99894540e03b595c9ed93fb313b
-  data.tar.gz: 325c6d920df52dc61f4db48e64337b88480a1b0d
-SHA512:
-  metadata.gz: c5d93cd182875294ee9c50911b272363752039d8ab1ccae5c620291b109eb7c04a3ec8073901982e64fa040b04678197936fc8f2fe97d925ebb71fb8c230c438
-  data.tar.gz: 9932265ce43b14f7b942146291e1696d861c2070d8b79b147bda0b02bc4e41ac486b8996e20fac232802ddea0b083f276e2dddd7f7692cd5e49a711033fc2582

data/lib/vagrant-windows/guest/cap/mount_virtualbox_shared_folder.rb

@@ -1,17 +0,0 @@
-require_relative '../../helper'
-
-module VagrantWindows
-  module Guest
-    module Cap
-      class MountVirtualBoxSharedFolder
-        
-        def self.mount_virtualbox_shared_folder(machine, name, guestpath, options)
-          share_name = VagrantWindows::Helper.win_friendly_share_id(name)
-          mount_script = VagrantWindows.load_script_template("mount_volume.virtualbox.ps1",
-            :options => {:mount_point => guestpath, :share_name => share_name})
-          machine.communicate.execute(mount_script, {:shell => :powershell})
-        end
-      end
-    end
-  end
-end

data/lib/vagrant-windows/guest/cap/mount_vmware_shared_folder.rb

@@ -1,15 +0,0 @@
-module VagrantWindows
-  module Guest
-    module Cap
-      class MountVMwareSharedFolder
-
-        def self.mount_vmware_shared_folder(machine, name, guestpath, options)
-          share_name = VagrantWindows::Helper.win_friendly_share_id(name)
-          mount_script = VagrantWindows.load_script_template("mount_volume.vmware.ps1",
-            :options => {:mount_point => guestpath, :share_name => share_name})
-          machine.communicate.execute(mount_script, {:shell => :powershell})
-        end
-      end
-    end
-  end
-end

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

@@ -1,49 +0,0 @@
-
-function Test-ReparsePoint([string]$path) {
-  $file = Get-Item $path -Force -ea 0
-  return [bool]($file.Attributes -band [IO.FileAttributes]::ReparsePoint)
-}
-
-
-$MountPoint = [System.IO.Path]::GetFullPath("<%= options[:mount_point] %>")
-$ShareName = "<%= options[:share_name] %>"
-
-# https://github.com/BIAINC/vagrant-windows/issues/4
-# Not sure why this works, but it does.
-
-& net use $ShareName 2>&1 | Out-Null
-
-Write-Debug "Attempting to mount $ShareName to $MountPoint"
-if( (Test-Path "$MountPoint") -and (Test-ReparsePoint "$MountPoint") )
-{
-  Write-Debug "Junction already exists, so I will delete it"
-  # Powershell refuses to delete junctions, oh well use cmd
-  cmd /c rd "$MountPoint"
-
-  if ( $LASTEXITCODE -ne 0 )
-  {
-    Write-Error "Failed to delete symbolic link at $MountPoint"
-    exit 1
-  }
-
-} 
-elseif(Test-Path $MountPoint) 
-{
-  Write-Debug "Mount point already exists and is not a symbolic link"
-  exit 1
-}
-
-$BaseDirectory = [System.IO.Path]::GetDirectoryName($MountPoint)
-
-if (-not (Test-Path $BaseDirectory))
-{
-  Write-Debug "Creating parent directory for mount point $BaseDirectory"
-  New-Item $BaseDirectory -Type Directory -Force | Out-Null
-}
-
-cmd /c mklink /D "$MountPoint" "\\vboxsrv\$ShareName" | out-null
-
-if ( $LASTEXITCODE -ne 0 )
-{
-  exit 1
-}