ohai 0.6.14.rc.1 → 6.14.0.rc.1

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

@@ -38,8 +38,15 @@ elsif File.exists?("/etc/enterprise-release")
   platform "oracle"
   platform_version get_redhatish_version(contents)
 elsif File.exists?("/etc/debian_version")
-  platform "debian"
-  platform_version File.read("/etc/debian_version").chomp
+  # Ubuntu and Debian both have /etc/debian_version
+  # Ubuntu should always have a working lsb, debian does not by default
+  if lsb[:id] =~ /Ubuntu/i
+    platform "ubuntu"
+    platform_version lsb[:release]
+  else 
+    platform "debian"
+    platform_version File.read("/etc/debian_version").chomp
+  end
 elsif File.exists?("/etc/redhat-release")
   contents = File.read("/etc/redhat-release").chomp
   platform get_redhatish_platform(contents)

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

@@ -54,9 +54,8 @@ File.open("/etc/release") do |file|
       platform "solaris2"
     when /^\s*(NexentaCore)\s.*$/
       platform "nexentacore"
-    when /^\s*(SmartOS)\s(\d{8}T\d{6}Z)\s.*$/
+    when /^\s*(SmartOS)\s.*$/
       platform "smartos"
-      platform_version $2
     end
   end
 end

data/lib/ohai/version.rb

@@ -18,6 +18,6 @@
 
 module Ohai
   OHAI_ROOT = File.expand_path(File.dirname(__FILE__))
-  VERSION = '0.6.14.rc.1'
+  VERSION = '6.14.0.rc.1'
 end
 

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

@@ -52,7 +52,6 @@ describe Ohai::System, "Linux plugin platform" do
     it "should set platform to lowercased lsb[:id]" do
       @ohai._require_plugin("linux::platform")        
       @ohai[:platform].should == "ubuntu"
-      
     end
     
     it "should set platform_version to lsb[:release]" do
@@ -124,6 +123,13 @@ describe Ohai::System, "Linux plugin platform" do
       @ohai[:platform_version].should == "5.0"
     end
 
+    # Ubuntu has /etc/debian_version as well
+    it "should detect Ubuntu as itself rather than debian" do
+      @ohai[:lsb][:id] = "Ubuntu"
+      @ohai[:lsb][:release] = "8.04"
+      @ohai._require_plugin("linux::platform")
+      @ohai[:platform].should == "ubuntu"
+    end
   end
 
   describe "on slackware" do

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

@@ -69,7 +69,7 @@ UNAME_X
     
     it "should set the platform_version" do
       @ohai._require_plugin("solaris2::platform")
-      @ohai[:platform_version].should == "20120130T201844Z"
+      @ohai[:platform_version].should == "5.11"
     end
 
   end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: ohai
 version: !ruby/object:Gem::Version 
-  hash: 15424007
+  hash: 15424055
   prerelease: 7
   segments: 
-  - 0
   - 6
   - 14
+  - 0
   - rc
   - 1
-  version: 0.6.14.rc.1
+  version: 6.14.0.rc.1
 platform: ruby
 authors: 
 - Adam Jacob
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-15 00:00:00 Z
+date: 2012-05-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: systemu