facter 1.5.6 → 1.5.7

data/spec/spec.opts

@@ -1,3 +1,5 @@
+--format
+s
 --colour
 --loadby
 mtime

data/spec/unit/data/solaris_ifconfig_all_with_multiple_interfaces

@@ -0,0 +1,8 @@
+lo0: flags=2001000849<UP,LOOPBACK,RUNNING,MULTICAST,IPv4,VIRTUAL> mtu 8232 index 1
+	inet 127.0.0.1 netmask ff000000 
+e1000g0: flags=201004843<UP,BROADCAST,RUNNING,MULTICAST,DHCP,IPv4,CoS> mtu 1500 index 2
+	inet 192.168.162.130 netmask ffffff00 broadcast 192.168.162.255
+lo0: flags=2002000849<UP,LOOPBACK,RUNNING,MULTICAST,IPv6,VIRTUAL> mtu 8252 index 1
+	inet6 ::1/128 
+e1000g0: flags=202004841<UP,RUNNING,MULTICAST,DHCP,IPv6,CoS> mtu 1500 index 2
+	inet6 fe80::20c:29ff:fe09:627e/10 

data/spec/unit/facter.rb

@@ -82,6 +82,22 @@ describe Facter do
         end
     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
+    end
+
     describe "when passed code as a block" do
         it "should execute the provided block" do
             Facter.add("block_testing") { setcode { "foo" } }

data/spec/unit/operatingsystem.rb

@@ -5,7 +5,10 @@ require File.dirname(__FILE__) + '/../spec_helper'
 require 'facter'
 
 describe "Operating System fact" do
-    
+
+    before do
+        Facter.clear
+    end
     
     after do
         Facter.clear

data/spec/unit/util/ip.rb

@@ -34,6 +34,13 @@ describe Facter::Util::IP do
         Facter::Util::IP.get_interfaces().should == ["lo0", "en0"]
     end
 
+    it "should return a list two interfaces on Solaris with two interfaces multiply reporting" do
+        sample_output_file = File.dirname(__FILE__) + '/../data/solaris_ifconfig_all_with_multiple_interfaces'
+        solaris_ifconfig = File.new(sample_output_file).read()
+        Facter::Util::IP.stubs(:get_all_interface_output).returns(solaris_ifconfig)
+        Facter::Util::IP.get_interfaces().should == ["lo0", "e1000g0"]
+    end
+
     it "should return a value for a specific interface" do
         Facter::Util::IP.should respond_to(:get_interface_value)
     end
@@ -63,6 +70,16 @@ describe Facter::Util::IP do
         Facter::Util::IP.get_interface_value("e1000g0", "netmask").should == "255.255.255.0"
     end
 
+    it "should return calculated network information for Solaris" do
+        sample_output_file = File.dirname(__FILE__) + "/../data/solaris_ifconfig_single_interface"
+        solaris_ifconfig_interface = File.new(sample_output_file).read()
+
+        Facter::Util::IP.stubs(:get_single_interface_output).with("e1000g0").returns(solaris_ifconfig_interface)
+        Facter.stubs(:value).with(:kernel).returns("SunOS")
+
+        Facter::Util::IP.get_network_value("e1000g0").should == "172.16.15.0"
+    end
+
     it "should return interface information for FreeBSD supported via an alias" do
         sample_output_file = File.dirname(__FILE__) + "/../data/6.0-STABLE_FreeBSD_ifconfig"
         ifconfig_interface = File.new(sample_output_file).read()
@@ -113,6 +130,12 @@ describe Facter::Util::IP do
 
         Facter::Util::IP.get_interface_value("en1", "netmask").should == "255.255.255.0"
     end
+    
+    it "should not get bonding master on interface aliases" do
+        Facter.stubs(:value).with(:kernel).returns("Linux")
+        
+        Facter::Util::IP.get_bonding_master("eth0:1").should be_nil
+    end
 
     [:freebsd, :netbsd, :openbsd, :sunos, :darwin].each do |platform|
         it "should require conversion from hex on #{platform}" do

data/spec/unit/util/loader.rb

@@ -201,6 +201,16 @@ describe Facter::Util::Loader do
             @loader.load_all
         end
 
+        it "should not raise an exception when a file is unloadable" do
+            @loader.expects(:search_path).returns %w{/one/dir}
+            Dir.expects(:entries).with("/one/dir").returns %w{a.rb}
+
+            Kernel.expects(:load).with("/one/dir/a.rb").raises(LoadError)
+            @loader.expects(:warn)
+
+            lambda { @loader.load_all }.should_not raise_error
+        end
+
         it "should load all facts from the environment" do
             Facter.expects(:add).with('one')
             Facter.expects(:add).with('two')

data/spec/unit/util/macosx.rb

@@ -44,4 +44,38 @@ describe Facter::Util::Macosx do
         Facter::Util::Macosx.expects(:profiler_data).with("SPSoftwareDataType").returns "eh"
         Facter::Util::Macosx.os_overview.should == "eh"
     end
+    
+    describe "when working out software version" do
+        
+        before do
+            Facter::Util::Resolution.expects(:exec).with("/usr/bin/sw_vers -productName").returns "Mac OS X"
+            Facter::Util::Resolution.expects(:exec).with("/usr/bin/sw_vers -buildVersion").returns "9J62"
+        end
+        
+        it "should have called sw_vers three times when determining software version" do
+            Facter::Util::Resolution.expects(:exec).with("/usr/bin/sw_vers -productVersion").returns "10.5.7"
+            Facter::Util::Macosx.sw_vers
+        end
+    
+        it "should return a hash with the correct keys when determining software version" do
+            Facter::Util::Resolution.expects(:exec).with("/usr/bin/sw_vers -productVersion").returns "10.5.7"
+            Facter::Util::Macosx.sw_vers.keys.sort.should == ["macosx_productName",
+                                                              "macosx_buildVersion",
+                                                              "macosx_productversion_minor",
+                                                              "macosx_productversion_major",
+                                                              "macosx_productVersion"].sort
+        end
+    
+        it "should split a product version of 'x.y.z' into separate hash entries correctly" do
+            Facter::Util::Resolution.expects(:exec).with("/usr/bin/sw_vers -productVersion").returns "1.2.3"
+            sw_vers = Facter::Util::Macosx.sw_vers
+            sw_vers["macosx_productversion_major"].should == "1.2"
+            sw_vers["macosx_productversion_minor"].should == "3"
+        end
+    
+        it "should treat a product version of 'x.y' as 'x.y.0" do
+            Facter::Util::Resolution.expects(:exec).with("/usr/bin/sw_vers -productVersion").returns "2.3"
+            Facter::Util::Macosx.sw_vers["macosx_productversion_minor"].should == "0"
+        end
+    end
 end

data/spec/unit/util/resolution.rb

@@ -25,6 +25,14 @@ describe Facter::Util::Resolution do
         Facter::Util::Resolution.new("yay").limit.should == 0
     end
 
+    it "should default to nil for code" do
+        Facter::Util::Resolution.new("yay").code.should be_nil
+    end
+
+    it "should default to nil for interpreter" do
+        Facter::Util::Resolution.new("yay").interpreter.should be_nil
+    end
+
     it "should provide a 'limit' method that returns the timeout" do
         res = Facter::Util::Resolution.new("yay")
         res.timeout = "testing"
@@ -71,6 +79,13 @@ describe Facter::Util::Resolution do
             @resolve = Facter::Util::Resolution.new("yay")
         end
 
+        describe "and setcode has not been called" do
+            it "should return nil" do
+                Facter::Util::Resolution.expects(:exec).with(nil, nil).never
+                @resolve.value.should be_nil
+            end
+        end
+
         describe "and the code is a string" do
             it "should return the result of executing the code with the interpreter" do
                 @resolve.setcode "/bin/foo"
@@ -103,11 +118,17 @@ describe Facter::Util::Resolution do
                 @resolve.value.should be_nil
             end
 
+            it "should return nil if the value is an empty block" do
+                @resolve.setcode { "" }
+                @resolve.value.should be_nil
+            end
+
             it "should use its limit method to determine the timeout, to avoid conflict when a 'timeout' method exists for some other reason" do
                 @resolve.expects(:timeout).never
                 @resolve.expects(:limit).returns "foo"
                 Timeout.expects(:timeout).with("foo")
 
+                @resolve.setcode { sleep 2; "raise This is a test"}
                 @resolve.value
             end
 

data/spec/unit/util/virtual.rb

@@ -0,0 +1,96 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+require 'facter/util/virtual'
+
+describe Facter::Util::Virtual do
+
+    after do
+        Facter.clear
+    end
+    it "should detect openvz" do
+        FileTest.stubs(:exists?).with("/proc/vz/veinfo").returns(true)
+        Facter::Util::Virtual.should be_openvz
+    end
+
+    it "should identify openvzhn when version file exists" do
+        Facter::Util::Virtual.stubs(:openvz?).returns(true)
+        FileTest.stubs(:exists?).with("/proc/vz/version").returns(true)
+        Facter::Util::Virtual.openvz_type().should == "openvzhn"
+    end
+
+    it "should identify openvzve when no version file exists" do
+        Facter::Util::Virtual.stubs(:openvz?).returns(true)
+        FileTest.stubs(:exists?).with("/proc/vz/version").returns(false)
+        Facter::Util::Virtual.openvz_type().should == "openvzve"
+    end
+
+    it "should identify Solaris zones when non-global zone" do
+        Facter::Util::Resolution.stubs(:exec).with("/sbin/zonename").returns("somezone")
+        Facter::Util::Virtual.should be_zone
+    end
+
+    it "should not identify Solaris zones when global zone" do
+        Facter::Util::Resolution.stubs(:exec).with("/sbin/zonename").returns("global")
+        Facter::Util::Virtual.should_not be_zone
+    end
+
+    it "should not detect vserver if no self status" do
+        FileTest.stubs(:exists?).with("/proc/self/status").returns(false)
+        Facter::Util::Virtual.should_not be_vserver
+    end
+
+    it "should detect vserver when vxid present in process status" do
+        FileTest.stubs(:exists?).with("/proc/self/status").returns(true)
+        File.stubs(:read).with("/proc/self/status").returns("VxID: 42\n")
+        Facter::Util::Virtual.should be_vserver
+    end
+
+    it "should detect vserver when s_context present in process status" do
+        FileTest.stubs(:exists?).with("/proc/self/status").returns(true)
+        File.stubs(:read).with("/proc/self/status").returns("s_context: 42\n")
+        Facter::Util::Virtual.should be_vserver
+    end
+
+    it "should not detect vserver when vserver flags not present in process status" do
+        FileTest.stubs(:exists?).with("/proc/self/status").returns(true)
+        File.stubs(:read).with("/proc/self/status").returns("wibble: 42\n")
+        Facter::Util::Virtual.should_not be_vserver
+    end
+
+    it "should identify vserver_host when /proc/virtual exists" do
+        Facter::Util::Virtual.expects(:vserver?).returns(true)
+        FileTest.stubs(:exists?).with("/proc/virtual").returns(true)
+        Facter::Util::Virtual.vserver_type().should == "vserver_host"
+    end
+
+    it "should identify vserver_type as vserver when /proc/virtual does not exist" do
+        Facter::Util::Virtual.expects(:vserver?).returns(true)
+        FileTest.stubs(:exists?).with("/proc/virtual").returns(false)
+        Facter::Util::Virtual.vserver_type().should == "vserver"
+    end
+
+    it "should detect xen when /proc/sys/xen exists" do
+        FileTest.expects(:exists?).with("/proc/sys/xen").returns(true)
+        Facter::Util::Virtual.should be_xen
+    end
+
+    it "should detect xen when /sys/bus/xen exists" do
+        FileTest.expects(:exists?).with("/proc/sys/xen").returns(false)
+        FileTest.expects(:exists?).with("/sys/bus/xen").returns(true)
+        Facter::Util::Virtual.should be_xen
+    end
+
+    it "should detect xen when /proc/xen exists" do
+        FileTest.expects(:exists?).with("/proc/sys/xen").returns(false)
+        FileTest.expects(:exists?).with("/sys/bus/xen").returns(false)
+        FileTest.expects(:exists?).with("/proc/xen").returns(true)
+        Facter::Util::Virtual.should be_xen
+    end
+
+    it "should not detect xen when no sysfs/proc xen directories exist" do
+        FileTest.expects(:exists?).with("/proc/sys/xen").returns(false)
+        FileTest.expects(:exists?).with("/sys/bus/xen").returns(false)
+        FileTest.expects(:exists?).with("/proc/xen").returns(false)
+        Facter::Util::Virtual.should_not be_xen
+    end
+end

data/spec/unit/virtual.rb

@@ -0,0 +1,51 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+require 'facter'
+require 'facter/util/virtual'
+
+describe "Virtual fact" do
+
+    after do
+        Facter.clear
+    end
+
+  it "should be zone on Solaris when a zone" do
+      Facter.fact(:kernel).stubs(:value).returns("SunOS")
+      Facter::Util::Virtual.stubs(:zone?).returns(true)
+      Facter::Util::Virtual.stubs(:vserver?).returns(false)
+      Facter::Util::Virtual.stubs(:xen?).returns(false)
+      Facter.fact(:virtual).value.should == "zone"
+  end
+
+end
+
+describe "is_virtual fact" do
+
+    after do
+        Facter.clear
+    end
+
+    it "should be virtual when running on xen" do
+       Facter.fact(:kernel).stubs(:value).returns("Linux")
+       Facter.fact(:virtual).stubs(:value).returns("xenu")
+       Facter.fact(:is_virtual).value.should == true
+    end
+
+    it "should be false when running on xen0" do
+       Facter.fact(:kernel).stubs(:value).returns("Linux")
+       Facter.fact(:virtual).stubs(:value).returns("xen0")
+       Facter.fact(:is_virtual).value.should == false
+    end
+
+    it "should be true when running on vmware" do
+        Facter.fact(:kernel).stubs(:value).returns("Linux")
+        Facter.fact(:virtual).stubs(:value).returns("vmware")
+        Facter.fact(:is_virtual).value.should == true
+    end
+
+    it "should be true when running on openvz" do
+        Facter.fact(:kernel).stubs(:value).returns("Linux")
+        Facter.fact(:virtual).stubs(:value).returns("openvzve")
+        Facter.fact(:is_virtual).value.should == true
+    end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: facter
 version: !ruby/object:Gem::Version 
-  version: 1.5.6
+  version: 1.5.7
 platform: ruby
 authors: 
 - Reductive Labs
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-04 00:00:00 +00:00
+date: 2009-09-25 00:00:00 +10:00
 default_executable: 
 dependencies: []
 
@@ -22,74 +22,77 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- README.rst
 - COPYING
+- Rakefile
+- ChangeLog
 - CHANGELOG
 - README
 - LICENSE
+- README.rst
 - INSTALL
-- Rakefile
 - TODO
 - install.rb
 - bin/facter
+- lib/facter.rb
 - lib/facter
-- lib/facter/processor.rb
-- lib/facter/macaddress.rb
-- lib/facter/hostname.rb
-- lib/facter/selinux.rb
-- lib/facter/facterversion.rb
-- lib/facter/macosx.rb
 - lib/facter/hardwaremodel.rb
-- lib/facter/kernelrelease.rb
 - lib/facter/uptime.rb
-- lib/facter/ec2.rb
-- lib/facter/fqdn.rb
-- lib/facter/iphostnumber.rb
-- lib/facter/uniqueid.rb
-- lib/facter/puppetversion.rb
-- lib/facter/timezone.rb
-- lib/facter/manufacturer.rb
+- lib/facter/lsbmajdistrelease.rb
+- lib/facter/macaddress.rb
+- lib/facter/processor.rb
 - lib/facter/operatingsystem.rb
-- lib/facter/network.rb
-- lib/facter/rubysitedir.rb
-- lib/facter/ssh.rb
-- lib/facter/rubyversion.rb
-- lib/facter/netmask.rb
-- lib/facter/kernelmajversion.rb
-- lib/facter/memory.rb
-- lib/facter/hardwareisa.rb
-- lib/facter/architecture.rb
-- lib/facter/ps.rb
-- lib/facter/lsb.rb
-- lib/facter/id.rb
-- lib/facter/ipaddress.rb
-- lib/facter/virtual.rb
-- lib/facter/kernelversion.rb
 - lib/facter/operatingsystemrelease.rb
-- lib/facter/interfaces.rb
+- lib/facter/uniqueid.rb
+- lib/facter/kernel.rb
+- lib/facter/rubyversion.rb
+- lib/facter/network.rb
+- lib/facter/path.rb
 - lib/facter/util
+- lib/facter/util/loader.rb
+- lib/facter/util/uptime.rb
 - lib/facter/util/confine.rb
+- lib/facter/util/fact.rb
+- lib/facter/util/ip.rb
+- lib/facter/util/values.rb
 - lib/facter/util/macosx.rb
-- lib/facter/util/uptime.rb
+- lib/facter/util/netmask.rb
+- lib/facter/util/resolution.rb
+- lib/facter/util/plist.rb
+- lib/facter/util/memory.rb
 - lib/facter/util/plist
-- lib/facter/util/plist/parser.rb
 - lib/facter/util/plist/generator.rb
-- lib/facter/util/fact.rb
+- lib/facter/util/plist/parser.rb
 - lib/facter/util/manufacturer.rb
-- lib/facter/util/loader.rb
+- lib/facter/util/virtual.rb
 - lib/facter/util/collection.rb
-- lib/facter/util/netmask.rb
-- lib/facter/util/memory.rb
-- lib/facter/util/plist.rb
-- lib/facter/util/ip.rb
-- lib/facter/util/resolution.rb
-- lib/facter/util/values.rb
+- lib/facter/interfaces.rb
+- lib/facter/macosx.rb
+- lib/facter/hostname.rb
+- lib/facter/ssh.rb
+- lib/facter/netmask.rb
+- lib/facter/timezone.rb
 - lib/facter/physicalprocessorcount.rb
-- lib/facter/lsbmajdistrelease.rb
+- lib/facter/facterversion.rb
+- lib/facter/architecture.rb
+- lib/facter/kernelmajversion.rb
+- lib/facter/kernelversion.rb
 - lib/facter/domain.rb
-- lib/facter/kernel.rb
+- lib/facter/fqdn.rb
+- lib/facter/ipaddress.rb
+- lib/facter/rubysitedir.rb
+- lib/facter/memory.rb
+- lib/facter/puppetversion.rb
+- lib/facter/id.rb
+- lib/facter/hardwareisa.rb
+- lib/facter/iphostnumber.rb
+- lib/facter/ec2.rb
+- lib/facter/selinux.rb
+- lib/facter/lsb.rb
+- lib/facter/manufacturer.rb
 - lib/facter/Cfkey.rb
-- lib/facter.rb
+- lib/facter/virtual.rb
+- lib/facter/ps.rb
+- lib/facter/kernelrelease.rb
 - conf/redhat
 - conf/redhat/facter.spec
 - conf/solaris
@@ -99,31 +102,34 @@ files:
 - conf/osx/PackageInfo.plist
 - conf/osx/preflight
 - etc/facter.conf
+- spec/Rakefile
+- spec/integration
+- spec/integration/facter.rb
+- spec/spec.opts
+- spec/spec_helper.rb
 - spec/unit
-- spec/unit/selinux.rb
 - spec/unit/facter.rb
 - spec/unit/operatingsystem.rb
-- spec/unit/data
-- spec/unit/data/darwin_ifconfig_all_with_multiple_interfaces
-- spec/unit/data/linux_ifconfig_all_with_single_interface
-- spec/unit/data/darwin_ifconfig_single_interface
-- spec/unit/data/Mac_OS_X_10.5.5_ifconfig
-- spec/unit/data/6.0-STABLE_FreeBSD_ifconfig
-- spec/unit/data/solaris_ifconfig_single_interface
-- spec/unit/interfaces.rb
 - spec/unit/util
+- spec/unit/util/loader.rb
 - spec/unit/util/confine.rb
-- spec/unit/util/macosx.rb
 - spec/unit/util/fact.rb
-- spec/unit/util/loader.rb
-- spec/unit/util/collection.rb
 - spec/unit/util/ip.rb
+- spec/unit/util/macosx.rb
 - spec/unit/util/resolution.rb
-- spec/spec_helper.rb
-- spec/integration
-- spec/integration/facter.rb
-- spec/spec.opts
-- spec/Rakefile
+- spec/unit/util/virtual.rb
+- spec/unit/util/collection.rb
+- spec/unit/interfaces.rb
+- spec/unit/data
+- spec/unit/data/6.0-STABLE_FreeBSD_ifconfig
+- spec/unit/data/linux_ifconfig_all_with_single_interface
+- spec/unit/data/darwin_ifconfig_all_with_multiple_interfaces
+- spec/unit/data/solaris_ifconfig_single_interface
+- spec/unit/data/solaris_ifconfig_all_with_multiple_interfaces
+- spec/unit/data/darwin_ifconfig_single_interface
+- spec/unit/data/Mac_OS_X_10.5.5_ifconfig
+- spec/unit/selinux.rb
+- spec/unit/virtual.rb
 has_rdoc: true
 homepage: http://reductivelabs.com
 post_install_message: