OHAI-349: Fix regression in os fallback to ruby host_os

myplanetdigital-experimental · Mar 29, 2012 · 5d2323c · 5d2323c
1 parent 672095b
commit 5d2323c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/lib/ohai/plugins/os.rb b/lib/ohai/plugins/os.rb
@@ -47,7 +47,7 @@
   # subsystems.
   os "windows"
 else
-  Object.const_get(defined?(RbConfig) ? :RbConfig : :Config)::CONFIG['host_os']
+  os ::RbConfig::CONFIG['host_os']
 end
 
 os_version kernel[:release]
diff --git a/spec/ohai/plugins/os_spec.rb b/spec/ohai/plugins/os_spec.rb
@@ -72,4 +72,15 @@
       @ohai[:os].should == "solaris2"
     end
   end
+
+  describe "on something we have never seen before, but ruby has" do
+    before do
+      ::RbConfig::CONFIG['host_os'] = "tron"
+    end
+
+    it "sets the os to the ruby 'host_os'" do
+      @ohai._require_plugin("os")
+      @ohai[:os].should == "tron"
+    end
+  end
 end