Merge branch 'tickets/next/6614-ipaddress6-ruby-19-compat' into next

* tickets/next/6614-ipaddress6-ruby-19-compat:
  (#6614) Update ipaddress6 fact to work with Ruby 1.9

1 files changed, 17 insertions, 31 deletions

diff --git a/lib/facter/ipaddress6.rb b/lib/facter/ipaddress6.rb
index b494b9d..db3805b 100644
--- a/lib/facter/ipaddress6.rb
+++ b/lib/facter/ipaddress6.rb
@@ -21,21 +21,26 @@
 # Used the ipaddress fact that is already part of
 # Facter as a template.
 
+def get_address_after_token(output, token, return_first=false)
+  ip = nil
+
+  output.scan(/#{token} ((?>[0-9,a-f,A-F]*\:{1,2})+[0-9,a-f,A-F]{0,4})/).each do |match|
+    match = match.first
+    unless match =~ /fe80.*/ or match == "::1"
+      ip = match
+      break if return_first
+    end
+  end
+
+  ip
+end
+
 Facter.add(:ipaddress6) do
   confine :kernel => :linux
   setcode do
-    ip = nil
     output = Facter::Util::Resolution.exec('/sbin/ifconfig')
 
-    output.scan(/inet6 addr: ((?>[0-9,a-f,A-F]*\:{1,2})+[0-9,a-f,A-F]{0,4})/).each { |str|
-      str = str.to_s
-      unless str =~ /fe80.*/ or str == "::1"
-        ip = str
-      end
-    }
-
-    ip
-
+    get_address_after_token(output, 'inet6 addr:')
   end
 end
 
@@ -43,17 +48,8 @@ Facter.add(:ipaddress6) do
   confine :kernel => %w{SunOS}
   setcode do
     output = Facter::Util::Resolution.exec('/usr/sbin/ifconfig -a')
-    ip = nil
-
-    output.scan(/inet6 ((?>[0-9,a-f,A-F]*\:{0,2})+[0-9,a-f,A-F]{0,4})/).each { |str|
-      str = str.to_s
-      unless str =~ /fe80.*/ or str == "::1"
-        ip = str
-      end
-    }
-
-    ip
 
+    get_address_after_token(output, 'inet6')
   end
 end
 
@@ -61,17 +57,7 @@ Facter.add(:ipaddress6) do
   confine :kernel => %w{Darwin FreeBSD OpenBSD}
   setcode do
     output = Facter::Util::Resolution.exec('/sbin/ifconfig -a')
-    ip = nil
 
-    output.scan(/inet6 ((?>[0-9,a-f,A-F]*\:{1,2})+[0-9,a-f,A-F]{0,4})/).each do |str|
-      str = str.to_s
-      unless str =~ /fe80.*/ or str == "::1"
-        ip = str
-        break
-      end
-    end
-
-    ip
+    get_address_after_token(output, 'inet6', true)
   end
 end
-