vagrant-windows 1.3.0 → 1.3.1

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

@@ -22,7 +22,7 @@ module VagrantPlugins
             windows_machine = VagrantWindows::WindowsMachine.new(@machine)
             wait_if_rebooting(windows_machine)
 
-            with_script_file do |path|
+            with_windows_script_file do |path|
             # Upload the script to the machine
             @machine.communicate.tap do |comm|
               # Ensure the uploaded script has a file extension, by default
@@ -63,24 +63,38 @@ module VagrantPlugins
         # This method yields the path to a script to upload and execute
         # on the remote server. This method will properly clean up the
         # script file if needed.
-        def with_script_file
-          if config.path
+        def with_windows_script_file
+          script = nil
+
+          if config.remote?
+            download_path = @machine.env.tmp_path.join("#{@machine.id}-remote-script")
+            download_path.delete if download_path.file?
+
+            Vagrant::Util::Downloader.new(config.path, download_path).download!
+            script = download_path.read
+
+            download_path.delete
+          elsif config.path
             # Just yield the path to that file...
-            yield config.path
+            root_path = @machine.env.root_path
+            script = Pathname.new(config.path).expand_path(root_path).read
           else
-            # Otherwise we have an inline script, we need to Tempfile it,
-            # and handle it specially...
-            file = Tempfile.new(['vagrant-powershell', '.ps1'])
+            # The script is just the inline code...
+            script = config.inline
+          end
 
-            begin
-              file.write(config.inline)
-              file.fsync
-              file.close
-              yield file.path
-            ensure
-              file.close
-              file.unlink
-            end
+          # 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
           end
         end
 

data/lib/vagrant-windows/version.rb

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

data/lib/vagrant-windows/windows_machine.rb

@@ -26,6 +26,13 @@ module VagrantWindows
       @machine.provider_name.to_s().start_with?('vmware')
     end
     
+    # Checks to see if the machine is using Oracle VirtualBox.
+    #
+    # @return [Boolean]
+    def is_virtualbox?()
+      @machine.provider_name.to_s().start_with?('virtualbox')
+    end
+    
     # Checks to see if the machine is rebooting or has a scheduled reboot.
     #
     # @return [Boolean] True if rebooting
@@ -50,11 +57,15 @@ module VagrantWindows
     end
     
     # Returns a list of forwarded ports for a VM.
-    # NOTE: For VMWare this is currently unsupported.
+    # NOTE: Only the VBox provider currently supports this method
     #
     # @return [Array<Array>]
     def read_forwarded_ports()
-      is_vmware?() ? [] : @machine.provider.driver.read_forwarded_ports
+      if is_virtualbox?()
+        @machine.provider.driver.read_forwarded_ports
+      else
+        []
+      end
     end
     
     # Returns the SSH config for this machine.

data/spec/vagrant-windows/windows_machine_spec.rb

@@ -24,6 +24,20 @@ describe VagrantWindows::WindowsMachine , :unit => true do
     end
   end
   
+  describe "is_virtualbox?" do
+    it "should be true for virtualbox" do
+      machine = stub(:provider_name => :virtualbox)
+      windows_machine = VagrantWindows::WindowsMachine.new(machine)
+      expect(windows_machine.is_virtualbox?()).to be_true
+    end
+    
+    it "should be false for vmware_workstation" do
+      machine = stub(:provider_name => :vmware_workstation)
+      windows_machine = VagrantWindows::WindowsMachine.new(machine)
+      expect(windows_machine.is_virtualbox?()).to be_false
+    end
+  end
+  
   describe "is_windows?" do
     it "should return true when config vm guest is windows" do
       vm = stub(:guest => :windows)
@@ -38,7 +52,14 @@ describe VagrantWindows::WindowsMachine , :unit => true do
       machine = stub(:config => config)
       expect(VagrantWindows::WindowsMachine.is_windows?(machine)).to be_false
     end
-
+  end
+  
+  describe "read_forwarded_ports" do
+    it "should return empty array for vmware provider" do
+      machine = stub(:provider_name => :vmware_fusion)
+      windows_machine = VagrantWindows::WindowsMachine.new(machine)
+      expect(windows_machine.read_forwarded_ports()).to eq([])
+    end
   end
 
 end

data/test.ps1

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-windows
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-14 00:00:00.000000000 Z
+date: 2013-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: winrm
@@ -209,6 +209,7 @@ 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
@@ -230,7 +231,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3499483992626948935
+      hash: -417370087256644247
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -239,7 +240,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3499483992626948935
+      hash: -417370087256644247
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23