ohai 8.10.0 → 8.11.1

data/lib/ohai/plugins/sigar/network_route.rb

@@ -16,44 +16,49 @@
 # limitations under the License.
 #
 
-require 'ohai/mixin/network_constants'
+require "ohai/mixin/network_constants"
 
 Ohai.plugin(:NetworkRoutes) do
-  include Ohai::Mixin::NetworkConstants
+  begin
+    require "sigar"
 
-  provides "network/interfaces/adapters/route"
-  depends "network/interfaces"
+    include Ohai::Mixin::NetworkConstants
 
-  def flags(flags)
-    f = ""
-    if (flags & Sigar::RTF_UP) != 0
-      f += "U"
-    end
-    if (flags & Sigar::RTF_GATEWAY) != 0
-      f += "G"
-    end
-    if (flags & Sigar::RTF_HOST) != 0
-      f += "H"
+    provides "network/interfaces/adapters/route"
+    depends "network/interfaces"
+
+    def flags(flags)
+      f = ""
+      if (flags & Sigar::RTF_UP) != 0
+        f += "U"
+      end
+      if (flags & Sigar::RTF_GATEWAY) != 0
+        f += "G"
+      end
+      if (flags & Sigar::RTF_HOST) != 0
+        f += "H"
+      end
+      f
     end
-    f
-  end
 
-  collect_data(:default) do
-    require "sigar"
-    sigar = Sigar.new
+    collect_data(:default) do
+      sigar = Sigar.new
 
-    sigar.net_route_list.each do |route|
-      next unless network[:interfaces][route.ifname] # this should never happen
-      network[:interfaces][route.ifname][:route] = Mash.new unless network[:interfaces][route.ifname][:route]
-      route_data={}
-      Ohai::Mixin::NetworkConstants::SIGAR_ROUTE_METHODS.each do |m|
-        if(m == :flags)
-          route_data[m]=flags(route.send(m))
-        else
-          route_data[m]=route.send(m)
+      sigar.net_route_list.each do |route|
+        next unless network[:interfaces][route.ifname] # this should never happen
+        network[:interfaces][route.ifname][:route] = Mash.new unless network[:interfaces][route.ifname][:route]
+        route_data = {}
+        Ohai::Mixin::NetworkConstants::SIGAR_ROUTE_METHODS.each do |m|
+          if(m == :flags)
+            route_data[m] = flags(route.send(m))
+          else
+            route_data[m] = route.send(m)
+          end
         end
+        network[:interfaces][route.ifname][:route][route.destination] = route_data
       end
-      network[:interfaces][route.ifname][:route][route.destination] = route_data
     end
+  rescue LoadError
+    Ohai::Log.debug("Could not load sigar gem. Skipping NetworkRoutes plugin")
   end
 end

data/lib/ohai/plugins/softlayer.rb

@@ -18,12 +18,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'ohai/mixin/softlayer_metadata'
+require "ohai/mixin/softlayer_metadata"
 
 Ohai.plugin(:Softlayer) do
   include ::Ohai::Mixin::SoftlayerMetadata
 
-  provides 'softlayer'
+  provides "softlayer"
 
   # Identifies the softlayer cloud
   #
@@ -31,17 +31,18 @@ Ohai.plugin(:Softlayer) do
   # true:: If the softlayer cloud can be identified
   # false:: Otherwise
   def looks_like_softlayer?
-    hint?('softlayer')
+    hint?("softlayer")
   end
 
   collect_data do
     # Adds softlayer Mash
     if looks_like_softlayer?
-      ::Ohai::Log.debug("looks_like_softlayer? == true")
+      Ohai::Log.debug("softlayer plugin: looks_like_softlayer? == true")
       metadata = fetch_metadata
       softlayer Mash.new
-      metadata.each { |k,v| softlayer[k] = v } if metadata
+      metadata.each { |k, v| softlayer[k] = v } if metadata
+    else
+      Ohai::Log.debug("softlayer plugin: looks_like_softlayer? == false")
     end
-
   end
-end
+end

data/lib/ohai/plugins/solaris2/cpu.rb

@@ -16,13 +16,13 @@
 
 Ohai.plugin(:CPU) do
   provides "cpu"
-  
+
   collect_data(:solaris2) do
     cpu Mash.new
     # This does assume that /usr/bin/kstat is in the path
     processor_info = shell_out("kstat -p cpu_info").stdout.lines
-    cpu["total"] = 0 
-    cpu["sockets"] = 0 
+    cpu["total"] = 0
+    cpu["sockets"] = 0
     cpu["cores"] = 0
     cpu["corethreads"] = 0
     cpu["cpustates"] = Mash.new
@@ -31,35 +31,35 @@ Ohai.plugin(:CPU) do
     cpucores = Array.new
     cpusockets = Array.new
     processor_info.each_with_index do |processor, i|
-      desc,instance,record,keyvalue = processor.split(":")
+      desc, instance, record, keyvalue = processor.split(":")
       cpu[instance] ||= Mash.new
-      if (currentcpu !=  instance)
-         cpu["total"] += 1
-         currentcpu = instance
-      end 
+      if currentcpu != instance
+        cpu["total"] += 1
+        currentcpu = instance
+      end
       kv = keyvalue.split(/\s+/)
       key = kv.shift
       value = kv.join(" ").chomp
       case key
         when /chip_id/
-           cpu[instance]["socket"] = value
-           cpusockets.push(value) if cpusockets.index(value).nil?
+          cpu[instance]["socket"] = value
+          cpusockets.push(value) if cpusockets.index(value).nil?
         when /cpu_type/
-           cpu[instance]["arch"] = value
+          cpu[instance]["arch"] = value
         when /clock_MHz/
-           cpu[instance]["mhz"] = value
+          cpu[instance]["mhz"] = value
         when /brand/
-           cpu[instance]["model_name"] = value.sub(/\s+/," ")
+          cpu[instance]["model_name"] = value.sub(/\s+/, " ")
         when /^state$/
-           cpu[instance]["state"] = value
-           cpu["cpustates"][value] ||= 0 
-           cpu["cpustates"][value] += 1 
+          cpu[instance]["state"] = value
+          cpu["cpustates"][value] ||= 0
+          cpu["cpustates"][value] += 1
         when /core_id/
-           cpu[instance]["core_id"] = value
+          cpu[instance]["core_id"] = value
            # Detect hyperthreading/multithreading
-           cpucores.push(value) if cpucores.index(value).nil?
+          cpucores.push(value) if cpucores.index(value).nil?
         when /family|fpu_type|model|stepping|vendor_id/
-           cpu[instance][key] = value
+          cpu[instance][key] = value
       end
     end
     cpu["cores"] = cpucores.size

data/lib/ohai/plugins/solaris2/dmi.rb

@@ -6,9 +6,9 @@
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,72 +20,72 @@ Ohai.plugin(:DMI) do
   provides "dmi"
 
   collect_data(:solaris2) do
-    require 'ohai/common/dmi'
+    require "ohai/common/dmi"
 
     # if we already have a "dmi" with keys (presumably from dmidecode), don't try smbios
     # note that a single key just means dmidecode exited with its version
-    if (dmi.class.to_s == 'Mash') and (dmi.keys.length > 1) 
-      Ohai::Log.debug('skipping smbios output, since DMI information has already been provided')
+    if (dmi.class.to_s == "Mash") and (dmi.keys.length > 1)
+      Ohai::Log.debug("skipping smbios output, since DMI information has already been provided")
       return
     end
 
     dmi Mash.new
 
-    # bad Solaris shows strings defined by system instead of SMB IDs 
+    # bad Solaris shows strings defined by system instead of SMB IDs
     # this is what the *real* IDs are:
     # pulled from http://src.opensolaris.org/source/xref/nwam/nwam1/usr/src/uts/common/sys/smbios.h
     smb_to_id = {
-      'SMB_TYPE_BIOS' =>         0, # BIOS information (R)
-      'SMB_TYPE_SYSTEM' =>       1, # system information (R)
-      'SMB_TYPE_BASEBOARD' =>    2, # base board
-      'SMB_TYPE_CHASSIS' =>      3, # system enclosure or chassis (R)
-      'SMB_TYPE_PROCESSOR' =>    4, # processor (R)
-      'SMB_TYPE_MEMCTL' =>       5, # memory controller (O)
-      'SMB_TYPE_MEMMOD' =>       6, # memory module (O)
-      'SMB_TYPE_CACHE' =>        7, # processor cache (R)
-      'SMB_TYPE_PORT' =>         8, # port connector
-      'SMB_TYPE_SLOT' =>         9, # upgradeable system slot (R)
-      'SMB_TYPE_OBDEVS' =>       10, # on-board devices
-      'SMB_TYPE_OEMSTR' =>       11, # OEM string table
-      'SMB_TYPE_SYSCONFSTR' =>   12, # system configuration string table
-      'SMB_TYPE_LANG' =>         13, # BIOS language information
-      'SMB_TYPE_GROUP' =>        14, # group associations
-      'SMB_TYPE_EVENTLOG' =>     15, # system event log
-      'SMB_TYPE_MEMARRAY' =>     16, # physical memory array (R)
-      'SMB_TYPE_MEMDEVICE' =>    17, # memory device (R)
-      'SMB_TYPE_MEMERR32' =>     18, # 32-bit memory error information
-      'SMB_TYPE_MEMARRAYMAP' =>  19, # memory array mapped address (R)
-      'SMB_TYPE_MEMDEVICEMAP' => 20, # memory device mapped address (R)
-      'SMB_TYPE_POINTDEV' =>     21, # built-in pointing device
-      'SMB_TYPE_BATTERY' =>      22, # portable battery
-      'SMB_TYPE_RESET' =>        23, # system reset settings
-      'SMB_TYPE_SECURITY' =>     24, # hardware security settings
-      'SMB_TYPE_POWERCTL' =>     25, # system power controls
-      'SMB_TYPE_VPROBE' =>       26, # voltage probe
-      'SMB_TYPE_COOLDEV' =>      27, # cooling device
-      'SMB_TYPE_TPROBE' =>       28, # temperature probe
-      'SMB_TYPE_IPROBE' =>       29, # current probe
-      'SMB_TYPE_OOBRA' =>        30, # out-of-band remote access facility
-      'SMB_TYPE_BIS' =>          31, # boot integrity services
-      'SMB_TYPE_BOOT' =>         32, # system boot status (R)
-      'SMB_TYPE_MEMERR64' =>     33, # 64-bit memory error information
-      'SMB_TYPE_MGMTDEV' =>      34, # management device
-      'SMB_TYPE_MGMTDEVCP' =>    35, # management device component
-      'SMB_TYPE_MGMTDEVDATA' =>  36, # management device threshold data
-      'SMB_TYPE_MEMCHAN' =>      37, # memory channel
-      'SMB_TYPE_IPMIDEV' =>      38, # IPMI device information
-      'SMB_TYPE_POWERSUP' =>     39, # system power supply
-      'SMB_TYPE_ADDINFO' =>      40, # additional information
-      'SMB_TYPE_OBDEVEXT' =>     41, # on-board device extended info
-      'SMB_TYPE_MCHI' =>         42, # mgmt controller host interface
-      'SMB_TYPE_INACTIVE' =>     126, # inactive table entry
-      'SMB_TYPE_EOT' =>          127, # end of table
-      'SMB_TYPE_OEM_LO' =>       128, # start of OEM-specific type range
-      'SUN_OEM_EXT_PROCESSOR' => 132, # processor extended info
-      'SUN_OEM_PCIEXRC' =>       138, # PCIE RootComplex/RootPort info
-      'SUN_OEM_EXT_MEMARRAY' =>  144, # phys memory array extended info
-      'SUN_OEM_EXT_MEMDEVICE' => 145, # memory device extended info
-      'SMB_TYPE_OEM_HI' =>       256, # end of OEM-specific type range
+      "SMB_TYPE_BIOS" =>         0, # BIOS information (R)
+      "SMB_TYPE_SYSTEM" =>       1, # system information (R)
+      "SMB_TYPE_BASEBOARD" =>    2, # base board
+      "SMB_TYPE_CHASSIS" =>      3, # system enclosure or chassis (R)
+      "SMB_TYPE_PROCESSOR" =>    4, # processor (R)
+      "SMB_TYPE_MEMCTL" =>       5, # memory controller (O)
+      "SMB_TYPE_MEMMOD" =>       6, # memory module (O)
+      "SMB_TYPE_CACHE" =>        7, # processor cache (R)
+      "SMB_TYPE_PORT" =>         8, # port connector
+      "SMB_TYPE_SLOT" =>         9, # upgradeable system slot (R)
+      "SMB_TYPE_OBDEVS" =>       10, # on-board devices
+      "SMB_TYPE_OEMSTR" =>       11, # OEM string table
+      "SMB_TYPE_SYSCONFSTR" =>   12, # system configuration string table
+      "SMB_TYPE_LANG" =>         13, # BIOS language information
+      "SMB_TYPE_GROUP" =>        14, # group associations
+      "SMB_TYPE_EVENTLOG" =>     15, # system event log
+      "SMB_TYPE_MEMARRAY" =>     16, # physical memory array (R)
+      "SMB_TYPE_MEMDEVICE" =>    17, # memory device (R)
+      "SMB_TYPE_MEMERR32" =>     18, # 32-bit memory error information
+      "SMB_TYPE_MEMARRAYMAP" =>  19, # memory array mapped address (R)
+      "SMB_TYPE_MEMDEVICEMAP" => 20, # memory device mapped address (R)
+      "SMB_TYPE_POINTDEV" =>     21, # built-in pointing device
+      "SMB_TYPE_BATTERY" =>      22, # portable battery
+      "SMB_TYPE_RESET" =>        23, # system reset settings
+      "SMB_TYPE_SECURITY" =>     24, # hardware security settings
+      "SMB_TYPE_POWERCTL" =>     25, # system power controls
+      "SMB_TYPE_VPROBE" =>       26, # voltage probe
+      "SMB_TYPE_COOLDEV" =>      27, # cooling device
+      "SMB_TYPE_TPROBE" =>       28, # temperature probe
+      "SMB_TYPE_IPROBE" =>       29, # current probe
+      "SMB_TYPE_OOBRA" =>        30, # out-of-band remote access facility
+      "SMB_TYPE_BIS" =>          31, # boot integrity services
+      "SMB_TYPE_BOOT" =>         32, # system boot status (R)
+      "SMB_TYPE_MEMERR64" =>     33, # 64-bit memory error information
+      "SMB_TYPE_MGMTDEV" =>      34, # management device
+      "SMB_TYPE_MGMTDEVCP" =>    35, # management device component
+      "SMB_TYPE_MGMTDEVDATA" =>  36, # management device threshold data
+      "SMB_TYPE_MEMCHAN" =>      37, # memory channel
+      "SMB_TYPE_IPMIDEV" =>      38, # IPMI device information
+      "SMB_TYPE_POWERSUP" =>     39, # system power supply
+      "SMB_TYPE_ADDINFO" =>      40, # additional information
+      "SMB_TYPE_OBDEVEXT" =>     41, # on-board device extended info
+      "SMB_TYPE_MCHI" =>         42, # mgmt controller host interface
+      "SMB_TYPE_INACTIVE" =>     126, # inactive table entry
+      "SMB_TYPE_EOT" =>          127, # end of table
+      "SMB_TYPE_OEM_LO" =>       128, # start of OEM-specific type range
+      "SUN_OEM_EXT_PROCESSOR" => 132, # processor extended info
+      "SUN_OEM_PCIEXRC" =>       138, # PCIE RootComplex/RootPort info
+      "SUN_OEM_EXT_MEMARRAY" =>  144, # phys memory array extended info
+      "SUN_OEM_EXT_MEMDEVICE" => 145, # memory device extended info
+      "SMB_TYPE_OEM_HI" =>       256, # end of OEM-specific type range
     }
 
     # all output lines should fall within one of these patterns
@@ -103,9 +103,9 @@ Ohai.plugin(:DMI) do
     # ==== EXAMPLE: ====
     # ID    SIZE TYPE
     # 0     40   SMB_TYPE_BIOS (BIOS information)
-    # 
+    #
     #   Vendor: HP
-    #   Version String: 2.16  
+    #   Version String: 2.16
     # ... similar lines trimmed
     #   Characteristics: 0x7fc9da80
     #         SMB_BIOSFL_PCI (PCI is supported)
@@ -116,8 +116,8 @@ Ohai.plugin(:DMI) do
       next if blank_line.match(raw_line)
 
       # remove/replace any characters that don't fall inside permissible ASCII range, or whitespace
-      line = raw_line.gsub(/[^\x20-\x7E\n\t\r]/, '.')
-      if (line != raw_line)
+      line = raw_line.gsub(/[^\x20-\x7E\n\t\r]/, ".")
+      if line != raw_line
         Ohai::Log.debug("converted characters from line:\n#{raw_line}")
       end
 
@@ -164,7 +164,7 @@ Ohai.plugin(:DMI) do
           Ohai::Log.debug("unexpected data line found before header; discarding:\n#{line}")
           next
         end
-        dmi[dmi_record[:type]][:all_records][dmi_record[:position]][data[1]] = ''
+        dmi[dmi_record[:type]][:all_records][dmi_record[:position]][data[1]] = ""
         field = data[1]
 
       elsif extended_data = extended_data_line.match(line)
@@ -177,7 +177,7 @@ Ohai.plugin(:DMI) do
           next
         end
         # overwrite "raw" value with a new Mash
-        dmi[dmi_record[:type]][:all_records][dmi_record[:position]][field] = Mash.new unless dmi[dmi_record[:type]][:all_records][dmi_record[:position]][field].class.to_s == 'Mash'
+        dmi[dmi_record[:type]][:all_records][dmi_record[:position]][field] = Mash.new unless dmi[dmi_record[:type]][:all_records][dmi_record[:position]][field].class.to_s == "Mash"
         dmi[dmi_record[:type]][:all_records][dmi_record[:position]][field][extended_data[1]] = extended_data[2]
 
       else

data/lib/ohai/plugins/solaris2/filesystem.rb

@@ -42,10 +42,10 @@ Ohai.plugin(:Filesystem) do
     # Grab file system type from df (must be done separately)
     so = shell_out("df -na")
     so.stdout.lines do |line|
-      next unless (line =~ /^(.+?)\s*: (\S+)\s*$/)
+      next unless line =~ /^(.+?)\s*: (\S+)\s*$/
       mount = $1
-      fs.each { |filesystem,fs_attributes|
-        next unless (fs_attributes[:mount] == mount)
+      fs.each { |filesystem, fs_attributes|
+        next unless fs_attributes[:mount] == mount
         fs[filesystem][:fs_type] = $2
       }
     end
@@ -53,7 +53,7 @@ Ohai.plugin(:Filesystem) do
     # Grab mount information from /bin/mount
     so = shell_out("mount")
     so.stdout.lines do |line|
-      next unless (line =~ /^(.+?) on (.+?) (.+?) on (.+?)$/)
+      next unless line =~ /^(.+?) on (.+?) (.+?) on (.+?)$/
       filesystem = $2
       fs[filesystem] = Mash.new unless fs.has_key?(filesystem)
       fs[filesystem][:mount] = $1
@@ -69,30 +69,30 @@ Ohai.plugin(:Filesystem) do
     if configuration(:zfs_properties).nil? || configuration(:zfs_properties).empty?
       zfs_get << "all"
     else
-      zfs_get << [configuration(:zfs_properties)].join(',')
+      zfs_get << [configuration(:zfs_properties)].join(",")
     end
     so = shell_out(zfs_get)
     so.stdout.lines do |line|
-      next unless (line =~ /^([^\t]+)\t([^\t]+)\t([^\t]+)\t([^\t]+)$/)
+      next unless line =~ /^([^\t]+)\t([^\t]+)\t([^\t]+)\t([^\t]+)$/
       filesystem = $1
       zfs[filesystem] = Mash.new unless zfs.has_key?(filesystem)
-      zfs[filesystem][:values] = Mash.new unless zfs[filesystem].has_key?('values')
-      zfs[filesystem][:sources] = Mash.new unless zfs[filesystem].has_key?('sources')
+      zfs[filesystem][:values] = Mash.new unless zfs[filesystem].has_key?("values")
+      zfs[filesystem][:sources] = Mash.new unless zfs[filesystem].has_key?("sources")
       zfs[filesystem][:values][$2] = $3
       zfs[filesystem][:sources][$2] = $4.chomp
     end
 
     zfs.each { |filesystem, attributes|
       fs[filesystem] = Mash.new unless fs.has_key?(filesystem)
-      fs[filesystem][:fs_type] = 'zfs'
-      fs[filesystem][:mount] = attributes[:values][:mountpoint] if attributes[:values].has_key?('mountpoint')
+      fs[filesystem][:fs_type] = "zfs"
+      fs[filesystem][:mount] = attributes[:values][:mountpoint] if attributes[:values].has_key?("mountpoint")
       fs[filesystem][:zfs_values] = attributes[:values]
       fs[filesystem][:zfs_sources] = attributes[:sources]
       # find all zfs parents
-      parents = filesystem.split('/')
+      parents = filesystem.split("/")
       zfs_parents = []
-      (0 .. parents.length - 1).to_a.each { |parent_indexes|
-        next_parent = parents[0 .. parent_indexes].join('/')
+      (0..parents.length - 1).to_a.each { |parent_indexes|
+        next_parent = parents[0..parent_indexes].join("/")
         zfs_parents.push(next_parent)
       }
       zfs_parents.pop

data/lib/ohai/plugins/solaris2/memory.rb

@@ -20,9 +20,9 @@ Ohai.plugin(:Memory) do
   collect_data(:solaris2) do
     memory Mash.new
     memory[:swap] = Mash.new
-    meminfo =  shell_out("prtconf | grep Memory").stdout
+    meminfo = shell_out("prtconf | grep Memory").stdout
     memory[:total] = "#{meminfo.split[2].to_i * 1024}kB"
-    
+
     tokens = shell_out("swap -s").stdout.strip.split
     used_swap = tokens[8][0..-1].to_i #strip k from end
     free_swap = tokens[10][0..-1].to_i #strip k from end

data/lib/ohai/plugins/solaris2/network.rb

@@ -73,14 +73,14 @@ Ohai.plugin(:Network) do
 
   def arpname_to_ifname(iface, arpname)
     iface.keys.each do |ifn|
-      return ifn if ifn.split(':')[0].eql?(arpname)
+      return ifn if ifn.split(":")[0].eql?(arpname)
     end
 
     nil
   end
 
   collect_data(:solaris2) do
-    require 'scanf'
+    require "scanf"
 
     iface = Mash.new
     network Mash.new unless network
@@ -98,7 +98,7 @@ Ohai.plugin(:Network) do
         iface[cint][:mtu] = $2
         iface[cint][:index] = $3
         if line =~ / flags\=\d+\<((ADDRCONF|ANYCAST|BROADCAST|CoS|DEPRECATED|DHCP|DUPLICATE|FAILED|FIXEDMTU|INACTIVE|L3PROTECT|LOOPBACK|MIP|MULTI_BCAST|MULTICAST|NOARP|NOFAILOVER|NOLOCAL|NONUD|NORTEXCH|NOXMIT|OFFLINE|POINTOPOINT|PREFERRED|PRIVATE|ROUTER|RUNNING|STANDBY|TEMPORARY|UNNUMBERED|UP|VIRTUAL|XRESOLV|IPv4|IPv6|,)+)\>\s/
-          flags = $1.split(',')
+          flags = $1.split(",")
         else
           flags = Array.new
         end
@@ -111,11 +111,11 @@ Ohai.plugin(:Network) do
       end
       if line =~ /\s+inet (\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}) netmask (([0-9a-f]){1,8})\s*$/
         iface[cint][:addresses] = Mash.new unless iface[cint][:addresses]
-        iface[cint][:addresses][$1] = { "family" => "inet", "netmask" => $2.scanf('%2x'*4)*"."}
+        iface[cint][:addresses][$1] = { "family" => "inet", "netmask" => $2.scanf("%2x" * 4) * "." }
       end
       if line =~ /\s+inet (\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}) netmask (([0-9a-f]){1,8}) broadcast (\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})/
         iface[cint][:addresses] = Mash.new unless iface[cint][:addresses]
-        iface[cint][:addresses][$1] = { "family" => "inet", "netmask" => $2.scanf('%2x'*4)*".", "broadcast" => $4 }
+        iface[cint][:addresses][$1] = { "family" => "inet", "netmask" => $2.scanf("%2x" * 4) * ".", "broadcast" => $4 }
       end
       if line =~ /\s+inet6 ([a-f0-9\:]+)(\s*|(\%[a-z0-9]+)\s*)\/(\d+)\s*$/
         iface[cint][:addresses] = Mash.new unless iface[cint][:addresses]