ohai 6.24.2 → 7.0.0.rc.0

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

@@ -15,56 +15,59 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-provides "system_profile"
 
-begin
-  require 'plist'
+Ohai.plugin(:SystemProfile) do
+  provides "system_profile"
 
-  system_profile Array.new
-  items Array.new
-  detail_level = {
-    'mini' => [
-      "SPParallelATAData",
-      "SPAudioData",
-      "SPBluetoothData",
-      "SPCardReaderData",
-      "SPDiagnosticsData",
-      "SPDiscBurningData",
-      "SPEthernetData",
-      "SPFibreChannelData",
-      "SPFireWireData",
-      "SPDisplaysData",
-      "SPHardwareRAIDData",
-      "SPMemoryData",
-      "SPModemData",
-      "SPNetworkData",
-      "SPPCIData",
-      "SPParallelSCSIData",
-      "SPPrintersSoftwareData",
-      "SPPrintersData",
-      "SPSASData",
-      "SPSerialATAData",
-      "SPSoftwareData",
-      "SPThunderboltData",
-      "SPUSBData",
-      "SPWWANData",
-      "SPAirPortData"
-    ],
-    'full' => [
-      "SPHardwareDataType"
-    ]
-  }
+  collect_data(:darwin) do
+    begin
+      require 'plist'
 
-  detail_level.each do |level, data_types|
-    popen4("system_profiler -xml -detailLevel #{level} #{data_types.join(' ')}") do |pid, stdin, stdout, stderr|
-      stdin.close
-      Plist::parse_xml(stdout.read).each do |e|
-        items << e
+      system_profile Array.new
+      items =  Array.new
+      detail_level = {
+        'mini' => [
+                   "SPParallelATAData",
+                   "SPAudioData",
+                   "SPBluetoothData",
+                   "SPCardReaderData",
+                   "SPDiagnosticsData",
+                   "SPDiscBurningData",
+                   "SPEthernetData",
+                   "SPFibreChannelData",
+                   "SPFireWireData",
+                   "SPDisplaysData",
+                   "SPHardwareRAIDData",
+                   "SPMemoryData",
+                   "SPModemData",
+                   "SPNetworkData",
+                   "SPPCIData",
+                   "SPParallelSCSIData",
+                   "SPPrintersSoftwareData",
+                   "SPPrintersData",
+                   "SPSASData",
+                   "SPSerialATAData",
+                   "SPSoftwareData",
+                   "SPThunderboltData",
+                   "SPUSBData",
+                   "SPWWANData",
+                   "SPAirPortData"
+                  ],
+        'full' => [
+                   "SPHardwareDataType"
+                  ]
+      }
+
+      detail_level.each do |level, data_types|
+        so = shell_out("system_profiler -xml -detailLevel #{level} #{data_types.join(' ')}")
+        Plist::parse_xml(so.stdout).each do |e|
+          items << e
+        end
       end
+
+      system_profile items.sort_by { |h| h['_dataType'] }
+    rescue LoadError => e
+      Ohai::Log.debug("Can't load gem: #{e})")
     end
   end
-
-  system_profile items.sort_by { |h| h['_dataType'] }
-rescue LoadError => e
-  Ohai::Log.debug("Can't load gem: #{e})")
 end

data/lib/ohai/plugins/dmi.rb

@@ -16,110 +16,110 @@
 # limitations under the License.
 #
 
-require "ohai/plugins/dmi_common"
-
-provides "dmi"
-
-# dmidecode does not return data without access to /dev/mem (or its equivalent)
-
-dmi Mash.new
-
-# all output lines should fall within one of these patterns
-handle_line = /^Handle (0x[0-9A-F]{4}), DMI type (\d+), (\d+) bytes/
-type_line = /^([A-Z][a-zA-Z ]+)( Information)?/
-blank_line = /^\s*$/
-data_line = /^\t([^:]+):(?: (.*))?/
-extended_data_line = /^\t\t(.+)/
-# first lines may contain some interesting information:
-# # dmidecode 2.10
-# SMBIOS 2.5 present.
-# 5 structures occupying 352 bytes.
-# Table at 0x000E1000.
-dmidecode_version_line = /^# dmidecode (\d+\.\d+)/
-smbios_version_line = /^SMBIOS (\d+\.\d+) present\./
-structures_line = /^(\d+) structures occupying (\d+) bytes\./
-table_location_line = /^Table at (0x[0-9A-E]+)\./
-
-dmi_record = nil
-field = nil
-
-popen4("dmidecode") do |pid, stdin, stdout, stderr|
-  stdin.close
-  
-  # ==== EXAMPLE RECORD: ====
-  #Handle 0x0000, DMI type 0, 24 bytes
-  #BIOS Information
-  #        Vendor: American Megatrends Inc.
-  #        Version: 080012 
-  # ... similar lines trimmed
-  #        Characteristics:
-  #                ISA is supported
-  #                PCI is supported
-  # ... similar lines trimmed
-  stdout.each do |line|
-    next if blank_line.match(line)
-
-    if dmidecode_version = dmidecode_version_line.match(line)
-      dmi[:dmidecode_version] = dmidecode_version[1]
-
-    elsif smbios_version = smbios_version_line.match(line)
-      dmi[:smbios_version] = smbios_version[1]
-
-    elsif structures = structures_line.match(line)
-      dmi[:structures] = Mash.new
-      dmi[:structures][:count] = structures[1]
-      dmi[:structures][:size] = structures[2]
-
-    elsif table_location = table_location_line.match(line)
-      dmi[:table_location] = table_location[1]
-
-    elsif handle = handle_line.match(line)
-      # Don't overcapture for now (OHAI-260)
-      next unless DMI::IdToCapture.include?(handle[2].to_i)
-
-      dmi_record = {:type => DMI.id_lookup(handle[2])}
-
-      dmi[dmi_record[:type]] = Mash.new unless dmi.has_key?(dmi_record[:type])
-      dmi[dmi_record[:type]][:all_records] = [] unless dmi[dmi_record[:type]].has_key?(:all_records)
-      dmi_record[:position] = dmi[dmi_record[:type]][:all_records].length
-      dmi[dmi_record[:type]][:all_records].push(Mash.new)
-      dmi[dmi_record[:type]][:all_records][dmi_record[:position]][:record_id] = handle[1]
-      dmi[dmi_record[:type]][:all_records][dmi_record[:position]][:size] = handle[2]
-      field = nil
-    
-    elsif type = type_line.match(line)
-      if dmi_record == nil
-        Ohai::Log.debug("unexpected data line found before header; discarding:\n#{line}")
-        next
-      end
-      dmi[dmi_record[:type]][:all_records][dmi_record[:position]][:application_identifier] = type[1]
+Ohai.plugin(:DMI) do
+  provides "dmi"
+
+  # dmidecode does not return data without access to /dev/mem (or its equivalent)
+
+  collect_data do
+    require 'ohai/common/dmi'
+    dmi Mash.new
+
+    # all output lines should fall within one of these patterns
+    handle_line = /^Handle (0x[0-9A-F]{4}), DMI type (\d+), (\d+) bytes/
+    type_line = /^([A-Z][a-zA-Z ]+)( Information)?/
+    blank_line = /^\s*$/
+    data_line = /^\t([^:]+):(?: (.*))?/
+    extended_data_line = /^\t\t(.+)/
+    # first lines may contain some interesting information:
+    # # dmidecode 2.10
+    # SMBIOS 2.5 present.
+    # 5 structures occupying 352 bytes.
+    # Table at 0x000E1000.
+    dmidecode_version_line = /^# dmidecode (\d+\.\d+)/
+    smbios_version_line = /^SMBIOS (\d+\.\d+) present\./
+    structures_line = /^(\d+) structures occupying (\d+) bytes\./
+    table_location_line = /^Table at (0x[0-9A-E]+)\./
+
+    dmi_record = nil
+    field = nil
+
+    so = shell_out("dmidecode")
+    # ==== EXAMPLE RECORD: ====
+    #Handle 0x0000, DMI type 0, 24 bytes
+    #BIOS Information
+    #        Vendor: American Megatrends Inc.
+    #        Version: 080012 
+    # ... similar lines trimmed
+    #        Characteristics:
+    #                ISA is supported
+    #                PCI is supported
+    # ... similar lines trimmed
+    so.stdout.lines do |line|
+      next if blank_line.match(line)
+
+      if dmidecode_version = dmidecode_version_line.match(line)
+        dmi[:dmidecode_version] = dmidecode_version[1]
+
+      elsif smbios_version = smbios_version_line.match(line)
+        dmi[:smbios_version] = smbios_version[1]
+
+      elsif structures = structures_line.match(line)
+        dmi[:structures] = Mash.new
+        dmi[:structures][:count] = structures[1]
+        dmi[:structures][:size] = structures[2]
+
+      elsif table_location = table_location_line.match(line)
+        dmi[:table_location] = table_location[1]
+
+      elsif handle = handle_line.match(line)
+        # Don't overcapture for now (OHAI-260)
+        next unless Ohai::Common::DMI::IdToCapture.include?(handle[2].to_i)
+
+        dmi_record = {:type => Ohai::Common::DMI.id_lookup(handle[2])}
+
+        dmi[dmi_record[:type]] = Mash.new unless dmi.has_key?(dmi_record[:type])
+        dmi[dmi_record[:type]][:all_records] = [] unless dmi[dmi_record[:type]].has_key?(:all_records)
+        dmi_record[:position] = dmi[dmi_record[:type]][:all_records].length
+        dmi[dmi_record[:type]][:all_records].push(Mash.new)
+        dmi[dmi_record[:type]][:all_records][dmi_record[:position]][:record_id] = handle[1]
+        dmi[dmi_record[:type]][:all_records][dmi_record[:position]][:size] = handle[2]
+        field = nil
+
+      elsif type = type_line.match(line)
+        if dmi_record == nil
+          Ohai::Log.debug("unexpected data line found before header; discarding:\n#{line}")
+          next
+        end
+        dmi[dmi_record[:type]][:all_records][dmi_record[:position]][:application_identifier] = type[1]
+
+      elsif data = data_line.match(line)
+        if dmi_record == nil
+          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]] = data[2]
+        field = data[1]
+
+      elsif extended_data = extended_data_line.match(line)
+        if dmi_record == nil
+          Ohai::Log.debug("unexpected extended data line found before header; discarding:\n#{line}")
+          next
+        end
+        if field == nil
+          Ohai::Log.debug("unexpected extended data line found outside data section; discarding:\n#{line}")
+          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][extended_data[1]] = nil
+
+      else
+        Ohai::Log.debug("unrecognized output line; discarding:\n#{line}")
 
-    elsif data = data_line.match(line)
-      if dmi_record == nil
-        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]] = data[2]
-      field = data[1]
-    
-    elsif extended_data = extended_data_line.match(line)
-      if dmi_record == nil
-        Ohai::Log.debug("unexpected extended data line found before header; discarding:\n#{line}")
-        next
       end
-      if field == nil
-        Ohai::Log.debug("unexpected extended data line found outside data section; discarding:\n#{line}")
-        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][extended_data[1]] = nil
-
-    else
-      Ohai::Log.debug("unrecognized output line; discarding:\n#{line}")
-
     end
+
+    Ohai::Common::DMI.convenience_keys(dmi)
   end
 end
-
-DMI.convenience_keys(dmi)

data/lib/ohai/plugins/ec2.rb

@@ -17,41 +17,43 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-provides "ec2"
-
 require 'ohai/mixin/ec2_metadata'
 
-require_plugin "hostname"
-require_plugin "kernel"
-require_plugin "network"
+Ohai.plugin(:EC2) do
+  include Ohai::Mixin::Ec2Metadata
+
+  provides "ec2"
 
-extend Ohai::Mixin::Ec2Metadata
+  depends "network/interfaces"
 
-def has_ec2_mac?
-  network[:interfaces].values.each do |iface|
-    unless iface[:arp].nil?
-      if iface[:arp].value?("fe:ff:ff:ff:ff:ff")
-        Ohai::Log.debug("has_ec2_mac? == true")
-        return true
+  def has_ec2_mac?
+    network[:interfaces].values.each do |iface|
+      unless iface[:arp].nil?
+        if iface[:arp].value?("fe:ff:ff:ff:ff:ff")
+          Ohai::Log.debug("has_ec2_mac? == true")
+          return true
+        end
       end
     end
+    Ohai::Log.debug("has_ec2_mac? == false")
+    false
   end
-  Ohai::Log.debug("has_ec2_mac? == false")
-  false
-end
 
-def looks_like_ec2?
-  # Try non-blocking connect so we don't "block" if 
-  # the Xen environment is *not* EC2
-  hint?('ec2') || has_ec2_mac? && can_metadata_connect?(EC2_METADATA_ADDR,80)
-end
+  def looks_like_ec2?
+    # Try non-blocking connect so we don't "block" if 
+    # the Xen environment is *not* EC2
+    hint?('ec2') || has_ec2_mac? && can_metadata_connect?(Ohai::Mixin::Ec2Metadata::EC2_METADATA_ADDR,80)
+  end
 
-if looks_like_ec2?
-  Ohai::Log.debug("looks_like_ec2? == true")
-  ec2 Mash.new
-  fetch_metadata.each {|k, v| ec2[k] = v }
-  ec2[:userdata] = self.fetch_userdata
-else
-  Ohai::Log.debug("looks_like_ec2? == false")
-  false
+  collect_data do
+    if looks_like_ec2?
+      Ohai::Log.debug("looks_like_ec2? == true")
+      ec2 Mash.new
+      fetch_metadata.each {|k, v| ec2[k] = v }
+      ec2[:userdata] = self.fetch_userdata
+    else
+      Ohai::Log.debug("looks_like_ec2? == false")
+      false
+    end
+  end
 end

data/lib/ohai/plugins/erlang.rb

@@ -16,25 +16,28 @@
 # limitations under the License.
 #
 
-provides "languages/erlang"
+Ohai.plugin(:Erlang) do
+  provides "languages/erlang"
 
-require_plugin "languages"
+  depends "languages"
 
-output = nil
+  collect_data do
+    output = nil
 
-erlang = Mash.new
-status, stdout, stderr = run_command(:no_status_check => true, :command => "erl +V")
-
-if status == 0
-  output = stderr.split
-  if output.length >= 6
-    options = output[1]
-    options.gsub!(/(\(|\))/, '')
-    erlang[:version] = output[5]
-    erlang[:options] = options.split(',')
-    erlang[:emulator] = output[2].gsub!(/(\(|\))/, '')
-    if erlang[:version] and erlang[:options] and erlang[:emulator]
-      languages[:erlang] = erlang
+    erlang = Mash.new
+    so = shell_out("erl +V")
+    if so.exitstatus == 0
+      output = so.stderr.split
+      if output.length >= 6
+        options = output[1]
+        options.gsub!(/(\(|\))/, '')
+        erlang[:version] = output[5]
+        erlang[:options] = options.split(',')
+        erlang[:emulator] = output[2].gsub!(/(\(|\))/, '')
+        if erlang[:version] and erlang[:options] and erlang[:emulator]
+          languages[:erlang] = erlang
+        end
+      end
     end
   end
 end

data/lib/ohai/plugins/eucalyptus.rb

@@ -17,49 +17,50 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-provides "eucalyptus"
-
 require 'ohai/mixin/ec2_metadata'
 
-require_plugin "hostname"
-require_plugin "kernel"
-require_plugin "network"
+Ohai.plugin(:Eucalyptus) do
+  include Ohai::Mixin::Ec2Metadata
 
-extend Ohai::Mixin::Ec2Metadata
+  provides "eucalyptus"
 
-def get_mac_address(addresses)
-  detected_addresses = addresses.detect { |address, keypair| keypair == {"family"=>"lladdr"} }
-  if detected_addresses
-    return detected_addresses.first
-  else
-    return ""
-  end
-end
+  depends "network/interfaces"
 
-def has_euca_mac?
-  network[:interfaces].values.each do |iface|
-    has_mac = (get_mac_address(iface[:addresses]) =~ /^[dD]0:0[dD]:/)
-    Ohai::Log.debug("has_euca_mac? == #{!!has_mac}")
-    return true if has_mac
+  def get_mac_address(addresses)
+    detected_addresses = addresses.detect { |address, keypair| keypair == {"family"=>"lladdr"} }
+    if detected_addresses
+      return detected_addresses.first
+    else
+      return ""
+    end
   end
 
-  Ohai::Log.debug("has_euca_mac? == false")
-  false
-end
+  def has_euca_mac?
+    network[:interfaces].values.each do |iface|
+      has_mac = (get_mac_address(iface[:addresses]) =~ /^[dD]0:0[dD]:/)
+      Ohai::Log.debug("has_euca_mac? == #{!!has_mac}")
+      return true if has_mac
+    end
 
-def looks_like_euca?
-  # Try non-blocking connect so we don't "block" if 
-  # the Xen environment is *not* EC2
-  hint?('eucalyptus') || has_euca_mac? && can_metadata_connect?(EC2_METADATA_ADDR,80)
-end
+    Ohai::Log.debug("has_euca_mac? == false")
+    false
+  end
 
-if looks_like_euca?
-  Ohai::Log.debug("looks_like_euca? == true")
-  eucalyptus Mash.new
-  self.fetch_metadata.each {|k, v| eucalyptus[k] = v }
-  eucalyptus[:userdata] = self.fetch_userdata
-else
-  Ohai::Log.debug("looks_like_euca? == false")
-  false
-end
+  def looks_like_euca?
+    # Try non-blocking connect so we don't "block" if 
+    # the Xen environment is *not* EC2
+    hint?('eucalyptus') || has_euca_mac? && can_metadata_connect?(Ohai::Mixin::Ec2Metadata::EC2_METADATA_ADDR,80)
+  end
 
+  collect_data do
+    if looks_like_euca?
+      Ohai::Log.debug("looks_like_euca? == true")
+      eucalyptus Mash.new
+      self.fetch_metadata.each {|k, v| eucalyptus[k] = v }
+      eucalyptus[:userdata] = self.fetch_userdata
+    else
+      Ohai::Log.debug("looks_like_euca? == false")
+      false
+    end
+  end
+end