ohai 0.4.0 → 0.5.0

data/Rakefile

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

data/lib/ohai.rb

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

data/lib/ohai/config.rb

@@ -25,5 +25,6 @@ module Ohai
     log_level :info
     log_location STDOUT
     plugin_path [ File.expand_path(File.join(File.dirname(__FILE__), 'plugins'))]
+    disabled_plugins []
   end
 end

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

@@ -54,7 +54,7 @@ end
 if File.exists?("/usr/sbin/dmidecode")
   popen4("dmidecode") do |pid, stdin, stdout, stderr|
     stdin.close
-    dmi_info = stdout.string
+    dmi_info = stdout.read
     case dmi_info
     when /Manufacturer: Microsoft/
       if dmi_info =~ /Product Name: Virtual Machine/ 

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

@@ -144,7 +144,7 @@ network[:interfaces] = iface
 
 popen4("route get default") do |pid, stdin, stdout, stderr|
   stdin.close
-  route_get = stdout.string
+  route_get = stdout.read
   matches = /interface: (\S+)/.match(route_get)
   if matches
     Ohai::Log.debug("found gateway device: #{$1}")

data/lib/ohai/system.rb

@@ -128,6 +128,9 @@ module Ohai
           end
         end
       end
+      # Catch any errant children who need to be reaped
+      Process.waitall
+      true
     end
 
     def collect_providers(providers)
@@ -175,6 +178,11 @@ module Ohai
         return true if @seen_plugins[plugin_name]
       end
 
+      if Ohai::Config[:disabled_plugins].include?(plugin_name)
+        Ohai::Log.debug("Skipping disabled plugin #{plugin_name}")
+        return false
+      end
+
       @plugin_path = plugin_name
 
       filename = "#{plugin_name.gsub("::", File::SEPARATOR)}.rb"

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

@@ -105,7 +105,7 @@ System Information
 	UUID: D29974A4-BE51-044C-BDC6-EFBC4B87A8E9
 	Wake-up Type: Power Switch
 MSVPC
-      @stdout.stub!(:string).and_return(ms_vpc_dmidecode) 
+      @stdout.stub!(:read).and_return(ms_vpc_dmidecode) 
        
       @ohai.stub!(:popen4).with("dmidecode").and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status)
       @ohai._require_plugin("linux::virtualization")
@@ -125,7 +125,7 @@ System Information
 	SKU Number: Not Specified
 	Family: Not Specified
 VMWARE
-      @stdout.stub!(:string).and_return(vmware_dmidecode)
+      @stdout.stub!(:read).and_return(vmware_dmidecode)
       @ohai.stub!(:popen4).with("dmidecode").and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status)
       @ohai._require_plugin("linux::virtualization")
       @ohai[:virtualization][:emulator].should == "vmware"

data/spec/ohai/plugins/solaris2/network_spec.rb

@@ -122,7 +122,7 @@ ROUTE_GET
 
   describe "setting the node's default IP address attribute" do
     before do
-      @stdout = mock("Pipe, stdout, cmd=`route get default`", :string => @solaris_route_get)
+      @stdout = mock("Pipe, stdout, cmd=`route get default`", :read => @solaris_route_get)
       @ohai.stub!(:popen4).with("route get default").and_yield(nil,@stdin, @stdout, nil)
       @ohai._require_plugin("solaris2::network")
     end

data/spec/ohai/system_spec.rb

@@ -126,5 +126,11 @@ describe Ohai::System, "require_plugin" do
   it "should return true if the plugin has been loaded" do
     @ohai.require_plugin("foo").should eql(true)
   end
+
+  it "should return false if the plugin is in the disabled plugins list" do
+    Ohai::Config[:disabled_plugins] = [ "foo" ]
+    Ohai::Log.should_receive(:debug).with("Skipping disabled plugin foo")
+    @ohai.require_plugin("foo").should eql(false)
+  end
 end
 

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 4
+  - 5
   - 0
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Adam Jacob
@@ -14,7 +14,7 @@ autorequire: ohai
 bindir: bin
 cert_chain: []
 
-date: 2010-02-28 00:00:00 -08:00
+date: 2010-03-04 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency