Partial fix for #2191 - Facter compatibility for Ruby 1.9

1 files changed, 6 insertions, 6 deletions

diff --git a/lib/facter/macaddress.rb b/lib/facter/macaddress.rb
index e048209..94d00f4 100644
--- a/lib/facter/macaddress.rb
+++ b/lib/facter/macaddress.rb
@@ -3,7 +3,7 @@ Facter.add(:macaddress) do
     setcode do
         ether = []
         output = %x{/sbin/ifconfig -a}
-        output.each do |s|
+        output.each_line do |s|
             ether.push($1) if s =~ /(?:ether|HWaddr) (\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2})/
         end
         ether[0]
@@ -15,7 +15,7 @@ Facter.add(:macaddress) do
     setcode do
     ether = []
         output = %x{/sbin/ifconfig}
-        output.each do |s|
+        output.each_line do |s|
             if s =~ /(?:ether|lladdr)\s+(\w\w:\w\w:\w\w:\w\w:\w\w:\w\w)/
                 ether.push($1)
             end
@@ -30,7 +30,7 @@ Facter.add(:macaddress) do
         ether = nil
         output = %x{/sbin/ifconfig}
 
-        output.split(/^\S/).each do |str|
+        output.split(/^\S/).each_line do |str|
             if str =~ /10baseT/ # we're wired
                 str =~ /ether (\w\w:\w\w:\w\w:\w\w:\w\w:\w\w)/
                 ether = $1
@@ -47,12 +47,12 @@ Facter.add(:macaddress) do
         ether = []
         ip = nil
         output = %x{/usr/sbin/ifconfig -a}
-        output.each do |str|
+        output.each_line do |str|
             if str =~ /([a-z]+\d+): flags=/
                 devname = $1
                 unless devname =~ /lo0/
                     output2 = %x{/usr/bin/entstat #{devname}}
-                    output2.each do |str2|
+                    output2.each_line do |str2|
                         if str2 =~ /^Hardware Address: (\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2}:\w{1,2})/
                             ether.push($1)
                         end
@@ -69,7 +69,7 @@ Facter.add(:macaddress) do
     setcode do
         ether = []
         output = %x{ipconfig /all}
-        output.split(/\r\n/).each  do |str|
+        output.split(/\r\n/).each_line 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