ohai 0.3.6 → 0.4.0

data/Rakefile

@@ -5,7 +5,7 @@ require 'date'
 require 'spec/rake/spectask'
 
 GEM = "ohai"
-GEM_VERSION = "0.3.6"
+GEM_VERSION = "0.4.0"
 AUTHOR = "Adam Jacob"
 EMAIL = "adam@opscode.com"
 HOMEPAGE = "http://wiki.opscode.com/display/ohai"
@@ -21,7 +21,8 @@ spec = Gem::Specification.new do |s|
   s.author = AUTHOR
   s.email = EMAIL
   s.homepage = HOMEPAGE
-  
+
+  s.add_dependency "json"
   s.add_dependency "extlib"
   s.add_dependency "systemu"
   s.add_dependency "mixlib-cli"
@@ -50,7 +51,7 @@ end
 
 desc "install the gem locally"
 task :install => [:package] do
-  sh %{sudo gem install pkg/#{GEM}-#{GEM_VERSION}}
+  sh %{gem install pkg/#{GEM}-#{GEM_VERSION}}
 end
 
 desc "create a gemspec file"

data/bin/ohai

@@ -19,6 +19,22 @@
 # limitations under the License.
 #
 
+require 'rubygems'
+
 $: << File.join(File.dirname(__FILE__), "..", "lib")
-require 'ohai/application'
+begin
+  require 'rubygems'
+rescue LoadError
+  # must be debian! ;) 
+  missing_rubygems = true
+end
+begin
+  require 'ohai/application'
+rescue LoadError
+  if missing_rubygems 
+    STDERR.puts "rubygems previously failed to load - is it installed?"
+  end
+
+  raise
+end
 Ohai::Application.new.run

data/lib/ohai.rb

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

data/lib/ohai/application.rb

@@ -6,9 +6,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.
@@ -21,7 +21,7 @@ require 'mixlib/cli'
 
 class Ohai::Application
   include Mixlib::CLI
- 
+
   option :directory,
     :short       => "-d DIRECTORY",
     :long        => "--directory DIRECTORY",
@@ -31,8 +31,8 @@ class Ohai::Application
     :short       => "-f FILE",
     :long        => "--file FILE",
     :description => "A file to run Ohai against"
-   
-  option :log_level, 
+
+  option :log_level,
     :short        => "-l LEVEL",
     :long         => "--log_level LEVEL",
     :description  => "Set the log level (debug, info, warn, error, fatal)",
@@ -43,7 +43,7 @@ class Ohai::Application
     :long         => "--logfile LOGLOCATION",
     :description  => "Set the log file location, defaults to STDOUT - recommended for daemonizing",
     :proc         => nil
- 
+
   option :help,
     :short        => "-h",
     :long         => "--help",
@@ -75,10 +75,10 @@ class Ohai::Application
       Ohai::Config[:plugin_path] << Ohai::Config[:directory]
     end
   end
- 
+
   def configure_logging
     Ohai::Log.init(Ohai::Config[:log_location])
-    Ohai::Log.level(Ohai::Config[:log_level])
+    Ohai::Log.level = Ohai::Config[:log_level]
   end
 
   def run_application
@@ -89,8 +89,8 @@ class Ohai::Application
       ohai.all_plugins
     end
     if @attributes.length > 0
-      @attributes.each do |a| 
-        puts ohai.attributes_print(a) 
+      @attributes.each do |a|
+        puts ohai.attributes_print(a)
       end
     else
       puts ohai.json_pretty_print

data/lib/ohai/log.rb

@@ -22,5 +22,9 @@ require 'mixlib/log'
 module Ohai
   class Log
     extend Mixlib::Log
+    
+    init(Ohai::Config[:log_location])
+    level = Ohai::Config[:log_level]
+    
   end
 end

data/lib/ohai/mixin/command.rb

@@ -1,22 +1,19 @@
 #
 # Author:: Adam Jacob (<adam@opscode.com>)
 # Copyright:: Copyright (c) 2008 Opscode, Inc.
-# License:: GNU GPL, Version 3
+# License:: Apache License, Version 2.0
 #
-# Copyright (C) 2008, Opscode Inc. 
+# 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
 # 
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+#     http://www.apache.org/licenses/LICENSE-2.0
 # 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# 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/exception'

data/lib/ohai/plugins/cloud.rb

@@ -0,0 +1,80 @@
+#
+# Author:: Cary Penniman (<cary@rightscale.com>)
+# 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 "cloud"
+
+require_plugin "ec2"
+require_plugin "rackspace"
+
+# Make top-level cloud hashes
+#
+def create_objects
+  cloud Mash.new
+  cloud[:public_ips] = Array.new
+  cloud[:private_ips] = Array.new
+end
+
+# ----------------------------------------
+# ec2
+# ----------------------------------------
+
+# Is current cloud ec2?
+#
+# === Return
+# true:: If ec2 Hash is defined
+# false:: Otherwise
+def on_ec2?
+  ec2 != nil
+end
+
+# Fill cloud hash with ec2 values
+def get_ec2_values 
+  cloud[:public_ips] << ec2['public_ipv4']
+  cloud[:private_ips] << ec2['local_ipv4']
+  cloud[:provider] = "ec2"
+end
+
+# setup ec2 cloud  
+if on_ec2?
+  create_objects
+  get_ec2_values
+end
+
+# ----------------------------------------
+# rackspace
+# ----------------------------------------
+
+# Is current cloud rackspace?
+#
+# === Return
+# true:: If rackspace Hash is defined
+# false:: Otherwise
+def on_rackspace?
+  rackspace != nil
+end
+
+# Fill cloud hash with rackspace values
+def get_rackspace_values 
+  cloud[:public_ips] << rackspace['public_ip']
+  cloud[:private_ips] << rackspace['private_ip']
+  cloud[:provider] = "rackspace"
+end
+
+# setup rackspace cloud 
+if on_rackspace?
+  create_objects
+  get_rackspace_values
+end

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

@@ -15,6 +15,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+def get_redhatish_platform(contents)
+  contents[/^Red Hat/i] ? "redhat" : contents[/(\w+)/i, 1].downcase
+end
+
+def get_redhatish_version(contents)
+  contents[/Rawhide/i] ? contents[/((\d+) \(Rawhide\))/i, 1].downcase : contents[/release ([\d\.]+)/, 1]
+end
 
 provides "platform", "platform_version"
 
@@ -27,17 +34,17 @@ elsif File.exists?("/etc/debian_version")
   platform "debian"
   platform_version File.read("/etc/debian_version").chomp
 elsif File.exists?("/etc/redhat-release")
-  platform "redhat"
-  File.open("/etc/redhat-release").each do |line|
-    platform "centos" if line =~ /centos/i
-    case line
-    when /\(Rawhide\)/
-      platform_version "rawhide"
-    when /release ([\d\.]+)/
-      platform_version $1
-    end
-  end
+  contents = File.read("/etc/redhat-release").chomp
+  platform get_redhatish_platform(contents)
+  platform_version get_redhatish_version(contents)
 elsif File.exists?('/etc/gentoo-release')
   platform "gentoo"
   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]
+elsif File.exists?('/etc/arch-release')
+  platform "arch"
+  # no way to determine platform_version in a rolling release distribution
+  # kernel release will be used - ex. 2.6.32-ARCH
 end

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

@@ -54,24 +54,21 @@ end
 if File.exists?("/usr/sbin/dmidecode")
   popen4("dmidecode") do |pid, stdin, stdout, stderr|
     stdin.close
-    found_virt_manufacturer = nil
-    stdout.each do |line|
-      case line
-      when /Manufacturer: Microsoft/
-        found_virt_manufacturer = "virtualpc"
-      when / Product Name: Virtual Machine/
-        if found_virt_manufacturer == "virtualpc" 
-          virtualization[:emulator] = "virtualpc"
-          virtualization[:role] = "guest"
-        end
-      when /Manufacturer: VMware/
-        found_virt_manufacturer = "vmware"
-      when /Product Name: VMware Virtual Platform/
-        if found_virt_manufacturer == "vmware" 
-          virtualization[:emulator] = "vmware"
-          virtualization[:role] = "guest"
-        end
+    dmi_info = stdout.string
+    case dmi_info
+    when /Manufacturer: Microsoft/
+      if dmi_info =~ /Product Name: Virtual Machine/ 
+        virtualization[:emulator] = "virtualpc"
+        virtualization[:role] = "guest"
+      end 
+    when /Manufacturer: VMware/
+      if dmi_info =~ /Product Name: VMware Virtual Platform/ 
+        virtualization[:emulator] = "vmware"
+        virtualization[:role] = "guest"
       end
+    else
+      nil
     end
+
   end
 end

data/lib/ohai/plugins/passwd.rb

@@ -0,0 +1,22 @@
+provides 'etc', 'current_user'
+
+require 'etc'
+
+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)
+  end
+  
+  Etc.group do |entry|
+    etc[:group][entry.name] = Mash.new(:gid => entry.gid, :members => entry.mem)
+  end
+end
+
+unless current_user
+  current_user Etc.getlogin
+end

data/lib/ohai/plugins/rackspace.rb

@@ -0,0 +1,60 @@
+#
+# Author:: Cary Penniman (<cary@rightscale.com>)
+# 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 "rackspace"
+
+require_plugin "network"
+
+# Checks for matching rackspace arp mac
+#
+# === Return
+# true:: If mac address matches 
+# false:: Otherwise
+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")
+    end
+  end
+  false
+end
+
+# Identifies the rackspace cloud
+#
+# === Return
+# true:: If the rackspace cloud can be identified
+# false:: Otherwise
+def looks_like_rackspace?  
+  has_rackspace_mac?
+end
+
+# Names rackspace ip address
+#
+# === Parameters
+# name<Symbol>:: Use :public_ip or :private_ip
+# eth<Symbol>:: Interface name of public or private ip
+def get_ip_address(name, eth)
+  network[:interfaces][eth][:addresses].each do |key, info|
+    rackspace[name] = key if info['family'] == 'inet'
+  end
+end
+
+# Adds rackspace Mash
+if looks_like_rackspace?
+  rackspace Mash.new
+  get_ip_address(:public_ip, :eth0)
+  get_ip_address(:private_ip, :eth1)
+end

data/lib/ohai/plugins/ruby.rb

@@ -20,20 +20,49 @@ provides "languages/ruby"
 
 require_plugin "languages"
 
+
+def run_ruby(command)
+  cmd = "ruby -e \"require 'rbconfig'; #{command}\""
+  status, stdout, stderr = run_command(:no_status_check => true, :command => cmd)
+  stdout.strip
+end
+
+
 languages[:ruby] = Mash.new
 
-languages[:ruby][:platform] = RUBY_PLATFORM
-languages[:ruby][:version] = RUBY_VERSION
-languages[:ruby][:release_date] = RUBY_RELEASE_DATE
-languages[:ruby][:target] = ::Config::CONFIG['target']
-languages[:ruby][:target_cpu] = ::Config::CONFIG['target_cpu']
-languages[:ruby][:target_vendor] = ::Config::CONFIG['target_vendor']
-languages[:ruby][:target_os] = ::Config::CONFIG['target_os']
-languages[:ruby][:host] = ::Config::CONFIG['host']
-languages[:ruby][:host_cpu] = ::Config::CONFIG['host_cpu']
-languages[:ruby][:host_os] = ::Config::CONFIG['host_os']
-languages[:ruby][:host_vendor] = ::Config::CONFIG['host_vendor']
-if File.exists?("#{::Config::CONFIG['bindir']}/gem")
-  languages[:ruby][:gems_dir] = %x{#{::Config::CONFIG['bindir']}/gem env gemdir}.chomp!
+values = {
+  :platform => "RUBY_PLATFORM",
+  :version => "RUBY_VERSION",
+  :release_date => "RUBY_RELEASE_DATE",
+  :target => "::Config::CONFIG['target']",
+  :target_cpu => "::Config::CONFIG['target_cpu']",
+  :target_vendor => "::Config::CONFIG['target_vendor']",
+  :target_os => "::Config::CONFIG['target_os']",
+  :host => "::Config::CONFIG['host']",
+  :host_cpu => "::Config::CONFIG['host_cpu']",
+  :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'])" 
+}
+
+# Create a query string from above hash
+env_string = ""
+values.keys.each do |v| 
+  env_string << "#{v}:\#{#{values[v]}}," 
+end
+
+# Query the system ruby
+result = run_ruby "puts \\\"#{env_string}\\\""
+
+# Parse results to plugin hash
+result.split(',').each do |entry|
+ key, value = entry.split(':')
+ languages[:ruby][key.to_sym] = value
+end
+
+# Perform one more (conditional) query
+bin_dir = languages[:ruby][:bin_dir]
+if File.exist?("#{bin_dir}\/gem")
+  languages[:ruby][:gems_dir] = run_ruby "puts %x{#{bin_dir}\/gem env gemdir}.chomp!"
 end
-languages[:ruby][:ruby_bin] = File.join(::Config::CONFIG['bindir'], ::Config::CONFIG['ruby_install_name'])