ohai 0.5.2 → 0.5.4

data/Rakefile

@@ -5,7 +5,7 @@ require 'date'
 require 'spec/rake/spectask'
 
 GEM = "ohai"
-GEM_VERSION = "0.5.2"
+GEM_VERSION = "0.5.4"
 AUTHOR = "Adam Jacob"
 EMAIL = "adam@opscode.com"
 HOMEPAGE = "http://wiki.opscode.com/display/ohai"

data/bin/ohai

@@ -19,9 +19,7 @@
 # limitations under the License.
 #
 
-require 'rubygems'
 
-$: << File.join(File.dirname(__FILE__), "..", "lib")
 begin
   require 'rubygems'
 rescue LoadError
@@ -29,6 +27,9 @@ rescue LoadError
   missing_rubygems = true
 end
 begin
+  # if we're in a source code checkout, we want to run the code from that.
+  # have to do this *after* rubygems is loaded.
+  $:.unshift(File.expand_path(File.dirname(__FILE__) + '/../lib'))
   require 'ohai/application'
 rescue LoadError
   if missing_rubygems

data/lib/ohai.rb

@@ -16,12 +16,9 @@
 # limitations under the License.
 #
 
-$:.unshift(File.dirname(__FILE__)) unless
-  $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
-
 require 'ohai/config'
 require 'ohai/system'
 
 module Ohai
-  VERSION = '0.5.2'
+  VERSION = '0.5.4'
 end

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

@@ -0,0 +1,19 @@
+#
+# Author:: Doug MacEachern <dougm@vmware.com>
+# Copyright:: Copyright (c) 2010 VMware, 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_plugin "sigar::cpu"

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

@@ -0,0 +1,19 @@
+#
+# Author:: Doug MacEachern <dougm@vmware.com>
+# Copyright:: Copyright (c) 2010 VMware, 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_plugin "sigar::filesystem"

data/lib/ohai/plugins/aix/hostname.rb

@@ -0,0 +1,19 @@
+#
+# Author:: Doug MacEachern <dougm@vmware.com>
+# Copyright:: Copyright (c) 2010 VMware, 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_plugin "sigar::hostname"

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

@@ -0,0 +1,19 @@
+#
+# Author:: Doug MacEachern <dougm@vmware.com>
+# Copyright:: Copyright (c) 2010 VMware, 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_plugin "sigar::memory"

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

@@ -0,0 +1,19 @@
+#
+# Author:: Doug MacEachern <dougm@vmware.com>
+# Copyright:: Copyright (c) 2010 VMware, 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_plugin "sigar::network"

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

@@ -0,0 +1,19 @@
+#
+# Author:: Doug MacEachern <dougm@vmware.com>
+# Copyright:: Copyright (c) 2010 VMware, 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_plugin "sigar::platform"

data/lib/ohai/plugins/aix/ps.rb

@@ -0,0 +1,23 @@
+#
+# Author:: Adam Jacob (<adam@opscode.com>)
+# Copyright:: Copyright (c) 2008 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 "command/ps"
+
+require_plugin 'command'
+
+command[:ps] = 'ps -ef'

data/lib/ohai/plugins/aix/ssh_host_key.rb

@@ -0,0 +1,26 @@
+#
+# Author:: Adam Jacob (<adam@opscode.com>)
+# Copyright:: Copyright (c) 2008 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 "keys/ssh"
+
+require_plugin "keys"
+
+keys[:ssh] = Mash.new
+
+keys[:ssh][:host_dsa_public] = IO.read("/etc/ssh/ssh_host_dsa_key.pub").split[1]
+keys[:ssh][:host_rsa_public] = IO.read("/etc/ssh/ssh_host_rsa_key.pub").split[1]

data/lib/ohai/plugins/aix/uptime.rb

@@ -0,0 +1,19 @@
+#
+# Author:: Doug MacEachern <dougm@vmware.com>
+# Copyright:: Copyright (c) 2010 VMware, 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_plugin "sigar::uptime"

data/lib/ohai/plugins/chef.rb

@@ -19,5 +19,6 @@
 require 'chef'
 provides "chef"
 
-chef Mash.new
-chef[:version] = Chef::VERSION
+self[:chef_packages] = Mash.new unless self[:chef_packages]
+self[:chef_packages][:chef] = Mash.new
+self[:chef_packages][:chef][:version] = Chef::VERSION

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

@@ -0,0 +1,19 @@
+#
+# Author:: Doug MacEachern <dougm@vmware.com>
+# Copyright:: Copyright (c) 2010 VMware, 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_plugin "sigar::cpu"

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

@@ -0,0 +1,19 @@
+#
+# Author:: Doug MacEachern <dougm@vmware.com>
+# Copyright:: Copyright (c) 2010 VMware, 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_plugin "sigar::filesystem"

data/lib/ohai/plugins/hpux/hostname.rb

@@ -0,0 +1,19 @@
+#
+# Author:: Doug MacEachern <dougm@vmware.com>
+# Copyright:: Copyright (c) 2010 VMware, 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_plugin "sigar::hostname"

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

@@ -0,0 +1,19 @@
+#
+# Author:: Doug MacEachern <dougm@vmware.com>
+# Copyright:: Copyright (c) 2010 VMware, 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_plugin "sigar::memory"

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

@@ -0,0 +1,19 @@
+#
+# Author:: Doug MacEachern <dougm@vmware.com>
+# Copyright:: Copyright (c) 2010 VMware, 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_plugin "sigar::network"

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

@@ -0,0 +1,19 @@
+#
+# Author:: Doug MacEachern <dougm@vmware.com>
+# Copyright:: Copyright (c) 2010 VMware, 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_plugin "sigar::platform"

data/lib/ohai/plugins/hpux/ps.rb

@@ -0,0 +1,23 @@
+#
+# Author:: Adam Jacob (<adam@opscode.com>)
+# Copyright:: Copyright (c) 2008 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 "command/ps"
+
+require_plugin 'command'
+
+command[:ps] = 'ps -ef'

data/lib/ohai/plugins/hpux/ssh_host_key.rb

@@ -0,0 +1,26 @@
+#
+# Author:: Adam Jacob (<adam@opscode.com>)
+# Copyright:: Copyright (c) 2008 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 "keys/ssh"
+
+require_plugin "keys"
+
+keys[:ssh] = Mash.new
+
+keys[:ssh][:host_dsa_public] = IO.read("/opt/ssh/etc/ssh_host_dsa_key.pub").split[1]
+keys[:ssh][:host_rsa_public] = IO.read("/opt/ssh/etc/ssh_host_rsa_key.pub").split[1]

data/lib/ohai/plugins/hpux/uptime.rb

@@ -0,0 +1,19 @@
+#
+# Author:: Doug MacEachern <dougm@vmware.com>
+# Copyright:: Copyright (c) 2010 VMware, 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_plugin "sigar::uptime"

data/lib/ohai/plugins/ohai.rb

@@ -19,5 +19,6 @@
 require "ohai"
 provides "ohai"
 
-ohai Mash.new
-ohai[:version] = Ohai::VERSION
+self[:chef_packages] = Mash.new unless self[:chef_packages]
+self[:chef_packages][:ohai] = Mash.new
+self[:chef_packages][:ohai][:version] = Ohai::VERSION

data/lib/ohai/plugins/os.rb

@@ -23,8 +23,12 @@ require 'rbconfig'
 require_plugin 'kernel'
 
 case ::Config::CONFIG['host_os']
+when /aix(.+)$/
+  os "aix"
 when /darwin(.+)$/
   os "darwin"
+when /hpux(.+)$/
+  os "hpux"
 when /linux/
   os "linux"
 when /freebsd(.+)$/

data/lib/ohai/plugins/perl.rb

@@ -22,8 +22,8 @@ require_plugin "languages"
 output = nil
 
 perl = Mash.new
-status = popen4("perl -V:version -V:archname") do |pid, stdin, stdout, stderr|
-  stdin.close
+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=\'(.+)\';$/

data/lib/ohai/plugins/ruby.rb

@@ -49,20 +49,21 @@ values = {
 # Create a query string from above hash
 env_string = ""
 values.keys.each do |v| 
-  env_string << "#{v}:\#{#{values[v]}}," 
+  env_string << "#{v}=\#{#{values[v]}},"
 end
 
 # Query the system ruby
-result = run_ruby "puts \\\"#{env_string}\\\""
+result = run_ruby "puts %Q(#{env_string})"
 
 # Parse results to plugin hash
 result.split(',').each do |entry|
- key, value = entry.split(':')
+ key, value = entry.split('=')
  languages[:ruby][key.to_sym] = value
 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{#{bin_dir}\/gem env gemdir}.chomp!"
+  languages[:ruby][:gems_dir] = run_ruby "puts %x{#{ruby_bin} #{bin_dir}\/gem env gemdir}.chomp!"
 end

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

@@ -0,0 +1,40 @@
+#
+# Author:: Doug MacEachern <dougm@vmware.com>
+# Copyright:: Copyright (c) 2010 VMware, 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"
+
+sigar = Sigar.new
+
+provides "cpu"
+
+cpuinfo = Mash.new
+ix = 0
+
+sigar.cpu_info_list.each do |info|
+  current_cpu = ix.to_s
+  ix += 1
+  cpuinfo[current_cpu] = Mash.new
+  cpuinfo[current_cpu]["vendor_id"] = info.vendor
+  cpuinfo[current_cpu]["model"] = info.model
+  cpuinfo[current_cpu]["mhz"] = info.mhz.to_s
+  cpuinfo[current_cpu]["cache_size"] = info.cache_size.to_s
+  cpuinfo[:total] = info.total_cores
+  cpuinfo[:real] = info.total_sockets
+end
+
+cpu cpuinfo

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

@@ -0,0 +1,45 @@
+#
+# Author:: Doug MacEachern <dougm@vmware.com>
+# Copyright:: Copyright (c) 2010 VMware, 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 "filesystem"
+
+require "sigar"
+
+fs = Mash.new
+
+sigar = Sigar.new
+
+sigar.file_system_list.each do |fsys|
+  filesystem = fsys.dev_name
+  fs[filesystem] = Mash.new
+  fs[filesystem][:mount] = fsys.dir_name
+  fs[filesystem][:fs_type] = fsys.sys_type_name
+  fs[filesystem][:mount_options] = fsys.options
+  begin
+    usage = sigar.file_system_usage(fsys.dir_name)
+    fs[filesystem][:kb_size] = (usage.total / 1024).to_s
+    fs[filesystem][:kb_used] = ((usage.total - usage.free) / 1024).to_s
+    fs[filesystem][:kb_available] = (usage.free / 1024).to_s
+    fs[filesystem][:percent_used] = (usage.use_percent * 100).to_s + '%'
+  rescue Exception => e
+    #e.g. floppy or cdrom drive
+  end
+end
+
+# Set the filesystem data
+filesystem fs

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

@@ -0,0 +1,28 @@
+#
+# Author:: Doug MacEachern <dougm@vmware.com>
+# Copyright:: Copyright (c) 2010 VMware, 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'
+
+provides "hostname", "fqdn"
+
+sigar = Sigar.new
+
+hostname sigar.net_info.host_name
+
+fqdn sigar.fqdn
+

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

@@ -0,0 +1,36 @@
+#
+# Author:: Doug MacEachern <dougm@vmware.com>
+# Copyright:: Copyright (c) 2010 VMware, 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"
+
+sigar = Sigar.new
+
+provides "memory"
+
+memory Mash.new
+memory[:swap] = Mash.new
+
+mem = sigar.mem
+swap = sigar.swap
+
+memory[:total] = (mem.total / 1024).to_s + "kB"
+memory[:free] = (mem.free / 1024).to_s + "kB"
+memory[:used] = (mem.used / 1024).to_s + "kB"
+memory[:swap][:total] = (swap.total / 1024).to_s + "kB"
+memory[:swap][:free] = (swap.free / 1024).to_s + "kB"
+memory[:swap][:used] = (swap.used / 1024).to_s + "kB"

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

@@ -0,0 +1,102 @@
+#
+# Author:: Matthew Kent (<mkent@magoazul.com>)
+# Copyright:: Copyright (c) 2009 Matthew Kent
+# 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.
+#
+
+#http://github.com/mdkent/ohai/commit/92f51aa18b6add9682510a87dcf94835ea72b04d
+
+require "sigar"
+
+sigar = Sigar.new
+
+provides "network", "counters/network"
+
+ninfo = sigar.net_info
+
+network[:default_interface] = ninfo.default_gateway_interface
+
+network[:default_gateway] = ninfo.default_gateway
+
+def encaps_lookup(encap)
+  return "Loopback" if encap.eql?("Local Loopback")
+  return "PPP" if encap.eql?("Point-to-Point Protocol")
+  return "SLIP" if encap.eql?("Serial Line IP")
+  return "VJSLIP" if encap.eql?("VJ Serial Line IP")
+  return "IPIP" if encap.eql?("IPIP Tunnel")
+  return "6to4" if encap.eql?("IPv6-in-IPv4")
+  encap
+end
+
+iface = Mash.new
+
+net_counters = Mash.new
+
+sigar.net_interface_list.each do |cint|
+  iface[cint] = Mash.new
+  if cint =~ /^(\w+)(\d+.*)/
+    iface[cint][:type] = $1
+    iface[cint][:number] = $2
+  end
+  ifconfig = sigar.net_interface_config(cint)
+  iface[cint][:encapsulation] = encaps_lookup(ifconfig.type)
+  iface[cint][:addresses] = Mash.new
+  # Backwards compat: loopback has no hwaddr
+  if (ifconfig.flags & Sigar::IFF_LOOPBACK) == 0
+    iface[cint][:addresses][ifconfig.hwaddr] = { "family" => "lladdr" }
+  end
+  if ifconfig.address != "0.0.0.0"
+    iface[cint][:addresses][ifconfig.address] = { "family" => "inet" }
+    # Backwards compat: no broadcast on tunnel or loopback dev
+    if (((ifconfig.flags & Sigar::IFF_POINTOPOINT) == 0) &&
+          ((ifconfig.flags & Sigar::IFF_LOOPBACK) == 0))
+      iface[cint][:addresses][ifconfig.address]["broadcast"] = ifconfig.broadcast
+    end
+    iface[cint][:addresses][ifconfig.address]["netmask"] = ifconfig.netmask
+  end
+  iface[cint][:flags] = Sigar.net_interface_flags_to_s(ifconfig.flags).split(' ')
+  iface[cint][:mtu] = ifconfig.mtu.to_s
+  iface[cint][:queuelen] = ifconfig.tx_queue_len.to_s
+  if ifconfig.prefix6_length != 0
+    iface[cint][:addresses][ifconfig.address6] = { "family" => "inet6" }
+    iface[cint][:addresses][ifconfig.address6]["prefixlen"] = ifconfig.prefix6_length.to_s
+    iface[cint][:addresses][ifconfig.address6]["scope"] = Sigar.net_scope_to_s(ifconfig.scope6)
+  end
+  net_counters[cint] = Mash.new unless net_counters[cint]
+  if (!cint.include?(":"))
+    ifstat = sigar.net_interface_stat(cint)
+    net_counters[cint][:rx] = { "packets" => ifstat.rx_packets.to_s, "errors"     => ifstat.rx_errors.to_s,
+                                "drop"    => ifstat.rx_dropped.to_s, "overrun"    => ifstat.rx_overruns.to_s,
+                                "frame"   => ifstat.rx_frame.to_s,   "bytes"      => ifstat.rx_bytes.to_s }
+    net_counters[cint][:tx] = { "packets" => ifstat.tx_packets.to_s, "errors"     => ifstat.tx_errors.to_s,
+                                "drop"    => ifstat.tx_dropped.to_s, "overrun"    => ifstat.tx_overruns.to_s,
+                                "carrier" => ifstat.tx_carrier.to_s, "collisions" => ifstat.tx_collisions.to_s,
+                                "bytes"   => ifstat.tx_bytes.to_s }
+  end
+end
+
+begin
+  sigar.arp_list.each do |arp|
+    next unless iface[arp.ifname] # this should never happen
+    iface[arp.ifname][:arp] = Mash.new unless iface[arp.ifname][:arp]
+    iface[arp.ifname][:arp][arp.address] = arp.hwaddr
+  end
+rescue
+  #64-bit AIX for example requires 64-bit caller
+end
+
+counters[:network][:interfaces] = net_counters
+
+network["interfaces"] = iface

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

@@ -0,0 +1,26 @@
+#
+# Author:: Doug MacEachern <dougm@vmware.com>
+# Copyright:: Copyright (c) 2010 VMware, 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"
+
+provides "platform", "platform_version"
+
+sys = Sigar.new.sys_info
+
+platform sys.name.downcase
+platform_version sys.version

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

@@ -0,0 +1,27 @@
+#
+# Author:: Doug MacEachern <dougm@vmware.com>
+# Copyright:: Copyright (c) 2010 VMware, 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"
+
+sigar = Sigar.new
+
+provides "uptime", "uptime_seconds"
+
+uptime = sigar.uptime.uptime
+uptime_seconds uptime.to_i * 1000
+uptime self._seconds_to_human(uptime.to_i)

data/lib/ohai/system.rb

@@ -127,10 +127,12 @@ module Ohai
           end
         end
       end
-      # Catch any errant children who need to be reaped
-      begin
-        true while Process.wait(-1, Process::WNOHANG)
-      rescue Errno::ECHILD
+      unless RUBY_PLATFORM =~ /mswin|mingw32|windows/
+        # Catch any errant children who need to be reaped
+        begin
+          true while Process.wait(-1, Process::WNOHANG)
+        rescue Errno::ECHILD
+        end
       end
       true
     end

data/spec/ohai/mixin/command_spec.rb

@@ -19,6 +19,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper.rb')
 
 describe Ohai::Mixin::Command, "popen4" do
+  break if RUBY_PLATFORM =~ /(win|w)32$/
 
   it "should default all commands to be run in the POSIX standard C locale" do
     Ohai::Mixin::Command.popen4("echo $LC_ALL") do |pid, stdin, stdout, stderr|

data/spec/ohai/plugins/chef_spec.rb

@@ -28,9 +28,9 @@ describe Ohai::System, "plugin chef" do
     @ohai.stub!(:require_plugin).and_return(true)
   end
   
-  it "should set chef[:version] to the current chef version" do
+  it "should set [:chef_packages][:chef][:version] to the current chef version" do
     @ohai._require_plugin("chef")
-    @ohai[:chef][:version].should == Chef::VERSION
+    @ohai[:chef_packages][:chef][:version].should == Chef::VERSION
   end
 end
 rescue LoadError

data/spec/ohai/plugins/groovy_spec.rb

@@ -17,7 +17,7 @@
 #
 
 
-require File.join(File.dirname(__FILE__), '..', '..', '/spec_helper.rb')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '/spec_helper.rb'))
 
 describe Ohai::System, "plugin groovy" do
 

data/spec/ohai/plugins/lua_spec.rb

@@ -17,7 +17,7 @@
 #
 
 
-require File.join(File.dirname(__FILE__), '..', '..', '/spec_helper.rb')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '/spec_helper.rb'))
 
 describe Ohai::System, "plugin lua" do
 

data/spec/ohai/plugins/mono_spec.rb

@@ -17,7 +17,7 @@
 #
 
 
-require File.join(File.dirname(__FILE__), '..', '..', '/spec_helper.rb')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '/spec_helper.rb'))
 
 describe Ohai::System, "plugin mono" do
 

data/spec/ohai/plugins/ohai_spec.rb

@@ -26,8 +26,8 @@ describe Ohai::System, "plugin ohai" do
     @ohai.stub!(:require_plugin).and_return(true)
   end
   
-  it "should set ohai[:version] to the current version" do
+  it "should set [:chef_packages][:ohai][:version] to the current version" do
     @ohai._require_plugin("ohai")
-    @ohai[:ohai][:version].should == Ohai::VERSION
+    @ohai[:chef_packages][:ohai][:version].should == Ohai::VERSION
   end
 end

data/spec/ohai/plugins/os_spec.rb

@@ -53,7 +53,7 @@ describe Ohai::System, "plugin os" do
   
   describe "on darwin" do
     before(:each) do
-      @ohai[:languages][:ruby][:host_os] = "darwin"
+      ::Config::CONFIG['host_os'] = "darwin"
     end
     
     it "should set the os to darwin" do
@@ -72,4 +72,4 @@ describe Ohai::System, "plugin os" do
       @ohai[:os].should == "solaris2"
     end
   end
-end
+end

data/spec/ohai/plugins/perl_spec.rb

@@ -30,21 +30,15 @@ describe Ohai::System, "plugin perl" do
       and_yield("archname='darwin-thread-multi-2level';")
     @stdin = mock("STDIN", :null_object => true)
     @status = 0
-    @ohai.stub!(:popen4).with("perl -V:version -V:archname").and_yield(
-      @pid,
-      @stdin,
+    @ohai.stub!(:run_command).with({:no_status_check=>true, :command=>"perl -V:version -V:archname"}).and_return([
+      @status,
       @stdout,
       @stderr
-    ).and_return(@status)
+    ])
   end
   
   it "should run perl -V:version -V:archname" do
-    @ohai.should_receive(:popen4).with("perl -V:version -V:archname").and_return(true)
-    @ohai._require_plugin("perl")
-  end
-  
-  it "should close perl command's stdin" do
-    @stdin.should_receive(:close)
+    @ohai.should_receive(:run_command).with({:no_status_check=>true, :command=>"perl -V:version -V:archname"}).and_return(true)
     @ohai._require_plugin("perl")
   end
   
@@ -65,24 +59,22 @@ describe Ohai::System, "plugin perl" do
   
   it "should set languages[:perl] if perl command succeeds" do
     @status = 0
-    @ohai.stub!(:popen4).with("perl -V:version -V:archname").and_yield(
-      @pid,
-      @stdin,
+    @ohai.stub!(:run_command).with({:no_status_check=>true, :command=>"perl -V:version -V:archname"}).and_return([
+      @status,
       @stdout,
       @stderr
-    ).and_return(@status)
+    ])
     @ohai._require_plugin("perl")
     @ohai.languages.should have_key(:perl)
   end
   
   it "should not set languages[:perl] if perl command fails" do
      @status = 1
-     @ohai.stub!(:popen4).with("perl -V:version -V:archname").and_yield(
-       @pid,
-       @stdin,
-       @stdout,
-       @stderr
-     ).and_return(@status)
+    @ohai.stub!(:run_command).with({:no_status_check=>true, :command=>"perl -V:version -V:archname"}).and_return([
+      @status,
+      @stdout,
+      @stderr
+     ])
      @ohai._require_plugin("perl")
      @ohai.languages.should_not have_key(:perl)
   end

data/spec/ohai/plugins/php_spec.rb

@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require File.join(File.dirname(__FILE__), '..', '..', '/spec_helper.rb')
+require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '/spec_helper.rb'))
 
 describe Ohai::System, "plugin php" do
 

data/spec/ohai/plugins/ruby_spec.rb

@@ -19,6 +19,8 @@
 
 require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper.rb')
 
+ruby_bin = File.join(::Config::CONFIG['bindir'], ::Config::CONFIG['ruby_install_name'])
+
 describe Ohai::System, "plugin ruby" do
 
   before(:each) do
@@ -39,8 +41,8 @@ describe Ohai::System, "plugin ruby" do
     :host_cpu => ::Config::CONFIG['host_cpu'],
     :host_os => ::Config::CONFIG['host_os'],
     :host_vendor => ::Config::CONFIG['host_vendor'],
-    :gems_dir => %x{#{::Config::CONFIG['bindir']}/gem env gemdir}.chomp!,
-    :ruby_bin => File.join(::Config::CONFIG['bindir'], ::Config::CONFIG['ruby_install_name'])
+    :gems_dir => %x{#{ruby_bin} #{::Config::CONFIG['bindir']}/gem env gemdir}.chomp!,
+    :ruby_bin => ruby_bin
   }.each do |attribute, value|
     it "should have #{attribute} set" do
       @ohai._require_plugin("ruby")
@@ -48,4 +50,4 @@ describe Ohai::System, "plugin ruby" do
     end
   end
   
-end
+end

data/spec/ohai/system_spec.rb

@@ -90,9 +90,11 @@ describe Ohai::System, "get_attribute" do
 end
 
 describe Ohai::System, "require_plugin" do
+  tmp = ENV['TMPDIR'] || ENV['TMP'] || ENV['TEMP'] || '/tmp'
+
   before(:each) do
     @plugin_path = Ohai::Config[:plugin_path]
-    Ohai::Config[:plugin_path] = ["/tmp/plugins"]
+    Ohai::Config[:plugin_path] = ["#{tmp}/plugins"]
     File.stub!(:exists?).and_return(true)
     @ohai = Ohai::System.new
     @ohai.stub!(:from_file).and_return(true)
@@ -109,7 +111,7 @@ describe Ohai::System, "require_plugin" do
   end
   
   it "should check each part of the Ohai::Config[:plugin_path] for the plugin_filename.rb" do
-    @ohai.should_receive(:from_file).with("/tmp/plugins/foo.rb").and_return(true)
+    @ohai.should_receive(:from_file).with(File.expand_path("#{tmp}/plugins/foo.rb")).and_return(true)
     @ohai.require_plugin("foo")
   end
   

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  - 2
-  version: 0.5.2
+  - 4
+  version: 0.5.4
 platform: ruby
 authors: 
 - Adam Jacob
@@ -14,7 +14,7 @@ autorequire: ohai
 bindir: bin
 cert_chain: []
 
-date: 2010-05-06 00:00:00 -07:00
+date: 2010-05-11 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -117,6 +117,15 @@ files:
 - lib/ohai/mixin/command.rb
 - lib/ohai/mixin/from_file.rb
 - lib/ohai/mixin/string.rb
+- lib/ohai/plugins/aix/cpu.rb
+- lib/ohai/plugins/aix/filesystem.rb
+- lib/ohai/plugins/aix/hostname.rb
+- lib/ohai/plugins/aix/memory.rb
+- lib/ohai/plugins/aix/network.rb
+- lib/ohai/plugins/aix/platform.rb
+- lib/ohai/plugins/aix/ps.rb
+- lib/ohai/plugins/aix/ssh_host_key.rb
+- lib/ohai/plugins/aix/uptime.rb
 - lib/ohai/plugins/chef.rb
 - lib/ohai/plugins/cloud.rb
 - lib/ohai/plugins/command.rb
@@ -145,6 +154,15 @@ files:
 - lib/ohai/plugins/freebsd/virtualization.rb
 - lib/ohai/plugins/groovy.rb
 - lib/ohai/plugins/hostname.rb
+- lib/ohai/plugins/hpux/cpu.rb
+- lib/ohai/plugins/hpux/filesystem.rb
+- lib/ohai/plugins/hpux/hostname.rb
+- lib/ohai/plugins/hpux/memory.rb
+- lib/ohai/plugins/hpux/network.rb
+- lib/ohai/plugins/hpux/platform.rb
+- lib/ohai/plugins/hpux/ps.rb
+- lib/ohai/plugins/hpux/ssh_host_key.rb
+- lib/ohai/plugins/hpux/uptime.rb
 - lib/ohai/plugins/java.rb
 - lib/ohai/plugins/kernel.rb
 - lib/ohai/plugins/keys.rb
@@ -198,6 +216,13 @@ files:
 - lib/ohai/plugins/python.rb
 - lib/ohai/plugins/rackspace.rb
 - lib/ohai/plugins/ruby.rb
+- lib/ohai/plugins/sigar/cpu.rb
+- lib/ohai/plugins/sigar/filesystem.rb
+- lib/ohai/plugins/sigar/hostname.rb
+- lib/ohai/plugins/sigar/memory.rb
+- lib/ohai/plugins/sigar/network.rb
+- lib/ohai/plugins/sigar/platform.rb
+- lib/ohai/plugins/sigar/uptime.rb
 - lib/ohai/plugins/solaris2/cpu.rb
 - lib/ohai/plugins/solaris2/hostname.rb
 - lib/ohai/plugins/solaris2/kernel.rb