vagrant-windows 1.3.2 → 1.4.0

data/CHANGELOG.md

@@ -60,3 +60,8 @@
 
 1.3.2
 - Fixed issue 145 - The shell provisioner wasn't respecting file extensions for non-inline scripts.
+
+1.4.0
+- Added Vagrant 1.4.0 support, added VBox synced folder monkey patch for Vagrant 1.4
+- Fixed issue 149 - Added documentation about auto_correct for winrm port
+- Fixed issue 152 - Chef task fails when password contains $

data/Gemfile

@@ -7,6 +7,6 @@ group :development do
   # We depend on Vagrant for development, but we don't add it as a
   # 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.3.5'
+  gem "vagrant", :git => "git://github.com/mitchellh/vagrant.git", :tag => 'v1.4.0'
   gem "mocha", :require => false
 end

data/README.md

@@ -77,22 +77,12 @@ Add the following to your Vagrantfile
 
 ```ruby
 config.vm.guest = :windows
-config.windows.halt_timeout = 25
-config.winrm.username = "vagrant"
-config.winrm.password = "vagrant"
-config.vm.network :forwarded_port, guest: 5985, host: 5985
+config.vm.network :forwarded_port, guest: 5985, host: 5985, id: "winrm", auto_correct: true
 ```
 
 Example:
 ```ruby
 Vagrant.configure("2") do |config|
-  
-  # Max time to wait for the guest to shutdown
-  config.windows.halt_timeout = 25
-  
-  # Admin user name and password
-  config.winrm.username = "vagrant"
-  config.winrm.password = "vagrant"
 
   # Configure base box parameters
   config.vm.box = "vagrant-windows2008r2"
@@ -101,7 +91,7 @@ Vagrant.configure("2") do |config|
 
   # Port forward WinRM and RDP
   config.vm.network :forwarded_port, guest: 3389, host: 3389
-  config.vm.network :forwarded_port, guest: 5985, host: 5985
+  config.vm.network :forwarded_port, guest: 5985, host: 5985, id: "winrm", auto_correct: true
   
 end
 ````

data/lib/vagrant-windows/monkey_patches/plugins/providers/virtualbox/synced_folder.rb

@@ -0,0 +1,27 @@
+require "#{Vagrant::source_root}/plugins/providers/virtualbox/synced_folder"
+require_relative '../../../../helper'
+
+module VagrantPlugins
+  module ProviderVirtualBox
+    
+    class SyncedFolder < Vagrant.plugin("2", :synced_folder)
+      include VagrantWindows::Helper
+      
+      vagrant_prepare = instance_method(:prepare)
+      
+      define_method(:prepare) do |machine, folders, _opts|
+        if VagrantWindows::WindowsMachine.is_windows?(machine)
+          windows_folders = {}
+          folders.each do |id, data|
+            windows_id = win_friendly_share_id(id.gsub(/[\/\/]/,'_').sub(/^_/, ''))
+            windows_folders[windows_id] = data
+          end
+          folders = windows_folders
+        end
+        vagrant_prepare.bind(self).(machine, folders, _opts)
+      end
+
+    end
+
+  end
+end

data/lib/vagrant-windows/plugin.rb

@@ -10,13 +10,21 @@ if Vagrant::VERSION < "1.1.0"
   raise "The Vagrant Windows plugin is only compatible with Vagrant 1.1+"
 end
 
-if Vagrant::VERSION >= "1.2.0"
+if Vagrant::VERSION >= "1.2.0" && Vagrant::VERSION < "1.4.0"
   # Monkey Patch the virtualbox share_folders action to make valid share names on windows
   require_relative "monkey_patches/plugins/providers/virtualbox/action/share_folders"
 end
 
-# Monkey patch the vbox42 driver to support read mac addresses
-require_relative "monkey_patches/plugins/providers/virtualbox/driver/version_4_2"
+if Vagrant::VERSION >= "1.4.0"
+  # Monkey Patch the virtualbox share_folders action to make valid share names on windows
+  require_relative "monkey_patches/plugins/providers/virtualbox/synced_folder"
+end
+
+# Monkey patch the vbox42 driver to support read mac addresses on old versions of Vagrant
+# before this commit 18417234787de9294abac5850ec426b841a09c87
+if Vagrant::VERSION < "1.2.5"
+  require_relative "monkey_patches/plugins/providers/virtualbox/driver/version_4_2"
+end
 
 # Monkey Patch the VM object to support multiple channels, i.e. WinRM
 require_relative "monkey_patches/lib/vagrant/machine"

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

@@ -7,7 +7,7 @@ if (Test-Path "<%= options[:chef_task_running] %>") {
 }
 
 # schedule the task to run once in the far distant future
-schtasks /create /tn "chef-solo" /xml "<%= options[:chef_task_xml] %>" /ru "<%= options[:user] %>" /rp "<%= options[:pass] %>" | Out-Null
+schtasks /create /tn 'chef-solo' /xml '<%= options[:chef_task_xml] %>' /ru '<%= options[:user] %>' /rp '<%= options[:pass] %>' | Out-Null
 
 # start the scheduled task right now
 schtasks /run /tn "chef-solo" | Out-Null

data/lib/vagrant-windows/version.rb

@@ -1,3 +1,3 @@
 module VagrantWindows
-  VERSION = "1.3.2"
+  VERSION = "1.4.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-windows
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-04 00:00:00.000000000 Z
+date: 2013-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: winrm
@@ -117,47 +117,6 @@ 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
-- coverage/assets/0.7.1/fancybox/fancy_close.png
-- coverage/assets/0.7.1/fancybox/fancy_loading.png
-- coverage/assets/0.7.1/fancybox/fancy_nav_left.png
-- coverage/assets/0.7.1/fancybox/fancy_nav_right.png
-- coverage/assets/0.7.1/fancybox/fancy_shadow_e.png
-- coverage/assets/0.7.1/fancybox/fancy_shadow_n.png
-- coverage/assets/0.7.1/fancybox/fancy_shadow_ne.png
-- coverage/assets/0.7.1/fancybox/fancy_shadow_nw.png
-- coverage/assets/0.7.1/fancybox/fancy_shadow_s.png
-- coverage/assets/0.7.1/fancybox/fancy_shadow_se.png
-- coverage/assets/0.7.1/fancybox/fancy_shadow_sw.png
-- coverage/assets/0.7.1/fancybox/fancy_shadow_w.png
-- coverage/assets/0.7.1/fancybox/fancy_title_left.png
-- coverage/assets/0.7.1/fancybox/fancy_title_main.png
-- coverage/assets/0.7.1/fancybox/fancy_title_over.png
-- coverage/assets/0.7.1/fancybox/fancy_title_right.png
-- coverage/assets/0.7.1/fancybox/fancybox-x.png
-- coverage/assets/0.7.1/fancybox/fancybox-y.png
-- coverage/assets/0.7.1/fancybox/fancybox.png
-- coverage/assets/0.7.1/favicon_green.png
-- coverage/assets/0.7.1/favicon_red.png
-- coverage/assets/0.7.1/favicon_yellow.png
-- coverage/assets/0.7.1/loading.gif
-- coverage/assets/0.7.1/magnify.png
-- coverage/assets/0.7.1/smoothness/images/ui-bg_flat_0_aaaaaa_40x100.png
-- coverage/assets/0.7.1/smoothness/images/ui-bg_flat_75_ffffff_40x100.png
-- coverage/assets/0.7.1/smoothness/images/ui-bg_glass_55_fbf9ee_1x400.png
-- coverage/assets/0.7.1/smoothness/images/ui-bg_glass_65_ffffff_1x400.png
-- coverage/assets/0.7.1/smoothness/images/ui-bg_glass_75_dadada_1x400.png
-- coverage/assets/0.7.1/smoothness/images/ui-bg_glass_75_e6e6e6_1x400.png
-- coverage/assets/0.7.1/smoothness/images/ui-bg_glass_95_fef1ec_1x400.png
-- coverage/assets/0.7.1/smoothness/images/ui-bg_highlight-soft_75_cccccc_1x100.png
-- coverage/assets/0.7.1/smoothness/images/ui-icons_222222_256x240.png
-- coverage/assets/0.7.1/smoothness/images/ui-icons_2e83ff_256x240.png
-- coverage/assets/0.7.1/smoothness/images/ui-icons_454545_256x240.png
-- coverage/assets/0.7.1/smoothness/images/ui-icons_888888_256x240.png
-- coverage/assets/0.7.1/smoothness/images/ui-icons_cd0a0a_256x240.png
-- coverage/index.html
 - Gemfile
 - lib/vagrant-windows/communication/guestnetwork.rb
 - lib/vagrant-windows/communication/winrmcommunicator.rb
@@ -176,6 +135,7 @@ files:
 - lib/vagrant-windows/monkey_patches/lib/vagrant/machine.rb
 - lib/vagrant-windows/monkey_patches/plugins/providers/virtualbox/action/share_folders.rb
 - lib/vagrant-windows/monkey_patches/plugins/providers/virtualbox/driver/version_4_2.rb
+- lib/vagrant-windows/monkey_patches/plugins/providers/virtualbox/synced_folder.rb
 - lib/vagrant-windows/monkey_patches/plugins/provisioners/chef/provisioner/chef_client.rb
 - lib/vagrant-windows/monkey_patches/plugins/provisioners/chef/provisioner/chef_solo.rb
 - lib/vagrant-windows/monkey_patches/plugins/provisioners/puppet/provisioner/puppet.rb
@@ -208,14 +168,8 @@ files:
 - spec/vagrant-windows/winrmfinder_spec.rb
 - spec/vagrant-windows/winrmshell_spec.rb
 - vagrant-windows.gemspec
-- .DS_Store
 - .gitignore
 - .travis.yml
-- coverage/.DS_Store
-- coverage/.last_run.json
-- coverage/.resultset.json
-- lib/.DS_Store
-- spec/.DS_Store
 homepage: https://github.com/WinRb/vagrant-windows
 licenses:
 - APACHE2
@@ -231,7 +185,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1215411857304012752
+      hash: 604266058091008148
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -240,7 +194,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1215411857304012752
+      hash: 604266058091008148
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -259,4 +213,3 @@ test_files:
 - spec/vagrant-windows/winrmcommunicator_spec.rb
 - spec/vagrant-windows/winrmfinder_spec.rb
 - spec/vagrant-windows/winrmshell_spec.rb
-- spec/.DS_Store

data/coverage/.last_run.json

@@ -1,5 +0,0 @@
-{
-  "result": {
-    "covered_percent": 57.86
-  }
-}