ohai 0.5.0 → 0.5.2

data/Rakefile

@@ -5,7 +5,7 @@ require 'date'
 require 'spec/rake/spectask'
 
 GEM = "ohai"
-GEM_VERSION = "0.5.0"
+GEM_VERSION = "0.5.2"
 AUTHOR = "Adam Jacob"
 EMAIL = "adam@opscode.com"
 HOMEPAGE = "http://wiki.opscode.com/display/ohai"
@@ -22,7 +22,7 @@ spec = Gem::Specification.new do |s|
   s.email = EMAIL
   s.homepage = HOMEPAGE
 
-  s.add_dependency "json"
+  s.add_dependency "json", "<= 1.4.2"
   s.add_dependency "extlib"
   s.add_dependency "systemu"
   s.add_dependency "mixlib-cli"
@@ -33,7 +33,7 @@ spec = Gem::Specification.new do |s|
   
   s.require_path = 'lib'
   s.autorequire = GEM
-  s.files = %w(LICENSE README.rdoc Rakefile) + Dir.glob("{extras,lib,spec}/**/*")
+  s.files = %w(LICENSE README.rdoc Rakefile) + Dir.glob("{docs,lib,spec}/**/*")
 end
 
 task :default => :spec

data/bin/ohai

@@ -9,9 +9,9 @@
 # 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.
@@ -25,16 +25,26 @@ $: << File.join(File.dirname(__FILE__), "..", "lib")
 begin
   require 'rubygems'
 rescue LoadError
-  # must be debian! ;) 
+  # must be debian! ;)
   missing_rubygems = true
 end
 begin
   require 'ohai/application'
 rescue LoadError
-  if missing_rubygems 
+  if missing_rubygems
     STDERR.puts "rubygems previously failed to load - is it installed?"
   end
 
   raise
 end
+
+if RUBY_PLATFORM =~ /mswin|mingw32|windows/
+  begin
+    require 'ruby-wmi'
+  rescue LoadError
+    STDERR.puts "ruby-wmi failed to load - is it installed?"
+    raise
+  end
+end
+
 Ohai::Application.new.run

data/docs/man/man1/ohai.1

@@ -0,0 +1,23 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
+.TH OHAI "1" "April 2009" "ohai" "User Commands"
+.SH NAME
+ohai \- collect system information
+.SH SYNOPSIS
+.B ohai
+[\fIOPTION\fR]... 
+.SH DESCRIPTION
+Information about your system is collected and returned as multidimensional
+attributes in a JSON format.
+.TP
+\fB\-d\fR, \fB\-\-directory\fR NAME
+A directory to add to the Ohai search path
+.TP
+\fB\-f\fR, \fB\-\-file\fR NAME
+A file to run Ohai against
+.TP
+\fB\-l\fR, \fB\-\-loglevel\fR NAME
+Set log level for Ohai
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Show this message
+.IP

data/lib/ohai.rb

@@ -23,5 +23,5 @@ require 'ohai/config'
 require 'ohai/system'
 
 module Ohai
-  VERSION = '0.5.0'
+  VERSION = '0.5.2'
 end

data/lib/ohai/application.rb

@@ -61,6 +61,14 @@ class Ohai::Application
     :proc         => lambda {|v| puts "Ohai: #{::Ohai::VERSION}"},
     :exit         => 0
 
+  def initialize
+    super
+
+    # Always switch to a readable directory. Keeps subsequent Dir.chdir() {}
+    # from failing due to permissions when launched as a less privileged user.
+    Dir.chdir("/")
+  end
+
   def run
     configure_ohai
     configure_logging

data/lib/ohai/plugins/chef.rb

@@ -0,0 +1,23 @@
+#
+# Author:: Tollef Fog Heen <tfheen@err.no>
+# Copyright:: Copyright (c) 2010 Tollef Fog Heen
+# 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 'chef'
+provides "chef"
+
+chef Mash.new
+chef[:version] = Chef::VERSION

data/lib/ohai/plugins/groovy.rb

@@ -0,0 +1,35 @@
+#
+# Author:: Doug MacEachern <dougm@vmware.com>
+# Copyright:: Copyright (c) 2009 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 "languages/groovy"
+
+require_plugin "languages"
+
+output = nil
+
+groovy = Mash.new
+
+status, stdout, stderr = run_command(:no_status_check => true, :command => "groovy -v")
+if status == 0
+  output = stdout.split
+  if output.length >= 2
+    groovy[:version] = output[2]
+  end
+  languages[:groovy] = groovy if groovy[:version]
+end
+

data/lib/ohai/plugins/java.rb

@@ -26,9 +26,12 @@ status, stdout, stderr = run_command(:no_status_check => true, :command => "java
 if status == 0
   stderr.split("\n").each do |line|
     case line
-    when /java version \"([0-9\.\_]+)\"/: java[:version] = $1
-    when /^(.+Runtime Environment.*) \(build (.+)\)$/: java[:runtime] = { "name" => $1, "build" => $2 }
-    when /^(.+ Client VM) \(build (.+)\)$/: java[:hotspot] = { "name" => $1, "build" => $2 }
+    when /java version \"([0-9\.\_]+)\"/
+      java[:version] = $1
+    when /^(.+Runtime Environment.*) \(build (.+)\)$/
+      java[:runtime] = { "name" => $1, "build" => $2 }
+    when /^(.+ Client VM) \(build (.+)\)$/ 
+      java[:hotspot] = { "name" => $1, "build" => $2 }
     end
   end
 

data/lib/ohai/plugins/kernel.rb

@@ -22,7 +22,7 @@ require_plugin 'ruby'
 
 kernel Mash.new
 case languages[:ruby][:host_os]
-when /mswin/
+when /mswin|mingw32|windows/
   require_plugin "windows::kernel"
 else
   kernel[:name] = from("uname -s")

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

@@ -18,7 +18,7 @@
 
 provides "network", "counters/network"
 
-network[:default_interface] = from("route -n \| grep ^0.0.0.0 \| awk \'{print \$8\}\'")
+network[:default_interface] = from("route -n \| grep -m 1 ^0.0.0.0 \| awk \'{print \$8\}\'")
 
 def encaps_lookup(encap)
   return "Loopback" if encap.eql?("Local Loopback")

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

@@ -42,7 +42,7 @@ elsif File.exists?('/etc/gentoo-release')
   platform_version IO.read('/etc/gentoo-release').scan(/(\d+|\.+)/).join
 elsif File.exists?('/etc/SuSE-release')
   platform "suse"
-  platform_version IO.read('/etc/SuSE-release').scan(/\d+\.\d+/)[0]
+  platform_version File.read("/etc/SuSE-release").scan(/VERSION = (\d+)\nPATCHLEVEL = (\d+)/).flatten.join(".")
 elsif File.exists?('/etc/arch-release')
   platform "arch"
   # no way to determine platform_version in a rolling release distribution

data/lib/ohai/plugins/lua.rb

@@ -0,0 +1,34 @@
+#
+# Author:: Doug MacEachern <dougm@vmware.com>
+# Copyright:: Copyright (c) 2009 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 "languages/lua"
+
+require_plugin "languages"
+
+output = nil
+
+lua = Mash.new
+
+status, stdout, stderr = run_command(:no_status_check => true, :command => "lua -v")
+if status == 0
+  output = stderr.split
+  if output.length >= 1
+    lua[:version] = output[1]
+  end
+  languages[:lua] = lua if lua[:version]
+end

data/lib/ohai/plugins/mono.rb

@@ -0,0 +1,37 @@
+#
+# Author:: Doug MacEachern <dougm@vmware.com>
+# Copyright:: Copyright (c) 2009 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 "languages/mono"
+
+require_plugin "languages"
+
+output = nil
+
+mono = Mash.new
+
+status, stdout, stderr = run_command(:no_status_check => true, :command => "mono -V")
+if status == 0
+  output = stdout.split
+  if output.length >= 4
+    mono[:version] = output[4]
+  end
+  if output.length >= 11
+    mono[:builddate] = "%s %s %s %s" % [output[6],output[7],output[8],output[11].gsub!(/\)/,'')]
+  end
+  languages[:mono] = mono if mono[:version]
+end

data/lib/ohai/plugins/network_listeners.rb

@@ -0,0 +1,47 @@
+#
+# Author:: Doug MacEachern <dougm@vmware.com>
+# Copyright:: Copyright (c) 2009 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 "network/listeners"
+
+require_plugin "network"
+
+flags = Sigar::NETCONN_TCP|Sigar::NETCONN_SERVER
+
+listeners = Mash.new
+
+sigar = Sigar.new
+sigar.net_connection_list(flags).each do |conn|
+  port = conn.local_port
+  addr = conn.local_address.to_s
+  if addr == "0.0.0.0" || addr == "::"
+    addr = "*"
+  end
+  listeners[port] = Mash.new
+  listeners[port][:address] = addr
+  begin
+    pid = sigar.proc_port(conn.type, port)
+    listeners[port][:pid] = pid
+    listeners[port][:name] = sigar.proc_state(pid).name
+    rescue
+  end
+end
+
+network[:listeners] = Mash.new
+network[:listeners][:tcp] = listeners

data/lib/ohai/plugins/ohai.rb

@@ -0,0 +1,23 @@
+#
+# Author:: Tollef Fog Heen <tfheen@err.no>
+# Copyright:: Copyright (c) 2010 Tollef Fog Heen
+# 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 "ohai"
+provides "ohai"
+
+ohai Mash.new
+ohai[:version] = Ohai::VERSION

data/lib/ohai/plugins/os.rb

@@ -18,10 +18,11 @@
 
 provides "os", "os_version"
 
-require_plugin 'ruby'
+require 'rbconfig'
+
 require_plugin 'kernel'
 
-case languages[:ruby][:host_os]
+case ::Config::CONFIG['host_os']
 when /darwin(.+)$/
   os "darwin"
 when /linux/
@@ -34,7 +35,7 @@ when /netbsd(.+)$/
   os "netbsd"
 when /solaris2\.([\d]+)/
   os "solaris2"
-when /mswin/
+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
@@ -42,7 +43,7 @@ when /mswin/
   # subsystems.
   os "windows"
 else
-  os languages[:ruby][:host_os]
+  os ::Config::CONFIG['host_os']
 end
 
 os_version kernel[:release]

data/lib/ohai/plugins/perl.rb

@@ -24,10 +24,12 @@ output = nil
 perl = Mash.new
 status = popen4("perl -V:version -V:archname") do |pid, stdin, stdout, stderr|
   stdin.close
-  stdout.each do |line|
+  stdout.each_line do |line|
     case line
-    when /^version=\'(.+)\';$/: perl[:version] = $1
-    when /^archname=\'(.+)\';$/: perl[:archname] = $1
+    when /^version=\'(.+)\';$/
+      perl[:version] = $1
+    when /^archname=\'(.+)\';$/
+      perl[:archname] = $1
     end
   end
 end

data/lib/ohai/plugins/php.rb

@@ -0,0 +1,36 @@
+#
+# Author:: Doug MacEachern <dougm@vmware.com>
+# Copyright:: Copyright (c) 2009 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 "languages/php"
+
+require_plugin "languages"
+
+output = nil
+
+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]]
+  end
+  languages[:php] = php if php[:version]
+end
+