vagrant-windows 1.3.1 → 1.3.2

data/CHANGELOG.md

@@ -1,38 +1,62 @@
 ## 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.
+- 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.
+- Fixed issue 91 - drive mapping was failing on Vagrant 1.1.
+
+1.2.2
+- Reduced code duplication in WinRMShell
+- Fixes issue 85 - Windows XP, 2000, 2003 officially not supported
+- Fixed issue 98 - added Apache 2.0 license
+- Fixed issue 104 - configuration "config.winrm.hostname" is not used
+- Fixed issue 106 - WinRMCommunicator should throw an exception when a command fails by default
+
+1.2.3
+- Puppet provisioner re-establishes symbolic links (see issue 119 for Chef)
+- Fixed issue 118 - chef-solo provisioner doesn't retry
+- Fixed issue 119 - chef-solo provisioner fails with a CookbookNotFound error if a reboot occurs after vagrant up
+
+1.3.0
+- Added new Windows machine abstraction layer between Vagrant and vagrant-windows
+- VMware should not error out when Vagrantfile contains a secondary NIC
+- wql method removed from WinRM communicator
+- Extracted WinRMShell factory class and added more unit tests
+- Provisioners wait to start if there is a reboot pending or currently scheduled
+- Fixed issue 74 - chef-solo displays error "The system cannot find the path specified" on first provision
+- Fixed issue 119 - when a reboot occurs in the middle of a Chef run
+- Fixed issue 125 - puppet provisioner should not error on exit code 2.
+- Fixed issue 126 - cheftask.ps1 can sometimes try to read a negative number of lines
+- Fixed issue 128 - Base box configuration described in readme is not correct for Windows 2008 R2 and WinRM 1.1
+- Fixed issue 129 - vagrant halt fails if a provisioner has already scheduled a reboot
+- Fixed issue 130 - chef-solo task now uses normal Windows task priority
+
+1.3.1
+- Fixed issue 137 - Cannot execute download script after installing the vagrant windows plugins
+- Fixed issue 138 - vagrant-windows errors out for providers other than VBox or VMware
+
+1.3.2
+- Fixed issue 145 - The shell provisioner wasn't respecting file extensions for non-inline scripts.

data/coverage/.last_run.json

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

data/coverage/.resultset.json

@@ -1117,20 +1117,17 @@
         null,
         0,
         0,
-        0,
         null,
         0,
         0,
-        null,
         0,
         null,
-        null,
-        0,
         0,
         null,
         null,
         0,
         null,
+        0,
         null,
         null,
         null,
@@ -1149,6 +1146,7 @@
         null,
         null,
         null,
+        null,
         null
       ],
       "/Users/sneal/src/vagrant-windows/lib/vagrant-windows/config/windows.rb": [
@@ -1748,6 +1746,6 @@
         null
       ]
     },
-    "timestamp": 1386022058
+    "timestamp": 1386201398
   }
 }

data/coverage/index.html

@@ -14,14 +14,14 @@
       <img src="./assets/0.7.1/loading.gif" alt="loading"/>
     </div>
     <div id="wrapper" style="display:none;">
-      <div class="timestamp">Generated <abbr class="timeago" title="2013-12-02T14:07:38-08:00">2013-12-02T14:07:38-08:00</abbr></div>
+      <div class="timestamp">Generated <abbr class="timeago" title="2013-12-04T15:56:38-08:00">2013-12-04T15:56:38-08:00</abbr></div>
       <ul class="group_tabs"></ul>
 
       <div id="content">
         <div class="file_list_container" id="AllFiles">
   <h2>
     <span class="group_name">All Files</span>
-    (<span class="covered_percent"><span class="red">57.79%</span></span>
+    (<span class="covered_percent"><span class="red">57.86%</span></span>
      covered at
      <span class="covered_strength">
        <span class="green">
@@ -32,9 +32,9 @@
   <a name="AllFiles"></a>
   <div>
     <b>29</b> files in total.
-    <b>822</b> relevant lines. 
+    <b>821</b> relevant lines. 
     <span class="green"><b>475</b> lines covered</span> and
-    <span class="red"><b>347</b> lines missed </span>
+    <span class="red"><b>346</b> lines missed </span>
   </div>
   <table class="file_list">
     <thead>
@@ -232,11 +232,11 @@
       
       <tr>
         <td class="strong"><a href="#8dd805604e0326933cecd09151f4d1dac947b74c" class="src_link" title="lib/vagrant-windows/monkey_patches/plugins/provisioners/shell/provisioner.rb">lib/vagrant-windows/monkey_patches/plugins/provisioners/shell/provisioner.rb</a></td>
-        <td class="red strong">26.09 %</td>
-        <td>103</td>
-        <td>46</td>
+        <td class="red strong">26.67 %</td>
+        <td>101</td>
+        <td>45</td>
         <td>12</td>
-        <td>34</td>
+        <td>33</td>
         <td>0.3</td>
       </tr>
       
@@ -6959,11 +6959,11 @@
         <div class="source_table" id="8dd805604e0326933cecd09151f4d1dac947b74c">
   <div class="header">
     <h3>lib/vagrant-windows/monkey_patches/plugins/provisioners/shell/provisioner.rb</h3>
-    <h4><span class="red">26.09 %</span> covered</h4>
+    <h4><span class="red">26.67 %</span> covered</h4>
     <div>
-      <b>46</b> relevant lines. 
+      <b>45</b> relevant lines. 
       <span class="green"><b>12</b> lines covered</span> and
-      <span class="red"><b>34</b> lines missed.</span>
+      <span class="red"><b>33</b> lines missed.</span>
     </div>
   </div>
   
@@ -7369,220 +7369,208 @@
         <li class="missed" data-hits="0" data-linenumber="67">
           
           
-          <code class="ruby">          script = nil</code>
+          <code class="ruby">          if config.remote?</code>
         </li>
       
         <li class="never" data-hits="" data-linenumber="68">
           
           
-          <code class="ruby"></code>
+          <code class="ruby">            </code>
         </li>
       
         <li class="missed" data-hits="0" data-linenumber="69">
           
           
-          <code class="ruby">          if config.remote?</code>
+          <code class="ruby">            download_path = @machine.env.tmp_path.join(&quot;#{@machine.id}-remote-script#{File.extname(config.path)}&quot;)</code>
         </li>
       
         <li class="missed" data-hits="0" data-linenumber="70">
           
           
-          <code class="ruby">            download_path = @machine.env.tmp_path.join(&quot;#{@machine.id}-remote-script&quot;)</code>
+          <code class="ruby">            download_path.delete if download_path.file?</code>
         </li>
       
-        <li class="missed" data-hits="0" data-linenumber="71">
+        <li class="never" data-hits="" data-linenumber="71">
           
           
-          <code class="ruby">            download_path.delete if download_path.file?</code>
+          <code class="ruby"></code>
         </li>
       
-        <li class="never" data-hits="" data-linenumber="72">
+        <li class="missed" data-hits="0" data-linenumber="72">
           
           
-          <code class="ruby"></code>
+          <code class="ruby">            begin</code>
         </li>
       
         <li class="missed" data-hits="0" data-linenumber="73">
           
           
-          <code class="ruby">            Vagrant::Util::Downloader.new(config.path, download_path).download!</code>
+          <code class="ruby">              Vagrant::Util::Downloader.new(config.path, download_path).download!</code>
         </li>
       
         <li class="missed" data-hits="0" data-linenumber="74">
           
           
-          <code class="ruby">            script = download_path.read</code>
+          <code class="ruby">              yield download_path</code>
         </li>
       
         <li class="never" data-hits="" data-linenumber="75">
           
           
-          <code class="ruby"></code>
+          <code class="ruby">            ensure</code>
         </li>
       
         <li class="missed" data-hits="0" data-linenumber="76">
           
           
-          <code class="ruby">            download_path.delete</code>
+          <code class="ruby">              download_path.delete</code>
         </li>
       
         <li class="never" data-hits="" data-linenumber="77">
           
           
-          <code class="ruby">          elsif config.path</code>
+          <code class="ruby">            end</code>
         </li>
       
         <li class="never" data-hits="" data-linenumber="78">
           
           
-          <code class="ruby">            # Just yield the path to that file...</code>
+          <code class="ruby">            </code>
         </li>
       
         <li class="missed" data-hits="0" data-linenumber="79">
           
           
-          <code class="ruby">            root_path = @machine.env.root_path</code>
+          <code class="ruby">          elsif config.path</code>
         </li>
       
-        <li class="missed" data-hits="0" data-linenumber="80">
+        <li class="never" data-hits="" data-linenumber="80">
           
           
-          <code class="ruby">            script = Pathname.new(config.path).expand_path(root_path).read</code>
+          <code class="ruby">            # Just yield the path to that file...</code>
         </li>
       
-        <li class="never" data-hits="" data-linenumber="81">
+        <li class="missed" data-hits="0" data-linenumber="81">
           
           
-          <code class="ruby">          else</code>
+          <code class="ruby">            yield config.path</code>
         </li>
       
         <li class="never" data-hits="" data-linenumber="82">
           
           
-          <code class="ruby">            # The script is just the inline code...</code>
+          <code class="ruby">          else</code>
         </li>
       
-        <li class="missed" data-hits="0" data-linenumber="83">
+        <li class="never" data-hits="" data-linenumber="83">
           
           
-          <code class="ruby">            script = config.inline</code>
+          <code class="ruby">            # Otherwise we have an inline script, we need to Tempfile it,</code>
         </li>
       
         <li class="never" data-hits="" data-linenumber="84">
           
           
-          <code class="ruby">          end</code>
+          <code class="ruby">            # and handle it specially...</code>
         </li>
       
-        <li class="never" data-hits="" data-linenumber="85">
+        <li class="missed" data-hits="0" data-linenumber="85">
           
           
-          <code class="ruby"></code>
+          <code class="ruby">            file = Tempfile.new(['vagrant-powershell', '.ps1'])</code>
         </li>
       
         <li class="never" data-hits="" data-linenumber="86">
           
           
-          <code class="ruby">          # Otherwise we have an inline script, we need to Tempfile it,</code>
+          <code class="ruby"></code>
         </li>
       
-        <li class="never" data-hits="" data-linenumber="87">
+        <li class="missed" data-hits="0" data-linenumber="87">
           
           
-          <code class="ruby">          # and handle it specially...</code>
+          <code class="ruby">            begin</code>
         </li>
       
         <li class="missed" data-hits="0" data-linenumber="88">
           
           
-          <code class="ruby">          file = Tempfile.new(['vagrant-powershell', '.ps1'])</code>
+          <code class="ruby">              file.write(config.inline)</code>
         </li>
       
-        <li class="never" data-hits="" data-linenumber="89">
+        <li class="missed" data-hits="0" data-linenumber="89">
           
           
-          <code class="ruby"></code>
+          <code class="ruby">              file.fsync</code>
         </li>
       
         <li class="missed" data-hits="0" data-linenumber="90">
           
           
-          <code class="ruby">          begin</code>
+          <code class="ruby">              file.close</code>
         </li>
       
         <li class="missed" data-hits="0" data-linenumber="91">
           
           
-          <code class="ruby">            file.write(script)</code>
+          <code class="ruby">              yield file.path</code>
         </li>
       
-        <li class="missed" data-hits="0" data-linenumber="92">
+        <li class="never" data-hits="" data-linenumber="92">
           
           
-          <code class="ruby">            file.fsync</code>
+          <code class="ruby">            ensure</code>
         </li>
       
         <li class="missed" data-hits="0" data-linenumber="93">
           
           
-          <code class="ruby">            file.close</code>
+          <code class="ruby">              file.close</code>
         </li>
       
         <li class="missed" data-hits="0" data-linenumber="94">
           
           
-          <code class="ruby">            yield file.path</code>
+          <code class="ruby">              file.unlink</code>
         </li>
       
         <li class="never" data-hits="" data-linenumber="95">
           
           
-          <code class="ruby">          ensure</code>
-        </li>
-      
-        <li class="missed" data-hits="0" data-linenumber="96">
-          
-          
-          <code class="ruby">            file.close</code>
-        </li>
-      
-        <li class="missed" data-hits="0" data-linenumber="97">
-          
-          
-          <code class="ruby">            file.unlink</code>
+          <code class="ruby">            end</code>
         </li>
       
-        <li class="never" data-hits="" data-linenumber="98">
+        <li class="never" data-hits="" data-linenumber="96">
           
           
           <code class="ruby">          end</code>
         </li>
       
-        <li class="never" data-hits="" data-linenumber="99">
+        <li class="never" data-hits="" data-linenumber="97">
           
           
           <code class="ruby">        end</code>
         </li>
       
-        <li class="never" data-hits="" data-linenumber="100">
+        <li class="never" data-hits="" data-linenumber="98">
           
           
           <code class="ruby"></code>
         </li>
       
-        <li class="never" data-hits="" data-linenumber="101">
+        <li class="never" data-hits="" data-linenumber="99">
           
           
           <code class="ruby">      end # Provisioner class</code>
         </li>
       
-        <li class="never" data-hits="" data-linenumber="102">
+        <li class="never" data-hits="" data-linenumber="100">
           
           
           <code class="ruby">  end</code>
         </li>
       
-        <li class="never" data-hits="" data-linenumber="103">
+        <li class="never" data-hits="" data-linenumber="101">
           
           
           <code class="ruby">end</code>

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

@@ -64,37 +64,35 @@ module VagrantPlugins
         # on the remote server. This method will properly clean up the
         # script file if needed.
         def with_windows_script_file
-          script = nil
-
           if config.remote?
-            download_path = @machine.env.tmp_path.join("#{@machine.id}-remote-script")
+            
+            download_path = @machine.env.tmp_path.join("#{@machine.id}-remote-script#{File.extname(config.path)}")
             download_path.delete if download_path.file?
 
-            Vagrant::Util::Downloader.new(config.path, download_path).download!
-            script = download_path.read
-
-            download_path.delete
+            begin
+              Vagrant::Util::Downloader.new(config.path, download_path).download!
+              yield download_path
+            ensure
+              download_path.delete
+            end
+            
           elsif config.path
             # Just yield the path to that file...
-            root_path = @machine.env.root_path
-            script = Pathname.new(config.path).expand_path(root_path).read
+            yield config.path
           else
-            # The script is just the inline code...
-            script = config.inline
-          end
-
-          # Otherwise we have an inline script, we need to Tempfile it,
-          # and handle it specially...
-          file = Tempfile.new(['vagrant-powershell', '.ps1'])
+            # Otherwise we have an inline script, we need to Tempfile it,
+            # and handle it specially...
+            file = Tempfile.new(['vagrant-powershell', '.ps1'])
 
-          begin
-            file.write(script)
-            file.fsync
-            file.close
-            yield file.path
-          ensure
-            file.close
-            file.unlink
+            begin
+              file.write(config.inline)
+              file.fsync
+              file.close
+              yield file.path
+            ensure
+              file.close
+              file.unlink
+            end
           end
         end
 

data/lib/vagrant-windows/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-windows
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-02 00:00:00.000000000 Z
+date: 2013-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: winrm
@@ -159,7 +159,6 @@ 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
@@ -196,7 +195,6 @@ files:
 - lib/vagrant-windows.rb
 - LICENSE
 - locales/en.yml
-- puppet-3.3.2.msi
 - Rakefile
 - README.md
 - spec/spec_helper.rb
@@ -209,13 +207,15 @@ files:
 - spec/vagrant-windows/winrmcommunicator_spec.rb
 - spec/vagrant-windows/winrmfinder_spec.rb
 - spec/vagrant-windows/winrmshell_spec.rb
-- test.ps1
 - 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 +231,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -417370087256644247
+      hash: 1215411857304012752
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -240,7 +240,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -417370087256644247
+      hash: 1215411857304012752
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -259,3 +259,4 @@ test_files:
 - spec/vagrant-windows/winrmcommunicator_spec.rb
 - spec/vagrant-windows/winrmfinder_spec.rb
 - spec/vagrant-windows/winrmshell_spec.rb
+- spec/.DS_Store

data/init.pp

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

data/test.ps1

@@ -1 +0,0 @@
-echo 'hi'