Updating Platform to use os instead of operatingsystem, Updating Client specs to use Ohai style platform/platform_version, removing specs that are no longer relevant from Platform

Author: adamhjk

chef/lib/chef/platform.rb

@@ -111,8 +111,8 @@ def find_platform_and_version(node)
 
         if node[:platform]
           platform = node[:platform]
-        elsif node.attribute?("operatingsystem")
-          platform = node[:operatingsystem]
+        elsif node.attribute?("os")
+          platform = node[:os]
         end
 
         raise ArgumentError, "Cannot find a platform for #{node}" unless platform

chef/spec/unit/client_spec.rb

@@ -128,9 +128,12 @@
     @mock_facter_fqdn.stub!(:value).and_return("foo.bar.com")
     @mock_facter_hostname = mock("Facter Hostname")
     @mock_facter_hostname.stub!(:value).and_return("foo")
-    Facter.stub!(:[]).with("fqdn").and_return(@mock_facter_fqdn)
-    Facter.stub!(:[]).with("hostname").and_return(@mock_facter_hostname)
-    Facter.stub!(:each).and_return(true)
+    @mock_ohai = {
+      :fqdn => "foo.bar.com",
+      :hostname => "foo"
+    }
+    @mock_ohai.stub!(:all_plugins).and_return(true)
+    Ohai::System.stub!(:new).and_return(@mock_ohai)
     @node = Chef::Node.new
     @mock_rest.stub!(:get_rest).and_return(@node)
     Chef::REST.stub!(:new).and_return(@mock_rest)
@@ -145,7 +148,7 @@
   end
 
   it "should set the name equal to the hostname if FQDN is not available" do
-    @mock_facter_fqdn.stub!(:value).and_return(nil)
+    @mock_ohai[:fqdn] = nil
     @mock_rest.stub!(:get_rest).and_return(nil)
     @client.build_node
     @client.node.name.should eql("foo")

chef/spec/unit/platform_spec.rb

@@ -94,73 +94,11 @@
     kitty = Chef::Resource::Cat.new("loulou")    
     node = Chef::Node.new
     node.name("Intel")
-    node.operatingsystem("Darwin")
-    node.operatingsystemversion("9.2.2")
+    node.platform("mac_os_x")
+    node.platform_version("9.2.2")
     Chef::Platform.find_provider_for_node(node, kitty).should eql("nice")
   end
 
-  it "should prefer lsbdistid over operatingsystem when looking up via node" do
-    kitty = Chef::Resource::Cat.new("loulou")    
-    node = Chef::Node.new
-    node.name("Intel")
-    node.operatingsystem("Darwin")
-    node.operatingsystemversion("9.2.2")
-    node.lsbdistid("Not Linux")
-    Chef::Platform.set(
-      :platform => :not_linux,
-      :resource => :cat,
-      :provider => "bourbon"
-    )
-    Chef::Platform.find_provider_for_node(node, kitty).should eql("bourbon")
-  end
-  
-  it "should prefer macosx_productnmae over operatingsystem when looking up via node" do
-    kitty = Chef::Resource::Cat.new("loulou")    
-    node = Chef::Node.new
-    node.name("Intel")
-    node.operatingsystem("Darwin")
-    node.operatingsystemversion("9.2.2")
-    node.macosx_productname("Mac OS X")
-    Chef::Platform.set(
-      :platform => :mac_os_x,
-      :resource => :cat,
-      :provider => "bourbon"
-    )
-    Chef::Platform.find_provider_for_node(node, kitty).should eql("bourbon")
-  end
-  
-  it "should prefer lsbdistrelease over operatingsystem when looking up via node" do
-    kitty = Chef::Resource::Cat.new("loulou")    
-    node = Chef::Node.new
-    node.name("Intel")
-    node.operatingsystem("Darwin")
-    node.operatingsystemversion("9.2.2")
-    node.lsbdistrelease("10")
-    Chef::Platform.set(
-      :platform => :darwin,
-      :version => "10",
-      :resource => :cat,
-      :provider => "bourbon"
-    )
-    Chef::Platform.find_provider_for_node(node, kitty).should eql("bourbon")
-  end
-  
-  it "should prefer macosx_productversion over operatingsystem when looking up via node" do
-    kitty = Chef::Resource::Cat.new("loulou")    
-    node = Chef::Node.new
-    node.name("Intel")
-    node.operatingsystem("Darwin")
-    node.operatingsystemversion("9.2.2")
-    node.macosx_productversion("10")
-    Chef::Platform.set(
-      :platform => :darwin,
-      :version => "10",
-      :resource => :cat,
-      :provider => "bourbon"
-    )
-    Chef::Platform.find_provider_for_node(node, kitty).should eql("bourbon")
-  end
-  
   it "should update the provider map with map" do  
     Chef::Platform.set(
          :platform => :darwin,

example-repository/cookbooks/fakefile/recipes/default.rb

@@ -78,7 +78,7 @@
   mode 0755
   source "remote_test"
   files_owner "root"
-  files_group(@node['operatingsystem'] == "Ubuntu" ? "admin" : "wheel")
+  files_group(@node['platform'] == "ubuntu" ? "admin" : "wheel")
   files_mode 0644
   files_backup false
 end