Fixed #3393 - Updates to Facter for MS Windows

This patch is originally by Daniel Berger <djberg96@gmail.com>, I
changed using Facter.value instead of repeatedly testing
Config['host_os'], removed Resolution::which, and fixed the specs.

Thanks to Paul Nasrat for helping with cross-platform debugging.

Signed-off-by: David Schmitt <david@dasz.at>

1 files changed, 21 insertions, 8 deletions

diff --git a/lib/facter/macaddress.rb b/lib/facter/macaddress.rb
index e8f40dc..889feea 100644
--- a/lib/facter/macaddress.rb
+++ b/lib/facter/macaddress.rb
@@ -67,13 +67,26 @@ end
 Facter.add(:macaddress) do
     confine :kernel => %w(windows)
     setcode do
-        ether = []
-        output = %x{ipconfig /all}
-        output.split(/\r\n/).each do |str|
-            if str =~  /.*Physical Address.*: (\w{1,2}-\w{1,2}-\w{1,2}-\w{1,2}-\w{1,2}-\w{1,2})/
-                ether.push($1.gsub(/-/, ":"))
-            end
-        end
-        ether[0]
+        require 'win32ole'
+        require 'socket'
+
+        ether = nil
+        host = Socket.gethostname
+        connect_string = "winmgmts://#{host}/root/cimv2"
+
+        wmi = WIN32OLE.connect(connect_string)
+
+        query = %Q{
+          select *
+          from Win32_NetworkAdapterConfiguration
+          where IPEnabled = True
+        }
+
+        wmi.ExecQuery(query).each{ |nic|
+          ether = nic.MacAddress
+          break
+        }
+        
+        ether
     end
 end