vagrant-windows 1.3.0.pre.3 → 1.3.0

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.2.2'
+  gem "vagrant", :git => "git://github.com/mitchellh/vagrant.git", :tag => 'v1.3.5'
   gem "mocha", :require => false
 end

data/README.md

@@ -47,6 +47,18 @@ These commands assume you're running from a regular command window and not Power
    winrm set winrm/config/service/auth @{Basic="true"}
    sc config WinRM start= auto
 ```
+
+#### Additional WinRM 1.1 Configuration
+
+These additional configuration steps are specific to Windows7 and Windows Server 2008 (WinRM 1.1). For Windows Server 2008 R2 and newer you can ignore this section.
+
+1. Ensure the Windows PowerShell feature is installed
+2. [change the default WinRM port](http://technet.microsoft.com/en-us/library/ff520073(v=ws.10).aspx) - see below or [upgrade to WinRM 2.0](http://www.microsoft.com/en-us/download/details.aspx?id=20430).
+```
+netsh firewall add portopening TCP 5985 "Port 5985"
+winrm set winrm/config/listener?Address=*+Transport=HTTP @{Port="5985"}
+```
+
 ### Required Windows Services
 
 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:

data/init.pp

@@ -0,0 +1,5 @@
+file {'c:/hellopuppet.txt':
+  ensure => present,
+  content => 'yo dawg you did its!'
+}
+

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

@@ -90,7 +90,7 @@ module VagrantWindows
         if shell.eql? :cmd
           winrmshell.cmd(command, &block)[:exitcode]
         else
-          command = VagrantWindows.load_script("command_alias.ps1") << "\r\n" << command
+          command = VagrantWindows.load_script("command_alias.ps1") << "\r\n" << command << "\r\nexit $LASTEXITCODE"
           winrmshell.powershell(command, &block)[:exitcode]
         end
       end

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

@@ -17,29 +17,31 @@ module VagrantWindows
           
           windows_machine = VagrantWindows::WindowsMachine.new(machine)
           guest_network = VagrantWindows::Communication::GuestNetwork.new(windows_machine.winrmshell)
-          unless windows_machine.is_vmware?() 
-            vm_interface_map = create_vm_interface_map(windows_machine, guest_network)
-          end
-          
-          networks.each do |network|
-            interface = vm_interface_map[network[:interface]+1]
-            if interface.nil?
-              @@logger.warn("Could not find interface for network #{network.inspect}")
-              next
-            end
-            network_type = network[:type].to_sym
-            if network_type == :static
-              guest_network.configure_static_interface(
-                interface[:index],
-                interface[:net_connection_id],
-                network[:ip],
-                network[:netmask])
-            elsif network_type == :dhcp
-              guest_network.configure_dhcp_interface(
-                interface[:index],
-                interface[:net_connection_id])
-            else
-              raise WindowsError, "#{network_type} network type is not supported, try static or dhcp"
+          if windows_machine.is_vmware?()
+            @@logger.warn('Configuring secondary network adapters through VMware is not yet supported.')
+            @@logger.warn('You will need to manually configure the network adapter.')
+          else
+            vm_interface_map = create_vm_interface_map(windows_machine, guest_network)          
+            networks.each do |network|
+              interface = vm_interface_map[network[:interface]+1]
+              if interface.nil?
+                @@logger.warn("Could not find interface for network #{network.inspect}")
+                next
+              end
+              network_type = network[:type].to_sym
+              if network_type == :static
+                guest_network.configure_static_interface(
+                  interface[:index],
+                  interface[:net_connection_id],
+                  network[:ip],
+                  network[:netmask])
+              elsif network_type == :dhcp
+                guest_network.configure_dhcp_interface(
+                  interface[:index],
+                  interface[:net_connection_id])
+              else
+                raise WindowsError, "#{network_type} network type is not supported, try static or dhcp"
+              end
             end
           end
           guest_network.set_all_networks_to_work() if windows_machine.windows_config.set_work_network

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

@@ -1,6 +1,7 @@
 require "#{Vagrant::source_root}/plugins/provisioners/puppet/provisioner/puppet"
 require_relative '../../../../../windows_machine'
 require_relative '../../../../../helper'
+require_relative '../../../../../errors'
 
 module VagrantPlugins
   module Puppet
@@ -33,7 +34,7 @@ module VagrantPlugins
           # This re-establishes our symbolic links if they were created between now and a reboot
           @machine.communicate.execute('& net use a-non-existant-share', :error_check => false)
           
-          options = [config.options].flatten
+          options = [@config.options].flatten
           module_paths = @module_paths.map { |_, to| to }
           if !@module_paths.empty?
             # Prepend the default module path
@@ -58,9 +59,9 @@ module VagrantPlugins
 
           # Build up the custom facts if we have any
           facter = ""
-          if !config.facter.empty?
+          if !@config.facter.empty?
             facts = []
-            config.facter.each do |key, value|
+            @config.facter.each do |key, value|
               facts << "$env:FACTER_#{key}='#{value}';"
             end
 
@@ -68,18 +69,26 @@ module VagrantPlugins
           end
 
           command = "#{facter} puppet apply #{options}"
-          if config.working_directory
-            command = "cd #{config.working_directory}; if($?) \{ #{command} \}"
+          if @config.working_directory
+            command = "cd #{@config.working_directory}; if($?) \{ #{command} \}"
           end
 
           @machine.env.ui.info I18n.t("vagrant.provisioners.puppet.running_puppet",
                                       :manifest => @manifest_file)
 
-          @machine.communicate.sudo(command) do |type, data|
+          exit_status = @machine.communicate.sudo(command, :error_check => false) do |type, data|
             if !data.empty?
               @machine.env.ui.info(data, :new_line => false, :prefix => false)
             end
           end
+          
+          # Puppet returns 0 or 2 for success with --detailed-exitcodes
+          if ![0,2].include?(exit_status)
+            raise ::VagrantWindows::Errors::WinRMExecutionError,
+              :shell => :powershell,
+              :command => command,
+              :message => "Puppet failed with an exit code of #{exit_status}"
+          end
         end
 
         def configure_on_windows(root_config)
@@ -92,7 +101,7 @@ module VagrantPlugins
           # 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}")]
+            @module_paths << [path, File.join(@config.temp_dir, "modules-#{i}")]
           end
 
           @logger.debug("Syncing folders from puppet configure")

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

@@ -1,8 +1,5 @@
-schtasks /query /tn "chef-solo" | Out-Null
-if ($?) {
-  # task already exists, kill it
-  schtasks /delete /tn "chef-solo" /f | Out-Null
-}
+# kill the task so we can recreate it
+schtasks /delete /tn "chef-solo" /f 2>&1 | out-null
 
 # Ensure the chef task running file doesn't exist from a previous failure
 if (Test-Path "<%= options[:chef_task_running] %>") {
@@ -34,14 +31,18 @@ $success = $TRUE
 while (Test-Path "<%= options[:chef_task_running] %>") {
   Start-Sleep -m 100
   
-  $text = (get-content "<%= options[:chef_stdout_log] %>")
-  $numLines = ($text | Measure-Object -line).lines    
-  $numLinesToRead = $numLines - $numLinesRead
-  
-  $text | select -first $numLinesToRead -skip $numLinesRead | ForEach {
-    Write-Host "$_"
+  if (Test-Path "<%= options[:chef_stdout_log] %>") {
+    $text = (get-content "<%= options[:chef_stdout_log] %>")
+    $numLines = ($text | Measure-Object -line).lines    
+    $numLinesToRead = $numLines - $numLinesRead
+    
+    if ($numLinesToRead -gt 0) {
+      $text | select -first $numLinesToRead -skip $numLinesRead | ForEach {
+        Write-Host "$_"
+      }
+      $numLinesRead += $numLinesToRead
+    }
   }
-  $numLinesRead += $numLinesToRead
 }
 
 exit Get-Content "<%= options[:chef_task_exitcode] %>"

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

@@ -34,7 +34,7 @@
     <RunOnlyIfIdle>false</RunOnlyIfIdle>
     <WakeToRun>false</WakeToRun>
     <ExecutionTimeLimit>PT2H</ExecutionTimeLimit>
-    <Priority>7</Priority>
+    <Priority>4</Priority>
   </Settings>
   <Actions Context="Author">
     <Exec>

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

@@ -10,7 +10,9 @@ Try
 Finally
 {
   $exitCode | Out-File "<%= options[:chef_task_exitcode] %>"
-  del "<%= options[:chef_task_running] %>"
+  if (Test-Path "<%= options[:chef_task_running] %>") {
+    del "<%= options[:chef_task_running] %>"
+  }
 }
 
 exit $exitCode

data/lib/vagrant-windows/version.rb

@@ -1,3 +1,3 @@
 module VagrantWindows
-  VERSION = "1.3.0.pre.3"
+  VERSION = "1.3.0"
 end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-windows
 version: !ruby/object:Gem::Version
-  version: 1.3.0.pre.3
-  prerelease: 6
+  version: 1.3.0
+  prerelease: 
 platform: ruby
 authors:
 - Paul Morton
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-04 00:00:00.000000000 Z
+date: 2013-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: winrm
@@ -159,6 +159,7 @@ files:
 - coverage/assets/0.7.1/smoothness/images/ui-icons_cd0a0a_256x240.png
 - coverage/index.html
 - Gemfile
+- init.pp
 - lib/vagrant-windows/communication/guestnetwork.rb
 - lib/vagrant-windows/communication/winrmcommunicator.rb
 - lib/vagrant-windows/communication/winrmfinder.rb
@@ -195,6 +196,7 @@ files:
 - lib/vagrant-windows.rb
 - LICENSE
 - locales/en.yml
+- puppet-3.3.2.msi
 - Rakefile
 - README.md
 - spec/spec_helper.rb
@@ -228,13 +230,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -432043001542177050
+      hash: 3499483992626948935
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
+      segments:
+      - 0
+      hash: 3499483992626948935
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23