vagrant-guest-msys2 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af7802cda0568d6a063b68cb3452f67648159dd0
-  data.tar.gz: fcfbc1a87759bb101f21de94f6b8810bc968c4cc
+  metadata.gz: a38fc1e6e11b2ea0c37d729e8b2ce316b71838f1
+  data.tar.gz: 472c3cc0a1d7ec4e77e83cad309a2134db629347
 SHA512:
-  metadata.gz: a395497aeffc997adbcf174e3393db6b91c3930ef52d0417ba8a18d8e889888a73e38bdaec566db87b395c5045e7d3b38afbebd7cf30a8ef92eb62d37557f0cf
-  data.tar.gz: 0a14c3a8f140356d7e35f77796b634c9eb23466468e71639f93613061ae78f8ad83430ca0f7d223e631858689580dec81aa202b041b540462102879682dc7520
+  metadata.gz: 7c529ebc4548601c0aeb4e7f88998711187527e2d365ebdfc073fee129070dac11457551864068fa9d2cc244df5eb885516eae4a0258380b361b03d5f982c68f
+  data.tar.gz: a1861008090af71832f1ab6d2d5293d43fb6fd9c70ac9ad9705fe112bdecfe0a177df9cd8f8c4a894a654c505c5aedc0bfd0c08c0d5842e34c99c4fad1c4b15f

data/Rakefile

@@ -1,2 +1,7 @@
 require "bundler/gem_tasks"
 
+task :default => [:test]
+
+task :test do
+  
+end

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

@@ -5,17 +5,77 @@ module VagrantPlugins
   module GuestMSYS2
     module Cap
       module ConfigureNetworks
-        @@logger = Log4r::Logger.new("vagrant::guest::windows::configure_networks")
+        @@logger = Log4r::Logger.new("vagrant::guest::msys2::configure_networks")
+
+        def self.configure_networks(machine, networks)          
+          @@logger.info("Networks: #{networks.inspect}")
 
-        def self.configure_networks(machine, networks)
-          @@logger.debug("Networks: #{networks.inspect}")
-          @@logger.debug("communicator: #{machine.config.vm.communicator.inspect}")
-          
           guest_network = GuestNetwork.new(machine.communicate)
+          
           network_adapters = guest_network.network_adapters()
-          @@logger.debug("network_adapters: #{network_adapters}")
+          @@logger.info("network_adapters: #{network_adapters}")
           
-          return
+          if machine.provider_name.to_s.start_with?("vmware")
+            machine.ui.warn("Configuring secondary network adapters through VMware ")
+            machine.ui.warn("on Windows is not yet supported. You will need to manually")
+            machine.ui.warn("configure the network adapter.")
+          else
+            vm_interface_map = create_vm_interface_map(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 "#{network_type} network type is not supported, try static or dhcp"
+              end
+            end
+          end
+
+          if machine.config.windows.set_work_network
+            guest_network.set_all_networks_to_work
+          end
+        end
+
+        def self.create_vm_interface_map(machine, guest_network)
+          if !machine.provider.capability?(:nic_mac_addresses)
+            raise Vagrant::Errors::CantReadMACAddresses,
+              provider: machine.provider_name.to_s
+          end
+
+          driver_mac_address = machine.provider.capability(:nic_mac_addresses).invert
+          @@logger.debug("mac addresses: #{driver_mac_address.inspect}")
+
+          vm_interface_map = {}
+          guest_network.network_adapters.each do |nic|
+            @@logger.debug("nic: #{nic.inspect}")
+            naked_mac = nic[:mac_address].gsub(':','')
+            # If the :net_connection_id entry is nil then it is probably a virtual connection
+            # and should be ignored.
+            if driver_mac_address[naked_mac] && !nic[:net_connection_id].nil?
+              vm_interface_map[driver_mac_address[naked_mac]] = {
+                net_connection_id: nic[:net_connection_id],
+                mac_address: naked_mac,
+                interface_index: nic[:interface_index],
+                index: nic[:index] }
+            end
+          end
+
+          @@logger.debug("vm_interface_map: #{vm_interface_map.inspect}")
+          vm_interface_map
         end
       end
     end

data/lib/vagrant-guest-msys2/guest_network.rb

@@ -1,14 +1,12 @@
 require "log4r"
+require "vagrant-guest-msys2/util/cap_helpers"
 
 module VagrantPlugins
   module GuestMSYS2
     # Manages the remote Windows guest network.
-    class GuestNetwork
-      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'
-
+    class GuestNetwork      
       def initialize(communicator)
-        @logger       = Log4r::Logger.new("vagrant::windows::guestnetwork")
+        @logger       = Log4r::Logger.new("vagrant::guest::msys2::guestnetwork")
         @communicator = communicator
       end
 
@@ -19,7 +17,34 @@ module VagrantPlugins
       def network_adapters
         @logger.debug("querying network adapters")
         
-        wsman_version == 2? network_adapters_v2_winrm : network_adapters_v3_winrm
+        # Note: without JSON escape because MACAddress and NetConnectionID 
+        # can't contain invalid characters
+        cmd = <<-EOH.gsub(/^ {10}/, '')
+          $adapters = Get-WmiObject -Class Win32_NetworkAdapter -Filter "MACAddress IS NOT NULL"
+          [string[]] $json= $()
+          foreach ($adapter in $adapters) {
+            $json += "{`
+              `"mac_address`": `"$($adapter.MACAddress)`",`
+              `"net_connection_id`": `"$($adapter.NetConnectionID)`",`
+              `"interface_index`": $([int]$adapter.InterfaceIndex),`
+              `"index`": $([int]$adapter.Index)`
+            }"
+          }
+          Write-Host "[$($json -Join ",")]"
+        EOH
+        
+        output = ""
+        @communicator.execute(Util::CapHelpers.wrap_powershell(cmd)) do |type, line|
+          output = output + "#{line}" if type == :stdout && !line.nil?
+        end
+        
+        adapters = []
+        JSON.parse(output).each do |nic|
+          adapters << nic.inject({}){ |memo,(k,v)| memo[k.to_sym] = v; memo }
+        end
+
+        @logger.debug("#{adapters.inspect}")
+        return adapters
       end
 
       # Checks to see if the specified NIC is currently configured for DHCP.
@@ -32,7 +57,7 @@ module VagrantPlugins
           }
           exit 1
         EOH
-        @communicator.test(cmd)
+        @communicator.test(Util::CapHelpers.wrap_powershell(cmd))
       end
 
       # Configures the specified interface for DHCP
@@ -65,62 +90,17 @@ module VagrantPlugins
       # https://github.com/WinRb/vagrant-windows/issues/63
       def set_all_networks_to_work
         @logger.info("Setting all networks to 'Work Network'")
-        command = File.read(File.expand_path("../scripts/set_work_network.ps1", __FILE__))
-        @communicator.execute(command)
-      end
-
-      protected
-
-      # Checks the WinRS version on the guest. Usually 2 on Windows 7/2008
-      # and 3 on Windows 8/2012.
-      #
-      # @return [Integer]
-      def wsman_version
-        @logger.debug("querying WSMan version")
-        version = ''
-        @communicator.execute(PS_GET_WSMAN_VER) do |type, line|
-          version = version + "#{line}" if type == :stdout && !line.nil?
-        end
-        @logger.debug("wsman version: #{version}")
-        Integer(version)
-      end
-
-      # Returns an array of all NICs on the guest. Each array entry is a
-      # Hash of the NICs properties. This method should only be used on
-      # guests that have WinRS version 2.
-      #
-      # @return [Array]
-      def network_adapters_v2_winrm
-        @logger.debug("querying network adapters")
-
-        # Get all NICs that have a MAC address
-        # https://msdn.microsoft.com/en-us/library/windows/desktop/aa394216(v=vs.85).aspx
-        adapters = @communicator.execute(WQL_NET_ADAPTERS_V2, { shell: :wql } )[:win32_network_adapter]
-        @logger.debug("#{adapters.inspect}")
-        return adapters
-      end
-
-      # Returns an array of all NICs on the guest. Each array entry is a
-      # Hash of the NICs properties. This method should only be used on
-      # guests that have WinRS version 3.
-      #
-      # This method is a workaround until the WinRM gem supports WinRS version 3.
-      #
-      # @return [Array]
-      def network_adapters_v3_winrm
-        command = File.read(File.expand_path("../scripts/winrs_v3_get_adapters.ps1", __FILE__))
-        output = ""
-        @communicator.execute(command) do |type, line|
-          output = output + "#{line}" if type == :stdout && !line.nil?
-        end
-
-        adapters = []
-        JSON.parse(output).each do |nic|
-          adapters << nic.inject({}){ |memo,(k,v)| memo[k.to_sym] = v; memo }
-        end
+        
+        cmd = <<-EOH            
+          # Get network connections
+          $networkListManager = [Activator]::CreateInstance([Type]::GetTypeFromCLSID([Guid]"{DCB00C01-570F-4A9B-8D69-199FDBA5723B}"))
+          $connections = $networkListManager.GetNetworkConnections()
 
-        @logger.debug("#{adapters.inspect}")
-        return adapters
+          # Set network location to Private for all networks
+          $connections | % {$_.GetNetwork().SetCategory(1)}
+        EOH
+        
+        @communicator.execute(Util::CapHelpers.wrap_powershell(cmd))
       end
     end
   end

data/lib/vagrant-guest-msys2/scripts/mount_volume.ps1.erb

@@ -17,7 +17,7 @@ if( (Test-Path "$MountPoint") -and (Test-ReparsePoint "$MountPoint") )
 {
   Write-Output "Junction already exists, so I will delete it"
   # Powershell refuses to delete junctions, oh well use cmd
-  cmd /c rd "$MountPoint"
+  & cmd.exe /c rd "$MountPoint"
 
   if ( $LASTEXITCODE -ne 0 )
   {

data/lib/vagrant-guest-msys2/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module GuestMSYS2
-    VERSION = "0.0.5"
+    VERSION = "0.0.6"
   end
 end

data/vagrant-guest-msys2.gemspec

@@ -14,6 +14,7 @@ Gem::Specification.new do |s|
   s.description   = "Adds MSYS2 (https://sourceforge.net/p/msys2/wiki/Home/) as a guest for Vagrant. "
   s.homepage      = "https://github.com/tsmolka/vagrant-guest-msys2"
   s.required_rubygems_version = ">= 1.3.6"
+  s.add_dependency 'rake'
   root_path       = File.dirname(__FILE__)
   
   s.files = `git ls-files`.split($INPUT_RECORD_SEPARATOR)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-guest-msys2
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Tobias
@@ -9,8 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-09 00:00:00.000000000 Z
-dependencies: []
+date: 2017-03-14 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 'Adds MSYS2 (https://sourceforge.net/p/msys2/wiki/Home/) as a guest for
   Vagrant. '
 email: tsmolka@gmail.com