vagrant-windows 1.5.0 → 1.5.1

data/CHANGELOG.md

@@ -68,3 +68,8 @@
 
 1.5.0
 - Support for Parallels 8/9 VMs via vagrant-parallels plugin.
+
+1.5.1
+- Fixed issue 158 - Vagrant 1.4 broke the Puppet provisioner monkey patch. Removed configure method monkey patch.
+- Fixed issue 162 - Set plugin name to 'vagrant-windows' to support has_plugin? method works.
+- Reset winrmshell on error. When using the vSphere provider the hostname would not resolve.

data/README.md

@@ -147,7 +147,7 @@ Note - You need to ensure you specify a config.windows and a config.winrm in you
 - The SQL Server installer uses a lot of resources, ensure WinRM Quota Management is properly configured to give it enough resources.
 - See [COOK-1172](http://tickets.opscode.com/browse/COOK-1172) and http://stackoverflow.com/a/15235996/82906 for more information.
 
-If all else fails try running [vagrant with debug logging](http://docs.vagrantup.com/v2/debugging.html), perhaps that will give
+If all else fails try running [vagrant with debug logging](http://docs.vagrantup.com/v2/other/debugging.html), perhaps that will give
 you enough insight to fix the problem or file an issue.
 
 

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

@@ -18,7 +18,7 @@ module VagrantWindows
       def initialize(machine)
         @windows_machine = VagrantWindows::WindowsMachine.new(machine)
         @winrm_shell_factory = WinRMShellFactory.new(@windows_machine, WinRMFinder.new(@windows_machine))
-        
+
         @logger = Log4r::Logger.new("vagrant_windows::communication::winrmcommunicator")
         @logger.debug("initializing WinRMCommunicator")
       end
@@ -32,11 +32,15 @@ module VagrantWindows
 
         @logger.info("WinRM is ready!")
         return true
-        
+
       rescue Vagrant::Errors::VagrantError => e
         # We catch a `VagrantError` which would signal that something went
         # wrong expectedly in the `connect`, which means we didn't connect.
         @logger.info("WinRM not up: #{e.inspect}")
+        # We reset the shell to trigger calling of winrm_finder again.
+        # This resolves a problem when using vSphere where the ssh_info was not refreshing
+        # thus never getting the correct hostname.
+        @winrmshell = nil
         return false
       end
       

data/lib/vagrant-windows/monkey_patches/plugins/provisioners/puppet/provisioner/puppet.rb

@@ -13,15 +13,10 @@ module VagrantPlugins
         # This patch is needed until Vagrant supports Puppet on Windows guests
         provision_on_linux = instance_method(:provision)
         run_puppet_apply_on_linux = instance_method(:run_puppet_apply)
-        configure_on_linux = instance_method(:configure)
 
         define_method(:run_puppet_apply) do
           is_windows? ? run_puppet_apply_on_windows() : run_puppet_apply_on_linux.bind(self).()
         end
-
-        define_method(:configure) do |root_config|
-          is_windows? ? configure_on_windows(root_config) : configure_on_linux.bind(self).(root_config)
-        end
         
         define_method(:provision) do
           windows_machine = VagrantWindows::WindowsMachine.new(@machine)
@@ -91,43 +86,6 @@ module VagrantPlugins
           end
         end
 
-        def configure_on_windows(root_config)
-          # Calculate the paths we're going to use based on the environment
-          root_path = @machine.env.root_path
-          @expanded_manifests_path = @config.expanded_manifests_path(root_path)
-          @expanded_module_paths   = @config.expanded_module_paths(root_path)
-          @manifest_file           = File.join(manifests_guest_path, @config.manifest_file)
-
-          # Setup the module paths
-          @module_paths = []
-          @expanded_module_paths.each_with_index do |path, i|
-            @module_paths << [path, File.join(@config.temp_dir, "modules-#{i}")]
-          end
-
-          @logger.debug("Syncing folders from puppet configure")
-          @logger.debug("manifests_guest_path = #{manifests_guest_path}")
-          @logger.debug("expanded_manifests_path = #{@expanded_manifests_path}")
-
-          # Windows guest volume mounting fails without an "id" specified
-          # This hacks around that problem and allows the PS mount script to work
-          root_config.vm.synced_folder(
-            @expanded_manifests_path, manifests_guest_path,
-            :id =>  "v-manifests-1")
-
-          # Share the manifests directory with the guest
-          #root_config.vm.synced_folder(
-          #  @expanded_manifests_path, manifests_guest_path)
-
-          # Share the module paths
-          count = 0
-          @module_paths.each do |from, to|
-            # Sorry for the cryptic key here, but VirtualBox has a strange limit on
-            # maximum size for it and its something small (around 10)
-            root_config.vm.synced_folder(from, to, :id => "v-modules-#{count}")
-            count += 1
-          end
-        end
-
         def is_windows?
           VagrantWindows::WindowsMachine.is_windows?(@machine)
         end

data/lib/vagrant-windows/plugin.rb

@@ -43,11 +43,8 @@ require_relative "monkey_patches/plugins/provisioners/shell/provisioner"
 
 module VagrantWindows
   class Plugin < Vagrant.plugin("2")
-    name "Windows guest"
-    description <<-DESC
-    This plugin installs a provider that allows Vagrant to manage
-    Windows machines as guests.
-    DESC
+    name "vagrant-windows"
+    description "This plugin allows Vagrant to manage Windows guests."
 
     config(:windows) do
       require_relative "config/windows"

data/lib/vagrant-windows/version.rb

@@ -1,3 +1,3 @@
 module VagrantWindows
-  VERSION = "1.5.0"
+  VERSION = "1.5.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-windows
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-16 00:00:00.000000000 Z
+date: 2014-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: winrm
@@ -185,7 +185,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4266967096352305010
+      hash: -4320786780650999420
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -194,7 +194,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4266967096352305010
+      hash: -4320786780650999420
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23