Merge pull request #235 from opscode/OHAI-537

OHAI-537: Require the os plugin in the hostname plugin

2 files changed, 13 insertions, 2 deletions

diff --git a/lib/ohai/plugins/hostname.rb b/lib/ohai/plugins/hostname.rb
index 119e3c29..34c9a155 100644
--- a/lib/ohai/plugins/hostname.rb
+++ b/lib/ohai/plugins/hostname.rb
@@ -18,10 +18,11 @@
 
 provides "fqdn", "domain"
 
+require_plugin "os"
 require_plugin "#{os}::hostname"
 
 # Domain is everything after the first dot
 if fqdn
   fqdn =~ /.+?\.(.*)/
   domain $1 
-end
\ No newline at end of file
+end
diff --git a/spec/unit/plugins/hostname_spec.rb b/spec/unit/plugins/hostname_spec.rb
index 1ac8dc53..fb427535 100644
--- a/spec/unit/plugins/hostname_spec.rb
+++ b/spec/unit/plugins/hostname_spec.rb
@@ -35,5 +35,15 @@ describe Ohai::System, "hostname plugin" do
     @ohai._require_plugin("hostname")
     @ohai.domain.should == nil
   end
-    
+
+  it "should require the os plugin" do
+    @ohai.should_receive(:require_plugin).with("os").and_return(true)
+    @ohai._require_plugin("hostname")
+  end
+
+  it "should load a platform specific hostname plugin" do
+    @ohai[:os] = "linux"
+    @ohai.should_receive(:require_plugin).with("linux::hostname").and_return(true)
+    @ohai._require_plugin("hostname")
+  end
 end