ohai 0.6.8 → 0.6.10.rc.1

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

@@ -33,6 +33,9 @@ require_plugin 'linux::lsb'
 if lsb[:id] =~ /RedHat/i
   platform "redhat"
   platform_version lsb[:release]
+elsif lsb[:id] =~ /Amazon/i
+ platform "amazon"
+ platform_version lsb[:release]
 elsif lsb[:id]	
   platform lsb[:id].downcase
   platform_version lsb[:release]

data/lib/ohai/plugins/network.rb

@@ -36,7 +36,10 @@ def find_ip_and_mac(addresses)
   [ip, mac]
 end
 
-if network[:default_interface]
+# If we have a default interface that has addresses, populate the short-cut attributes
+if network[:default_interface] and
+    network["interfaces"][network[:default_interface]] and
+    network["interfaces"][network[:default_interface]]["addresses"]
   Ohai::Log.debug("Using default interface for default ip and mac address")
   im = find_ip_and_mac(network["interfaces"][network[:default_interface]]["addresses"])
   ipaddress im.shift

data/lib/ohai/plugins/windows/kernel.rb

@@ -18,6 +18,8 @@
 
 require 'ruby-wmi'
 
+WIN32OLE.codepage = WIN32OLE::CP_UTF8
+
 def machine_lookup(sys_type)
   return "i386" if sys_type.eql?("X86-based PC")
   return "x86_64" if sys_type.eql?("x64-based PC")

data/lib/ohai/version.rb

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

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

@@ -56,6 +56,20 @@ describe Ohai::System, "Linux plugin platform" do
       @ohai._require_plugin("linux::platform")
       @ohai[:platform_version].should == "8.04"
     end
+
+    it "should set platform to redhat when [:lsb][:id] contains Redhat" do
+      @ohai[:lsb][:id] = "RedHatEnterpriseServer"
+      @ohai[:lsb][:release] = "5.7"
+      @ohai._require_plugin("linux::platform")
+      @ohai[:platform].should == "redhat"
+    end
+
+    it "should set platform to amazon when [:lsb][:id] contains Amazon" do
+      @ohai[:lsb][:id] = "AmazonAMI"
+      @ohai[:lsb][:release] = "2011.09"
+      @ohai._require_plugin("linux::platform")
+      @ohai[:platform].should == "amazon"
+    end
   end
 
   describe "on debian" do

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: ohai
 version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: 
+  hash: 15424039
+  prerelease: 7
   segments: 
   - 0
   - 6
-  - 8
-  version: 0.6.8
+  - 10
+  - rc
+  - 1
+  version: 0.6.10.rc.1
 platform: ruby
 authors: 
 - Adam Jacob
@@ -15,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-05 00:00:00 Z
+date: 2011-10-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: yajl-ruby
@@ -37,12 +39,14 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 7
         segments: 
+        - 2
+        - 2
         - 0
-        version: "0"
+        version: 2.2.0
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -375,12 +379,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: