ohai 6.24.2 → 7.0.0.rc.0

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

@@ -16,8 +16,14 @@
 # limitations under the License.
 #
 
-provides "platform", "platform_version"
-
-platform from("uname -s").downcase
-platform_version from("uname -r")
+Ohai.plugin(:Platform) do
+  provides "platform", "platform_version", "platform_family"
 
+  collect_data(:openbsd) do
+    so = shell_out("uname -s")
+    platform so.stdout.split($/)[0].downcase
+    so = shell_out("uname -r")
+    platform_version so.stdout.split($/)[0]
+    platform_family "openbsd"
+  end
+end

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

@@ -16,51 +16,53 @@
 # limitations under the License.
 #
 
-provides "virtualization"
+Ohai.plugin(:Virtualization) do
+  provides "virtualization"
 
-virtualization Mash.new
+  collect_data(:openbsd) do
+    virtualization Mash.new
 
-# KVM Host support for FreeBSD is in development
-# http://feanor.sssup.it/~fabio/freebsd/lkvm/
+    # KVM Host support for FreeBSD is in development
+    # http://feanor.sssup.it/~fabio/freebsd/lkvm/
 
-# Detect KVM/QEMU from cpu, report as KVM
-# hw.model: QEMU Virtual CPU version 0.9.1
-if from("sysctl -n hw.model") =~ /QEMU Virtual CPU/
-  virtualization[:system] = "kvm"
-  virtualization[:role] = "guest"
-end
+    # Detect KVM/QEMU from cpu, report as KVM
+    # hw.model: QEMU Virtual CPU version 0.9.1
+    so = shell_out("sysctl -n hw.model")
+    if so.stdout.split($/)[0] =~ /QEMU Virtual CPU/
+      virtualization[:system] = "kvm"
+      virtualization[:role] = "guest"
+    end
 
-# http://www.dmo.ca/blog/detecting-virtualization-on-linux
-if File.exists?("/usr/local/sbin/dmidecode")
-  popen4("dmidecode") do |pid, stdin, stdout, stderr|
-    stdin.close
-    found_virt_manufacturer = nil
-    found_virt_product = nil
-    stdout.each do |line|
-      case line
-      when /Manufacturer: Microsoft/
-        found_virt_manufacturer = "microsoft"
-      when /Product Name: Virtual Machine/
-        found_virt_product = "microsoft"
-      when /Version: 5.0/
-        if found_virt_manufacturer == "microsoft" && found_virt_product == "microsoft"
-          virtualization[:system] = "virtualpc"
-          virtualization[:role] = "guest"
-        end
-      when /Version: VS2005R2/
-        if found_virt_manufacturer == "microsoft" && found_virt_product == "microsoft"
-          virtualization[:system] = "virtualserver"
-          virtualization[:role] = "guest"
-        end
-      when /Manufacturer: VMware/
-        found_virt_manufacturer = "vmware"
-      when /Product Name: VMware Virtual Platform/
-        if found_virt_manufacturer == "vmware" 
-          virtualization[:system] = "vmware"
-          virtualization[:role] = "guest"
+    # http://www.dmo.ca/blog/detecting-virtualization-on-linux
+    if File.exists?("/usr/local/sbin/dmidecode")
+      so = shell_out("dmidecode")
+      found_virt_manufacturer = nil
+      found_virt_product = nil
+      so.stdout.lines do |line|
+        case line
+        when /Manufacturer: Microsoft/
+          found_virt_manufacturer = "microsoft"
+        when /Product Name: Virtual Machine/
+          found_virt_product = "microsoft"
+        when /Version: 5.0/
+          if found_virt_manufacturer == "microsoft" && found_virt_product == "microsoft"
+            virtualization[:system] = "virtualpc"
+            virtualization[:role] = "guest"
+          end
+        when /Version: VS2005R2/
+          if found_virt_manufacturer == "microsoft" && found_virt_product == "microsoft"
+            virtualization[:system] = "virtualserver"
+            virtualization[:role] = "guest"
+          end
+        when /Manufacturer: VMware/
+          found_virt_manufacturer = "vmware"
+        when /Product Name: VMware Virtual Platform/
+          if found_virt_manufacturer == "vmware" 
+            virtualization[:system] = "vmware"
+            virtualization[:role] = "guest"
+          end
         end
       end
     end
   end
 end
-

data/lib/ohai/plugins/openstack.rb

@@ -15,32 +15,34 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-provides "openstack"
-
 require 'ohai/mixin/ec2_metadata'
 
-extend Ohai::Mixin::Ec2Metadata
+Ohai.plugin(:Openstack) do
+  provides "openstack"
+
+  include Ohai::Mixin::Ec2Metadata
+
+  collect_data do
+    # Adds openstack Mash
+    if hint?('openstack') || hint?('hp')
+      Ohai::Log.debug("ohai openstack")
+
+      if can_metadata_connect?(Ohai::Mixin::Ec2Metadata::EC2_METADATA_ADDR,80)
+        openstack Mash.new
+        Ohai::Log.debug("connecting to the OpenStack metadata service")
+        fetch_metadata.each {|k, v| openstack[k] = v }
 
-# does it matter that it's not hitting latest?
-#Ec2Metadata::EC2_METADATA_URL = "/latest/meta-data"
+        if hint?('hp')
+          openstack['provider'] = 'hp'
+        else
+          openstack['provider'] = 'openstack'
+        end
 
-# Adds openstack Mash
-if hint?('openstack') || hint?('hp')
-  Ohai::Log.debug("ohai openstack")
-  openstack Mash.new
-  #for now, use the metadata service
-  if can_metadata_connect?(EC2_METADATA_ADDR,80)
-    Ohai::Log.debug("connecting to the OpenStack metadata service")
-    self.fetch_metadata.each {|k, v| openstack[k] = v }
-    case
-    when hint?('hp')
-      openstack['provider'] = 'hp'
+      else
+        Ohai::Log.debug("unable to connect to the OpenStack metadata service")
+      end
     else
-      openstack['provider'] = 'openstack'
+      Ohai::Log.debug("NOT ohai openstack")
     end
-  else
-    Ohai::Log.debug("unable to connect to the OpenStack metadata service")
   end
-else
-  Ohai::Log.debug("NOT ohai openstack")
 end

data/lib/ohai/plugins/os.rb

@@ -16,38 +16,14 @@
 # limitations under the License.
 #
 
-provides "os", "os_version"
+require 'ohai/mixin/os'
 
-require 'rbconfig'
+Ohai.plugin(:OS) do
+  provides "os", "os_version"
+  depends 'kernel'
 
-require_plugin 'kernel'
-
-case ::RbConfig::CONFIG['host_os']
-when /aix(.+)$/
-  os "aix"
-when /darwin(.+)$/
-  os "darwin"
-when /hpux(.+)$/
-  os "hpux"
-when /linux/
-  os "linux"
-when /freebsd(.+)$/
-  os "freebsd"
-when /openbsd(.+)$/
-  os "openbsd"
-when /netbsd(.*)$/
-  os "netbsd"
-when /solaris2/
-  os "solaris2"
-when /mswin|mingw32|windows/
-  # After long discussion in IRC the "powers that be" have come to a concensus
-  # that there is no other Windows platforms exist that were not based on the
-  # Windows_NT kernel, so we herby decree that "windows" will refer to all
-  # platforms built upon the Windows_NT kernel and have access to win32 or win64
-  # subsystems.
-  os "windows"
-else
-  os ::RbConfig::CONFIG['host_os']
+  collect_data do
+    os collect_os
+    os_version kernel[:release]
+  end
 end
-
-os_version kernel[:release]

data/lib/ohai/plugins/passwd.rb

@@ -1,32 +1,37 @@
-provides 'etc', 'current_user'
 
 require 'etc'
 
-def fix_encoding(str)
-  str.force_encoding(Encoding.default_external) if str.respond_to?(:force_encoding)
-  str
-end
+Ohai.plugin(:Passwd) do
+  provides 'etc', 'current_user'
 
-unless etc
-  etc Mash.new
+  def fix_encoding(str)
+    str.force_encoding(Encoding.default_external) if str.respond_to?(:force_encoding)
+    str
+  end
 
-  etc[:passwd] = Mash.new
-  etc[:group] = Mash.new
+  collect_data do
+    unless etc
+      etc Mash.new
 
-  Etc.passwd do |entry|
-    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[:passwd] = Mash.new
+      etc[:group] = Mash.new
 
-  Etc.group do |entry|
-    group_entry = Mash.new(:gid => entry.gid,
-                           :members => entry.mem.map {|u| fix_encoding(u)})
+      Etc.passwd do |entry|
+        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][fix_encoding(entry.name)] = group_entry
-  end
-end
+      Etc.group do |entry|
+        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 fix_encoding(Etc.getlogin)
+    unless current_user
+      current_user fix_encoding(Etc.getlogin)
+    end
+  end
 end

data/lib/ohai/plugins/perl.rb

@@ -16,24 +16,29 @@
 # limitations under the License.
 #
 
-provides "languages/perl"
+Ohai.plugin(:Perl) do
+  provides "languages/perl"
 
-require_plugin "languages"
-output = nil
+  depends "languages"
 
-perl = Mash.new
-status, stdout, stderr = run_command(:no_status_check => true, :command => "perl -V:version -V:archname")
-if status == 0
-  stdout.each_line do |line|
-    case line
-    when /^version=\'(.+)\';$/
-      perl[:version] = $1
-    when /^archname=\'(.+)\';$/
-      perl[:archname] = $1
+  collect_data do
+    output = nil
+
+    perl = Mash.new
+    so = shell_out("perl -V:version -V:archname")
+    if so.exitstatus == 0
+      so.stdout.split(/\r?\n/).each do |line|
+        case line
+        when /^version=\'(.+)\';$/
+          perl[:version] = $1
+        when /^archname=\'(.+)\';$/
+          perl[:archname] = $1
+        end
+      end
     end
-  end
-end
 
-if status == 0
-  languages[:perl] = perl 
+    if so.exitstatus == 0
+      languages[:perl] = perl 
+    end
+  end
 end

data/lib/ohai/plugins/php.rb

@@ -16,21 +16,24 @@
 # limitations under the License.
 #
 
-provides "languages/php"
+Ohai.plugin(:PHP) do
+  provides "languages/php"
 
-require_plugin "languages"
+  depends "languages"
 
-output = nil
+  collect_data do
+    output = nil
 
-php = Mash.new
+    php = Mash.new
 
-status, stdout, stderr = run_command(:no_status_check => true, :command => "php -v")
-if status == 0
-  output = stdout.split
-  if output.length >= 6
-    php[:version] = output[1]
-    php[:builddate] = "%s %s %s" % [output[4],output[5],output[6]]
+    so = shell_out("php -v")
+    if so.exitstatus == 0
+      output = /PHP (\S+).+built: ([^)]+)/.match(so.stdout)
+      if output
+        php[:version] = output[1]
+        php[:builddate] = output[2]
+      end
+      languages[:php] = php if php[:version]
+    end
   end
-  languages[:php] = php if php[:version]
 end
-

data/lib/ohai/plugins/platform.rb

@@ -16,13 +16,13 @@
 # limitations under the License.
 #
 
-provides "platform", "platform_version", "platform_family"
-
-require_plugin "#{os}::platform"
-
-platform os unless attribute?("platform")
-
-platform_version os_version unless attribute?("platform_version")
-
-platform_family platform unless attribute?("platform_family")
+Ohai.plugin(:Platform) do
+  provides "platform", "platform_version", "platform_family"
+  depends "os", "os_version"
 
+  collect_data(:default) do
+    platform os unless attribute?("platform")
+    platform_version os_version unless attribute?("platform_version")
+    platform_family platform unless attribute?("platform_family")
+  end
+end

data/lib/ohai/plugins/{linux/kernel.rb → ps.rb}

@@ -1,6 +1,8 @@
 #
 # Author:: Adam Jacob (<adam@opscode.com>)
+# Author:: Bryan McLellan (<btm@loftninjas.org>)
 # Copyright:: Copyright (c) 2008 Opscode, Inc.
+# Copyright:: Copyright (c) 2009 Bryan McLellan
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -11,23 +13,22 @@
 #
 # 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.
+# 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 "kernel"
+Ohai.plugin(:PS) do
+  provides "command/ps"
+  depends "command"
 
-kernel[:os] = from("uname -o")
+  collect_data(:aix, :darwin, :hpux, :linux, :solaris2) do
+    command[:ps] = 'ps -ef'
+  end
 
-kext = Mash.new
-popen4("env lsmod") do |pid, stdin, stdout, stderr|
-  stdin.close
-  stdout.each do |line|
-    if line =~ /([a-zA-Z0-9\_]+)\s+(\d+)\s+(\d+)/
-      kext[$1] = { :size => $2, :refcount => $3 }
-    end
+  collect_data(:freebsd, :netbsd, :openbsd) do
+    # ps -e requires procfs
+    command[:ps] = 'ps -ax'
   end
 end
-
-kernel[:modules] = kext

data/lib/ohai/plugins/python.rb

@@ -16,22 +16,26 @@
 # limitations under the License.
 #
 
-provides "languages/python"
+Ohai.plugin(:Python) do
+  provides "languages/python"
 
-require_plugin "languages"
+  depends "languages"
 
-output = nil
+  collect_data do
+    output = nil
 
-python = Mash.new
+    python = Mash.new
 
-status, stdout, stderr = run_command(:no_status_check => true, :command => "python -c \"import sys; print sys.version\"")
+    so = shell_out("python -c \"import sys; print sys.version\"")
 
-if status == 0
-  output = stdout.split
-  python[:version] = output[0]
-  if output.length >= 6
-    python[:builddate] = "%s %s %s %s" % [output[2],output[3],output[4],output[5].gsub!(/\)/,'')]
-  end
+    if so.exitstatus == 0
+      output = so.stdout.split
+      python[:version] = output[0]
+      if output.length >= 6
+        python[:builddate] = "%s %s %s %s" % [output[2],output[3],output[4],output[5].gsub!(/\)/,'')]
+      end
 
-  languages[:python] = python if python[:version] and python[:builddate]
+      languages[:python] = python if python[:version] and python[:builddate]
+    end
+  end
 end