Exception processing added to all Facter modules

Author: Gerard Hickey

hanlon_microkernel/facter/hnl_mk_bus.rb

@@ -17,7 +17,15 @@
   unless definition.empty?
     lines = definition.split(/\n/)
     item = lines.shift.tr(':', '')
-    attribs = Hash[ lines.collect { |l| l =~ /^\s*([^:]+):\s+(.*)\s*$/; v=$2; [$1.gsub(/\s/, '_'), v] } ]
+    attribs = Hash[ lines.collect do |l|
+      begin
+        l =~ /^\s*([^:]+):\s+(.*)\s*$/; v=$2; [$1.gsub(/\s/, '_'), v]
+      rescue NoMethodError
+        if Facter.debugging?
+          puts "Error: (bus class) unable to parse #{l}"
+        end
+      end
+    end ]
     results[item] = attribs
   end
 end

hanlon_microkernel/facter/hnl_mk_cpu.rb

@@ -20,7 +20,15 @@
     unless cpu =~ /disabled/i
       cpus += 1
       # Create a hash of attributes for each section (i.e. cpu)
-      attribs = Hash[ lines.collect { |l| l =~ /^\s*([^:]+):\s+(.*)\s*$/; v=$2; [$1.gsub(/\s/, '_'), v] } ]
+      attribs = Hash[ lines.collect do |l|
+        begin
+          l =~ /^\s*([^:]+):\s+(.*)\s*$/; v=$2; [$1.gsub(/\s/, '_'), v] 
+        rescue NoMethodError
+          if Facter.debugging?
+            puts "Error: (cpu class) unable to parse #{l}"
+          end
+        end
+      end ]
       attribs.each_pair do |attrib, val|
         Facter.add("mk_hw_#{cpu}_#{attrib}") do
           setcode { val }

hanlon_microkernel/facter/hnl_mk_disk.rb

@@ -19,7 +19,15 @@
     disk = lines.shift.tr(':', '')
     disks += 1
     # Create a hash of attributes for each section (i.e. cpu)
-    attribs = Hash[ lines.collect { |l| l =~ /^\s*([^:]+):\s+(.*)\s*$/; v=$2; [$1.gsub(/\s/, '_'), v] } ]
+    attribs = Hash[ lines.collect do |l|
+      begin
+        l =~ /^\s*([^:]+):\s+(.*)\s*$/; v=$2; [$1.gsub(/\s/, '_'), v] 
+      rescue NoMethodError
+        if Facter.debugging?
+          puts "Error: (disk class) unable to parse #{l}"
+        end
+      end
+    end ]
     attribs.each_pair do |attrib, val|
       Facter.add("mk_hw_#{disk}_#{attrib}") do
         setcode { val }

hanlon_microkernel/facter/hnl_mk_mem.rb

@@ -87,8 +87,14 @@ def def_to_hash(definition, delimiter=':')
     else
       # no sub-definitions, just process the attributes
       result.merge! Hash[ 
-          definition.split(/\n/).collect do |l| 
-            l =~ /^\s*([^#{delimiter}]+)#{delimiter}\s+(.*)\s*$/; v=$2; [$1.gsub(/\s/, '_'), v] 
+          definition.split(/\n/).collect do |l|
+            begin
+              l =~ /^\s*([^#{delimiter}]+)#{delimiter}\s+(.*)\s*$/; v=$2; [$1.gsub(/\s/, '_'), v]
+            rescue NoMethodError
+              if Facter.debugging?
+                puts "Error: (memory class) unable to parse #{l}"
+              end
+            end
           end 
       ]
     end

hanlon_microkernel/facter/hnl_mk_nic.rb

@@ -19,7 +19,14 @@
     network = lines.shift.tr(':', '')
     nics += 1
     # Create a hash of attributes for each section (i.e. cpu)
-    attribs = Hash[ lines.collect { |l| l =~ /^\s*([^:]+):\s+(.*)\s*$/; v=$2; [$1.gsub(/\s/, '_'), v] } ]
+    attribs = Hash[ lines.collect do |l| 
+      begin
+        l =~ /^\s*([^:]+):\s+(.*)\s*$/; v=$2; [$1.gsub(/\s/, '_'), v]
+      rescue NoMethodError
+        if Facter.debugging?
+          puts "Error: (network class) unable to parse #{l}"
+        end
+      end ]
     attribs.each_pair do |attrib, val|
       Facter.add("mk_hw_#{network}_#{attrib}") do
         setcode { val }

hanlon_microkernel/facter/hnl_mk_sys.rb

@@ -21,7 +21,9 @@
       begin
         l =~ /^\s*([^:]+):\s+(.*)\s*$/; v=$2; [$1.gsub(/\s/, '_'), v] 
       rescue NoMethodError
-        puts "Error: (system class) unable to parse %{l}"
+        if Facter.debugging?
+          puts "Error: (system class) unable to parse #{l}"
+        end
       end
     end ]
     attribs.each_pair do |attrib, val|

hanlon_microkernel/facter/hnl_mk_vol.rb

@@ -19,7 +19,15 @@
     volume = lines.shift.tr(':', '') and vols += 1
 
     # Create a hash of attributes for each section (i.e. cpu)
-    attribs = Hash[ lines.collect { |l| l =~ /^\s*([^:]+):\s+(.*)\s*$/; v=$2; [$1.gsub(/\s/, '_'), v] } ]
+    attribs = Hash[ lines.collect do |l| 
+      begin
+        l =~ /^\s*([^:]+):\s+(.*)\s*$/; v=$2; [$1.gsub(/\s/, '_'), v] 
+      rescue NoMethodError
+        if Facter.debugging?
+          puts "Error: (volume class) unable to parse #{l}"
+        end
+      end
+    end ]
     attribs.each_pair do |attrib, val|
       Facter.add("mk_hw_#{volume}_#{attrib}") do
         setcode { val }