ohai 6.24.2 → 7.0.0.rc.0

data/lib/ohai/plugins/command.rb

@@ -16,6 +16,10 @@
 # limitations under the License.
 #
 
-provides "command"
+Ohai.plugin(:Command) do
+  provides "command"
 
-command Mash.new
+  collect_data do
+    command Mash.new
+  end
+end

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

@@ -16,8 +16,14 @@
 # limitations under the License.
 #
 
-provides "cpu"
+Ohai.plugin(:CPU) do
+  provides "cpu"
 
-cpu Mash.new
-cpu[:real]  = from("sysctl -n hw.physicalcpu").to_i
-cpu[:total] = from("sysctl -n hw.logicalcpu").to_i
+  collect_data(:darwin) do
+    cpu Mash.new
+    so = shell_out("sysctl -n hw.physicalcpu")
+    cpu[:real] = so.stdout.to_i
+    so = shell_out("sysctl -n hw.logicalcpu")
+    cpu[:total] = so.stdout.to_i
+  end
+end

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

@@ -16,42 +16,42 @@
 # limitations under the License.
 #
 
-provides "filesystem"
+Ohai.plugin(:Filesystem) do
+  provides "filesystem"
 
-fs = Mash.new
+  collect_data(:darwin) do
+    fs = Mash.new
 
-block_size = 0
-popen4("df") do |pid, stdin, stdout, stderr|
-  stdin.close
-  stdout.each do |line|
-    case line
-    when /^Filesystem\s+(\d+)-/
-      block_size = $1.to_i
-      next
-    when /^(.+?)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+\%)\s+(.+)$/
-      filesystem = $1
-      fs[filesystem] = Mash.new
-      fs[filesystem][:block_size] = block_size
-      fs[filesystem][:kb_size] = $2.to_i / (1024 / block_size)
-      fs[filesystem][:kb_used] = $3.to_i / (1024 / block_size)
-      fs[filesystem][:kb_available] = $4.to_i / (1024 / block_size)
-      fs[filesystem][:percent_used] = $5
-      fs[filesystem][:mount] = $6
+    block_size = 0
+    so = shell_out("df")
+    so.stdout.lines do |line|
+      case line
+      when /^Filesystem\s+(\d+)-/
+        block_size = $1.to_i
+        next
+      when /^(.+?)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+\%)\s+(.+)$/
+        filesystem = $1
+        fs[filesystem] = Mash.new
+        fs[filesystem][:block_size] = block_size
+        fs[filesystem][:kb_size] = $2.to_i / (1024 / block_size)
+        fs[filesystem][:kb_used] = $3.to_i / (1024 / block_size)
+        fs[filesystem][:kb_available] = $4.to_i / (1024 / block_size)
+        fs[filesystem][:percent_used] = $5
+        fs[filesystem][:mount] = $6
+      end
     end
-  end
-end
 
-popen4("mount") do |pid, stdin, stdout, stderr|
-  stdin.close
-  stdout.each do |line|
-    if line =~ /^(.+?) on (.+?) \((.+?), (.+?)\)$/
-      filesystem = $1
-      fs[filesystem] = Mash.new unless fs.has_key?(filesystem)
-      fs[filesystem][:mount] = $2
-      fs[filesystem][:fs_type] = $3
-      fs[filesystem][:mount_options] = $4.split(/,\s*/)
+    so = shell_out("mount")
+    so.stdout.lines do |line|
+      if line =~ /^(.+?) on (.+?) \((.+?), (.+?)\)$/
+        filesystem = $1
+        fs[filesystem] = Mash.new unless fs.has_key?(filesystem)
+        fs[filesystem][:mount] = $2
+        fs[filesystem][:fs_type] = $3
+        fs[filesystem][:mount_options] = $4.split(/,\s*/)
+      end
     end
+
+    filesystem fs
   end
 end
-
-filesystem fs

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

@@ -16,182 +16,185 @@
 # limitations under the License.
 #
 
-provides "network", "counters/network"
-
-require 'scanf'
-
-from("route -n get default").split("\n").each do |line|
-  if line =~ /(\w+): ([\w\.]+)/
-    case $1
-    when "gateway"
-      network[:default_gateway] = $2
-    when "interface"
-      network[:default_interface] = $2
-    end
-  end
-end
-
-def parse_media(media_string)
-  media = Hash.new
-  line_array = media_string.split(' ')
-
-  0.upto(line_array.length - 1) do |i|
-    unless line_array[i].eql?("none")
-
-      if line_array[i + 1] =~ /^\<([a-zA-Z\-\,]+)\>$/
-        media[line_array[i]] = Hash.new unless media.has_key?(line_array[i])
-        if media[line_array[i]].has_key?("options")
-          $1.split(",").each do |opt|
-            media[line_array[i]]["options"] << opt unless media[line_array[i]]["options"].include?(opt)
+Ohai.plugin(:Network) do
+  provides "network", "network/interfaces"
+  provides "counters/network", "counters/network/interfaces"
+
+  def parse_media(media_string)
+    media = Hash.new
+    line_array = media_string.split(' ')
+
+    0.upto(line_array.length - 1) do |i|
+      unless line_array[i].eql?("none")
+
+        if line_array[i + 1] =~ /^\<([a-zA-Z\-\,]+)\>$/
+          media[line_array[i]] = Hash.new unless media.has_key?(line_array[i])
+          if media[line_array[i]].has_key?("options")
+            $1.split(",").each do |opt|
+              media[line_array[i]]["options"] << opt unless media[line_array[i]]["options"].include?(opt)
+            end
+          else
+            media[line_array[i]]["options"] = $1.split(",")
           end
         else
-          media[line_array[i]]["options"] = $1.split(",") 
+          if line_array[i].eql?("autoselect")
+            media["autoselect"] = Hash.new unless media.has_key?("autoselect")
+            media["autoselect"]["options"] = []
+          end
         end
       else
-        if line_array[i].eql?("autoselect")
-          media["autoselect"] = Hash.new unless media.has_key?("autoselect")
-          media["autoselect"]["options"] = []
-        end
+        media["none"] = { "options" => [] }
       end
-    else
-      media["none"] = { "options" => [] }
     end
-  end
 
-  media
-end
+    media
+  end
 
-def encaps_lookup(ifname)
-  return "Loopback" if ifname.eql?("lo")
-  return "1394" if ifname.eql?("fw")
-  return "IPIP" if ifname.eql?("gif")
-  return "6to4" if ifname.eql?("stf")
-  return "dot1q" if ifname.eql?("vlan")
-  "Unknown"
-end
+  def darwin_encaps_lookup(ifname)
+    return "Loopback" if ifname.eql?("lo")
+    return "1394" if ifname.eql?("fw")
+    return "IPIP" if ifname.eql?("gif")
+    return "6to4" if ifname.eql?("stf")
+    return "dot1q" if ifname.eql?("vlan")
+    "Unknown"
+  end
 
-def scope_lookup(scope)
-  return "Node" if scope.eql?("::1")
-  return "Link" if scope.match(/^fe80\:/)
-  return "Site" if scope.match(/^fec0\:/)
-  "Global"
-end
+  def scope_lookup(scope)
+    return "Node" if scope.eql?("::1")
+    return "Link" if scope.match(/^fe80\:/)
+    return "Site" if scope.match(/^fec0\:/)
+    "Global"
+  end
 
-def excluded_setting?(setting)
-  setting.match('_sw_cksum')
-end
+  def excluded_setting?(setting)
+    setting.match('_sw_cksum')
+  end
 
-def locate_interface(ifaces, ifname, mac)
-  return ifname unless ifaces[ifname].nil?
-  # oh well, time to go hunting!
-  return ifname.chop if ifname.match /\*$/
-  ifaces.keys.each do |ifc|
-    ifaces[ifc][:addresses].keys.each do |addr|
-      return ifc if addr.eql? mac
+  def locate_interface(ifaces, ifname, mac)
+    return ifname unless ifaces[ifname].nil?
+    # oh well, time to go hunting!
+    return ifname.chop if ifname.match /\*$/
+    ifaces.keys.each do |ifc|
+      ifaces[ifc][:addresses].keys.each do |addr|
+        return ifc if addr.eql? mac
+      end
     end
+
+    nil
   end
-  
-  nil
-end
 
-iface = Mash.new
-popen4("ifconfig -a") do |pid, stdin, stdout, stderr|
-  stdin.close
-  cint = nil
-  stdout.each do |line|
-    if line =~ /^([0-9a-zA-Z\.\:\-]+): \S+ mtu (\d+)$/
-      cint = $1
-      iface[cint] = Mash.new unless iface[cint]; iface[cint][:addresses] = Mash.new unless iface[cint][:addresses]
-      iface[cint][:mtu] = $2
-      if line =~ /\sflags\=\d+\<((UP|BROADCAST|DEBUG|SMART|SIMPLEX|LOOPBACK|POINTOPOINT|NOTRAILERS|RUNNING|NOARP|PROMISC|ALLMULTI|SLAVE|MASTER|MULTICAST|DYNAMIC|,)+)\>\s/
-        flags = $1.split(',')
-      else
-        flags = Array.new
-      end
-      iface[cint][:flags] = flags.flatten
-      if cint =~ /^(\w+)(\d+.*)/
-        iface[cint][:type] = $1
-        iface[cint][:number] = $2
-        iface[cint][:encapsulation] = encaps_lookup($1)
+  collect_data(:darwin) do
+    require 'scanf'
+
+    network Mash.new unless network
+    network[:interfaces] = Mash.new unless network[:interfaces]
+    counters Mash.new unless counters
+    counters[:network] = Mash.new unless counters[:network]
+
+    so = shell_out("route -n get default")
+    so.stdout.lines do |line|
+      if line =~ /(\w+): ([\w\.]+)/
+        case $1
+        when "gateway"
+          network[:default_gateway] = $2
+        when "interface"
+          network[:default_interface] = $2
+        end
       end
     end
-    if line =~ /^\s+ether ([0-9a-f\:]+)/
-      iface[cint][:addresses] = Mash.new unless iface[cint][:addresses]
-      iface[cint][:addresses][$1] = { "family" => "lladdr" }
-      iface[cint][:encapsulation] = "Ethernet"
-    end
-    if line =~ /^\s+lladdr ([0-9a-f\:]+)\s/
-      iface[cint][:addresses] = Mash.new unless iface[cint][:addresses]
-      iface[cint][:addresses][$1] = { "family" => "lladdr" }
-    end
-    if line =~ /\s+inet (\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}) netmask 0x(([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)*"."}
-    end
-    if line =~ /\s+inet (\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}) netmask 0x(([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 }
-    end
-    if line =~ /\s+inet6 ([a-f0-9\:]+)(\s*|(\%[a-z0-9]+)\s*) prefixlen (\d+)\s*/
-      iface[cint][:addresses] = Mash.new unless iface[cint][:addresses]
-      iface[cint][:addresses][$1] = { "family" => "inet6", "prefixlen" => $4 , "scope" => scope_lookup($1) }
-    end
-    if line =~ /\s+inet6 ([a-f0-9\:]+)(\s*|(\%[a-z0-9]+)\s*) prefixlen (\d+) scopeid 0x([a-f0-9]+)/
-      iface[cint][:addresses] = Mash.new unless iface[cint][:addresses]
-      iface[cint][:addresses][$1] = { "family" => "inet6", "prefixlen" => $4 , "scope" => scope_lookup($1) }
-    end
-    if line =~ /^\s+media: ((\w+)|(\w+ [a-zA-Z0-9\-\<\>]+)) status: (\w+)/
-      iface[cint][:media] = Mash.new unless iface[cint][:media]
-      iface[cint][:media][:selected] = parse_media($1)
-      iface[cint][:status] = $4
-    end
-    if line =~ /^\s+supported media: (.*)/
-      iface[cint][:media] = Mash.new unless iface[cint][:media]
-      iface[cint][:media][:supported] = parse_media($1)
+
+    iface = Mash.new
+    so = shell_out("ifconfig -a")
+    cint = nil
+    so.stdout.lines do |line|
+      if line =~ /^([0-9a-zA-Z\.\:\-]+): \S+ mtu (\d+)$/
+        cint = $1
+        iface[cint] = Mash.new unless iface[cint]; iface[cint][:addresses] = Mash.new unless iface[cint][:addresses]
+        iface[cint][:mtu] = $2
+        if line =~ /\sflags\=\d+\<((UP|BROADCAST|DEBUG|SMART|SIMPLEX|LOOPBACK|POINTOPOINT|NOTRAILERS|RUNNING|NOARP|PROMISC|ALLMULTI|SLAVE|MASTER|MULTICAST|DYNAMIC|,)+)\>\s/
+          flags = $1.split(',')
+        else
+          flags = Array.new
+        end
+        iface[cint][:flags] = flags.flatten
+        if cint =~ /^(\w+)(\d+.*)/
+          iface[cint][:type] = $1
+          iface[cint][:number] = $2
+          iface[cint][:encapsulation] = darwin_encaps_lookup($1)
+        end
+      end
+      if line =~ /^\s+ether ([0-9a-f\:]+)/
+        iface[cint][:addresses] = Mash.new unless iface[cint][:addresses]
+        iface[cint][:addresses][$1] = { "family" => "lladdr" }
+        iface[cint][:encapsulation] = "Ethernet"
+      end
+      if line =~ /^\s+lladdr ([0-9a-f\:]+)\s/
+        iface[cint][:addresses] = Mash.new unless iface[cint][:addresses]
+        iface[cint][:addresses][$1] = { "family" => "lladdr" }
+      end
+      if line =~ /\s+inet (\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}) netmask 0x(([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)*"."}
+      end
+      if line =~ /\s+inet (\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}) netmask 0x(([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 }
+      end
+      if line =~ /\s+inet6 ([a-f0-9\:]+)(\s*|(\%[a-z0-9]+)\s*) prefixlen (\d+)\s*/
+        iface[cint][:addresses] = Mash.new unless iface[cint][:addresses]
+        iface[cint][:addresses][$1] = { "family" => "inet6", "prefixlen" => $4 , "scope" => scope_lookup($1) }
+      end
+      if line =~ /\s+inet6 ([a-f0-9\:]+)(\s*|(\%[a-z0-9]+)\s*) prefixlen (\d+) scopeid 0x([a-f0-9]+)/
+        iface[cint][:addresses] = Mash.new unless iface[cint][:addresses]
+        iface[cint][:addresses][$1] = { "family" => "inet6", "prefixlen" => $4 , "scope" => scope_lookup($1) }
+      end
+      if line =~ /^\s+media: ((\w+)|(\w+ [a-zA-Z0-9\-\<\>]+)) status: (\w+)/
+        iface[cint][:media] = Mash.new unless iface[cint][:media]
+        iface[cint][:media][:selected] = parse_media($1)
+        iface[cint][:status] = $4
+      end
+      if line =~ /^\s+supported media: (.*)/
+        iface[cint][:media] = Mash.new unless iface[cint][:media]
+        iface[cint][:media][:supported] = parse_media($1)
+      end
     end
-  end
-end
 
-popen4("arp -an") do |pid, stdin, stdout, stderr|
-  stdin.close
-  stdout.each do |line|
-    if line =~ /^\S+ \((\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})\) at ([a-fA-F0-9\:]+) on ([a-zA-Z0-9\.\:\-]+).*\[(\w+)\]/
-      # MAC addr really should be normalized to include all the zeroes.
-      next if iface[$3].nil? # this should never happen
-      iface[$3][:arp] = Mash.new unless iface[$3][:arp]
-      iface[$3][:arp][$1] = $2
+    so = shell_out("arp -an")
+    so.stdout.lines do |line|
+      if line =~ /^\S+ \((\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})\) at ([a-fA-F0-9\:]+) on ([a-zA-Z0-9\.\:\-]+).*\[(\w+)\]/
+        # MAC addr really should be normalized to include all the zeroes.
+        next if iface[$3].nil? # this should never happen
+        iface[$3][:arp] = Mash.new unless iface[$3][:arp]
+        iface[$3][:arp][$1] = $2
+      end
     end
-  end
-end
 
-settings = Mash.new
-popen4("sysctl net") do |pid, stdin, stdout, stderr|
-  stdin.close
-  stdout.each do |line|
-    if line =~ /^([a-zA-Z0-9\.\_]+)\: (.*)/
-      # should normalize names between platforms for the same settings.
-      settings[$1] = $2 unless excluded_setting?($1)
+    settings = Mash.new
+    so = shell_out("sysctl net")
+    so.stdout.lines do |line|
+      if line =~ /^([a-zA-Z0-9\.\_]+)\: (.*)/
+        # should normalize names between platforms for the same settings.
+        settings[$1] = $2 unless excluded_setting?($1)
+      end
     end
-  end
-end
 
-network[:settings] = settings
-network[:interfaces] = iface
-
-net_counters = Mash.new
-popen4("netstat -i -d -l -b -n") do |pid, stdin, stdout, stderr|
-  stdin.close
-  stdout.each do |line|
-    if line =~ /^([a-zA-Z0-9\.\:\-\*]+)\s+\d+\s+\<[a-zA-Z0-9\#]+\>\s+([a-f0-9\:]+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)/ ||
-       line =~ /^([a-zA-Z0-9\.\:\-\*]+)\s+\d+\s+\<[a-zA-Z0-9\#]+\>(\s+)(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)/
-      ifname = locate_interface(iface, $1, $2)
-      next if iface[ifname].nil? # this shouldn't happen, but just in case
-      net_counters[ifname] = Mash.new unless net_counters[ifname]
-      net_counters[ifname] = { :rx => { :bytes => $5, :packets => $3, :errors => $4, :drop => 0, :overrun => 0, :frame => 0, :compressed => 0, :multicast => 0 },
-                               :tx => { :bytes => $8, :packets => $6, :errors => $7, :drop => 0, :overrun => 0, :collisions => $9, :carrier => 0, :compressed => 0 }
-                             }
+    network[:settings] = settings
+    network[:interfaces] = iface
+
+    net_counters = Mash.new
+    so = shell_out("netstat -i -d -l -b -n")
+    so.stdout.lines do |line|
+      if line =~ /^([a-zA-Z0-9\.\:\-\*]+)\s+\d+\s+\<[a-zA-Z0-9\#]+\>\s+([a-f0-9\:]+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)/ ||
+          line =~ /^([a-zA-Z0-9\.\:\-\*]+)\s+\d+\s+\<[a-zA-Z0-9\#]+\>(\s+)(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+)/
+        ifname = locate_interface(iface, $1, $2)
+        next if iface[ifname].nil? # this shouldn't happen, but just in case
+        net_counters[ifname] = Mash.new unless net_counters[ifname]
+        net_counters[ifname] = { :rx => { :bytes => $5, :packets => $3, :errors => $4, :drop => 0, :overrun => 0, :frame => 0, :compressed => 0, :multicast => 0 },
+          :tx => { :bytes => $8, :packets => $6, :errors => $7, :drop => 0, :overrun => 0, :collisions => $9, :carrier => 0, :compressed => 0 }
+        }
+      end
     end
+
+    counters[:network][:interfaces] = net_counters
   end
 end
-
-counters[:network][:interfaces] = net_counters

data/lib/ohai/plugins/darwin/platform.rb

@@ -16,23 +16,25 @@
 # limitations under the License.
 #
 
-provides "platform", "platform_version", "platform_build", "platform_family"
+Ohai.plugin(:Platform) do
+  provides "platform", "platform_version", "platform_build", "platform_family"
 
-popen4("/usr/bin/sw_vers") do |pid, stdin, stdout, stderr|
-  stdin.close
-  stdout.each do |line|
-    case line
-    when /^ProductName:\s+(.+)$/
-      macname = $1
-      macname.downcase!
-      macname.gsub!(" ", "_")
-      platform macname
-    when /^ProductVersion:\s+(.+)$/
-      platform_version $1
-    when /^BuildVersion:\s+(.+)$/
-      platform_build $1
+  collect_data(:darwin) do
+    so = shell_out("#{ Ohai.abs_path( "/usr/bin/sw_vers" )}")
+    so.stdout.lines do |line|
+      case line
+      when /^ProductName:\s+(.+)$/
+        macname = $1
+        macname.downcase!
+        macname.gsub!(" ", "_")
+        platform macname
+      when /^ProductVersion:\s+(.+)$/
+        platform_version $1
+      when /^BuildVersion:\s+(.+)$/
+        platform_build $1
+      end
     end
+
+    platform_family "mac_os_x"
   end
 end
-
-platform_family "mac_os_x"