ohai 6.22.0.rc.0 → 6.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3872010f8bc963540ab72655b4dd162db4e3e59
-  data.tar.gz: 8447bce3ab96458b3d9273fa055cef1f29552c4a
+  metadata.gz: d66c2d60f9b4b0168070e6a8f184040ad9bf0bf2
+  data.tar.gz: 458d0975660f2b604020e4c6bce7dd3e40c958e9
 SHA512:
-  metadata.gz: 3260b0e87284e822bb5408d5525eb406b325cdb4c49b49b452cb0b775d9dcacad46d2da46c06685831606c8089c645f2eaafb1821da27771ee2756dc172ef4a6
-  data.tar.gz: cb88f272673036b3f28d10302685339917bcc9e0282c1485e6b4e8c474ddd8db5477359b61210c83838baa207bfc279e744df1c6ed92bdda44ddb9eef1ae320b
+  metadata.gz: a4c712fa989b69a385f8f9e2688fc82c5039ac6e141b17856e8a8b1f14bc383d72fda737e9a63ab1d7116d44c15658aea5e0b5d606d08cb53192e69ed373c883
+  data.tar.gz: 60614716e19d3709fb82ef6966f284e6c3a05561bbeffb78f67e93b5f6540d2b33229e545abf085a565762dd162ec89657c1748ac3a55e4ca6090da8a1455410

data/lib/ohai/plugins/java.rb

@@ -24,10 +24,10 @@ java = Mash.new
 status, stdout, stderr = nil
 if RUBY_PLATFORM.downcase.include?("darwin")
   if system("/usr/libexec/java_home >/dev/null 2>&1")
-    status, stdout, stderr = run_command(:no_status_check => true, :command => "java -version")
+    status, stdout, stderr = run_command(:no_status_check => true, :command => "java -mx64m -version")
   end
 else
-  status, stdout, stderr = run_command(:no_status_check => true, :command => "java -version")
+  status, stdout, stderr = run_command(:no_status_check => true, :command => "java -mx64m -version")
 end
 
 if status == 0

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

@@ -21,35 +21,34 @@ provides "filesystem"
 fs = Mash.new
 
 # Grab filesystem data from df
-popen4("df -P") do |pid, stdin, stdout, stderr|
-  stdin.close
-  stdout.each do |line|
-    case line
-    when /^Filesystem\s+1024-blocks/
-      next
-    when /^(.+?)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+\%)\s+(.+)$/
-      filesystem = $1
-      fs[filesystem] = Mash.new
-      fs[filesystem][:kb_size] = $2
-      fs[filesystem][:kb_used] = $3
-      fs[filesystem][:kb_available] = $4
-      fs[filesystem][:percent_used] = $5
-      fs[filesystem][:mount] = $6
-    end
+# df often returns non-zero even when it has useful output, accept it.
+status, stdout, stderr = run_command(:command => "df -P",
+                                     :timeout => 120,
+                                     :no_status_check => true)
+stdout.each_line do |line|
+  case line
+  when /^Filesystem\s+1024-blocks/
+    next
+  when /^(.+?)\s+(\d+)\s+(\d+)\s+(\d+)\s+(\d+\%)\s+(.+)$/
+    filesystem = $1
+    fs[filesystem] = Mash.new
+    fs[filesystem][:kb_size] = $2
+    fs[filesystem][:kb_used] = $3
+    fs[filesystem][:kb_available] = $4
+    fs[filesystem][:percent_used] = $5
+    fs[filesystem][:mount] = $6
   end
 end
 
 # Grab mount information from /bin/mount
-popen4("mount") do |pid, stdin, stdout, stderr|
-  stdin.close
-  stdout.each do |line|
-    if line =~ /^(.+?) on (.+?) type (.+?) \((.+?)\)$/
-      filesystem = $1
-      fs[filesystem] = Mash.new unless fs.has_key?(filesystem)
-      fs[filesystem][:mount] = $2
-      fs[filesystem][:fs_type] = $3
-      fs[filesystem][:mount_options] = $4.split(",")
-    end
+status, stdout, stderr = run_command(:command => "mount", :timeout => 120)
+stdout.each_line do |line|
+  if line =~ /^(.+?) on (.+?) type (.+?) \((.+?)\)$/
+    filesystem = $1
+    fs[filesystem] = Mash.new unless fs.has_key?(filesystem)
+    fs[filesystem][:mount] = $2
+    fs[filesystem][:fs_type] = $3
+    fs[filesystem][:mount_options] = $4.split(",")
   end
 end
 

data/lib/ohai/version.rb

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

data/spec/unit/plugins/java_spec.rb

@@ -26,11 +26,11 @@ describe Ohai::System, "plugin java (Java5 Client VM)" do
     @status = 0
     @stdout = ""
     @stderr = "java version \"1.5.0_16\"\nJava(TM) 2 Runtime Environment, Standard Edition (build 1.5.0_16-b06-284)\nJava HotSpot(TM) Client VM (build 1.5.0_16-133, mixed mode, sharing)"
-    @ohai.stub!(:run_command).with({:no_status_check => true, :command => "java -version"}).and_return([@status, @stdout, @stderr])
+    @ohai.stub!(:run_command).with({:no_status_check => true, :command => "java -mx64m -version"}).and_return([@status, @stdout, @stderr])
   end
 
-  it "should run java -version" do
-    @ohai.should_receive(:run_command).with({:no_status_check => true, :command => "java -version"}).and_return([0, "", "java version \"1.5.0_16\"\nJava(TM) 2 Runtime Environment, Standard Edition (build 1.5.0_16-b06-284)\nJava HotSpot(TM) Client VM (build 1.5.0_16-133, mixed mode, sharing)"])
+  it "should run java -mx64m -version" do
+    @ohai.should_receive(:run_command).with({:no_status_check => true, :command => "java -mx64m -version"}).and_return([0, "", "java version \"1.5.0_16\"\nJava(TM) 2 Runtime Environment, Standard Edition (build 1.5.0_16-b06-284)\nJava HotSpot(TM) Client VM (build 1.5.0_16-133, mixed mode, sharing)"])
     @ohai._require_plugin("java")
   end
 
@@ -63,7 +63,7 @@ describe Ohai::System, "plugin java (Java5 Client VM)" do
     @status = 1
     @stdout = ""
     @stderr = "Some error output here"
-    @ohai.stub!(:run_command).with({:no_status_check => true, :command => "java -version"}).and_return([@status, @stdout, @stderr])
+    @ohai.stub!(:run_command).with({:no_status_check => true, :command => "java -mx64m -version"}).and_return([@status, @stdout, @stderr])
     @ohai._require_plugin("java")
     @ohai.languages.should_not have_key(:java)
   end
@@ -77,11 +77,11 @@ describe Ohai::System, "plugin java (Java6 Server VM)" do
     @status = 0
     @stdout = ""
     @stderr = "java version \"1.6.0_22\"\nJava(TM) 2 Runtime Environment (build 1.6.0_22-b04)\nJava HotSpot(TM) Server VM (build 17.1-b03, mixed mode)"
-    @ohai.stub!(:run_command).with({:no_status_check => true, :command => "java -version"}).and_return([@status, @stdout, @stderr])
+    @ohai.stub!(:run_command).with({:no_status_check => true, :command => "java -mx64m -version"}).and_return([@status, @stdout, @stderr])
   end
 
-  it "should run java -version" do
-    @ohai.should_receive(:run_command).with({:no_status_check => true, :command => "java -version"}).and_return([0, "", "java version \"1.6.0_22\"\nJava(TM) 2 Runtime Environment (build 1.6.0_22-b04)\nJava HotSpot(TM) Server VM (build 17.1-b03, mixed mode)"])
+  it "should run java -mx64m -version" do
+    @ohai.should_receive(:run_command).with({:no_status_check => true, :command => "java -mx64m -version"}).and_return([0, "", "java version \"1.6.0_22\"\nJava(TM) 2 Runtime Environment (build 1.6.0_22-b04)\nJava HotSpot(TM) Server VM (build 17.1-b03, mixed mode)"])
     @ohai._require_plugin("java")
   end
 
@@ -114,7 +114,7 @@ describe Ohai::System, "plugin java (Java6 Server VM)" do
     @status = 1
     @stdout = ""
     @stderr = "Some error output here"
-    @ohai.stub!(:run_command).with({:no_status_check => true, :command => "java -version"}).and_return([@status, @stdout, @stderr])
+    @ohai.stub!(:run_command).with({:no_status_check => true, :command => "java -mx64m -version"}).and_return([@status, @stdout, @stderr])
     @ohai._require_plugin("java")
     @ohai.languages.should_not have_key(:java)
   end

data/spec/unit/plugins/linux/filesystem_spec.rb

@@ -25,8 +25,23 @@ describe Ohai::System, "Linux filesystem plugin" do
     @ohai.stub!(:require_plugin).and_return(true)
     @ohai.extend(SimpleFromFile)
 
-    @ohai.stub!(:popen4).with("df -P").and_return(false)
-    @ohai.stub!(:popen4).with("mount").and_return(false)
+    stdout = mock("STDOUT_SKEL")
+    stderr = mock("STDERR_SKEL")
+    stdout.stub!(:each_line).and_yield('')
+    stderr.stub!(:each_line).and_yield('')
+
+    @df_cmd = {
+      :command => "df -P",
+      :timeout => 120,
+      :no_status_check => true
+    }
+    @mount_cmd = {
+      :command => "mount",
+      :timeout => 120,
+    }
+
+    @ohai.stub!(:run_command).with(@df_cmd).and_return([0,stdout,stderr])
+    @ohai.stub!(:run_command).with(@mount_cmd).and_return([0,stdout,stderr])
     @ohai.stub!(:popen4).with("blkid -s TYPE").and_return(false)
     @ohai.stub!(:popen4).with("blkid -s UUID").and_return(false)
     @ohai.stub!(:popen4).with("blkid -s LABEL").and_return(false)
@@ -42,7 +57,7 @@ describe Ohai::System, "Linux filesystem plugin" do
       @stdout = mock("STDOUT")
       @status = 0
 
-      @stdout.stub!(:each).
+      @stdout.stub!(:each_line).
         and_yield("Filesystem         1024-blocks      Used Available Capacity Mounted on").
         and_yield("/dev/mapper/sys.vg-root.lv   4805760    378716   4182924       9% /").
         and_yield("tmpfs                  2030944         0   2030944       0% /lib/init/rw").
@@ -57,36 +72,36 @@ describe Ohai::System, "Linux filesystem plugin" do
     end
 
     it "should run df -P" do
-      @ohai.should_receive(:popen4).with("df -P").and_return(true)
+      @ohai.should_receive(:run_command).with(@df_cmd).and_return(true)
       @ohai._require_plugin("linux::filesystem")
     end
 
     it "should set kb_size to value from df -P" do
-      @ohai.stub!(:popen4).with("df -P").and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status)
+      @ohai.stub!(:run_command).with(@df_cmd).and_return([@status, @stdout, @stderr])
       @ohai._require_plugin("linux::filesystem")
       @ohai[:filesystem]["/dev/mapper/sys.vg-special.lv"][:kb_size].should be == "97605057"
     end
 
     it "should set kb_used to value from df -P" do
-      @ohai.stub!(:popen4).with("df -P").and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status)
+      @ohai.stub!(:run_command).with(@df_cmd).and_return([@status, @stdout, @stderr])
       @ohai._require_plugin("linux::filesystem")
       @ohai[:filesystem]["/dev/mapper/sys.vg-special.lv"][:kb_used].should be == "53563253"
     end
 
     it "should set kb_available to value from df -P" do
-      @ohai.stub!(:popen4).with("df -P").and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status)
+      @ohai.stub!(:run_command).with(@df_cmd).and_return([@status, @stdout, @stderr])
       @ohai._require_plugin("linux::filesystem")
       @ohai[:filesystem]["/dev/mapper/sys.vg-special.lv"][:kb_available].should be == "44041805"
     end
 
     it "should set percent_used to value from df -P" do
-      @ohai.stub!(:popen4).with("df -P").and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status)
+      @ohai.stub!(:run_command).with(@df_cmd).and_return([@status, @stdout, @stderr])
       @ohai._require_plugin("linux::filesystem")
       @ohai[:filesystem]["/dev/mapper/sys.vg-special.lv"][:percent_used].should be == "56%"
     end
 
     it "should set mount to value from df -P" do
-      @ohai.stub!(:popen4).with("df -P").and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status)
+      @ohai.stub!(:run_command).with(@df_cmd).and_return([@status, @stdout, @stderr])
       @ohai._require_plugin("linux::filesystem")
       @ohai[:filesystem]["/dev/mapper/sys.vg-special.lv"][:mount].should be == "/special"
     end
@@ -100,7 +115,7 @@ describe Ohai::System, "Linux filesystem plugin" do
       @stdout = mock("STDOUT")
       @status = 0
 
-      @stdout.stub!(:each).
+      @stdout.stub!(:each_line).
         and_yield("/dev/mapper/sys.vg-root.lv on / type ext4 (rw,noatime,errors=remount-ro)").
         and_yield("tmpfs on /lib/init/rw type tmpfs (rw,nosuid,mode=0755)").
         and_yield("proc on /proc type proc (rw,noexec,nosuid,nodev)").
@@ -119,24 +134,24 @@ describe Ohai::System, "Linux filesystem plugin" do
     end
 
     it "should run mount" do
-      @ohai.should_receive(:popen4).with("mount").and_return(true)
+      @ohai.stub!(:run_command).with(@mount_cmd).and_return([@status, @stdout, @stderr])
       @ohai._require_plugin("linux::filesystem")
     end
 
     it "should set mount to value from mount" do
-      @ohai.stub!(:popen4).with("mount").and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status)
+      @ohai.stub!(:run_command).with(@mount_cmd).and_return([@status, @stdout, @stderr])
       @ohai._require_plugin("linux::filesystem")
       @ohai[:filesystem]["/dev/mapper/sys.vg-special.lv"][:mount].should be == "/special"
     end
 
     it "should set fs_type to value from mount" do
-      @ohai.stub!(:popen4).with("mount").and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status)
+      @ohai.stub!(:run_command).with(@mount_cmd).and_return([@status, @stdout, @stderr])
       @ohai._require_plugin("linux::filesystem")
       @ohai[:filesystem]["/dev/mapper/sys.vg-special.lv"][:fs_type].should be == "xfs"
     end
 
     it "should set mount_options to an array of values from mount" do
-      @ohai.stub!(:popen4).with("mount").and_yield(@pid, @stdin, @stdout, @stderr).and_return(@status)
+      @ohai.stub!(:run_command).with(@mount_cmd).and_return([@status, @stdout, @stderr])
       @ohai._require_plugin("linux::filesystem")
       @ohai[:filesystem]["/dev/mapper/sys.vg-special.lv"][:mount_options].should be == [ "ro", "noatime" ]
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ohai
 version: !ruby/object:Gem::Version
-  version: 6.22.0.rc.0
+  version: 6.22.0
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-31 00:00:00.000000000 Z
+date: 2014-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: systemu
@@ -430,9 +430,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2