vagrant-windows 1.7.0.pre.1 → 1.7.0.pre.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e0d8f67d7fd5775bc1dfffb01aee0f766c5c512
-  data.tar.gz: fd24bde9a3b09754acb450f2995a61c0292a7294
+  metadata.gz: 668a6e4a7bc645fa0e951e3f04a33257e4eb5890
+  data.tar.gz: e080e229467c6a45f6d3ae5a180e1c8b4ed92528
 SHA512:
-  metadata.gz: 081a4d22f0f528b6672009678de4c7558c24059036a62c5d8e595073de8cc4566c38f72c78bacd3a67d5a9da6b2a2b8d96a356dc26b391adf8bb59c11a75ec57
-  data.tar.gz: c11a66f853413fc9ca9970ce767c1a71ddd3c0193766a9cf7980b9aeb5af67dfff414720e1ea3e4116b0072925353bd780d300bbe94ab75f59372b23319f1d8e
+  metadata.gz: 77c523c5c5bd2a464cb4cabc5ce613f31ec4ab7f76c8765fffdc79fffd9175b90dfd59cd19cac4cdc4c3527cf5ba7392b7933e29cbcfaed50702b998c81761e2
+  data.tar.gz: d2b1f5f4198cdaa1e3b88480b95e69d8af18ce4f01d55836ee7a361e488a4168e821b7b9d336857b8165dca7163b6b0e57e0c63483115d7881dc0076cec33836

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

@@ -12,13 +12,10 @@ module VagrantWindows
       PS_GET_WSMAN_VER = '((test-wsman).productversion.split(" ") | select -last 1).split("\.")[0]'
       WQL_NET_ADAPTERS_V2 = 'SELECT * FROM Win32_NetworkAdapter WHERE MACAddress IS NOT NULL'
 
-      attr_reader :logger
-      attr_reader :winrmshell
-
-      def initialize(winrmshell)
-        @logger = Log4r::Logger.new("vagrant_windows::communication::winrmshell")
+      def initialize(communicator)
+        @logger = Log4r::Logger.new("vagrant_windows::communication::guestnetwork")
         @logger.debug("initializing WinRMShell")
-        @winrmshell = winrmshell
+        @communicator = communicator
       end
       
       # Returns an array of all NICs on the guest. Each array entry is a
@@ -33,13 +30,13 @@ module VagrantWindows
       #
       # @return [Boolean]
       def is_dhcp_enabled(nic_index)
-        has_dhcp_enabled = false
-        cmd = "Get-WmiObject -Class Win32_NetworkAdapterConfiguration -Filter \"Index=#{nic_index} and DHCPEnabled=True\""
-        @winrmshell.powershell(cmd) do |type, line|
-          has_dhcp_enabled = !line.nil?
-        end
-        @logger.debug("NIC #{nic_index} has DHCP enabled: #{has_dhcp_enabled}")
-        has_dhcp_enabled
+        cmd = <<-EOH
+          if (Get-WmiObject -Class Win32_NetworkAdapterConfiguration -Filter "Index=#{nic_index} and DHCPEnabled=True") {
+            exit 0
+          }
+          exit 1
+        EOH
+        @communicator.test(cmd)
       end
       
       # Configures the specified interface for DHCP
@@ -50,7 +47,7 @@ module VagrantWindows
         @logger.info("Configuring NIC #{net_connection_id} for DHCP")
         if !is_dhcp_enabled(nic_index)
           netsh = "netsh interface ip set address \"#{net_connection_id}\" dhcp"
-          @winrmshell.powershell(netsh)
+          @communicator.execute(netsh)
         end
       end
       
@@ -64,7 +61,7 @@ module VagrantWindows
         @logger.info("Configuring NIC #{net_connection_id} using static ip #{ip}")
         #netsh interface ip set address "Local Area Connection 2" static 192.168.33.10 255.255.255.0
         netsh = "netsh interface ip set address \"#{net_connection_id}\" static #{ip} #{netmask}"
-        @winrmshell.powershell(netsh)
+        @communicator.execute(netsh)
       end
       
       # Sets all networks on the guest to 'Work Network' mode. This is
@@ -73,7 +70,7 @@ module VagrantWindows
       def set_all_networks_to_work()
         @logger.info("Setting all networks to 'Work Network'")
         command = VagrantWindows.load_script("set_work_network.ps1")
-        @winrmshell.powershell(command)
+        @communicator.execute(command)
       end
       
 
@@ -86,7 +83,7 @@ module VagrantWindows
       def wsman_version()
         @logger.debug("querying WSMan version")
         version = ''
-        @winrmshell.powershell(PS_GET_WSMAN_VER) do |type, line|
+        @communicator.execute(PS_GET_WSMAN_VER) do |type, line|
           version = version + "#{line}" if type == :stdout && !line.nil?
         end
         @logger.debug("wsman version: #{version}")
@@ -102,7 +99,7 @@ module VagrantWindows
         @logger.debug("querying network adapters")
         # Get all NICs that have a MAC address
         # http://msdn.microsoft.com/en-us/library/windows/desktop/aa394216(v=vs.85).aspx
-        adapters = @winrmshell.wql(WQL_NET_ADAPTERS_V2)[:win32_network_adapter]
+        adapters = @communicator.execute(WQL_NET_ADAPTERS_V2, { :shell => :wql } )[:win32_network_adapter]
         @logger.debug("#{adapters.inspect}")
         return adapters
       end
@@ -117,7 +114,7 @@ module VagrantWindows
       def network_adapters_v3_winrm()
         winrs_v3_get_adapters_ps1 = VagrantWindows.load_script("winrs_v3_get_adapters.ps1")
         output = ''
-        @winrmshell.powershell(winrs_v3_get_adapters_ps1) do |type, line|
+        @communicator.execute(winrs_v3_get_adapters_ps1) do |type, line|
           output = output + "#{line}" if type == :stdout && !line.nil?
         end
         adapters = []

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

@@ -49,9 +49,7 @@ module VagrantWindows
       def execute(command, opts={}, &block)
         # If this is a *nix command with no Windows equivilant, don't run it
         win_friendly_cmd = @linux_cmd_filter.filter(command)
-        if (win_friendly_cmd.empty?)
-          return { :exitcode => 0, :stderr => '', :stdout => '' }
-        end
+        return 0 if win_friendly_cmd.empty?
 
         opts = {
           :error_check => true,
@@ -60,20 +58,21 @@ module VagrantWindows
           :command     => win_friendly_cmd,
           :shell       => :powershell
         }.merge(opts || {})
-        exit_status = do_execute(win_friendly_cmd, opts[:shell], &block)
-        if opts[:error_check] && exit_status != 0
-          raise_execution_error(opts, exit_status)
-        end
-        exit_status
+
+        win_friendly_cmd << "\r\nexit $LASTEXITCODE" if opts[:shell] == :powershell
+        output = winrmshell.send(opts[:shell], win_friendly_cmd, &block)
+
+        return output if opts[:shell] == :wql
+        exitcode = output[:exitcode]
+        raise_execution_error(opts, exitcode) if opts[:error_check] && exitcode != 0
+        exitcode
       end
       alias_method :sudo, :execute
       
       def test(command, opts=nil)
         # If this is a *nix command with no Windows equivilant, don't run it
         win_friendly_cmd = @linux_cmd_filter.filter(command)
-        if (win_friendly_cmd.empty?)
-          return false
-        end
+        return false if win_friendly_cmd.empty?
 
         opts = { :error_check => false }.merge(opts || {})
         execute(win_friendly_cmd, opts) == 0
@@ -98,15 +97,6 @@ module VagrantWindows
       
       protected
       
-      def do_execute(command, shell, &block)
-        if shell.eql? :cmd
-          winrmshell.cmd(command, &block)[:exitcode]
-        else
-          command << "\r\nexit $LASTEXITCODE"
-          winrmshell.powershell(command, &block)[:exitcode]
-        end
-      end
-      
       def raise_execution_error(opts, exit_code)
         # The error classes expect the translation key to be _key, but that makes for an ugly
         # configuration parameter, so we set it here from `error_key`

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

@@ -53,8 +53,8 @@ module VagrantWindows
         execute_shell(command, :cmd, &block)
       end
       
-      def wql(query)
-        execute_wql(query)
+      def wql(query, &block)
+        execute_shell(query, :wql, &block)
       end
 
       def upload(from, to)
@@ -69,7 +69,7 @@ module VagrantWindows
       protected
       
       def execute_shell(command, shell=:powershell, &block)
-        raise Errors::WinRMInvalidShell, :shell => shell unless shell == :cmd || shell == :powershell
+        raise Errors::WinRMInvalidShell, :shell => shell unless [:powershell, :cmd, :wql].include?(shell)
         begin
           execute_shell_with_retry(command, shell, &block)
         rescue => e
@@ -84,22 +84,11 @@ module VagrantWindows
             block.call(:stdout, out) if block_given? && out
             block.call(:stderr, err) if block_given? && err
           end
-          @logger.debug("Exit status: #{output[:exitcode].inspect}")
+          @logger.debug("Output: #{output.inspect}")
           return output
         end
       end
       
-      def execute_wql(query)
-        retryable(:tries => @max_tries, :on => @@exceptions_to_retry_on, :sleep => 10) do
-          @logger.debug("#executing wql: #{query}")
-          output = session.wql(query)
-          @logger.debug("wql result: #{output.inspect}")
-          return output
-        end
-      rescue => e
-        raise_winrm_exception(e, :wql, query)
-      end
-      
       def raise_winrm_exception(winrm_exception, shell, command)
         if winrm_exception.message.include?("401") # return a more specific auth error for 401 errors
           raise Errors::WinRMAuthorizationError,

data/lib/vagrant-windows/config/windows.rb

@@ -17,16 +17,16 @@ module VagrantWindows
       def validate(machine)
         errors = []
 
-        errors << "windows.halt_timeout cannot be nil."        if machine.config.windows.halt_timeout.nil?
-        errors << "windows.halt_check_interval cannot be nil." if machine.config.windows.halt_check_interval.nil?
+        errors << "windows.halt_timeout cannot be nil." if @halt_timeout.nil?
+        errors << "windows.halt_check_interval cannot be nil." if @halt_check_interval.nil?
+        errors << "windows.set_work_network cannot be nil." if @set_work_network.nil?
 
-        errors << "windows.set_work_network cannot be nil." if machine.config.windows.set_work_network.nil?
         { "Windows Guest" => errors }
       end
 
       def finalize!
-        @halt_timeout = 30       if @halt_timeout == UNSET_VALUE
-        @halt_check_interval = 1 if @halt_check_interval == UNSET_VALUE
+        @halt_timeout = 30        if @halt_timeout == UNSET_VALUE
+        @halt_check_interval = 1  if @halt_check_interval == UNSET_VALUE
         @set_work_network = false if @set_work_network == UNSET_VALUE
       end
 

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

@@ -16,7 +16,7 @@ module VagrantWindows
           @@logger.debug("networks: #{networks.inspect}")
           
           windows_machine = VagrantWindows::WindowsMachine.new(machine)
-          guest_network = VagrantWindows::Communication::GuestNetwork.new(windows_machine.winrmshell)
+          guest_network = VagrantWindows::Communication::GuestNetwork.new(machine.communicate)
           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.')

data/lib/vagrant-windows/version.rb

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

data/spec/vagrant-windows/guestnetwork_spec.rb

@@ -2,11 +2,16 @@ require 'spec_helper'
 
 describe VagrantWindows::Communication::GuestNetwork , :integration => true do
   
-  before(:all) do
+  before(:each) do
     port = (ENV['WINRM_PORT'] || 5985).to_i
+
+    @machine = stub()
     @shell = VagrantWindows::Communication::WinRMShell.new(
       "127.0.0.1", "vagrant", "vagrant", { port: port })
-    @guestnetwork = VagrantWindows::Communication::GuestNetwork.new(@shell)
+
+    @communicator = VagrantWindows::Communication::WinRMCommunicator.new(@machine)
+    @communicator.winrmshell = @shell
+    @guestnetwork = VagrantWindows::Communication::GuestNetwork.new(@communicator)
   end
   
   describe "wsman_version" do

data/spec/vagrant-windows/winrmshell_spec.rb

@@ -8,7 +8,7 @@ describe VagrantWindows::Communication::WinRMShell, :integration => true do
       "127.0.0.1", "vagrant", "vagrant", { port: port })
   end
   
-  describe "powershell" do
+  describe ".powershell" do
     it "should return exit code of 0" do
       expect(@shell.powershell("exit 0")[:exitcode]).to eq(0)
     end
@@ -26,7 +26,7 @@ describe VagrantWindows::Communication::WinRMShell, :integration => true do
     end
   end
   
-  describe "cmd" do
+  describe ".cmd" do
     it "should return stdout" do
       result = @shell.cmd("dir") do |type, line|
         expect(type).to eq(:stdout)
@@ -35,5 +35,12 @@ describe VagrantWindows::Communication::WinRMShell, :integration => true do
       expect(result[:exitcode]).to eq(0)
     end
   end
+
+  describe ".wql" do
+    it "should return query results in stdout" do
+      result = @shell.wql('SELECT * FROM Win32_NetworkAdapter WHERE MACAddress IS NOT NULL')
+      expect(result[:win32_network_adapter]).to_not be_empty
+    end
+  end
  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-windows
 version: !ruby/object:Gem::Version
-  version: 1.7.0.pre.1
+  version: 1.7.0.pre.2
 platform: ruby
 authors:
 - Paul Morton
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-18 00:00:00.000000000 Z
+date: 2014-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: winrm