ohai 0.6.4 → 0.6.6.rc.0

data/lib/ohai/mixin/command.rb

@@ -19,6 +19,7 @@
 require 'ohai/exception'
 require 'ohai/config'
 require 'ohai/log'
+require 'stringio'
 require 'tmpdir'
 require 'fcntl'
 require 'etc'
@@ -299,6 +300,29 @@ module Ohai
               results = Process.waitpid2(cid) unless results
               o.rewind
               e.rewind
+
+              # **OHAI-275**
+              # The way we read from the pipes causes ruby to mark the strings
+              # as ASCII-8BIT (i.e., binary), but the content should be encoded
+              # as the default external encoding. For example, a command may
+              # return data encoded as UTF-8, but the strings will be marked as
+              # ASCII-8BIT. Later, when you attempt to print the values as
+              # UTF-8, Ruby will try to convert them and fail, raising an
+              # error.
+              #
+              # Ruby always marks strings as binary when read from IO in
+              # incomplete chunks, since you may have split the data within a
+              # multibyte char. In our case, we concat the chunks back
+              # together, so any multibyte chars will be reassembled.
+              #
+              # Note that all of this applies only to Ruby 1.9, which we check
+              # for by making sure that the Encoding class exists and strings
+              # have encoding methods.
+              if "".respond_to?(:force_encoding) && defined?(Encoding)
+                o.string.force_encoding(Encoding.default_external)
+                e.string.force_encoding(Encoding.default_external)
+              end
+
               b[cid, pi[0], o, e]
               results.last
             end

data/lib/ohai/plugins/freebsd/virtualization.rb

@@ -20,6 +20,17 @@ provides "virtualization"
 
 virtualization Mash.new
 
+if from("sysctl -n security.jail.jailed").to_i == 1
+  virtualization[:system] = "jail"
+  virtualization[:role] = "guest"
+end
+
+# XXX doesn't work when jail is there but not running (ezjail-admin stop)
+if from("jls -n \| wc -l").to_i >= 1
+    virtualization[:system] = "jail"
+    virtualization[:role] = "host"
+end
+
 # KVM Host support for FreeBSD is in development
 # http://feanor.sssup.it/~fabio/freebsd/lkvm/
 

data/lib/ohai/plugins/ip_scopes.rb

@@ -24,6 +24,8 @@ begin
   require_plugin "network"
 
   network['interfaces'].keys.each do |ifName|
+    next if network['interfaces'][ifName]['addresses'].nil?
+
     network['interfaces'][ifName]['addresses'].each do |address,attrs|
       begin
         attrs.merge! 'ip_scope' => address.to_ip.scope

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

@@ -66,7 +66,7 @@ popen4("ls -l /dev/disk/by-uuid/* | awk '{print $11, $9}'") do |pid, stdin, stdo
 end
 
 # Grab any missing mount information from /proc/mounts
-File.open('/proc/mounts').each do |line|
+File.open('/proc/mounts').read_nonblock(4096).each do |line|
   if line =~ /^(\S+) (\S+) (\S+) (\S+) \S+ \S+$/
     filesystem = $1
     next if fs.has_key?(filesystem)

data/lib/ohai/plugins/linux/lsb.rb

@@ -20,19 +20,40 @@ provides "lsb"
 
 lsb Mash.new
 
-begin
+if File.exists?("/etc/lsb-release")
   File.open("/etc/lsb-release").each do |line|
     case line
-    when /^DISTRIB_ID=(.+)$/
+    when /^DISTRIB_ID=["']?(.+?)["']?$/
       lsb[:id] = $1
-    when /^DISTRIB_RELEASE=(.+)$/
+    when /^DISTRIB_RELEASE=["']?(.+?)["']?$/
       lsb[:release] = $1
-    when /^DISTRIB_CODENAME=(.+)$/
+    when /^DISTRIB_CODENAME=["']?(.+?)["']?$/
       lsb[:codename] = $1
-    when /^DISTRIB_DESCRIPTION=(.+)$/
+    when /^DISTRIB_DESCRIPTION=["']?(.+?)["']?$/
       lsb[:description] = $1
     end
   end
-rescue
-  Ohai::Log.debug("Skipping LSB, cannot find /etc/lsb-release")
+elsif File.exists?("/usr/bin/lsb_release")
+  # Fedora/Redhat, requires redhat-lsb package
+  popen4("lsb_release -a") do |pid, stdin, stdout, stderr|
+
+    stdin.close
+    stdout.each do |line|
+      case line
+      when /^Distributor ID:\s+(.+)$/
+        lsb[:id] = $1
+      when /^Description:\s+(.+)$/
+        lsb[:description] = $1
+      when /^Release:\s+(.+)$/
+        lsb[:release] = $1
+      when /^Codename:\s+(.+)$/
+        lsb[:codename] = $1
+      else
+        lsb[:id] = line
+      end
+
+    end
+  end
+else
+  Ohai::Log.debug("Skipping LSB, cannot find /etc/lsb-release or /usr/bin/lsb_release")
 end

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

@@ -47,6 +47,7 @@ elsif File.exists?('/etc/gentoo-release')
 elsif File.exists?('/etc/SuSE-release')
   platform "suse"
   platform_version File.read("/etc/SuSE-release").scan(/VERSION = (\d+)\nPATCHLEVEL = (\d+)/).flatten.join(".")
+  platform_version File.read("/etc/SuSE-release").scan(/VERSION = ([\d\.]{2,})/).flatten.join(".") if platform_version == ""
 elsif File.exists?('/etc/slackware-version')
   platform "slackware"
   platform_version File.read("/etc/slackware-version").scan(/(\d+|\.+)/).join

data/lib/ohai/plugins/linux/virtualization.rb

@@ -22,19 +22,27 @@ virtualization Mash.new
 
 # if it is possible to detect paravirt vs hardware virt, it should be put in
 # virtualization[:mechanism]
-if File.exists?("/proc/xen/capabilities") && File.read("/proc/xen/capabilities") =~ /control_d/i
-    virtualization[:system] = "xen"
-    virtualization[:role] = "host"
-elsif File.exists?("/proc/sys/xen/independent_wallclock")
+if File.exists?("/proc/xen/capabilities")
   virtualization[:system] = "xen"
-  virtualization[:role] = "guest"
+  if File.read("/proc/xen/capabilities") =~ /control_d/i
+    virtualization[:role] = "host"
+  else
+    virtualization[:role] = "guest"
+  end
 end
 
-# Detect KVM hosts by kernel module
+# Detect from kernel module
 if File.exists?("/proc/modules")
-  if File.read("/proc/modules") =~ /^kvm/
+  modules = File.read("/proc/modules")
+  if modules =~ /^kvm/
     virtualization[:system] = "kvm"
     virtualization[:role] = "host"
+  elsif modules =~ /^vboxdrv/
+    virtualization[:system] = "vbox"
+    virtualization[:role] = "host"
+  elsif modules =~ /^vboxguest/
+    virtualization[:system] = "vbox"
+    virtualization[:role] = "guest"
   end
 end
 
@@ -50,6 +58,17 @@ if File.exists?("/proc/cpuinfo")
   end
 end
 
+# http://wiki.openvz.org/Proc/user_beancounters
+if File.exists?("/proc/user_beancounters")
+  if File.read("/proc/user_beancounters") =~ /\n\s+0:\s+/
+    virtualization[:emulator] = "openvz"
+    virtualization[:role] = "host"
+  else
+    virtualization[:emulator] = "openvz"
+    virtualization[:role] = "guest"
+  end
+end
+
 # http://www.dmo.ca/blog/detecting-virtualization-on-linux
 if File.exists?("/usr/sbin/dmidecode")
   popen4("dmidecode") do |pid, stdin, stdout, stderr|
@@ -57,19 +76,19 @@ if File.exists?("/usr/sbin/dmidecode")
     dmi_info = stdout.read
     case dmi_info
     when /Manufacturer: Microsoft/
-      if dmi_info =~ /Product Name: Virtual Machine/ 
+      if dmi_info =~ /Product Name: Virtual Machine/
         virtualization[:system] = "virtualpc"
         virtualization[:role] = "guest"
-      end 
+      end
     when /Manufacturer: VMware/
-      if dmi_info =~ /Product Name: VMware Virtual Platform/ 
+      if dmi_info =~ /Product Name: VMware Virtual Platform/
         virtualization[:system] = "vmware"
         virtualization[:role] = "guest"
       end
     when /Manufacturer: Xen/
       if dmi_info =~ /Product Name: HVM domU/
         virtualization[:system] = "xen"
-        virtualization[:role] = "guest"  
+        virtualization[:role] = "guest"
       end
     else
       nil

data/lib/ohai/plugins/passwd.rb

@@ -2,21 +2,31 @@ provides 'etc', 'current_user'
 
 require 'etc'
 
+def fix_encoding(str)
+  str.force_encoding(Encoding.default_external) if str.respond_to?(:force_encoding)
+  str
+end
+
 unless etc
   etc Mash.new
 
   etc[:passwd] = Mash.new
   etc[:group] = Mash.new
-  
+
   Etc.passwd do |entry|
-    etc[:passwd][entry.name] = Mash.new(:dir => entry.dir, :gid => entry.gid, :uid => entry.uid, :shell => entry.shell, :gecos => entry.gecos)
+    user_passwd_entry = Mash.new(:dir => entry.dir, :gid => entry.gid, :uid => entry.uid, :shell => entry.shell, :gecos => entry.gecos)
+    user_passwd_entry.each_value {|v| fix_encoding(v)}
+    etc[:passwd][fix_encoding(entry.name)] = user_passwd_entry
   end
-  
+
   Etc.group do |entry|
-    etc[:group][entry.name] = Mash.new(:gid => entry.gid, :members => entry.mem)
+    group_entry = Mash.new(:gid => entry.gid,
+                           :members => entry.mem.map {|u| fix_encoding(u)})
+
+    etc[:group][fix_encoding(entry.name)] = group_entry
   end
 end
 
 unless current_user
-  current_user Etc.getlogin
-end
+  current_user fix_encoding(Etc.getlogin)
+end

data/lib/ohai/plugins/rackspace.rb

@@ -36,7 +36,7 @@ end
 def has_rackspace_mac?
   network[:interfaces].values.each do |iface|
     unless iface[:arp].nil?
-      return true if iface[:arp].value?("00:00:0c:07:ac:01")
+      return true if iface[:arp].value?("00:00:0c:07:ac:01") or iface[:arp].value?("00:00:0c:9f:f0:01")
     end
   end
   false

data/lib/ohai/plugins/ruby.rb

@@ -43,7 +43,7 @@ values = {
   :host_os => "::Config::CONFIG['host_os']",
   :host_vendor => "::Config::CONFIG['host_vendor']",
   :bin_dir => "::Config::CONFIG['bindir']",
-  :ruby_bin => "::File.join(::Config::CONFIG['bindir'], ::Config::CONFIG['ruby_install_name'])" 
+  :ruby_bin => "::File.join(::Config::CONFIG['bindir'], ::Config::CONFIG['ruby_install_name'])"
 }
 
 # Create a query string from above hash
@@ -64,6 +64,12 @@ end
 # Perform one more (conditional) query
 bin_dir = languages[:ruby][:bin_dir]
 ruby_bin = languages[:ruby][:ruby_bin]
-if File.exist?("#{bin_dir}\/gem")
-  languages[:ruby][:gems_dir] = run_ruby "puts %x{#{ruby_bin} #{bin_dir}\/gem env gemdir}.chomp!"
+gem_binaries = [ 
+  run_ruby("require 'rubygems'; puts ::Gem.default_exec_format % 'gem'"),
+  "gem"
+].map {|bin| ::File.join(bin_dir, bin)}
+gem_binary = gem_binaries.find {|bin| ::File.exists? bin }
+if gem_binary
+  languages[:ruby][:gems_dir] = run_ruby "puts %x{#{ruby_bin} #{gem_binary} env gemdir}.chomp!"
+  languages[:ruby][:gem_bin] = gem_binary
 end

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

@@ -0,0 +1,51 @@
+#
+# Author:: Toomas Pelberg (<toomas.pelberg@playtech.com>)
+# Copyright:: Copyright (c) 2011 Opscode, Inc.
+# License:: Apache License, Version 2.0
+#
+# 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.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require "sigar"
+require_plugin "network"
+
+provides "network"
+
+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
+
+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={}
+  (route.methods-Object.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

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

@@ -79,7 +79,7 @@ popen4("ifconfig -a") do |pid, stdin, stdout, stderr|
   stdout.each do |line|
     if line =~ /^([0-9a-zA-Z\.\:\-]+): \S+ mtu (\d+) index (\d+)/
       cint = $1
-      iface[cint] = Mash.new
+      iface[cint] = Mash.new unless iface[cint]
       iface[cint][:mtu] = $2
       iface[cint][:index] = $3
       if line =~ / flags\=\d+\<((ADDRCONF|ANYCAST|BROADCAST|CoS|DEPRECATED|DHCP|DUPLICATE|FAILED|FIXEDMTU|INACTIVE|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/

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

@@ -18,12 +18,16 @@
 
 provides "platform", "platform_version", "platform_build"
 
-popen4("uname -X") do |pid, stdin, stdout, stderr|
+if File.exists?("/sbin/uname")
+  uname_exec = "/sbin/uname"
+else
+  uname_exec = "uname"
+end
+
+popen4("#{uname_exec} -X") do |pid, stdin, stdout, stderr|
   stdin.close
   stdout.each do |line|
     case line
-    when /^System =\s+(.+)$/
-      platform = ($1.eql?("SunOS") ? "solaris2" : $1.downcase)
     when /^Release =\s+(.+)$/
       platform_version $1
     when /^KernelID =\s+(.+)$/
@@ -31,3 +35,22 @@ popen4("uname -X") do |pid, stdin, stdout, stderr|
     end
   end
 end
+
+File.open("/etc/release") do |file|
+  while line = file.gets
+    case line
+    when /^\s*(OpenIndiana).*oi_(\d+).*$/
+      platform "openindiana"
+      platform_version $2
+    when /^\s*(OpenSolaris).*snv_(\d+).*$/
+      platform "opensolaris"
+      platform_version $2
+    when /^\s*(Oracle Solaris) (\d+)\s.*$/
+      platform "solaris2"
+    when /^\s*(Solaris)\s.*$/
+      platform "solaris2"
+    when /^\s*(NexentaCore)\s.*$/
+      platform "nexentacore"
+    end
+  end
+end

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

@@ -0,0 +1,64 @@
+#
+# Author:: Jason J. W. Williams (williamsjj@digitar.com)
+# Copyright:: Copyright (c) 2011 Opscode, Inc.
+# License:: Apache License, Version 2.0
+#
+# 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.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+provides "zpools"
+
+pools = Mash.new
+
+# Grab ZFS zpools overall health and attributes
+popen4("zpool list -H -o name,size,alloc,free,cap,dedup,health,version") do |pid, stdin, stdout, stderr|
+  stdin.close
+  stdout.each do |line|
+    case line
+    when /^([-_0-9A-Za-z]*)\s+([.0-9]+[MGTPE])\s+([.0-9]+[MGTPE])\s+([.0-9]+[MGTPE])\s+(\d+%)\s+([.0-9]+x)\s+([-_0-9A-Za-z]+)\s+(\d+)$/
+      pools[$1] = Mash.new
+      pools[$1][:pool_size] = $2
+      pools[$1][:pool_allocated] = $3
+      pools[$1][:pool_free] = $4
+      pools[$1][:capacity_used] = $5
+      pools[$1][:dedup_factor] = $6
+      pools[$1][:health] = $7
+      pools[$1][:zpool_version] = $8
+    end
+  end
+end
+
+# Grab individual health for devices in the zpools
+for pool in pools.keys
+  pools[pool][:devices] = Mash.new
+  # Run "zpool status" as non-root user (adm) so that 
+  # the command won't try to open() each device which can
+  # hang the command if any of the disks are bad.
+  popen4("su adm -c \"zpool status #{pool}\"") do |pid, stdin, stdout, stderr|
+    stdin.close
+    stdout.each do |line|
+      case line
+      when /^\s+(c[-_a-zA-Z0-9]+)\s+([-_a-zA-Z0-9]+)\s+(\d+)\s+(\d+)\s+(\d+)$/
+        pools[pool][:devices][$1] = Mash.new
+        pools[pool][:devices][$1][:state] = $2
+        pools[pool][:devices][$1][:errors] = Mash.new
+        pools[pool][:devices][$1][:errors][:read] = $3
+        pools[pool][:devices][$1][:errors][:write] = $4
+        pools[pool][:devices][$1][:errors][:checksum] = $5
+      end
+    end
+  end
+end
+
+# Set the zpools data
+zpools pools

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

@@ -29,7 +29,7 @@ disks.each do |disk|
     fs[filesystem] = Mash.new
     ld_info[filesystem] = Mash.new
     disk.properties_.each do |p|
-      ld_info[filesystem][p.name.wmi_underscore.to_sym] = disk[p.name]
+      ld_info[filesystem][p.name.wmi_underscore.to_sym] = disk.send(p.name)
     end
     fs[filesystem][:kb_size] = ld_info[filesystem][:size].to_i / 1000
     fs[filesystem][:kb_available] = ld_info[filesystem][:free_space].to_i / 1000

data/lib/ohai/plugins/windows/kernel.rb

@@ -39,7 +39,7 @@ end
 host = WMI::Win32_OperatingSystem.find(:first)
 kernel[:os_info] = Mash.new
 host.properties_.each do |p|
-  kernel[:os_info][p.name.wmi_underscore.to_sym] = host[p.name]
+  kernel[:os_info][p.name.wmi_underscore.to_sym] = host.send(p.name)
 end
 
 kernel[:name] = "#{kernel[:os_info][:caption]}"
@@ -50,7 +50,7 @@ kernel[:os] = os_lookup(kernel[:os_info][:os_type]) || languages[:ruby][:host_os
 host = WMI::Win32_ComputerSystem.find(:first)
 kernel[:cs_info] = Mash.new
 host.properties_.each do |p|
-  kernel[:cs_info][p.name.wmi_underscore.to_sym] = host[p.name]
+  kernel[:cs_info][p.name.wmi_underscore.to_sym] = host.send(p.name)
 end
 
 kernel[:machine] = machine_lookup("#{kernel[:cs_info][:system_type]}")
@@ -62,7 +62,7 @@ drivers = WMI::Win32_PnPSignedDriver.find(:all)
 drivers.each do |driver|
   pnp_drivers[driver.DeviceID] = Mash.new
   driver.properties_.each do |p|
-    pnp_drivers[driver.DeviceID][p.name.wmi_underscore.to_sym] = driver[p.name]
+    pnp_drivers[driver.DeviceID][p.name.wmi_underscore.to_sym] = driver.send(p.name)
   end
   if driver.DeviceName
     kext[driver.DeviceName] = pnp_drivers[driver.DeviceID]

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

@@ -50,7 +50,7 @@ adapters.each do |adapter|
     i = adapter.Index
     iface_config[i] = Mash.new
     adapter.properties_.each do |p|
-      iface_config[i][p.name.wmi_underscore.to_sym] = adapter[p.name]
+      iface_config[i][p.name.wmi_underscore.to_sym] = adapter.send(p.name)
     end
 end
 
@@ -59,7 +59,7 @@ adapters.each do |adapter|
     i = adapter.Index
     iface_instance[i] = Mash.new
      adapter.properties_.each do |p|
-      iface_instance[i][p.name.wmi_underscore.to_sym] = adapter[p.name]
+      iface_instance[i][p.name.wmi_underscore.to_sym] = adapter.send(p.name)
     end
 end
 
@@ -87,7 +87,8 @@ iface_instance.keys.each do |i|
       rescue
       end
     end
-    iface[cint][:configuration][:mac_address].each do |mac_addr|
+    # Apparently you can have more than one mac_address? Odd.
+    [iface[cint][:configuration][:mac_address]].flatten.each do |mac_addr|
       iface[cint][:addresses][mac_addr] = {
         "family"    => "lladdr"
       }
@@ -106,7 +107,7 @@ end
 cint=nil
 status, stdout, stderr = run_command(:command => "arp -a")
 if status == 0
-  stdout.each do |line|
+  stdout.split("\n").each do |line|
     if line =~ /^Interface:\s+(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})\s+[-]+\s+(0x\S+)/
       cint = $2.downcase
     end

data/lib/ohai/version.rb

@@ -18,6 +18,6 @@
 
 module Ohai
   OHAI_ROOT = File.expand_path(File.dirname(__FILE__))
-  VERSION = '0.6.4'
+  VERSION = '0.6.6.rc.0'
 end
 

data/spec/ohai/mixin/command_spec.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 #
 # Author:: Diego Algorta (diego@oboxodo.com)
 # Copyright:: Copyright (c) 2009 Diego Algorta
@@ -35,4 +36,12 @@ describe Ohai::Mixin::Command, "popen4" do
     end
   end
 
+  if defined?(::Encoding) && "".respond_to?(:force_encoding) #i.e., ruby 1.9
+    it "[OHAI-275] should mark strings as in the default external encoding" do
+      extend Ohai::Mixin::Command
+      snowy = run_command(:command => ("echo '" + ('☃' * 8096) + "'"))[1]
+      snowy.encoding.should == Encoding.default_external
+    end
+  end
+
 end

data/spec/ohai/plugins/fail_spec.rb

@@ -0,0 +1,62 @@
+#
+# Author:: Toomas Pelberg (toomas.pelberg@playtech.com>)
+# Copyright:: Copyright (c) 2011 Opscode, Inc.
+# License:: Apache License, Version 2.0
+#
+# 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.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '/spec_helper.rb'))
+
+tmp = ENV['TMPDIR'] || ENV['TMP'] || ENV['TEMP'] || '/tmp'
+
+describe Ohai::System, "plugin fail" do
+  
+  before(:all) do
+    begin
+      Dir.mkdir("#{tmp}/plugins")
+    rescue Errno::EEXIST
+      # Ignore it
+    end
+    fail_plugin=File.open("#{tmp}/plugins/fail.rb","w+")
+    fail_plugin.write("provides \"fail\"require 'thiswillblowupinyourface'\nk=MissingClassName.new\nfail \"ohnoes\"")
+    fail_plugin.close
+    real_plugin=File.open("#{tmp}/plugins/real.rb","w+")
+    real_plugin.write("provides \"real\"\nreal \"useful\"\n")
+    real_plugin.close
+    @plugin_path=Ohai::Config[:plugin_path]
+  end
+  
+  before(:each) do
+    Ohai::Config[:plugin_path]=["#{tmp}/plugins"]
+    @ohai=Ohai::System.new
+  end
+  
+  after(:all) do
+    File.delete("#{tmp}/plugins/fail.rb")
+    File.delete("#{tmp}/plugins/real.rb")
+    begin
+      Dir.delete("#{tmp}/plugins")
+    rescue
+      # Don't care if it fails
+    end
+    Ohai::Config[:plugin_path]=@plugin_path
+  end
+  
+  it "should continue gracefully if plugin loading fails" do
+    @ohai.require_plugin("fail")
+    @ohai.require_plugin("real")
+    @ohai.data[:real].should eql("useful")
+    @ohai.data.should_not have_key("fail")
+  end
+end

data/spec/ohai/plugins/linux/lsb_spec.rb

@@ -24,37 +24,89 @@ describe Ohai::System, "Linux lsb plugin" do
     @ohai = Ohai::System.new
     @ohai[:os] = "linux"    
     @ohai.stub!(:require_plugin).and_return(true)
-    @mock_file = mock("/etc/lsb-release")
-    @mock_file.stub!(:each).
-      and_yield("DISTRIB_ID=Ubuntu").
-      and_yield("DISTRIB_RELEASE=8.04").
-      and_yield("DISTRIB_CODENAME=hardy").
-      and_yield('DISTRIB_DESCRIPTION="Ubuntu 8.04"')
-    File.stub!(:open).with("/etc/lsb-release").and_return(@mock_file)
+    @ohai.extend(SimpleFromFile)
   end
+
+  describe "on systems with /etc/lsb-release" do
+    before(:each) do
+      @mock_file = mock("/etc/lsb-release")
+      @mock_file.stub!(:each).
+        and_yield("DISTRIB_ID=Ubuntu").
+        and_yield("DISTRIB_RELEASE=8.04").
+        and_yield("DISTRIB_CODENAME=hardy").
+        and_yield('DISTRIB_DESCRIPTION="Ubuntu 8.04"')
+      File.stub!(:open).with("/etc/lsb-release").and_return(@mock_file) 
+      File.stub!(:exists?).with("/etc/lsb-release").and_return(true)
+    end
+
+    it "should set lsb[:id]" do
+      @ohai._require_plugin("linux::lsb")
+      @ohai[:lsb][:id].should == "Ubuntu"
+    end
   
-  it "should set lsb[:id]" do
-    @ohai._require_plugin("linux::lsb")
-    @ohai[:lsb][:id].should == "Ubuntu"
-  end
+    it "should set lsb[:release]" do
+      @ohai._require_plugin("linux::lsb")
+      @ohai[:lsb][:release].should == "8.04"
+    end
   
-  it "should set lsb[:release]" do
-    @ohai._require_plugin("linux::lsb")
-    @ohai[:lsb][:release].should == "8.04"
-  end
+    it "should set lsb[:codename]" do
+      @ohai._require_plugin("linux::lsb")
+      @ohai[:lsb][:codename].should == "hardy"
+    end
   
-  it "should set lsb[:codename]" do
-    @ohai._require_plugin("linux::lsb")
-    @ohai[:lsb][:codename].should == "hardy"
+    it "should set lsb[:description]" do
+      @ohai._require_plugin("linux::lsb")
+      @ohai[:lsb][:description].should == "Ubuntu 8.04"
+    end
   end
+
+  describe "on systems with /usr/bin/lsb_release" do
+    before(:each) do
+      File.stub!(:exists?).with("/etc/lsb-release").and_return(false)
+      File.stub!(:exists?).with("/usr/bin/lsb_release").and_return(true)
+
+      @stdin = mock("STDIN", { :close => true })
+      @pid = 10
+      @stderr = mock("STDERR")
+      @stdout = mock("STDOUT")
+      @status = 0
+
+      @stdout.stub!(:each).
+        and_yield("LSB Version:    :core-4.0-ia32:core-4.0-noarch").
+        and_yield("Distributor ID: Fedora").
+        and_yield("Description:    Fedora release 14 (Laughlin)").
+        and_yield("Release:        14").
+        and_yield("Codename:       Laughlin")
+
+      @ohai.stub!(:popen4).with("lsb_release -a").and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status)
+
+    end
+
+    it "should set lsb[:id]" do
+      @ohai._require_plugin("linux::lsb")
+      @ohai[:lsb][:id].should == "Fedora"
+    end
   
-  it "should set lsb[:description]" do
-    @ohai._require_plugin("linux::lsb")
-    @ohai[:lsb][:description].should == "\"Ubuntu 8.04\""
-  end
+    it "should set lsb[:release]" do
+      @ohai._require_plugin("linux::lsb")
+      @ohai[:lsb][:release].should == "14"
+    end
+  
+    it "should set lsb[:codename]" do
+      @ohai._require_plugin("linux::lsb")
+      @ohai[:lsb][:codename].should == "Laughlin"
+    end
   
-  it "should not set any lsb values if /etc/lsb-release cannot be read" do
-    File.stub!(:open).with("/etc/lsb-release").and_raise(IOError)
+    it "should set lsb[:description]" do
+      @ohai._require_plugin("linux::lsb")
+      @ohai[:lsb][:description].should == "Fedora release 14 (Laughlin)"
+    end
+  
+  end
+
+  it "should not set any lsb values if /etc/lsb-release or /usr/bin/lsb_release do not exist " do
+    File.stub!(:exists?).with("/etc/lsb-release").and_return(false)
+    File.stub!(:exists?).with("/usr/bin/lsb_release").and_return(false)
     @ohai.attribute?(:lsb).should be(false)
   end
-end
+end

data/spec/ohai/plugins/linux/platform_spec.rb

@@ -198,6 +198,27 @@ describe Ohai::System, "Linux plugin platform" do
       @ohai[:platform].should == "suse"
       @ohai[:platform_version].should == "11.2"
     end
+    
+    it "[OHAI-272] should read the version as 11.3" do
+      File.should_receive(:read).with("/etc/SuSE-release").exactly(2).times.and_return("openSUSE 11.3 (x86_64)\nVERSION = 11.3")
+      @ohai._require_plugin("linux::platform")
+      @ohai[:platform].should == "suse"
+      @ohai[:platform_version].should == "11.3"
+    end
+    
+    it "[OHAI-272] should read the version as 9.1" do
+      File.should_receive(:read).with("/etc/SuSE-release").exactly(2).times.and_return("SuSE Linux 9.1 (i586)\nVERSION = 9.1")
+      @ohai._require_plugin("linux::platform")
+      @ohai[:platform].should == "suse"
+      @ohai[:platform_version].should == "9.1"
+    end
+    
+    it "[OHAI-272] should read the version as 11.4" do
+      File.should_receive(:read).with("/etc/SuSE-release").exactly(2).times.and_return("openSUSE 11.4 (i586)\nVERSION = 11.4\nCODENAME = Celadon")
+      @ohai._require_plugin("linux::platform")
+      @ohai[:platform].should == "suse"
+      @ohai[:platform_version].should == "11.4"
+    end
   end
 
 end

data/spec/ohai/plugins/linux/virtualization_spec.rb

@@ -27,11 +27,11 @@ describe Ohai::System, "Linux virtualization platform" do
 
     # default to all requested Files not existing
     File.stub!(:exists?).with("/proc/xen/capabilities").and_return(false)
-    File.stub!(:exists?).with("/proc/sys/xen/independent_wallclock").and_return(false)
     File.stub!(:exists?).with("/proc/modules").and_return(false)
     File.stub!(:exists?).with("/proc/cpuinfo").and_return(false)
     File.stub!(:exists?).with("/usr/sbin/dmidecode").and_return(false)
     File.stub!(:exists?).with("/proc/self/status").and_return(false)
+		File.stub!(:exists?).with("/proc/user_beancounters").and_return(false)
   end
 
   describe "when we are checking for xen" do
@@ -39,12 +39,13 @@ describe Ohai::System, "Linux virtualization platform" do
       File.should_receive(:exists?).with("/proc/xen/capabilities").and_return(true)
       File.stub!(:read).with("/proc/xen/capabilities").and_return("control_d")
       @ohai._require_plugin("linux::virtualization")
-      @ohai[:virtualization][:system].should == "xen" 
+      @ohai[:virtualization][:system].should == "xen"
       @ohai[:virtualization][:role].should == "host"
     end
 
-    it "should set xen guest if /proc/sys/xen/independent_wallclock exists" do
-      File.should_receive(:exists?).with("/proc/sys/xen/independent_wallclock").and_return(true)
+    it "should set xen guest if /proc/xen/capabilities exists" do
+      File.should_receive(:exists?).with("/proc/xen/capabilities").and_return(true)
+      File.stub!(:read).with("/proc/xen/capabilities").and_return("")
       @ohai._require_plugin("linux::virtualization")
       @ohai[:virtualization][:system].should == "xen"
       @ohai[:virtualization][:role].should == "guest"
@@ -65,7 +66,7 @@ describe Ohai::System, "Linux virtualization platform" do
       @ohai[:virtualization][:system].should == "kvm"
       @ohai[:virtualization][:role].should == "host"
     end
-    
+
     it "should set kvm guest if /proc/cpuinfo contains QEMU Virtual CPU" do
       File.should_receive(:exists?).with("/proc/cpuinfo").and_return(true)
       File.stub!(:read).with("/proc/cpuinfo").and_return("QEMU Virtual CPU")
@@ -81,6 +82,30 @@ describe Ohai::System, "Linux virtualization platform" do
     end
   end
 
+  describe "when we are checking for VirtualBox" do
+    it "should set vbox host if /proc/modules contains vboxdrv" do
+      File.should_receive(:exists?).with("/proc/modules").and_return(true)
+      File.stub!(:read).with("/proc/modules").and_return("vboxdrv 268268 3 vboxnetadp,vboxnetflt")
+      @ohai._require_plugin("linux::virtualization")
+      @ohai[:virtualization][:system].should == "vbox"
+      @ohai[:virtualization][:role].should == "host"
+    end
+
+    it "should set vbox guest if /proc/modules contains vboxguest" do
+      File.should_receive(:exists?).with("/proc/modules").and_return(true)
+      File.stub!(:read).with("/proc/modules").and_return("vboxguest 177749 2 vboxsf")
+      @ohai._require_plugin("linux::virtualization")
+      @ohai[:virtualization][:system].should == "vbox"
+      @ohai[:virtualization][:role].should == "guest"
+    end
+
+    it "should not set virtualization if vbox isn't there" do
+      File.should_receive(:exists?).at_least(:once).and_return(false)
+      @ohai._require_plugin("linux::virtualization")
+      @ohai[:virtualization].should == {}
+    end
+  end
+
   describe "when we are parsing dmidecode" do
     before(:each) do
       File.should_receive(:exists?).with("/usr/sbin/dmidecode").and_return(true)
@@ -106,8 +131,8 @@ System Information
 	UUID: D29974A4-BE51-044C-BDC6-EFBC4B87A8E9
 	Wake-up Type: Power Switch
 MSVPC
-      @stdout.stub!(:read).and_return(ms_vpc_dmidecode) 
-       
+      @stdout.stub!(:read).and_return(ms_vpc_dmidecode)
+
       @ohai.stub!(:popen4).with("dmidecode").and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status)
       @ohai._require_plugin("linux::virtualization")
       @ohai[:virtualization][:system].should == "virtualpc"
@@ -179,6 +204,29 @@ VMWARE
       @ohai[:virtualization].should == {}
     end
   end
+	describe "when we are checking for openvz" do
+		it "should set openvz host if /proc/user_beancounters contains 0:" do
+			File.should_receive(:exists?).with("/proc/user_beancounters").and_return(true)
+			File.stub!(:read).with("/proc/user_beancounters").and_return("\n 0: ")
+			@ohai._require_plugin("linux::virtualization")
+			@ohai[:virtualization][:emulator].should == "openvz"
+			@ohai[:virtualization][:role].should == "host"
+		end
+
+		it "should set openvz guest if /proc/user_beancounters doesn't contain 0:" do
+			File.should_receive(:exists?).with("/proc/user_beancounters").and_return(true)
+			File.stub!(:read).with("/proc/user_beancounters").and_return("101:")
+			@ohai._require_plugin("linux::virtualization")
+			@ohai[:virtualization][:emulator].should == "openvz"
+			@ohai[:virtualization][:role].should == "guest"
+		end
+
+		it "should not set virtualization if openvz isn't there" do
+			File.should_receive(:exists?).at_least(:once).and_return(false)
+			@ohai._require_plugin("linux::virtualization")
+			@ohai[:virtualization].should == {}
+		end
+	end
 
   it "should not set virtualization if no tests match" do
     @ohai._require_plugin("linux::virtualization")

data/spec/ohai/plugins/passwd_spec.rb

@@ -16,17 +16,28 @@ describe Ohai::System, "plugin etc" do
     @ohai[:etc][:passwd]['root'].should == Mash.new(:shell => '/bin/zsh', :gecos => 'BOFH', :gid => 1, :uid => 1, :dir => '/root')
     @ohai[:etc][:passwd]['www'].should == Mash.new(:shell => '/bin/false', :gecos => 'Serving the web since 1970', :gid => 800, :uid => 800, :dir => '/var/www')
   end
-  
+
   it "should set the current user" do
     Etc.should_receive(:getlogin).and_return('chef')
     @ohai._require_plugin("passwd")
     @ohai[:current_user].should == 'chef'
   end
-  
+
   it "should set the available groups" do
     Etc.should_receive(:group).and_yield(GroupEntry.new("admin", 100, ['root', 'chef'])).and_yield(GroupEntry.new('www', 800, ['www', 'deploy']))
     @ohai._require_plugin("passwd")
     @ohai[:etc][:group]['admin'].should == Mash.new(:gid => 100, :members => ['root', 'chef'])
     @ohai[:etc][:group]['www'].should == Mash.new(:gid => 800, :members => ['www', 'deploy'])
   end
-end
+
+  if "".respond_to?(:force_encoding)
+    it "sets the encoding of strings to the default external encoding" do
+      fields = ["root", 1, 1, '/root', '/bin/zsh', 'BOFH']
+      fields.each {|f| f.force_encoding(Encoding::ASCII_8BIT) if f.respond_to?(:force_encoding) }
+      Etc.stub!(:passwd).and_yield(PasswdEntry.new(*fields))
+      @ohai._require_plugin("passwd")
+      root = @ohai[:etc][:passwd]['root']
+      root['gecos'].encoding.should == Encoding.default_external
+    end
+  end
+end

data/spec/ohai/plugins/ruby_spec.rb

@@ -42,6 +42,8 @@ describe Ohai::System, "plugin ruby" do
     :host_os => ::Config::CONFIG['host_os'],
     :host_vendor => ::Config::CONFIG['host_vendor'],
     :gems_dir => %x{#{ruby_bin} #{::Config::CONFIG['bindir']}/gem env gemdir}.chomp!,
+    :gem_bin => [ ::Gem.default_exec_format % 'gem', 'gem' ].map{|bin| "#{::Config::CONFIG['bindir']}/#{bin}"
+      }.find{|bin| ::File.exists? bin},
     :ruby_bin => ruby_bin
   }.each do |attribute, value|
     it "should have #{attribute} set" do

data/spec/ohai/plugins/sigar/network_route_spec.rb

@@ -0,0 +1,134 @@
+#
+# Author:: Toomas Pelberg (<toomas.pelberg@playtech.com>)
+# Copyright:: Copyright (c) 2011 Opscode, Inc.
+# License:: Apache License, Version 2.0
+#
+# 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.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper.rb')
+require 'sigar'
+require 'ohai'
+
+describe Ohai::System, "Sigar network route plugin" do
+
+  before(:each) do
+    @ohai = Ohai::System.new
+    @sigar = double("Sigar")
+    @net_info_conf={
+      :default_gateway => "192.168.1.254",
+      :default_gateway_interface => "eth0",
+      :primary_dns => "192.168.1.254",
+      :secondary_dns => "8.8.8.8",
+      :host_name => "localhost"
+    }
+    net_info=double("Sigar::NetInfo")
+    @net_info_conf.each_pair do |k,v|
+      net_info.stub(k).and_return(v)
+    end
+    @net_route_conf={
+      :destination => "192.168.1.0",
+      :gateway => "0.0.0.0",
+      :flags => 1,
+      :refcnt => 0,
+      :use => 0,
+      :ifname => "eth0",
+      :metric => 0,
+      :mtu => 0,
+      :window => 0,
+      :irtt => 0
+    }
+    net_route=double("Sigar::NetRoute")
+    @net_route_conf.each_pair do |k,v|
+      net_route.stub(k).and_return(v)
+    end
+    @net_interface_conf={
+      :flags => 2115,
+      :destination => "192.168.1.1",
+      :mtu => 1500,
+      :type => "Ethernet",
+      :hwaddr => "00:11:22:33:44:55:66",
+      :address => "192.168.1.1",
+      :broadcast => "192.168.1.255",
+      :netmask => "255.255.255.0",
+      :address6 => nil,
+      :tx_queue_len => 1000,
+      :prefix6_length => 0,
+    }
+    net_conf=double("Sigar::NetConf")
+    @net_interface_conf.each_pair do |k,v|
+      net_conf.stub(k).and_return(v)
+    end
+    @net_interface_stat={
+      :rx_bytes=>1369035618, 
+      :rx_dropped=>0,
+      :rx_errors=>0,
+      :rx_frame=>0,
+      :rx_overruns=>0,
+      :rx_packets=>7271669,
+      :speed=>-1,
+      :tx_bytes=>3482843666,
+      :tx_carrier=>0,
+      :tx_collisions=>0,
+      :tx_dropped=>0,
+      :tx_errors=>0,
+      :tx_overruns=>0,
+      :tx_packets=>4392794
+    }
+    net_stat=double("Sigar::NetStat")
+    @net_interface_stat.each_pair do |k,v|
+      net_stat.stub(k).and_return(v)
+    end
+    @net_arp_conf={
+      :address => "192.168.1.5",
+      :flags => 2,
+      :hwaddr => "00:15:62:96:01:D0",
+      :ifname => "eth0",
+      :type => "ether",
+    }
+    net_arp=double("Sigar::NetArp")
+    @net_arp_conf.each_pair do |k,v|
+      net_arp.stub(k).and_return(v)
+    end
+    @sigar.stub(:fqdn).and_return("localhost.localdomain")
+    @sigar.should_receive(:net_info).at_least(2).times.and_return(net_info)
+    @sigar.should_receive(:net_interface_list).once.and_return(["eth0"])
+    @sigar.should_receive(:net_interface_config).with("eth0").and_return(net_conf)
+    @sigar.should_receive(:net_interface_stat).with("eth0").and_return(net_stat)
+    @sigar.should_receive(:arp_list).once.and_return([net_arp])
+
+    # Since we mock net_route_list here, flags never gets called
+    @sigar.should_receive(:net_route_list).once.and_return([net_route])
+    Sigar.should_receive(:new).at_least(2).times.and_return(@sigar)
+    @ohai.require_plugin("os")
+    @ohai[:os]="sigar"
+    @ohai.require_plugin("network")
+    @ohai.require_plugin("sigar::network_route")
+  end
+  
+  it "should set the routes" do
+    @ohai[:network][:interfaces][:eth0].should have_key(:route)
+  end
+  
+  it "should set the route details" do
+    @net_route_conf.each_pair do |k,v|
+      # Work around the above mocking of net_route_list skipping the call to flags()
+      if k == :flags  
+        v="U"
+        @ohai[:network][:interfaces][:eth0][:route]["192.168.1.0"][k] = v
+      end
+      @ohai[:network][:interfaces][:eth0][:route]["192.168.1.0"].should have_key(k)
+      @ohai[:network][:interfaces][:eth0][:route]["192.168.1.0"][k].should eql(v)
+    end
+  end
+end

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: ohai
 version: !ruby/object:Gem::Version 
-  hash: 15
-  prerelease: false
+  hash: 15424069
+  prerelease: 6
   segments: 
   - 0
   - 6
-  - 4
-  version: 0.6.4
+  - 6
+  - rc
+  - 0
+  version: 0.6.6.rc.0
 platform: ruby
 authors: 
 - Adam Jacob
@@ -15,8 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-28 00:00:00 -07:00
-default_executable: 
+date: 2011-09-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: yajl-ruby
@@ -130,6 +131,20 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id008
+- !ruby/object:Gem::Dependency 
+  name: sigar
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id009
 description: Ohai profiles your system and emits JSON
 email: adam@opscode.com
 executables: 
@@ -211,6 +226,7 @@ files:
 - lib/ohai/plugins/solaris2/uptime.rb
 - lib/ohai/plugins/solaris2/ssh_host_key.rb
 - lib/ohai/plugins/solaris2/network.rb
+- lib/ohai/plugins/solaris2/zpools.rb
 - lib/ohai/plugins/solaris2/kernel.rb
 - lib/ohai/plugins/solaris2/platform.rb
 - lib/ohai/plugins/solaris2/ps.rb
@@ -242,6 +258,7 @@ files:
 - lib/ohai/plugins/sigar/hostname.rb
 - lib/ohai/plugins/sigar/uptime.rb
 - lib/ohai/plugins/sigar/network.rb
+- lib/ohai/plugins/sigar/network_route.rb
 - lib/ohai/plugins/sigar/platform.rb
 - lib/ohai/plugins/sigar/cpu.rb
 - lib/ohai/plugins/sigar/filesystem.rb
@@ -288,6 +305,7 @@ files:
 - spec/ohai/plugins/lua_spec.rb
 - spec/ohai/plugins/ec2_spec.rb
 - spec/ohai/plugins/ruby_spec.rb
+- spec/ohai/plugins/fail_spec.rb
 - spec/ohai/plugins/rackspace_spec.rb
 - spec/ohai/plugins/freebsd/kernel_spec.rb
 - spec/ohai/plugins/freebsd/platform_spec.rb
@@ -321,6 +339,7 @@ files:
 - spec/ohai/plugins/perl_spec.rb
 - spec/ohai/plugins/c_spec.rb
 - spec/ohai/plugins/ohai_spec.rb
+- spec/ohai/plugins/sigar/network_route_spec.rb
 - spec/ohai/plugins/os_spec.rb
 - spec/ohai/plugins/passwd_spec.rb
 - spec/ohai/plugins/cloud_spec.rb
@@ -338,7 +357,6 @@ files:
 - spec/rcov.opts
 - spec/ohai_spec.rb
 - bin/ohai
-has_rdoc: true
 homepage: http://wiki.opscode.com/display/ohai
 licenses: []
 
@@ -359,16 +377,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
 summary: Ohai profiles your system and emits JSON