ohai 0.6.6 → 0.6.8.rc.0

data/README.rdoc

@@ -8,17 +8,17 @@ Ohai will print out a JSON data blob for all the known data about your system. W
 
 Opscode distributes ohai as a RubyGem. This README is for developers who want to modify the Ohai source code. For users who want to write plugins for Ohai, see the wiki:
 
-* http://wiki.opscode.com/display/ohai/Home
+* http://wiki.opscode.com/display/chef/Ohai
 
 = DEVELOPMENT:
 
 Before working on the code, if you plan to contribute your changes, you need to read the Opscode Contributing document.
 
-* http://wiki.opscode.com/display/opscode/Contributing
+* http://wiki.opscode.com/display/chef/How+to+Contribute
 
 You will also need to set up the repository with the appropriate branches. We document the process on the Chef Wiki.
 
-* http://wiki.opscode.com/display/opscode/Working+with+Git
+* http://wiki.opscode.com/display/chef/Working+with+git
 
 (Substitude 'ohai' for 'chef')
 
@@ -75,7 +75,7 @@ Tickets/Issues:
 
 Documentation:
 
-* http://wiki.opscode.com/display/ohai/Home/
+* http://wiki.opscode.com/display/chef/Ohai
 
 = LICENSE:
 

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').read_nonblock(4096).each do |line|
+File.open('/proc/mounts').read_nonblock(4096).each_line do |line|
   if line =~ /^(\S+) (\S+) (\S+) (\S+) \S+ \S+$/
     filesystem = $1
     next if fs.has_key?(filesystem)

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

@@ -15,6 +15,7 @@
 # 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
@@ -26,8 +27,13 @@ end
 provides "platform", "platform_version"
 
 require_plugin 'linux::lsb'
+  
+# platform [ and platform_version ? ] should be lower case to avoid dealing with RedHat/Redhat/redhat matching
 
-if lsb[:id]
+if lsb[:id] =~ /RedHat/i
+  platform "redhat"
+  platform_version lsb[:release]
+elsif lsb[:id]	
   platform lsb[:id].downcase
   platform_version lsb[:release]
 elsif File.exists?("/etc/debian_version")

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

@@ -22,15 +22,23 @@ 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")
-  if File.exists?("/dev/xen/evtchn")
-    virtualization[:system] = "xen"
+
+## Xen
+# This file should exists on most Xen systems
+if File.exists?("/proc/xen/capabilities")
+  virtualization[:system] = "xen"
+  if File.read("/proc/xen/capabilities") =~ /control_d/i
     virtualization[:role] = "host"
   else
-    virtualization[:system] = "xen"
     virtualization[:role] = "guest"
   end
+# Guests do not always have this file, but may
+elsif File.exists?("/proc/sys/xen/independent_wallclock")
+  virtualization[:system] = "xen"
+  virtualization[:role] = "guest"
 end
+# cpuid of guests, if we could get it, would also be a clue
+# may be able to determine if under paravirt from /dev/xen/evtchn (See OHAI-253)
 
 # Detect from kernel module
 if File.exists?("/proc/modules")

data/lib/ohai/version.rb

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

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

@@ -19,6 +19,8 @@
 
 require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper.rb')
 
+# We do not alter case for lsb attributes and consume them as provided
+
 describe Ohai::System, "Linux lsb plugin" do
   before(:each) do
     @ohai = Ohai::System.new
@@ -64,44 +66,80 @@ describe Ohai::System, "Linux lsb plugin" 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
+    
+    describe "on Centos 5.4 correctly" do
+      before(:each) do
+        @stdout.stub!(:each).
+          and_yield("LSB Version: :core-3.1-ia32:core-3.1-noarch:graphics-3.1-ia32:graphics-3.1-noarch").
+          and_yield("Distributor ID: CentOS").
+          and_yield("Description:  CentOS release 5.4 (Final)").
+          and_yield("Release:  5.4").
+          and_yield("Codename: Final")
   
-    it "should set lsb[:release]" do
-      @ohai._require_plugin("linux::lsb")
-      @ohai[:lsb][:release].should == "14"
+        @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 == "CentOS"
+      end
+    
+      it "should set lsb[:release]" do
+        @ohai._require_plugin("linux::lsb")
+        @ohai[:lsb][:release].should == "5.4"
+      end
+    
+      it "should set lsb[:codename]" do
+        @ohai._require_plugin("linux::lsb")
+        @ohai[:lsb][:codename].should == "Final"
+      end
+    
+      it "should set lsb[:description]" do
+        @ohai._require_plugin("linux::lsb")
+        @ohai[:lsb][:description].should == "CentOS release 5.4 (Final)"
+      end
     end
+
+    describe "on Fedora 14 correctly" do
+      before(:each) do
+        @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")
   
-    it "should set lsb[:codename]" do
-      @ohai._require_plugin("linux::lsb")
-      @ohai[:lsb][:codename].should == "Laughlin"
-    end
+        @ohai.stub!(:popen4).with("lsb_release -a").and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status)
+      end
   
-    it "should set lsb[:description]" do
-      @ohai._require_plugin("linux::lsb")
-      @ohai[:lsb][:description].should == "Fedora release 14 (Laughlin)"
+      it "should set lsb[:id]" do
+        @ohai._require_plugin("linux::lsb")
+        @ohai[:lsb][:id].should == "Fedora"
+      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 set lsb[:description]" do
+        @ohai._require_plugin("linux::lsb")
+        @ohai[:lsb][:description].should == "Fedora release 14 (Laughlin)"
+      end
     end
-  
   end
 
   it "should not set any lsb values if /etc/lsb-release or /usr/bin/lsb_release do not exist " do

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

@@ -119,54 +119,74 @@ describe Ohai::System, "Linux plugin platform" do
   end
 
   describe "on redhat breeds" do
-    before(:each) do
-      @ohai.lsb = nil
-      File.should_receive(:exists?).with("/etc/redhat-release").and_return(true)
-    end
-
-    it "should check for the existance of redhat-release" do
-      @ohai._require_plugin("linux::platform")
-    end
-          
-    it "should read the platform as centos and version as 5.3" do
-      File.should_receive(:read).with("/etc/redhat-release").and_return("CentOS release 5.3")
-      @ohai._require_plugin("linux::platform")
-      @ohai[:platform].should == "centos"
-    end
-
-    it "may be that someone munged Red Hat to be RedHat" do
-      File.should_receive(:read).with("/etc/redhat-release").and_return("RedHat release 5.3")
-      @ohai._require_plugin("linux::platform")
-      @ohai[:platform].should == "redhat"
-      @ohai[:platform_version].should == "5.3"
-    end
-
-    it "should read the platform as redhat and version as 5.3" do
-      File.should_receive(:read).with("/etc/redhat-release").and_return("Red Hat release 5.3")
-      @ohai._require_plugin("linux::platform")
-      @ohai[:platform].should == "redhat"
-      @ohai[:platform_version].should == "5.3"
+    describe "with lsb_release results" do
+      it "should set the platform to redhat even if the LSB name is something absurd but redhat like" do
+        @ohai[:lsb][:id] = "RedHatEnterpriseServer"
+        @ohai[:lsb][:release] = "6.1"
+        @ohai._require_plugin("linux::platform")
+        @ohai[:platform].should == "redhat"
+        @ohai[:platform_version].should == "6.1"
+      end
+
+      it "should set the platform to centos" do
+        @ohai[:lsb][:id] = "CentOS"
+        @ohai[:lsb][:release] = "5.4"
+        @ohai._require_plugin("linux::platform")
+        @ohai[:platform].should == "centos"
+        @ohai[:platform_version].should == "5.4"
+      end
     end
   
-    it "should read the platform as fedora and version as 13 (rawhide)" do
-      File.should_receive(:read).with("/etc/redhat-release").and_return("Fedora release 13 (Rawhide)")
-      @ohai._require_plugin("linux::platform")
-      @ohai[:platform].should == "fedora"
-      @ohai[:platform_version].should == "13 (rawhide)"
-    end
-    
-    it "should read the platform as fedora and version as 10" do
-      File.should_receive(:read).with("/etc/redhat-release").and_return("Fedora release 10")
-      @ohai._require_plugin("linux::platform")
-      @ohai[:platform].should == "fedora"
-      @ohai[:platform_version].should == "10"
-    end
-
-    it "should read the platform as fedora and version as 13 using to_i" do
-      File.should_receive(:read).with("/etc/redhat-release").and_return("Fedora release 13 (Rawhide)")
-      @ohai._require_plugin("linux::platform")
-      @ohai[:platform].should == "fedora"
-      @ohai[:platform_version].to_i.should == 13
+    describe "without lsb_release results" do
+      before(:each) do
+        @ohai.lsb = nil
+        File.should_receive(:exists?).with("/etc/redhat-release").and_return(true)
+      end
+  
+      it "should check for the existance of redhat-release" do
+        @ohai._require_plugin("linux::platform")
+      end
+            
+      it "should read the platform as centos and version as 5.3" do
+        File.should_receive(:read).with("/etc/redhat-release").and_return("CentOS release 5.3")
+        @ohai._require_plugin("linux::platform")
+        @ohai[:platform].should == "centos"
+      end
+  
+      it "may be that someone munged Red Hat to be RedHat" do
+        File.should_receive(:read).with("/etc/redhat-release").and_return("RedHat release 5.3")
+        @ohai._require_plugin("linux::platform")
+        @ohai[:platform].should == "redhat"
+        @ohai[:platform_version].should == "5.3"
+      end
+  
+      it "should read the platform as redhat and version as 5.3" do
+        File.should_receive(:read).with("/etc/redhat-release").and_return("Red Hat release 5.3")
+        @ohai._require_plugin("linux::platform")
+        @ohai[:platform].should == "redhat"
+        @ohai[:platform_version].should == "5.3"
+      end
+  
+      it "should read the platform as fedora and version as 13 (rawhide)" do
+        File.should_receive(:read).with("/etc/redhat-release").and_return("Fedora release 13 (Rawhide)")
+        @ohai._require_plugin("linux::platform")
+        @ohai[:platform].should == "fedora"
+        @ohai[:platform_version].should == "13 (rawhide)"
+      end
+      
+      it "should read the platform as fedora and version as 10" do
+        File.should_receive(:read).with("/etc/redhat-release").and_return("Fedora release 10")
+        @ohai._require_plugin("linux::platform")
+        @ohai[:platform].should == "fedora"
+        @ohai[:platform_version].should == "10"
+      end
+  
+      it "should read the platform as fedora and version as 13 using to_i" do
+        File.should_receive(:read).with("/etc/redhat-release").and_return("Fedora release 13 (Rawhide)")
+        @ohai._require_plugin("linux::platform")
+        @ohai[:platform].should == "fedora"
+        @ohai[:platform_version].to_i.should == 13
+      end
     end
   end
 

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

@@ -26,8 +26,8 @@ describe Ohai::System, "Linux virtualization platform" do
     @ohai.extend(SimpleFromFile)
 
     # default to all requested Files not existing
-    File.stub(:exists?).with("/proc/xen").and_return(false)
-    File.stub(:exists?).with("/dev/xen/evtchn").and_return(false)
+    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)
@@ -36,17 +36,24 @@ describe Ohai::System, "Linux virtualization platform" do
   end
 
   describe "when we are checking for xen" do
-    it "should set xen host if /proc/xen " do
-      File.should_receive(:exists?).with("/proc/xen").and_return(true)
-      File.should_receive(:exists?).with("/dev/xen/evtchn").and_return(true)
+    it "should set xen host if /proc/xen/capabilities contains control_d " 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][:role].should == "host"
     end
 
-    it "should set xen guest if no /dev/xen/evtchn" do
-      File.should_receive(:exists?).with("/proc/xen").and_return(true)
-      File.should_receive(:exists?).with("/dev/xen/evtchn").and_return(false)
+    it "should set xen guest if /proc/xen/capabilities exists but is empty" 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"
+    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)
       @ohai._require_plugin("linux::virtualization")
       @ohai[:virtualization][:system].should == "xen"
       @ohai[:virtualization][:role].should == "guest"

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: ohai
 version: !ruby/object:Gem::Version 
-  hash: 11
-  prerelease: 
+  hash: 15424053
+  prerelease: 6
   segments: 
   - 0
   - 6
-  - 6
-  version: 0.6.6
+  - 8
+  - rc
+  - 0
+  version: 0.6.8.rc.0
 platform: ruby
 authors: 
 - Adam Jacob
@@ -15,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-03 00:00:00 Z
+date: 2011-10-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: yajl-ruby
@@ -355,7 +357,7 @@ files:
 - spec/rcov.opts
 - spec/ohai_spec.rb
 - bin/ohai
-homepage: http://wiki.opscode.com/display/ohai
+homepage: http://wiki.opscode.com/display/chef/Ohai
 licenses: []
 
 post_install_message: 
@@ -375,12 +377,14 @@ 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: