facter 1.6.2 → 1.6.3

data/lib/facter/virtual.rb

@@ -133,7 +133,7 @@ Facter.add("virtual") do
           end
         end
       end
-      
+
       if output = Facter::Util::Resolution.exec("vmware -v")
         result = output.sub(/(\S+)\s+(\S+).*/) { | text | "#{$1}_#{$2}"}.downcase
       end
@@ -148,7 +148,7 @@ end
 # Purpose: returning true or false for if a machine is virtualised or not.
 #
 # Resolution: Hypervisors and the like may be detected as a virtual type, but
-# are not actual virtual machines, or should not be treated as such. This 
+# are not actual virtual machines, or should not be treated as such. This
 # determines if the host is actually virtualized.
 #
 # Caveats:

data/lib/facter/vlans.rb

@@ -7,9 +7,8 @@
 #
 # Caveats:
 #
-
 require 'facter/util/vlans'
-    
+
 Facter.add("vlans") do
   confine :kernel => :linux
   setcode do

data/lib/facter/xendomains.rb

@@ -8,7 +8,6 @@
 #
 # Caveats:
 #
-
 require 'facter/util/xendomains'
 
 Facter.add("xendomains") do

data/spec/fixtures/unit/util/manufacturer/solaris_sunfire_v120_prtdiag

@@ -0,0 +1,33 @@
+System Configuration:  Sun Microsystems  sun4u Sun Fire V120 (UltraSPARC-IIe 648MHz)
+System clock frequency: 100 MHz
+Memory size: 2048 Megabytes
+
+========================= CPUs =========================
+
+                    Run   Ecache   CPU    CPU
+Brd  CPU   Module   MHz     MB    Impl.   Mask
+---  ---  -------  -----  ------  ------  ----
+ 0     0     0      648     0.5   13       3.3
+
+
+========================= IO Cards =========================
+
+     Bus#  Freq
+Brd  Type  MHz   Slot  Name                              Model
+---  ----  ----  ----  --------------------------------  ----------------------
+ 0   PCI-1  33    12   ebus                                                    
+ 0   PCI-1  33     3   pmu-pci10b9,7101                                        
+ 0   PCI-1  33     3   lomp                                                    
+ 0   PCI-1  33     7   isa                                                     
+ 0   PCI-1  33    12   network-pci108e,1101              SUNW,pci-eri          
+ 0   PCI-1  33    12   usb-pci108e,1103.1                                      
+ 0   PCI-1  33    13   ide-pci10b9,5229                                        
+ 0   PCI-1  33     5   network-pci108e,1101              SUNW,pci-eri          
+ 0   PCI-1  33     5   usb-pci108e,1103.1                                      
+ 0   PCI-2  33     8   scsi-glm                          Symbios,53C896        
+ 0   PCI-2  33     8   scsi-glm                          Symbios,53C896        
+ 0   PCI-2  33     5   network-pci108e,2bad              SUNW,pci-gem          
+
+
+No failures found in System
+===========================

data/spec/fixtures/unit/util/manufacturer/solaris_t5220_prtdiag

@@ -0,0 +1,136 @@
+System Configuration:  Sun Microsystems  sun4v SPARC Enterprise T5220
+Memory size: 32640 Megabytes
+
+================================ Virtual CPUs ================================
+
+
+CPU ID Frequency Implementation         Status
+------ --------- ---------------------- -------
+0      1165 MHz  SUNW,UltraSPARC-T2     on-line  
+1      1165 MHz  SUNW,UltraSPARC-T2     on-line  
+2      1165 MHz  SUNW,UltraSPARC-T2     on-line  
+3      1165 MHz  SUNW,UltraSPARC-T2     on-line  
+4      1165 MHz  SUNW,UltraSPARC-T2     on-line  
+5      1165 MHz  SUNW,UltraSPARC-T2     on-line  
+6      1165 MHz  SUNW,UltraSPARC-T2     on-line  
+7      1165 MHz  SUNW,UltraSPARC-T2     on-line  
+8      1165 MHz  SUNW,UltraSPARC-T2     on-line  
+9      1165 MHz  SUNW,UltraSPARC-T2     on-line  
+10     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+11     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+12     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+13     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+14     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+15     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+16     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+17     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+18     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+19     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+20     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+21     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+22     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+23     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+24     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+25     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+26     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+27     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+28     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+29     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+30     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+31     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+32     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+33     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+34     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+35     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+36     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+37     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+38     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+39     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+40     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+41     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+42     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+43     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+44     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+45     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+46     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+47     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+48     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+49     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+50     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+51     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+52     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+53     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+54     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+55     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+56     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+57     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+58     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+59     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+60     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+61     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+62     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+63     1165 MHz  SUNW,UltraSPARC-T2     on-line  
+
+======================= Physical Memory Configuration ========================
+Segment Table:
+--------------------------------------------------------------
+Base           Segment  Interleave  Bank     Contains
+Address        Size     Factor      Size     Modules
+--------------------------------------------------------------
+0x0            32 GB    8           4 GB     MB/CMP0/BR0/CH0/D0
+                                             MB/CMP0/BR0/CH1/D0
+                                    4 GB     MB/CMP0/BR0/CH0/D1
+                                             MB/CMP0/BR0/CH1/D1
+                                    4 GB     MB/CMP0/BR1/CH0/D0
+                                             MB/CMP0/BR1/CH1/D0
+                                    4 GB     MB/CMP0/BR1/CH0/D1
+                                             MB/CMP0/BR1/CH1/D1
+                                    4 GB     MB/CMP0/BR2/CH0/D0
+                                             MB/CMP0/BR2/CH1/D0
+                                    4 GB     MB/CMP0/BR2/CH0/D1
+                                             MB/CMP0/BR2/CH1/D1
+                                    4 GB     MB/CMP0/BR3/CH0/D0
+                                             MB/CMP0/BR3/CH1/D0
+                                    4 GB     MB/CMP0/BR3/CH0/D1
+                                             MB/CMP0/BR3/CH1/D1
+
+
+================================ IO Devices ================================
+Slot +            Bus   Name +                            Model   
+Status            Type  Path                                      
+----------------------------------------------------------------------------
+MB/NET0           PCIE  network-pciex8086,105e                    
+                        /pci@0/pci@0/pci@1/pci@0/pci@2/network@0    
+MB/NET1           PCIE  network-pciex8086,105e                    
+                        /pci@0/pci@0/pci@1/pci@0/pci@2/network@0,1  
+MB/NET2           PCIE  network-pciex8086,105e                    
+                        /pci@0/pci@0/pci@1/pci@0/pci@3/network@0    
+MB/NET3           PCIE  network-pciex8086,105e                    
+                        /pci@0/pci@0/pci@1/pci@0/pci@3/network@0,1  
+MB/SASHBA         PCIE  scsi-pciex1000,58                 LSI,1068E
+                        /pci@0/pci@0/pci@2/scsi@0                   
+MB                PCIX  usb-pciclass,0c0310                       
+                        /pci@0/pci@0/pci@1/pci@0/pci@1/pci@0/usb@0  
+MB                PCIX  usb-pciclass,0c0310                       
+                        /pci@0/pci@0/pci@1/pci@0/pci@1/pci@0/usb@0,1
+MB                PCIX  usb-pciclass,0c0320                       
+                        /pci@0/pci@0/pci@1/pci@0/pci@1/pci@0/usb@0,2
+
+============================ Environmental Status ============================
+Fan sensors:
+All fan sensors are OK.
+
+Temperature sensors:
+All temperature sensors are OK.
+
+Current sensors:
+All current sensors are OK.
+
+Voltage sensors:
+All voltage sensors are OK.
+
+Voltage indicators:
+All voltage indicators are OK.
+
+============================ FRU Status ============================
+All FRUs are enabled.

data/spec/spec_helper.rb

@@ -2,6 +2,11 @@ dir = File.expand_path(File.dirname(__FILE__))
 
 SPECDIR = dir
 
+def fixture_data(file)
+  File.read(File.join(SPECDIR, "fixtures", file))
+end
+
+
 $LOAD_PATH.unshift("#{dir}/")
 $LOAD_PATH.unshift("#{dir}/../lib")
 

data/spec/unit/architecture_spec.rb

@@ -6,49 +6,49 @@ require 'facter'
 
 describe "Architecture fact" do
 
-    it "should default to the hardware model" do
-        Facter.fact(:hardwaremodel).stubs(:value).returns("NonSpecialCasedHW")
-
-        Facter.fact(:architecture).value.should == "NonSpecialCasedHW"
-    end
-
-    os_archs = Hash.new
-    os_archs = {
-	["Debian","x86_64"] => "amd64",
-	["Gentoo","x86_64"] => "amd64",
-	["GNU/kFreeBSD","x86_64"] => "amd64",
-	["Ubuntu","x86_64"] => "amd64",
-	["Gentoo","i386"] => "x86",
-	["Gentoo","i486"] => "x86",
-	["Gentoo","i586"] => "x86",
-	["Gentoo","i686"] => "x86",
-	["Gentoo","pentium"] => "x86",
-    }
-    generic_archs = Hash.new
-    generic_archs = {
-	"i386" => "i386",
-	"i486" => "i386",
-	"i586" => "i386",
-	"i686" => "i386",
-	"pentium" => "i386",
-    }
-    
-    os_archs.each do |pair, result|
-	it "should be #{result} if os is #{pair[0]} and hardwaremodel is #{pair[1]}" do
-	 Facter.fact(:operatingsystem).stubs(:value).returns(pair[0])
-	 Facter.fact(:hardwaremodel).stubs(:value).returns(pair[1])
-
-	 Facter.fact(:architecture).value.should == result
-	end
+  it "should default to the hardware model" do
+    Facter.fact(:hardwaremodel).stubs(:value).returns("NonSpecialCasedHW")
+
+    Facter.fact(:architecture).value.should == "NonSpecialCasedHW"
+  end
+
+  os_archs = Hash.new
+  os_archs = {
+    ["Debian","x86_64"] => "amd64",
+    ["Gentoo","x86_64"] => "amd64",
+    ["GNU/kFreeBSD","x86_64"] => "amd64",
+    ["Ubuntu","x86_64"] => "amd64",
+    ["Gentoo","i386"] => "x86",
+    ["Gentoo","i486"] => "x86",
+    ["Gentoo","i586"] => "x86",
+    ["Gentoo","i686"] => "x86",
+    ["Gentoo","pentium"] => "x86",
+  }
+  generic_archs = Hash.new
+  generic_archs = {
+    "i386" => "i386",
+    "i486" => "i386",
+    "i586" => "i386",
+    "i686" => "i386",
+    "pentium" => "i386",
+  }
+  
+  os_archs.each do |pair, result|
+    it "should be #{result} if os is #{pair[0]} and hardwaremodel is #{pair[1]}" do
+     Facter.fact(:operatingsystem).stubs(:value).returns(pair[0])
+     Facter.fact(:hardwaremodel).stubs(:value).returns(pair[1])
+
+     Facter.fact(:architecture).value.should == result
     end
+  end
 
-    generic_archs.each do |hw, result|
-	it "should be #{result} if hardwaremodel is #{hw}" do
-	 Facter.fact(:hardwaremodel).stubs(:value).returns(hw)
-	 Facter.fact(:operatingsystem).stubs(:value).returns("NonSpecialCasedOS")
+  generic_archs.each do |hw, result|
+    it "should be #{result} if hardwaremodel is #{hw}" do
+     Facter.fact(:hardwaremodel).stubs(:value).returns(hw)
+     Facter.fact(:operatingsystem).stubs(:value).returns("NonSpecialCasedOS")
 
-	 Facter.fact(:architecture).value.should == result
-	end
+     Facter.fact(:architecture).value.should == result
     end
+  end
 
 end

data/spec/unit/facter_spec.rb

@@ -4,268 +4,268 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe Facter do
 
-    it "should have a version" do
-        Facter.version.should =~ /^[0-9]+(\.[0-9]+)*$/
+  it "should have a version" do
+    Facter.version.should =~ /^[0-9]+(\.[0-9]+)*$/
+  end
+
+  it "should have a method for returning its collection" do
+    Facter.should respond_to(:collection)
+  end
+
+  it "should cache the collection" do
+    Facter.collection.should equal(Facter.collection)
+  end
+
+  it "should delegate the :flush method to the collection" do
+    Facter.collection.expects(:flush)
+    Facter.flush
+  end
+
+  it "should delegate the :fact method to the collection" do
+    Facter.collection.expects(:fact)
+    Facter.fact
+  end
+
+  it "should delegate the :list method to the collection" do
+    Facter.collection.expects(:list)
+    Facter.list
+  end
+
+  it "should load all facts when listing" do
+    Facter.collection.expects(:load_all)
+    Facter.collection.stubs(:list)
+    Facter.list
+  end
+
+  it "should delegate the :to_hash method to the collection" do
+    Facter.collection.expects(:to_hash)
+    Facter.to_hash
+  end
+
+  it "should load all facts when calling :to_hash" do
+    Facter.collection.expects(:load_all)
+    Facter.collection.stubs(:to_hash)
+    Facter.to_hash
+  end
+
+  it "should delegate the :value method to the collection" do
+    Facter.collection.expects(:value)
+    Facter.value
+  end
+
+  it "should delegate the :each method to the collection" do
+    Facter.collection.expects(:each)
+    Facter.each
+  end
+
+  it "should load all facts when calling :each" do
+    Facter.collection.expects(:load_all)
+    Facter.collection.stubs(:each)
+    Facter.each
+  end
+
+  it "should yield to the block when using :each" do
+    Facter.collection.stubs(:load_all)
+    Facter.collection.stubs(:each).yields "foo"
+    result = []
+    Facter.each { |f| result << f }
+    result.should == %w{foo}
+  end
+
+  describe "when provided code as a string" do
+    it "should execute the code in the shell" do
+      Facter.add("shell_testing") do
+        setcode "echo yup"
+      end
+
+      Facter["shell_testing"].value.should == "yup"
     end
-
-    it "should have a method for returning its collection" do
-        Facter.should respond_to(:collection)
+  end
+
+  describe "when asked for a fact as an undefined Facter class method" do
+    describe "and the collection is already initialized" do
+      it "should return the fact's value" do
+        Facter.collection
+        Facter.ipaddress.should == Facter['ipaddress'].value
+      end
     end
 
-    it "should cache the collection" do
-        Facter.collection.should equal(Facter.collection)
+    describe "and the collection has been just reset" do
+      it "should return the fact's value" do
+        Facter.reset
+        Facter.ipaddress.should == Facter['ipaddress'].value
+      end
     end
+  end
 
-    it "should delegate the :flush method to the collection" do
-        Facter.collection.expects(:flush)
-        Facter.flush
-    end
+  describe "when passed code as a block" do
+    it "should execute the provided block" do
+      Facter.add("block_testing") { setcode { "foo" } }
 
-    it "should delegate the :fact method to the collection" do
-        Facter.collection.expects(:fact)
-        Facter.fact
+      Facter["block_testing"].value.should == "foo"
     end
+  end
 
-    it "should delegate the :list method to the collection" do
-        Facter.collection.expects(:list)
-        Facter.list
+  describe Facter[:hostname] do
+    it "should have its ldapname set to 'cn'" do
+      Facter[:hostname].ldapname.should == "cn"
     end
+  end
 
-    it "should load all facts when listing" do
-        Facter.collection.expects(:load_all)
-        Facter.collection.stubs(:list)
-        Facter.list
+  describe Facter[:ipaddress] do
+    it "should have its ldapname set to 'iphostnumber'" do
+      Facter[:ipaddress].ldapname.should == "iphostnumber"
     end
-
-    it "should delegate the :to_hash method to the collection" do
-        Facter.collection.expects(:to_hash)
-        Facter.to_hash
-    end
-
-    it "should load all facts when calling :to_hash" do
-        Facter.collection.expects(:load_all)
-        Facter.collection.stubs(:to_hash)
-        Facter.to_hash
+  end
+
+  # #33 Make sure we only get one mac address
+  it "should only return one mac address" do
+    Facter.value(:macaddress).should_not be_include(" ")
+  end
+
+  it "should have a method for registering directories to search" do
+    Facter.should respond_to(:search)
+  end
+
+  it "should have a method for returning the registered search directories" do
+    Facter.should respond_to(:search_path)
+  end
+
+  it "should have a method to query debugging mode" do
+    Facter.should respond_to(:debugging?)
+  end
+
+  it "should have a method to query timing mode" do
+    Facter.should respond_to(:timing?)
+  end
+
+  it "should have a method to show timing information" do
+    Facter.should respond_to(:show_time)
+  end
+
+  it "should have a method to warn" do
+    Facter.should respond_to(:warn)
+  end
+
+  describe "when warning" do
+    it "should warn if debugging is enabled" do
+      Facter.debugging(true)
+      Kernel.stubs(:warn)
+      Kernel.expects(:warn).with('foo')
+      Facter.warn('foo')
     end
 
-    it "should delegate the :value method to the collection" do
-        Facter.collection.expects(:value)
-        Facter.value
+    it "should not warn if debugging is enabled but nil is passed" do
+      Facter.debugging(true)
+      Kernel.stubs(:warn)
+      Kernel.expects(:warn).never
+      Facter.warn(nil)
     end
 
-    it "should delegate the :each method to the collection" do
-        Facter.collection.expects(:each)
-        Facter.each
+    it "should not warn if debugging is enabled but an empyt string is passed" do
+      Facter.debugging(true)
+      Kernel.stubs(:warn)
+      Kernel.expects(:warn).never
+      Facter.warn('')
     end
 
-    it "should load all facts when calling :each" do
-        Facter.collection.expects(:load_all)
-        Facter.collection.stubs(:each)
-        Facter.each
+    it "should not warn if debugging is disabled" do
+      Facter.debugging(false)
+      Kernel.stubs(:warn)
+      Kernel.expects(:warn).never
+      Facter.warn('foo')
     end
 
-    it "should yield to the block when using :each" do
-        Facter.collection.stubs(:load_all)
-        Facter.collection.stubs(:each).yields "foo"
-        result = []
-        Facter.each { |f| result << f }
-        result.should == %w{foo}
+    it "should warn for any given element for an array if debugging is enabled" do
+      Facter.debugging(true)
+      Kernel.stubs(:warn)
+      Kernel.expects(:warn).with('foo')
+      Kernel.expects(:warn).with('bar')
+      Facter.warn( ['foo','bar'])
     end
-
-    describe "when provided code as a string" do
-        it "should execute the code in the shell" do
-            Facter.add("shell_testing") do
-                setcode "echo yup"
-            end
-
-            Facter["shell_testing"].value.should == "yup"
-        end
+  end
+
+  describe "when warning once" do
+    it "should only warn once" do
+      Kernel.stubs(:warnonce)
+      Kernel.expects(:warn).with('foo').once
+      Facter.warnonce('foo')
+      Facter.warnonce('foo')
     end
 
-    describe "when asked for a fact as an undefined Facter class method" do
-        describe "and the collection is already initialized" do
-            it "should return the fact's value" do
-                Facter.collection
-                Facter.ipaddress.should == Facter['ipaddress'].value
-            end
-        end
-
-        describe "and the collection has been just reset" do
-            it "should return the fact's value" do
-                Facter.reset
-                Facter.ipaddress.should == Facter['ipaddress'].value
-            end
-        end
+    it "should not warnonce if nil is passed" do
+      Kernel.stubs(:warn)
+      Kernel.expects(:warnonce).never
+      Facter.warnonce(nil)
     end
 
-    describe "when passed code as a block" do
-        it "should execute the provided block" do
-            Facter.add("block_testing") { setcode { "foo" } }
-
-            Facter["block_testing"].value.should == "foo"
-        end
+    it "should not warnonce if an empty string is passed" do
+      Kernel.stubs(:warn)
+      Kernel.expects(:warnonce).never
+      Facter.warnonce('')
     end
+  end
 
-    describe Facter[:hostname] do
-        it "should have its ldapname set to 'cn'" do
-            Facter[:hostname].ldapname.should == "cn"
-        end
+  describe "when setting debugging mode" do
+    it "should have debugging enabled using 1" do
+      Facter.debugging(1)
+      Facter.should be_debugging
     end
-
-    describe Facter[:ipaddress] do
-        it "should have its ldapname set to 'iphostnumber'" do
-            Facter[:ipaddress].ldapname.should == "iphostnumber"
-        end
+    it "should have debugging enabled using true" do
+      Facter.debugging(true)
+      Facter.should be_debugging
     end
-
-    # #33 Make sure we only get one mac address
-    it "should only return one mac address" do
-        Facter.value(:macaddress).should_not be_include(" ")
+    it "should have debugging enabled using any string except off" do
+      Facter.debugging('aaaaa')
+      Facter.should be_debugging
     end
-
-    it "should have a method for registering directories to search" do
-        Facter.should respond_to(:search)
+    it "should have debugging disabled using 0" do
+      Facter.debugging(0)
+      Facter.should_not be_debugging
     end
-
-    it "should have a method for returning the registered search directories" do
-        Facter.should respond_to(:search_path)
+    it "should have debugging disabled using false" do
+      Facter.debugging(false)
+      Facter.should_not be_debugging
     end
-
-    it "should have a method to query debugging mode" do
-        Facter.should respond_to(:debugging?)
+    it "should have debugging disabled using the string 'off'" do
+      Facter.debugging('off')
+      Facter.should_not be_debugging
     end
+  end
 
-    it "should have a method to query timing mode" do
-        Facter.should respond_to(:timing?)
+  describe "when setting timing mode" do
+    it "should have timing enabled using 1" do
+      Facter.timing(1)
+      Facter.should be_timing
     end
-
-    it "should have a method to show timing information" do
-        Facter.should respond_to(:show_time)
+    it "should have timing enabled using true" do
+      Facter.timing(true)
+      Facter.should be_timing
     end
-
-    it "should have a method to warn" do
-        Facter.should respond_to(:warn)
+    it "should have timing disabled using 0" do
+      Facter.timing(0)
+      Facter.should_not be_timing
     end
-
-    describe "when warning" do
-        it "should warn if debugging is enabled" do
-          Facter.debugging(true)
-          Kernel.stubs(:warn)
-          Kernel.expects(:warn).with('foo')
-          Facter.warn('foo')
-        end
-
-        it "should not warn if debugging is enabled but nil is passed" do
-          Facter.debugging(true)
-          Kernel.stubs(:warn)
-          Kernel.expects(:warn).never
-          Facter.warn(nil)
-        end
-
-        it "should not warn if debugging is enabled but an empyt string is passed" do
-          Facter.debugging(true)
-          Kernel.stubs(:warn)
-          Kernel.expects(:warn).never
-          Facter.warn('')
-        end
-
-        it "should not warn if debugging is disabled" do
-          Facter.debugging(false)
-          Kernel.stubs(:warn)
-          Kernel.expects(:warn).never
-          Facter.warn('foo')
-        end
-
-        it "should warn for any given element for an array if debugging is enabled" do
-          Facter.debugging(true)
-          Kernel.stubs(:warn)
-          Kernel.expects(:warn).with('foo')
-          Kernel.expects(:warn).with('bar')
-          Facter.warn( ['foo','bar'])
-        end
+    it "should have timing disabled using false" do
+      Facter.timing(false)
+      Facter.should_not be_timing
     end
+  end
 
-    describe "when warning once" do
-        it "should only warn once" do
-          Kernel.stubs(:warnonce)
-          Kernel.expects(:warn).with('foo').once
-          Facter.warnonce('foo')
-          Facter.warnonce('foo')
-        end
-
-        it "should not warnonce if nil is passed" do
-          Kernel.stubs(:warn)
-          Kernel.expects(:warnonce).never
-          Facter.warnonce(nil)
-        end
-
-        it "should not warnonce if an empty string is passed" do
-          Kernel.stubs(:warn)
-          Kernel.expects(:warnonce).never
-          Facter.warnonce('')
-        end
-    end
+  describe "when registering directories to search" do
+    after { Facter.instance_variable_set("@search_path", []) }
 
-    describe "when setting debugging mode" do
-        it "should have debugging enabled using 1" do
-            Facter.debugging(1)
-            Facter.should be_debugging
-        end
-        it "should have debugging enabled using true" do
-            Facter.debugging(true)
-            Facter.should be_debugging
-        end
-        it "should have debugging enabled using any string except off" do
-            Facter.debugging('aaaaa')
-            Facter.should be_debugging
-        end
-        it "should have debugging disabled using 0" do
-            Facter.debugging(0)
-            Facter.should_not be_debugging
-        end
-        it "should have debugging disabled using false" do
-            Facter.debugging(false)
-            Facter.should_not be_debugging
-        end
-        it "should have debugging disabled using the string 'off'" do
-            Facter.debugging('off')
-            Facter.should_not be_debugging
-        end
+    it "should allow registration of a directory" do
+      Facter.search "/my/dir"
     end
 
-    describe "when setting timing mode" do
-        it "should have timing enabled using 1" do
-            Facter.timing(1)
-            Facter.should be_timing
-        end
-        it "should have timing enabled using true" do
-            Facter.timing(true)
-            Facter.should be_timing
-        end
-        it "should have timing disabled using 0" do
-            Facter.timing(0)
-            Facter.should_not be_timing
-        end
-        it "should have timing disabled using false" do
-            Facter.timing(false)
-            Facter.should_not be_timing
-        end
+    it "should allow registration of multiple directories" do
+      Facter.search "/my/dir", "/other/dir"
     end
 
-    describe "when registering directories to search" do
-        after { Facter.instance_variable_set("@search_path", []) }
-
-        it "should allow registration of a directory" do
-            Facter.search "/my/dir"
-        end
-
-        it "should allow registration of multiple directories" do
-            Facter.search "/my/dir", "/other/dir"
-        end
-
-        it "should return all registered directories when asked" do
-            Facter.search "/my/dir", "/other/dir"
-            Facter.search_path.should == %w{/my/dir /other/dir}
-        end
+    it "should return all registered directories when asked" do
+      Facter.search "/my/dir", "/other/dir"
+      Facter.search_path.should == %w{/my/dir /other/dir}
     end
+  end
 end